diff --git a/.github/labeler.yml b/.github/labeler.yml
index d3758efe3d..6685b12cbf 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,4 +1,4 @@
-"Changes: Sprites":
+"Changes: Sprites":
 - changed-files:
   - any-glob-to-any-file: '**/*.rsi/*.png'
 
diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml
index a20023a057..851c4339e9 100644
--- a/.github/workflows/build-map-renderer.yml
+++ b/.github/workflows/build-map-renderer.yml
@@ -1,4 +1,4 @@
-name: Build & Test Map Renderer
+name: Build & Test Map Renderer
 
 on:
   push:
diff --git a/.github/workflows/check-crlf.yml b/.github/workflows/check-crlf.yml
index 5e4b0d0341..3ae3c4121f 100644
--- a/.github/workflows/check-crlf.yml
+++ b/.github/workflows/check-crlf.yml
@@ -1,4 +1,4 @@
-name: CRLF Check
+name: CRLF Check
 
 on:
   pull_request:
diff --git a/.github/workflows/labeler-needsreview.yml b/.github/workflows/labeler-needsreview.yml
index d3373ce91d..7499d200a0 100644
--- a/.github/workflows/labeler-needsreview.yml
+++ b/.github/workflows/labeler-needsreview.yml
@@ -1,4 +1,4 @@
-name: "Labels: Review"
+name: "Labels: Review"
 
 on:
   pull_request_target:
diff --git a/.github/workflows/labeler-pr.yml b/.github/workflows/labeler-pr.yml
index 5e72630e4a..bd461bae69 100644
--- a/.github/workflows/labeler-pr.yml
+++ b/.github/workflows/labeler-pr.yml
@@ -1,4 +1,4 @@
-name: "Labels: PR"
+name: "Labels: PR"
 
 on:
 - pull_request_target
diff --git a/.github/workflows/labeler-untriaged.yml b/.github/workflows/labeler-untriaged.yml
index ec1d194851..5a7e4a51e7 100644
--- a/.github/workflows/labeler-untriaged.yml
+++ b/.github/workflows/labeler-untriaged.yml
@@ -1,4 +1,4 @@
-name: "Labels: Untriaged"
+name: "Labels: Untriaged"
 
 on:
   issues:
diff --git a/.github/workflows/publish-testing.yml b/.github/workflows/publish-testing.yml
index a8c1f45cfd..0863202d05 100644
--- a/.github/workflows/publish-testing.yml
+++ b/.github/workflows/publish-testing.yml
@@ -17,6 +17,8 @@ jobs:
     - uses: actions/checkout@v7
       with:
         submodules: 'recursive'
+        fetch-depth: 0
+        filter: blob:none
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v5
       with:
@@ -35,7 +37,7 @@ jobs:
 
     - name: Update changelog
       run: |
-        dotnet tool install --global SpaceWizards.ChangelogTool --version 1.0.7
+        dotnet tool install --global SpaceWizards.ChangelogTool --version 1.0.8
         ss14-changelog update -d Resources/Changelog
       env:
         REPO: ${{ github.repository }}
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 5390b91409..1d339fc7a1 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -52,4 +52,4 @@
             "preLaunchTask": "build"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Content.Benchmarks/ComponentQueryBenchmark.cs b/Content.Benchmarks/ComponentQueryBenchmark.cs
index 942fb10d71..883ad2891c 100644
--- a/Content.Benchmarks/ComponentQueryBenchmark.cs
+++ b/Content.Benchmarks/ComponentQueryBenchmark.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System;
 using System.IO;
 using System.Runtime.CompilerServices;
diff --git a/Content.Benchmarks/DestructibleBenchmark.cs b/Content.Benchmarks/DestructibleBenchmark.cs
index 58c834c0ae..10f9718d9a 100644
--- a/Content.Benchmarks/DestructibleBenchmark.cs
+++ b/Content.Benchmarks/DestructibleBenchmark.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
diff --git a/Content.Benchmarks/DeviceNetworkingBenchmark.cs b/Content.Benchmarks/DeviceNetworkingBenchmark.cs
index fcde4feb64..be68dcefd0 100644
--- a/Content.Benchmarks/DeviceNetworkingBenchmark.cs
+++ b/Content.Benchmarks/DeviceNetworkingBenchmark.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
@@ -6,7 +6,6 @@ using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
 using Content.IntegrationTests.Tests.DeviceNetwork;
 using Content.Server.DeviceNetwork.Systems;
-using Content.Shared.DeviceNetwork;
 using Robust.Shared;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
@@ -26,9 +25,6 @@ public class DeviceNetworkingBenchmark
     private readonly List<EntityUid> _targetEntities = new();
     private readonly List<EntityUid> _targetWirelessEntities = new();
 
-
-    private NetworkPayload _payload = default!;
-
     [TestPrototypes]
     private const string Prototypes = @"
 - type: entity
@@ -54,7 +50,7 @@ public class DeviceNetworkingBenchmark
     //public static IEnumerable<int> EntityCountSource { get; set; }
 
     //[ParamsSource(nameof(EntityCountSource))]
-    public int EntityCount = 500;
+    public int EntityCount = 1000;
 
     [GlobalSetup]
     public async Task SetupAsync()
@@ -70,14 +66,6 @@ public class DeviceNetworkingBenchmark
             _deviceNetworkSystem = entityManager.EntitySysManager.GetEntitySystem<DeviceNetworkSystem>();
             _deviceNetTestSystem = entityManager.EntitySysManager.GetEntitySystem<DeviceNetworkTestSystem>();
 
-            var testValue = "test";
-            _payload = new NetworkPayload
-            {
-                ["Test"] = testValue,
-                ["testnumber"] = 1,
-                ["testbool"] = true
-            };
-
             _sourceEntity = entityManager.SpawnEntity("DummyNetworkDevicePrivate", MapCoordinates.Nullspace);
             _sourceWirelessEntity = entityManager.SpawnEntity("DummyWirelessNetworkDevice", MapCoordinates.Nullspace);
 
@@ -120,7 +108,13 @@ public class DeviceNetworkingBenchmark
 
         _pair.Server.Post(() =>
         {
-            _deviceNetworkSystem.QueuePacket(_sourceEntity, null, _payload, 100);
+            var payload = new TestPayload
+            {
+                TestString = "test",
+                TestNumber = 1,
+                TestBool = true,
+            };
+            _deviceNetworkSystem.SendPacket(_sourceEntity, null, ref payload, 100);
         });
 
         await server.WaitRunTicks(1);
@@ -134,7 +128,53 @@ public class DeviceNetworkingBenchmark
 
         _pair.Server.Post(() =>
         {
-            _deviceNetworkSystem.QueuePacket(_sourceWirelessEntity, null, _payload, 100);
+            var payload = new TestPayload
+            {
+                TestString = "test",
+                TestNumber = 1,
+                TestBool = true,
+            };
+            _deviceNetworkSystem.SendPacket(_sourceWirelessEntity, null, ref payload, 100);
+        });
+
+        await server.WaitRunTicks(1);
+        await server.WaitIdleAsync();
+    }
+
+    [Benchmark(Description = "Device Net Broadcast No Connection Checks (Class payload)")]
+    public async Task DeviceNetworkBroadcastNoConnectionChecksClass()
+    {
+        var server = _pair.Server;
+
+        _pair.Server.Post(() =>
+        {
+            var payload = new TestPayloadClass
+            {
+                TestString = "test",
+                TestNumber = 1,
+                TestBool = true,
+            };
+            _deviceNetworkSystem.SendPacket(_sourceEntity, null, ref payload, 100);
+        });
+
+        await server.WaitRunTicks(1);
+        await server.WaitIdleAsync();
+    }
+
+    [Benchmark(Description = "Device Net Broadcast Wireless Connection Checks (Class payload)")]
+    public async Task DeviceNetworkBroadcastWirelessConnectionChecksClass()
+    {
+        var server = _pair.Server;
+
+        _pair.Server.Post(() =>
+        {
+            var payload = new TestPayloadClass
+            {
+                TestString = "test",
+                TestNumber = 1,
+                TestBool = true,
+            };
+            _deviceNetworkSystem.SendPacket(_sourceWirelessEntity, null, ref payload, 100);
         });
 
         await server.WaitRunTicks(1);
diff --git a/Content.Benchmarks/HeatCapacityBenchmark.cs b/Content.Benchmarks/HeatCapacityBenchmark.cs
index 18366306d7..1361f23280 100644
--- a/Content.Benchmarks/HeatCapacityBenchmark.cs
+++ b/Content.Benchmarks/HeatCapacityBenchmark.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Content.IntegrationTests;
diff --git a/Content.Benchmarks/NetSerializerIntBenchmark.cs b/Content.Benchmarks/NetSerializerIntBenchmark.cs
index 42afc80a1b..591e0fa00a 100644
--- a/Content.Benchmarks/NetSerializerIntBenchmark.cs
+++ b/Content.Benchmarks/NetSerializerIntBenchmark.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Buffers.Binary;
 using System.IO;
 using BenchmarkDotNet.Attributes;
diff --git a/Content.Benchmarks/Program.cs b/Content.Benchmarks/Program.cs
index 6f1f4e6f19..249c7cb03a 100644
--- a/Content.Benchmarks/Program.cs
+++ b/Content.Benchmarks/Program.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using BenchmarkDotNet.Running;
 using BenchmarkDotNet.Configs;
 using Robust.Benchmarks.Configs;
diff --git a/Content.Benchmarks/PvsBenchmark.cs b/Content.Benchmarks/PvsBenchmark.cs
index ab4e7981d2..44be7ee61e 100644
--- a/Content.Benchmarks/PvsBenchmark.cs
+++ b/Content.Benchmarks/PvsBenchmark.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System;
 using System.IO;
 using System.Linq;
diff --git a/Content.Benchmarks/RaiseEventBenchmark.cs b/Content.Benchmarks/RaiseEventBenchmark.cs
index b8c6bd7d47..c72b287115 100644
--- a/Content.Benchmarks/RaiseEventBenchmark.cs
+++ b/Content.Benchmarks/RaiseEventBenchmark.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
diff --git a/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs b/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs
index b6d5427480..17ab72b7b3 100644
--- a/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs
+++ b/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs
@@ -1,10 +1,10 @@
-using System.IO;
+using System.IO;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
-using Content.Server.Station.Systems;
 using Content.Shared.Roles;
+using Content.Shared.Station.Systems;
 using Robust.Shared;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
diff --git a/Content.Client/Access/IdCardSystem.cs b/Content.Client/Access/IdCardSystem.cs
index 24725d980c..80a3f12a54 100644
--- a/Content.Client/Access/IdCardSystem.cs
+++ b/Content.Client/Access/IdCardSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Access.Systems;
+using Content.Shared.Access.Systems;
 
 namespace Content.Client.Access;
 
diff --git a/Content.Client/Access/Systems/JobStatusSystem.cs b/Content.Client/Access/Systems/JobStatusSystem.cs
index 0b4ef98720..50968f68ff 100644
--- a/Content.Client/Access/Systems/JobStatusSystem.cs
+++ b/Content.Client/Access/Systems/JobStatusSystem.cs
@@ -1,4 +1,4 @@
-using Content.Client.Overlays;
+using Content.Client.Overlays;
 using Content.Shared.Access.Systems;
 using Content.Shared.StatusIcon;
 using Content.Shared.StatusIcon.Components;
diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml b/Content.Client/Access/UI/AgentIDCardWindow.xaml
index 6030851114..aa08172567 100644
--- a/Content.Client/Access/UI/AgentIDCardWindow.xaml
+++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml
@@ -38,7 +38,7 @@
                             <GridContainer Name="JobGroupGrid" Columns="3" />
                             <!-- Group buttons are generated in code -->
                         </BoxContainer>
-                        <PanelContainer StyleClasses="LowDivider" VerticalExpand="True" />
+                        <controls:Separator StyleClasses="LowDivider" VerticalExpand="True" Orientation="Vertical" MinHeight="2"/>
                         <PanelContainer StyleClasses="PanelInsetDark" HorizontalExpand="True">
                             <BoxContainer Margin="8">
                                 <GridContainer Name="IconGrid" Columns="4" />
diff --git a/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml b/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml
index 84d581487d..6eeed8a555 100644
--- a/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml
+++ b/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml
@@ -1,5 +1,5 @@
 <BoxContainer xmlns="https://spacestation14.io"
-              xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+              xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
               Orientation="Horizontal"
               Margin="10 10 10 10"
               VerticalExpand="True"
@@ -11,11 +11,7 @@
         <!-- Populated with C# code -->
     </BoxContainer>
 
-    <PanelContainer StyleClasses="LowDivider" VerticalExpand="True" Margin="0 0 0 0" SetWidth="2">
-        <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BackgroundColor="#FFFFFF" />
-        </PanelContainer.PanelOverride>
-    </PanelContainer>
+    <controls:Separator StyleClasses="LowDivider" VerticalExpand="True" SetWidth="2" Orientation="Vertical" MinHeight="2" ColorOverride="#FFFFFF"/>
 
     <!-- Access levels -->
     <ScrollContainer HorizontalExpand="True" VerticalExpand="True" Margin="10 0 0 0">
diff --git a/Content.Client/Administration/AdminNameOverlay.cs b/Content.Client/Administration/AdminNameOverlay.cs
index 5951dff2e1..78e49d087e 100644
--- a/Content.Client/Administration/AdminNameOverlay.cs
+++ b/Content.Client/Administration/AdminNameOverlay.cs
@@ -2,7 +2,7 @@ using System.Collections.Frozen;
 using System.Linq;
 using System.Numerics;
 using Content.Client.Administration.Systems;
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets.Fonts;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.Ghost.Components;
@@ -64,8 +64,9 @@ internal sealed class AdminNameOverlay : Overlay
         _prototypeManager = prototypeManager;
         ZIndex = 200;
         // Setting these to a specific ttf would break the antag symbols
-        _font = resourceCache.NotoStack();
-        _fontBold = resourceCache.NotoStack(variation: "Bold");
+        var fontStack = new NotoFontFamilyStack(resourceCache);
+        _font = fontStack.GetFont(10);
+        _fontBold = fontStack.GetFont(10, FontKind.Bold);
 
         config.OnValueChanged(CCVars.AdminOverlayAntagFormat, (show) => { _overlayFormat = UpdateOverlayFormat(show); }, true);
         config.OnValueChanged(CCVars.AdminOverlaySymbolStyle, (show) => { _overlaySymbolStyle = UpdateOverlaySymbolStyle(show); }, true);
diff --git a/Content.Client/Administration/AdminOverlayCommand.cs b/Content.Client/Administration/AdminOverlayCommand.cs
index afad7a4aef..67b5a564b6 100644
--- a/Content.Client/Administration/AdminOverlayCommand.cs
+++ b/Content.Client/Administration/AdminOverlayCommand.cs
@@ -1,4 +1,4 @@
-using Content.Client.Administration.Systems;
+using Content.Client.Administration.Systems;
 using Content.Shared.Commands;
 using Robust.Shared.Console;
 
diff --git a/Content.Client/Administration/AdminQuickInfoSystem.cs b/Content.Client/Administration/AdminQuickInfoSystem.cs
index 846dd3f0f0..778d33a221 100644
--- a/Content.Client/Administration/AdminQuickInfoSystem.cs
+++ b/Content.Client/Administration/AdminQuickInfoSystem.cs
@@ -1,3 +1,4 @@
+using Content.Client.UserInterface.Controls;
 using System.Linq;
 using Content.Client.Administration.Systems;
 using Content.Client.Stylesheets;
@@ -5,7 +6,6 @@ using Content.Shared.Administration;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Console;
-using Robust.Shared.Prototypes;
 using Robust.Shared.RichText;
 using Robust.Shared.Utility;
 
@@ -59,7 +59,7 @@ internal sealed partial class AdminQuickInfoSystem : EntitySystem
 
     public void OpenPopupFor(NetEntity[] entities)
     {
-        var vBox = new VBox() { SeparationOverride = 6 };;
+        var vBox = new VBox() { SeparationOverride = 6 };
         var popup = new Popup
         {
             Children =
@@ -79,7 +79,7 @@ internal sealed partial class AdminQuickInfoSystem : EntitySystem
         {
             if (!first)
             {
-                vBox.AddChild(new PanelContainer
+                vBox.AddChild(new Separator
                 {
                     StyleClasses = { StyleClass.LowDivider },
                     HorizontalExpand = true,
diff --git a/Content.Client/Administration/Managers/IClientAdminManager.cs b/Content.Client/Administration/Managers/IClientAdminManager.cs
index b4b5b48b81..157cff15ca 100644
--- a/Content.Client/Administration/Managers/IClientAdminManager.cs
+++ b/Content.Client/Administration/Managers/IClientAdminManager.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 
 namespace Content.Client.Administration.Managers
 {
diff --git a/Content.Client/Administration/Systems/BwoinkSystem.cs b/Content.Client/Administration/Systems/BwoinkSystem.cs
index 70c04f77fb..5de8d8dd0e 100644
--- a/Content.Client/Administration/Systems/BwoinkSystem.cs
+++ b/Content.Client/Administration/Systems/BwoinkSystem.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using Content.Shared.Administration;
 using JetBrains.Annotations;
 using Robust.Shared.Network;
diff --git a/Content.Client/Administration/Systems/HeadstandSystem.cs b/Content.Client/Administration/Systems/HeadstandSystem.cs
index 453982c53c..51412f8f1e 100644
--- a/Content.Client/Administration/Systems/HeadstandSystem.cs
+++ b/Content.Client/Administration/Systems/HeadstandSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration.Components;
+using Content.Shared.Administration.Components;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Administration.Systems;
diff --git a/Content.Client/Administration/Systems/KillSignSystem.cs b/Content.Client/Administration/Systems/KillSignSystem.cs
index 8ed2891468..f577142304 100644
--- a/Content.Client/Administration/Systems/KillSignSystem.cs
+++ b/Content.Client/Administration/Systems/KillSignSystem.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Shared.Administration.Components;
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
diff --git a/Content.Client/Administration/UI/BanList/BanListEui.cs b/Content.Client/Administration/UI/BanList/BanListEui.cs
index ff20e6fa89..c2fc2a4b74 100644
--- a/Content.Client/Administration/UI/BanList/BanListEui.cs
+++ b/Content.Client/Administration/UI/BanList/BanListEui.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Numerics;
 using Content.Client.Administration.UI.BanList.Bans;
 using Content.Client.Administration.UI.BanList.RoleBans;
diff --git a/Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml.cs b/Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml.cs
index 772f644b2e..1f369d4c19 100644
--- a/Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml.cs
+++ b/Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/Administration/UI/BanList/BanListWindow.xaml.cs b/Content.Client/Administration/UI/BanList/BanListWindow.xaml.cs
index fad55f9627..bd64bb6ed8 100644
--- a/Content.Client/Administration/UI/BanList/BanListWindow.xaml.cs
+++ b/Content.Client/Administration/UI/BanList/BanListWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Administration/UI/BanList/Bans/BanListControl.xaml.cs b/Content.Client/Administration/UI/BanList/Bans/BanListControl.xaml.cs
index a79fc4a137..857483c565 100644
--- a/Content.Client/Administration/UI/BanList/Bans/BanListControl.xaml.cs
+++ b/Content.Client/Administration/UI/BanList/Bans/BanListControl.xaml.cs
@@ -1,4 +1,5 @@
-using Content.Client.Administration.UI.CustomControls;
+using Content.Client.Stylesheets;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Administration.BanList;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
@@ -25,7 +26,7 @@ public sealed partial class BanListControl : Control
 
         foreach (var ban in bans)
         {
-            Bans.AddChild(new HSeparator());
+            Bans.AddChild(new Separator { StyleClasses = { StyleClass.LowDivider } });
 
             var line = new BanListLine(ban);
             line.IdsClicked += LineIdsClicked;
diff --git a/Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml b/Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml
index 00a652175c..58b315e2b4 100644
--- a/Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml
+++ b/Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml
@@ -1,6 +1,6 @@
-<ContainerButton
+<ContainerButton
     xmlns="https://spacestation14.io"
-    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <PanelContainer Name="BackgroundPanel" Access="Public">
         <BoxContainer
             Orientation="Horizontal"
@@ -9,19 +9,19 @@
             <Label Text="{Loc ban-list-header-ids}"
                    SizeFlagsStretchRatio="1"
                    HorizontalExpand="True"/>
-            <cc:VSeparator/>
+            <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
             <Label Text="{Loc ban-list-header-reason}"
                    SizeFlagsStretchRatio="6"
                    HorizontalExpand="True"/>
-            <cc:VSeparator/>
+            <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
             <Label Text="{Loc ban-list-header-time}"
                    SizeFlagsStretchRatio="2"
                    HorizontalExpand="True"/>
-            <cc:VSeparator/>
+            <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
             <Label Text="{Loc ban-list-header-expires}"
                    SizeFlagsStretchRatio="4"
                    HorizontalExpand="True"/>
-            <cc:VSeparator/>
+            <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
             <Label Text="{Loc ban-list-header-banning-admin}"
                    SizeFlagsStretchRatio="2"
                    HorizontalExpand="True"/>
diff --git a/Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml.cs b/Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml.cs
index c7cf73e1b2..d60c197097 100644
--- a/Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml.cs
+++ b/Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml b/Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml
index 9826585272..eea8a853f1 100644
--- a/Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml
+++ b/Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml
@@ -1,6 +1,6 @@
-<BoxContainer
+<BoxContainer
     xmlns="https://spacestation14.io"
-    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     Orientation="Horizontal"
     HorizontalExpand="True"
     SeparationOverride="4">
@@ -14,25 +14,25 @@
                 VerticalExpand="True"
                 MouseFilter="Pass"/>
     </BoxContainer>
-    <cc:VSeparator/>
+    <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
     <Label Name="Reason"
            Access="Public"
            SizeFlagsStretchRatio="6"
            HorizontalExpand="True"
            VerticalExpand="True"/>
-    <cc:VSeparator/>
+    <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
     <Label Name="BanTime"
            Access="Public"
            SizeFlagsStretchRatio="2"
            HorizontalExpand="True"
            ClipText="True"/>
-    <cc:VSeparator/>
+    <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
     <Label Name="Expires"
            Access="Public"
            SizeFlagsStretchRatio="4"
            HorizontalExpand="True"
            ClipText="True"/>
-    <cc:VSeparator/>
+    <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
     <Label Name="BanningAdmin"
            Access="Public"
            SizeFlagsStretchRatio="2"
diff --git a/Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml.cs b/Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml.cs
index f1320ef7b9..dc42fea217 100644
--- a/Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml.cs
+++ b/Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration.BanList;
+using Content.Shared.Administration.BanList;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Administration/UI/BanList/IBanListLine.cs b/Content.Client/Administration/UI/BanList/IBanListLine.cs
index 565e707218..492f755cb0 100644
--- a/Content.Client/Administration/UI/BanList/IBanListLine.cs
+++ b/Content.Client/Administration/UI/BanList/IBanListLine.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration.BanList;
+using Content.Shared.Administration.BanList;
 using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.Administration.UI.BanList;
diff --git a/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListControl.xaml.cs b/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListControl.xaml.cs
index f217dec5e6..baa806edf4 100644
--- a/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListControl.xaml.cs
+++ b/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListControl.xaml.cs
@@ -1,4 +1,5 @@
-using Content.Client.Administration.UI.CustomControls;
+using Content.Client.Stylesheets;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Administration.BanList;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
@@ -25,7 +26,7 @@ public sealed partial class RoleBanListControl : Control
 
         foreach (var ban in bans)
         {
-            RoleBans.AddChild(new HSeparator());
+            RoleBans.AddChild(new Separator { StyleClasses = { StyleClass.LowDivider } });
 
             var line = new RoleBanListLine(ban);
             line.IdsClicked += LineIdsClicked;
diff --git a/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListHeader.xaml b/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListHeader.xaml
index 0302266cfc..e5c7d62b10 100644
--- a/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListHeader.xaml
+++ b/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListHeader.xaml
@@ -1,6 +1,6 @@
-<ContainerButton
+<ContainerButton
     xmlns="https://spacestation14.io"
-    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <PanelContainer Name="BackgroundPanel" Access="Public">
         <BoxContainer
             Orientation="Horizontal"
@@ -9,23 +9,23 @@
             <Label Text="{Loc ban-list-header-ids}"
                    SizeFlagsStretchRatio="1"
                    HorizontalExpand="True"/>
-            <cc:VSeparator/>
+            <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
             <Label Text="{Loc ban-list-header-reason}"
                    SizeFlagsStretchRatio="4.5"
                    HorizontalExpand="True"/>
-            <cc:VSeparator Name="ReasonSeparator" Access="Public"/>
+            <controls:Separator StyleClasses="LowDivider" Name="ReasonSeparator" Access="Public" Orientation="Vertical" MinHeight="5"/>
             <Label Text="{Loc ban-list-header-role}"
                    SizeFlagsStretchRatio="1.5"
                    HorizontalExpand="True"/>
-            <cc:VSeparator/>
+            <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
             <Label Text="{Loc ban-list-header-time}"
                    SizeFlagsStretchRatio="2"
                    HorizontalExpand="True"/>
-            <cc:VSeparator/>
+            <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
             <Label Text="{Loc ban-list-header-expires}"
                    SizeFlagsStretchRatio="4"
                    HorizontalExpand="True"/>
-            <cc:VSeparator/>
+            <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
             <Label Text="{Loc ban-list-header-banning-admin}"
                    SizeFlagsStretchRatio="2"
                    HorizontalExpand="True"/>
diff --git a/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListHeader.xaml.cs b/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListHeader.xaml.cs
index e311e7479f..46b7f65ab7 100644
--- a/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListHeader.xaml.cs
+++ b/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListHeader.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListLine.xaml b/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListLine.xaml
index d3c99dd210..fb320f7592 100644
--- a/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListLine.xaml
+++ b/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListLine.xaml
@@ -1,6 +1,6 @@
-<BoxContainer
+<BoxContainer
     xmlns="https://spacestation14.io"
-    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     Orientation="Horizontal"
     HorizontalExpand="True"
     SeparationOverride="4">
@@ -14,30 +14,30 @@
                 VerticalExpand="True"
                 MouseFilter="Pass"/>
     </BoxContainer>
-    <cc:VSeparator/>
+    <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
     <Label Name="Reason"
            Access="Public"
            SizeFlagsStretchRatio="4.5"
            HorizontalExpand="True"
            VerticalExpand="True"/>
-    <cc:VSeparator/>
+    <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
     <Label Name="Role"
            SizeFlagsStretchRatio="1.5"
            HorizontalExpand="True"
            VerticalExpand="True"/>
-    <cc:VSeparator/>
+    <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
     <Label Name="BanTime"
            Access="Public"
            SizeFlagsStretchRatio="2"
            HorizontalExpand="True"
            ClipText="True"/>
-    <cc:VSeparator/>
+    <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
     <Label Name="Expires"
            Access="Public"
            SizeFlagsStretchRatio="4"
            HorizontalExpand="True"
            ClipText="True"/>
-    <cc:VSeparator/>
+    <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
     <Label Name="BanningAdmin"
            Access="Public"
            SizeFlagsStretchRatio="2"
diff --git a/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListLine.xaml.cs b/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListLine.xaml.cs
index ca0d214e31..006d27e9d0 100644
--- a/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListLine.xaml.cs
+++ b/Content.Client/Administration/UI/BanList/RoleBans/RoleBanListLine.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration.BanList;
+using Content.Shared.Administration.BanList;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml
index ede0ad3ee5..68bc4f63c8 100644
--- a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml
+++ b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml
@@ -1,6 +1,7 @@
 <DefaultWindow
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     Title="{Loc ban-panel-title}" MinSize="410 500">
     <BoxContainer Orientation="Vertical">
         <TabContainer Name="Tabs" VerticalExpand="True">
@@ -35,7 +36,7 @@
                     <Label Text="{Loc ban-panel-severity}" />
                     <OptionButton Name="SeverityOption" />
                 </BoxContainer>
-                <cc:HSeparator Margin="1"/>
+                <controls:Separator StyleClasses="LowDivider" Margin="1"/>
                 <TextEdit Name="ReasonTextEdit" MinHeight="100" VerticalExpand="True" HorizontalExpand="True" />
             </BoxContainer>
             <!-- Player List -->
diff --git a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
index 130164cf8e..82d01a3525 100644
--- a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
+++ b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
@@ -2,7 +2,8 @@ using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Numerics;
-using Content.Client.Administration.UI.CustomControls;
+using Content.Client.Stylesheets;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
@@ -218,7 +219,7 @@ public sealed partial class BanPanel : DefaultWindow
             }
         });
         RolesContainer.AddChild(outerContainer);
-        RolesContainer.AddChild(new HSeparator());
+        RolesContainer.AddChild(new Separator { StyleClasses = { StyleClass.LowDivider } });
     }
 
     private Button CreateRoleGroupHeader(string groupName, BoxContainer header, Color color, GridContainer innerContainer)
diff --git a/Content.Client/Administration/UI/CustomControls/AdminLogImpactButton.cs b/Content.Client/Administration/UI/CustomControls/AdminLogImpactButton.cs
index 879569ce2e..50fc93bca8 100644
--- a/Content.Client/Administration/UI/CustomControls/AdminLogImpactButton.cs
+++ b/Content.Client/Administration/UI/CustomControls/AdminLogImpactButton.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration.Logs;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Robust.Client.UserInterface.Controls;
 
diff --git a/Content.Client/Administration/UI/CustomControls/AdminLogLabel.cs b/Content.Client/Administration/UI/CustomControls/AdminLogLabel.cs
index 9be3578eed..51e92a2c10 100644
--- a/Content.Client/Administration/UI/CustomControls/AdminLogLabel.cs
+++ b/Content.Client/Administration/UI/CustomControls/AdminLogLabel.cs
@@ -1,4 +1,5 @@
-using Content.Shared.Administration.Logs;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Administration.Logs;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 
@@ -6,7 +7,7 @@ namespace Content.Client.Administration.UI.CustomControls;
 
 public sealed class AdminLogLabel : RichTextLabel
 {
-    public AdminLogLabel(ref SharedAdminLog log, HSeparator separator)
+    public AdminLogLabel(ref SharedAdminLog log, Separator separator)
     {
         Log = log;
         Separator = separator;
@@ -19,7 +20,7 @@ public sealed class AdminLogLabel : RichTextLabel
 
     public new SharedAdminLog Log { get; }
 
-    public HSeparator Separator { get; }
+    public Separator Separator { get; }
 
     private void VisibilityChanged(Control control)
     {
diff --git a/Content.Client/Administration/UI/CustomControls/AdminLogPlayerButton.cs b/Content.Client/Administration/UI/CustomControls/AdminLogPlayerButton.cs
index a3b0438561..97997550b8 100644
--- a/Content.Client/Administration/UI/CustomControls/AdminLogPlayerButton.cs
+++ b/Content.Client/Administration/UI/CustomControls/AdminLogPlayerButton.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.Administration.UI.CustomControls;
diff --git a/Content.Client/Administration/UI/CustomControls/AdminLogTypeButton.cs b/Content.Client/Administration/UI/CustomControls/AdminLogTypeButton.cs
index e0a8a55e79..1eb47c60ef 100644
--- a/Content.Client/Administration/UI/CustomControls/AdminLogTypeButton.cs
+++ b/Content.Client/Administration/UI/CustomControls/AdminLogTypeButton.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration.Logs;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Robust.Client.UserInterface.Controls;
 
diff --git a/Content.Client/Administration/UI/CustomControls/HSeparator.cs b/Content.Client/Administration/UI/CustomControls/HSeparator.cs
deleted file mode 100644
index 2dfb0b27fe..0000000000
--- a/Content.Client/Administration/UI/CustomControls/HSeparator.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Maths;
-
-namespace Content.Client.Administration.UI.CustomControls;
-
-public sealed class HSeparator : Control
-{
-    private static readonly Color SeparatorColor = Color.FromHex("#3D4059");
-
-    public HSeparator(Color color)
-    {
-        AddChild(new PanelContainer
-        {
-            PanelOverride = new StyleBoxFlat
-            {
-                BackgroundColor = color,
-                ContentMarginBottomOverride = 2, ContentMarginLeftOverride = 2
-            }
-        });
-    }
-
-    public HSeparator() : this(SeparatorColor) { }
-}
diff --git a/Content.Client/Administration/UI/CustomControls/UICommandButton.cs b/Content.Client/Administration/UI/CustomControls/UICommandButton.cs
index ea10c7637e..be333a1f1d 100644
--- a/Content.Client/Administration/UI/CustomControls/UICommandButton.cs
+++ b/Content.Client/Administration/UI/CustomControls/UICommandButton.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 
diff --git a/Content.Client/Administration/UI/CustomControls/VSeparator.cs b/Content.Client/Administration/UI/CustomControls/VSeparator.cs
deleted file mode 100644
index 0ab8a88c7b..0000000000
--- a/Content.Client/Administration/UI/CustomControls/VSeparator.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Numerics;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Maths;
-
-namespace Content.Client.Administration.UI.CustomControls;
-
-public sealed class VSeparator : PanelContainer
-{
-    private static readonly Color SeparatorColor = Color.FromHex("#3D4059");
-
-    public VSeparator(Color color)
-    {
-        MinSize = new Vector2(2, 5);
-
-        AddChild(new PanelContainer
-        {
-            PanelOverride = new StyleBoxFlat
-            {
-                BackgroundColor = color
-            }
-        });
-    }
-
-    public VSeparator() : this(SeparatorColor) { }
-}
diff --git a/Content.Client/Administration/UI/EventLog/AdminEventLogEui.cs b/Content.Client/Administration/UI/EventLog/AdminEventLogEui.cs
index 1691519d24..081eb6f91f 100644
--- a/Content.Client/Administration/UI/EventLog/AdminEventLogEui.cs
+++ b/Content.Client/Administration/UI/EventLog/AdminEventLogEui.cs
@@ -1,4 +1,4 @@
-using Content.Client.Eui;
+using Content.Client.Eui;
 using Content.Shared.Administration.AdminEventLog;
 using Content.Shared.Eui;
 using JetBrains.Annotations;
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml
index cd93ffeb0a..95655bea30 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml
+++ b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml
@@ -1,5 +1,5 @@
-<Control xmlns="https://spacestation14.io"
-         xmlns:aui="clr-namespace:Content.Client.Administration.UI.CustomControls">
+<Control xmlns="https://spacestation14.io"
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <PanelContainer StyleClasses="BackgroundDark">
         <BoxContainer Orientation="Horizontal">
             <BoxContainer Orientation="Vertical">
@@ -24,7 +24,7 @@
                             <BoxContainer Name="TypesContainer" Access="Public" Orientation="Vertical"/>
                         </ScrollContainer>
                     </BoxContainer>
-                    <aui:VSeparator/>
+                    <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
                     <BoxContainer Orientation="Vertical" MinWidth="200">
                         <LineEdit Name="PlayerSearch" Access="Public" StyleClasses="actionSearchBox"
                                   HorizontalExpand="true" PlaceHolder="{Loc admin-logs-search-players-placeholder}"/>
@@ -40,7 +40,7 @@
                             <BoxContainer Name="PlayersContainer" Access="Public" Orientation="Vertical"/>
                         </ScrollContainer>
                     </BoxContainer>
-                    <aui:VSeparator/>
+                    <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
                 </BoxContainer>
             </BoxContainer>
             <BoxContainer Orientation="Vertical" HorizontalExpand="True">
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
index 0a49ab127d..64a3d86fb0 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
+++ b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
@@ -1,6 +1,8 @@
-using System.Linq;
+using System.Linq;
 using System.Runtime.InteropServices;
 using Content.Client.Administration.UI.CustomControls;
+using Content.Client.Stylesheets;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Robust.Client.AutoGenerated;
@@ -486,7 +488,7 @@ public sealed partial class AdminLogsControl : Control
         for (var i = 0; i < span.Length; i++)
         {
             ref var log = ref span[i];
-            var separator = new HSeparator();
+            var separator = new Separator { StyleClasses = { StyleClass.LowDivider } };
             var label = new AdminLogLabel(ref log, separator);
             label.Visible = ShouldShowLog(label);
 
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
index 5a3976d3f1..71122c72ac 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
+++ b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 using Content.Client.Administration.UI.CustomControls;
 using Content.Client.Eui;
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs b/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs
index 23e6e9145e..3a70540685 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml b/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml
index aca2d3a235..ce668224d5 100644
--- a/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml
+++ b/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml
@@ -1,23 +1,23 @@
 <BoxContainer xmlns="https://spacestation14.io"
-              xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+              xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
               Orientation="Vertical">
     <BoxContainer Name ="MetadataContainer" Orientation="Horizontal">
         <TextureRect Name="SeverityRect" Margin="2"/>
         <Label Name="TimeLabel" Margin="4 0" />
-        <cc:HSeparator Margin="4 0" />
+        <controls:Separator StyleClasses="LowDivider" Margin="4 0" Orientation="Vertical" MinHeight="2"/>
         <Label Name="ServerLabel" />
-        <cc:HSeparator Margin="4 0" />
+        <controls:Separator StyleClasses="LowDivider" Margin="4 0" Orientation="Vertical" MinHeight="2"/>
         <Label Name="RoundLabel" />
-        <cc:HSeparator Margin="4 0" />
+        <controls:Separator StyleClasses="LowDivider" Margin="4 0" Orientation="Vertical" MinHeight="2"/>
         <Label Name="AdminLabel" />
-        <cc:HSeparator Margin="4 0" />
+        <controls:Separator StyleClasses="LowDivider" Margin="4 0" Orientation="Vertical" MinHeight="2"/>
         <Label Name="PlaytimeLabel" />
-        <cc:HSeparator Name="SecretSeparator" Visible="False" Margin="4 0" />
+        <controls:Separator StyleClasses="LowDivider" Name="SecretSeparator" Visible="False" Margin="4 0" Orientation="Vertical" MinHeight="2"/>
         <Label Name="SecretLabel" Text="{Loc admin-notes-secret} " Visible="False" />
     </BoxContainer>
     <RichTextLabel Name="NoteLabel" />
     <Label Name="ExpiresLabel" Text="{Loc admin-note-editor-expiry-label}" Visible="False" />
     <Label Name="ExtraLabel" Visible="False" Modulate="#1AA7EC" />
     <Label Name="EditedLabel" Visible="False" />
-    <cc:HSeparator Name="Separator" />
+    <controls:Separator StyleClasses="LowDivider" Name="Separator"/>
 </BoxContainer>
diff --git a/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs b/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs
index 4e4027e7d4..5883c76227 100644
--- a/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs
+++ b/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration.Notes;
+using Content.Shared.Administration.Notes;
 using Content.Shared.Database;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs b/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
index 0e7de8acba..4d61937698 100644
--- a/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
+++ b/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
@@ -362,4 +362,4 @@ public sealed partial class NoteEdit : FancyWindow
 
         SubmitPressed = null;
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml.cs
index 63534659f4..c759a36dfd 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 
 namespace Content.Client.Administration.UI.Tabs.AdminTab
diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs
index 1d71d5bdf4..8bfb050793 100644
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.Administration.Managers;
+using Content.Client.Administration.Managers;
 using Content.Client.UserInterface.Systems.DecalPlacer;
 using Content.Shared.Administration;
 using Robust.Client.AutoGenerated;
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml.cs
index b757c1b4f0..21b3be6e06 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 
 namespace Content.Client.Administration.UI.Tabs.AtmosTab
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml
index f4298bbc00..b0c9ae4d57 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml
@@ -1,5 +1,4 @@
-<Control xmlns="https://spacestation14.io"
-         xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+<Control xmlns="https://spacestation14.io"
          xmlns:ot="clr-namespace:Content.Client.Administration.UI.Tabs.ObjectsTab"
          xmlns:co="clr-namespace:Content.Client.UserInterface.Controls">
     <BoxContainer Orientation="Vertical">
@@ -10,10 +9,10 @@
                       SizeFlagsStretchRatio="1" />
             <Button Name="RefreshListButton" Text="{Loc object-tab-refresh-button}" ToggleMode="False" />
         </BoxContainer>
-        <cc:HSeparator />
+        <co:Separator StyleClasses="LowDivider" MinWidth="2" />
         <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
             <ot:ObjectsTabHeader Name="ListHeader" />
-            <cc:HSeparator />
+            <co:Separator StyleClasses="LowDivider" MinWidth="2" />
             <co:SearchListContainer Name="SearchList" Access="Public" VerticalExpand="True" />
         </BoxContainer>
     </BoxContainer>
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
index 4195fe7a75..79bc3c2be4 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
@@ -1,6 +1,6 @@
 using Content.Client.Administration.Managers;
-using Content.Client.Station;
 using Content.Client.UserInterface.Controls;
+using Content.Shared.Station.Systems;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
 using Robust.Client.Graphics;
@@ -79,7 +79,7 @@ public sealed partial class ObjectsTab : Control
                     // teleport to the station's largest grid, not to the station entity (which is in nullspace)
                     if (!_entityManager.TryGetEntity(nent, out var station))
                         break;
-                    var largestGrid = _entityManager.EntitySysManager.GetEntitySystem<StationSystem>().GetLargestGrid(station.Value);
+                    var largestGrid = _entityManager.System<StationSystem>().GetLargestGrid(station.Value);
                     if (largestGrid == null)
                         break;
                     _console.ExecuteCommand($"tpto {largestGrid.Value}");
@@ -107,7 +107,7 @@ public sealed partial class ObjectsTab : Control
         switch (selection)
         {
             case ObjectsTabSelection.Stations:
-                entities.AddRange(_entityManager.EntitySysManager.GetEntitySystem<StationSystem>().GetStationNames());
+                entities.AddRange(_entityManager.System<StationSystem>().GetStationNames());
                 break;
             case ObjectsTabSelection.Grids:
                 {
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
index 7c9dde79b5..38b4d0c875 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
@@ -1,5 +1,4 @@
-<PanelContainer xmlns="https://spacestation14.io"
-                xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+<PanelContainer xmlns="https://spacestation14.io"
                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                 Name="BackgroundColorPanel">
     <BoxContainer Orientation="Horizontal"
@@ -9,18 +8,18 @@
                SizeFlagsStretchRatio="5"
                HorizontalExpand="True"
                ClipText="True"/>
-        <customControls:VSeparator/>
+        <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
         <Label Name="EIDLabel"
                SizeFlagsStretchRatio="5"
                HorizontalExpand="True"
                ClipText="True"/>
-        <customControls:VSeparator/>
+        <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
         <Button Name="TeleportButton"
                 Text="{Loc object-tab-entity-teleport}"
                SizeFlagsStretchRatio="3"
                HorizontalExpand="True"
                ClipText="True"/>
-        <customControls:VSeparator/>
+        <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
         <controls:ConfirmButton Name="DeleteButton"
                 Text="{Loc object-tab-entity-delete}"
                 SizeFlagsStretchRatio="3"
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml
index 2cc7d76180..4a17adc7fe 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml
@@ -1,5 +1,5 @@
 <Control xmlns="https://spacestation14.io"
-         xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <PanelContainer Name="BackgroundColorPanel" Access="Public"/>
     <BoxContainer Orientation="Horizontal"
                   HorizontalExpand="True"
@@ -10,7 +10,7 @@
                ClipText="True"
                Text="{Loc object-tab-object-name}"
                MouseFilter="Pass"/>
-        <cc:VSeparator/>
+        <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
         <Label Name="EntityIDLabel"
                SizeFlagsStretchRatio="5"
                HorizontalExpand="True"
diff --git a/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerStatusWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerStatusWindow.xaml.cs
index ec16bf6aea..63e28a6dd0 100644
--- a/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerStatusWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerStatusWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
index ebc7734cb9..a67f6a333c 100644
--- a/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Corvax.Interfaces.Shared;
+using Content.Corvax.Interfaces.Shared;
 using Content.Shared.Administration.Events;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml
index e0723d4bdc..a2264ed0fc 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml
@@ -1,6 +1,5 @@
-<Control xmlns="https://spacestation14.io"
+<Control xmlns="https://spacestation14.io"
          xmlns:pt="clr-namespace:Content.Client.Administration.UI.Tabs.PlayerTab"
-         xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
          xmlns:co="clr-namespace:Content.Client.UserInterface.Controls">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
@@ -13,7 +12,7 @@
         </BoxContainer>
         <Control MinSize="0 5"/>
         <pt:PlayerTabHeader Name="ListHeader"/>
-        <cc:HSeparator/>
+        <co:Separator StyleClasses="LowDivider" MinWidth="2" />
         <co:SearchListContainer Name="SearchList" Access="Public" VerticalExpand="True"/>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
index a30b909226..9147f8c7cb 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
@@ -1,5 +1,5 @@
-<PanelContainer xmlns="https://spacestation14.io"
-                xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+<PanelContainer xmlns="https://spacestation14.io"
+                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                 Name="BackgroundColorPanel">
     <BoxContainer Orientation="Horizontal"
                   HorizontalExpand="True"
@@ -8,22 +8,22 @@
                SizeFlagsStretchRatio="3"
                HorizontalExpand="True"
                ClipText="True"/>
-        <customControls:VSeparator/>
+        <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
         <Label Name="CharacterLabel"
                SizeFlagsStretchRatio="3"
                HorizontalExpand="True"
                ClipText="True"/>
-        <customControls:VSeparator/>
+        <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
         <Label Name="JobLabel"
                SizeFlagsStretchRatio="2"
                HorizontalExpand="True"
                ClipText="True"/>
-        <customControls:VSeparator/>
+        <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
         <Label Name="RoleTypeLabel"
                SizeFlagsStretchRatio="2"
                HorizontalExpand="True"
                ClipText="True"/>
-        <customControls:VSeparator/>
+        <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
         <Label Name="OverallPlaytimeLabel"
                SizeFlagsStretchRatio="1"
                HorizontalExpand="True"
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
index 68516491d9..3b9f68d2b0 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using Content.Shared.Mind;
 using Content.Shared.Roles;
 using Robust.Client.AutoGenerated;
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
index a192ad017a..dcb440c4f4 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
@@ -1,5 +1,5 @@
-<Control xmlns="https://spacestation14.io"
-                 xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
+<Control xmlns="https://spacestation14.io"
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <PanelContainer Name="BackgroundColorPanel" Access="Public"/>
     <BoxContainer Orientation="Horizontal"
                   HorizontalExpand="True"
@@ -10,28 +10,28 @@
                ClipText="True"
                Text="{Loc player-tab-username}"
                MouseFilter="Pass"/>
-        <cc:VSeparator/>
+        <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
         <Label Name="CharacterLabel"
                SizeFlagsStretchRatio="3"
                HorizontalExpand="True"
                ClipText="True"
                Text="{Loc player-tab-character}"
                MouseFilter="Pass"/>
-        <cc:VSeparator/>
+        <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
         <Label Name="JobLabel"
                SizeFlagsStretchRatio="2"
                HorizontalExpand="True"
                ClipText="True"
                Text="{Loc player-tab-job}"
                MouseFilter="Pass"/>
-        <cc:VSeparator/>
+        <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
         <Label Name="RoleTypeLabel"
                SizeFlagsStretchRatio="2"
                HorizontalExpand="True"
                ClipText="True"
                Text="{Loc player-tab-roletype}"
                MouseFilter="Pass"/>
-        <cc:VSeparator/>
+        <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
         <Label Name="PlaytimeLabel"
                SizeFlagsStretchRatio="1"
                HorizontalExpand="True"
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs
index ef505d00f0..3875ad4a9a 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs b/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs
index cce809d35a..a5c4500148 100644
--- a/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs
index e8ba41a3fe..43854c8f95 100644
--- a/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using Content.Shared.CCVar;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
diff --git a/Content.Client/Animations/EntityPickupAnimationComponent.cs b/Content.Client/Animations/EntityPickupAnimationComponent.cs
index 663ce628f6..96d580acb7 100644
--- a/Content.Client/Animations/EntityPickupAnimationComponent.cs
+++ b/Content.Client/Animations/EntityPickupAnimationComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Client.Animations;
+namespace Content.Client.Animations;
 
 /// <summary>
 ///     Applied to client-side clone entities to animate them approaching the player that
diff --git a/Content.Client/Animations/EntityPickupAnimationSystem.cs b/Content.Client/Animations/EntityPickupAnimationSystem.cs
index 7445267ddf..23b659f2bf 100644
--- a/Content.Client/Animations/EntityPickupAnimationSystem.cs
+++ b/Content.Client/Animations/EntityPickupAnimationSystem.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
diff --git a/Content.Client/Anomaly/Effects/GravityAnomalySystem.cs b/Content.Client/Anomaly/Effects/GravityAnomalySystem.cs
index 212e207310..767f1c805f 100644
--- a/Content.Client/Anomaly/Effects/GravityAnomalySystem.cs
+++ b/Content.Client/Anomaly/Effects/GravityAnomalySystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Anomaly.Effects;
+using Content.Shared.Anomaly.Effects;
 
 namespace Content.Client.Anomaly.Effects;
 
diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml
index 269b44f62c..ad5dc4cd8b 100644
--- a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml
+++ b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml
@@ -49,7 +49,7 @@
 
          <!-- Footer -->
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'anomaly-generator-flavor-left'}" StyleClasses="WindowFooterText" />
                 <Label Text="{Loc 'anomaly-generator-flavor-right'}" StyleClasses="WindowFooterText"
diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
index f26219d532..a4da4239e4 100644
--- a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
+++ b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.Message;
+using Content.Client.Message;
 using Content.Shared.Anomaly;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
diff --git a/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml.cs b/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml.cs
index f849ce5d33..38ebc99ea0 100644
--- a/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml.cs
+++ b/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.Message;
+using Content.Client.Message;
 using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Antag/ClientAntagSelectionSystem.cs b/Content.Client/Antag/ClientAntagSelectionSystem.cs
new file mode 100644
index 0000000000..6c52b2a480
--- /dev/null
+++ b/Content.Client/Antag/ClientAntagSelectionSystem.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Antag;
+using Content.Shared.Antag.Components;
+using Content.Shared.Roles;
+using Robust.Shared.Audio;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Antag;
+
+/// <inheritdoc/>
+public sealed partial class ClientAntagSelectionSystem : AntagSelectionSystem
+{
+    public override void SendBriefing(ICommonSession? session, string briefing, Color? briefingColor, SoundSpecifier? briefingSound)
+    {
+
+    }
+
+    public override IEnumerable<ProtoId<AntagPrototype>> GetValidAntagPreferences(ICommonSession session, List<ProtoId<AntagPrototype>>? filter = null)
+    {
+        yield break;
+    }
+
+    public override bool IsAntagBanned(ICommonSession session, AntagSpecifierPrototype definition)
+    {
+        return false;
+    }
+
+    protected override Entity<AntagSelectionComponent>? ForceGetGameRuleEnt<T>(string id)
+    {
+        return null;
+    }
+}
diff --git a/Content.Client/Arcade/SpaceVillainArcadeMenu.xaml b/Content.Client/Arcade/SpaceVillainArcadeMenu.xaml
index bc40fdb1c9..ad98f99830 100644
--- a/Content.Client/Arcade/SpaceVillainArcadeMenu.xaml
+++ b/Content.Client/Arcade/SpaceVillainArcadeMenu.xaml
@@ -1,5 +1,6 @@
 <DefaultWindow
     xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     Title="{Loc 'spacevillain-menu-title'}"
     MinWidth="540"
     MinHeight="225">
@@ -33,8 +34,8 @@
                 </BoxContainer>
             </BoxContainer>
             <!-- Divider -->
-            <PanelContainer
-                StyleClasses="LowDivider"/>
+            <controls:Separator
+                StyleClasses="LowDivider" Orientation="Vertical" MinHeight="2"/>
             <!-- Villain -->
             <BoxContainer
                 Orientation="Vertical"
diff --git a/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs
index 4f08e6bd0a..e701bcc83f 100644
--- a/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs
+++ b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Arcade;
+using Content.Shared.Arcade;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 
diff --git a/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs
index 8fff406e86..ffda05c4f0 100644
--- a/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs
+++ b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Robust.Client.GameObjects;
+using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
diff --git a/Content.Client/Armor/ArmorSystem.cs b/Content.Client/Armor/ArmorSystem.cs
index 79a0834f39..67d57ca400 100644
--- a/Content.Client/Armor/ArmorSystem.cs
+++ b/Content.Client/Armor/ArmorSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Armor;
+using Content.Shared.Armor;
 
 namespace Content.Client.Armor;
 
diff --git a/Content.Client/Atmos/Components/MaxPressureVisualsComponent.cs b/Content.Client/Atmos/Components/MaxPressureVisualsComponent.cs
index e71f212786..f10cdf0126 100644
--- a/Content.Client/Atmos/Components/MaxPressureVisualsComponent.cs
+++ b/Content.Client/Atmos/Components/MaxPressureVisualsComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.EntitySystems;
 
 namespace Content.Client.Atmos.Components;
diff --git a/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs b/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
index e192a66fcc..5e8c97380c 100644
--- a/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
+++ b/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
@@ -1,4 +1,5 @@
 using Content.Client.Stylesheets;
+using Content.Client.Stylesheets.Palette;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.EntitySystems;
@@ -135,7 +136,7 @@ public sealed partial class AtmosAlarmEntryContainer : BoxContainer
                     {
                         Text = Loc.GetString("atmos-alerts-window-other-gases-value-nil"),
                         FontOverride = normalFont,
-                        FontColorOverride = StyleNano.DisabledFore,
+                        FontColorOverride = Palettes.Neutral.Base,
                         HorizontalAlignment = HAlignment.Center,
                         VerticalAlignment = VAlignment.Center,
                         HorizontalExpand = true,
@@ -175,13 +176,13 @@ public sealed partial class AtmosAlarmEntryContainer : BoxContainer
 
     public void SetAsFocus()
     {
-        FocusButton.AddStyleClass(StyleNano.StyleClassButtonColorGreen);
+        FocusButton.AddStyleClass(StyleClass.Positive);
         ArrowTexture.TexturePath = "/Textures/Interface/Nano/inverted_triangle.svg.png";
     }
 
     public void RemoveAsFocus()
     {
-        FocusButton.RemoveStyleClass(StyleNano.StyleClassButtonColorGreen);
+        FocusButton.RemoveStyleClass(StyleClass.Positive);
         ArrowTexture.TexturePath = "/Textures/Interface/Nano/triangle_right.png";
         FocusContainer.Visible = false;
     }
@@ -191,13 +192,13 @@ public sealed partial class AtmosAlarmEntryContainer : BoxContainer
         switch (alarmType)
         {
             case AtmosAlarmType.Normal:
-                return StyleNano.GoodGreenFore;
+                return Palettes.Status.Good;
             case AtmosAlarmType.Warning:
-                return StyleNano.ConcerningOrangeFore;
+                return Palettes.Status.Warning;
             case AtmosAlarmType.Danger:
-                return StyleNano.DangerousRedFore;
+                return Palettes.Status.Critical;
         }
 
-        return StyleNano.DisabledFore;
+        return Palettes.Neutral.Base;
     }
 }
diff --git a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml
index e5ede1b92e..27ef219d25 100644
--- a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml
+++ b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml
@@ -94,7 +94,7 @@
 
         <!-- Footer -->
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'atmos-alerts-window-flavor-left'}" StyleClasses="WindowFooterText" />
                 <Label Text="{Loc 'atmos-alerts-window-flavor-right'}" StyleClasses="WindowFooterText"
diff --git a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs
index 1268433cab..743da68e34 100644
--- a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs
+++ b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs
@@ -1,6 +1,6 @@
 using Content.Client.Message;
 using Content.Client.Pinpointer.UI;
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets.Palette;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.Monitor;
@@ -49,8 +49,8 @@ public sealed partial class AtmosAlertsComputerWindow : FancyWindow
     private Color _monitorBlipColor = Color.Cyan;
     private Color _untrackedEntColor = Color.DimGray;
     private Color _regionBaseColor = new Color(154, 154, 154);
-    private Color _inactiveColor = StyleNano.DisabledFore;
-    private Color _statusTextColor = StyleNano.GoodGreenFore;
+    private Color _inactiveColor = Palettes.Neutral.Base;
+    private Color _statusTextColor = Palettes.Status.Good;
     private Color _goodColor = Color.LimeGreen;
     private Color _warningColor = new Color(255, 182, 72);
     private Color _dangerColor = new Color(255, 67, 67);
diff --git a/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml
index b6fde7592f..4256fc3eec 100644
--- a/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml
+++ b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml
@@ -1,7 +1,6 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                xmlns:ui="clr-namespace:Content.Client.Atmos.Consoles"
                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-               xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                Title="{Loc 'atmos-monitoring-window-title'}"
                Resizable="False"
                SetSize="1120 750"
@@ -86,7 +85,7 @@
 
         <!-- Footer -->
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'atmos-monitoring-window-flavor-left'}" StyleClasses="WindowFooterText" />
                 <Label Text="{Loc 'atmos-monitoring-window-flavor-right'}" StyleClasses="WindowFooterText"
diff --git a/Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml.cs b/Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml.cs
index cf9a89d1a5..789913e172 100644
--- a/Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml.cs
+++ b/Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml.cs
@@ -1,5 +1,5 @@
 using Content.Client.Stylesheets;
-using Content.Shared.Atmos;
+using Content.Client.Stylesheets.Palette;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.FixedPoint;
@@ -96,15 +96,15 @@ public sealed partial class AtmosMonitoringEntryContainer : BoxContainer
             Loc.GetString("atmos-alerts-window-temperature-value", ("valueInC", tempC), ("valueInK", tempK)) :
             Loc.GetString("atmos-alerts-window-invalid-value");
 
-        TemperatureLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : StyleNano.DisabledFore;
+        TemperatureLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : Palettes.Neutral.Base;
 
         // Update pressure
         PressureLabel.Text = Loc.GetString("atmos-alerts-window-pressure-value", ("value", (FixedPoint2)updatedData.PressureData));
-        PressureLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : StyleNano.DisabledFore;
+        PressureLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : Palettes.Neutral.Base;
 
         // Update total mol
         TotalMolLabel.Text = Loc.GetString("atmos-alerts-window-total-mol-value", ("value", (FixedPoint2)updatedData.TotalMolData));
-        TotalMolLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : StyleNano.DisabledFore;
+        TotalMolLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : Palettes.Neutral.Base;
 
         // Update other present gases
         GasGridContainer.RemoveAllChildren();
@@ -116,7 +116,7 @@ public sealed partial class AtmosMonitoringEntryContainer : BoxContainer
             {
                 Text = Loc.GetString("atmos-alerts-window-other-gases-value-nil"),
                 FontOverride = normalFont,
-                FontColorOverride = StyleNano.DisabledFore,
+                FontColorOverride = Palettes.Neutral.Base,
                 HorizontalAlignment = HAlignment.Center,
                 VerticalAlignment = VAlignment.Center,
                 HorizontalExpand = true,
@@ -155,14 +155,14 @@ public sealed partial class AtmosMonitoringEntryContainer : BoxContainer
 
     public void SetAsFocus()
     {
-        FocusButton.AddStyleClass(StyleNano.StyleClassButtonColorGreen);
+        FocusButton.AddStyleClass(StyleClass.Positive);
         ArrowTexture.TexturePath = "/Textures/Interface/Nano/inverted_triangle.svg.png";
         FocusContainer.Visible = true;
     }
 
     public void RemoveAsFocus()
     {
-        FocusButton.RemoveStyleClass(StyleNano.StyleClassButtonColorGreen);
+        FocusButton.RemoveStyleClass(StyleClass.Positive);
         ArrowTexture.TexturePath = "/Textures/Interface/Nano/triangle_right.png";
         FocusContainer.Visible = false;
     }
diff --git a/Content.Client/Atmos/EntitySystems/AtmosphereSystem.cs b/Content.Client/Atmos/EntitySystems/AtmosphereSystem.cs
index 30567abbf7..709aae5827 100644
--- a/Content.Client/Atmos/EntitySystems/AtmosphereSystem.cs
+++ b/Content.Client/Atmos/EntitySystems/AtmosphereSystem.cs
@@ -1,4 +1,4 @@
-using Content.Client.Atmos.Components;
+using Content.Client.Atmos.Components;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.EntitySystems;
 using Robust.Shared.GameStates;
diff --git a/Content.Client/Atmos/EntitySystems/MaxPressureVisualsSystem.cs b/Content.Client/Atmos/EntitySystems/MaxPressureVisualsSystem.cs
index 28081214da..e27ac45dac 100644
--- a/Content.Client/Atmos/EntitySystems/MaxPressureVisualsSystem.cs
+++ b/Content.Client/Atmos/EntitySystems/MaxPressureVisualsSystem.cs
@@ -1,4 +1,4 @@
-using Content.Client.Atmos.Components;
+using Content.Client.Atmos.Components;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.Rounding;
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs
index 650f96eec9..2ef97504d8 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs
@@ -33,14 +33,14 @@ public sealed class AirAlarmBoundUserInterface : BoundUserInterface
         SendMessage(new AirAlarmResyncAllDevicesMessage());
     }
 
-    private void OnDeviceDataChanged(string address, IAtmosDeviceData data)
+    private void OnDeviceDataChanged(string address, IAtmosDeviceData dataPayload)
     {
-        SendMessage(new AirAlarmUpdateDeviceDataMessage(address, data));
+        SendMessage(new AirAlarmUpdateDeviceDataMessage(address, dataPayload));
     }
 
-	private void OnDeviceDataCopied(IAtmosDeviceData data)
+	private void OnDeviceDataCopied(IAtmosDeviceData dataPayload)
     {
-        SendMessage(new AirAlarmCopyDeviceDataMessage(data));
+        SendMessage(new AirAlarmCopyDeviceDataMessage(dataPayload));
     }
 
     private void OnAirAlarmModeChanged(AirAlarmMode mode)
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
index 60e06e98ce..efc970ff8d 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
@@ -17,7 +17,7 @@ namespace Content.Client.Atmos.Monitor.UI;
 public sealed partial class AirAlarmWindow : FancyWindow
 {
     public event Action<string, IAtmosDeviceData>? AtmosDeviceDataChanged;
-    public event Action<IAtmosDeviceData>? AtmosDeviceDataCopied;
+	public event Action<IAtmosDeviceData>? AtmosDeviceDataCopied;
     public event Action<string, AtmosMonitorThresholdType, AtmosAlarmThreshold, Gas?>? AtmosAlarmThresholdChanged;
     public event Action<AirAlarmMode>? AirAlarmModeChanged;
     public event Action<bool>? AutoModeChanged;
@@ -158,7 +158,7 @@ public sealed partial class AirAlarmWindow : FancyWindow
                 }
 
                 break;
-            case AtmosSensorData sensor:
+            case AtmosMonitorData sensor:
                 if (!_sensors.TryGetValue(addr, out var sensorControl))
                 {
                     var control = new SensorInfo(sensor, addr);
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs
index 8586049cb1..41336faba0 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos.Monitor.Components;
+using Content.Shared.Atmos.Monitor;
 using Content.Shared.Atmos.Piping.Unary.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -9,7 +9,7 @@ namespace Content.Client.Atmos.Monitor.UI.Widgets;
 [GenerateTypedNameReferences]
 public sealed partial class PumpControl : BoxContainer
 {
-    private GasVentPumpData _data;
+    private GasVentPumpData _dataPayload;
     private string _address;
 
     public event Action<string, IAtmosDeviceData>? PumpDataChanged;
@@ -23,37 +23,37 @@ public sealed partial class PumpControl : BoxContainer
     private FloatSpinBox _internalBound => CInternalBound;
     private Button _copySettings => CCopySettings;
 
-    public PumpControl(GasVentPumpData data, string address)
+    public PumpControl(GasVentPumpData dataPayload, string address)
     {
         RobustXamlLoader.Load(this);
 
         Name = address;
 
-        _data = data;
+        _dataPayload = dataPayload;
         _address = address;
 
         _addressLabel.Title = Loc.GetString("air-alarm-ui-atmos-net-device-label", ("address", $"{address}"));
 
-        _enabled.Pressed = data.Enabled;
+        _enabled.Pressed = dataPayload.Enabled;
         _enabled.OnToggled += _ =>
         {
-            _data.Enabled = _enabled.Pressed;
-            PumpDataChanged?.Invoke(_address, _data);
+            _dataPayload.Enabled = _enabled.Pressed;
+            PumpDataChanged?.Invoke(_address, _dataPayload);
         };
 
-        _internalBound.Value = _data.InternalPressureBound;
+        _internalBound.Value = _dataPayload.InternalPressureBound;
         _internalBound.OnValueChanged += _ =>
         {
-            _data.InternalPressureBound = _internalBound.Value;
-            PumpDataChanged?.Invoke(_address, _data);
+            _dataPayload.InternalPressureBound = _internalBound.Value;
+            PumpDataChanged?.Invoke(_address, _dataPayload);
         };
         _internalBound.IsValid += value => value >= 0;
 
-        _externalBound.Value = _data.ExternalPressureBound;
+        _externalBound.Value = _dataPayload.ExternalPressureBound;
         _externalBound.OnValueChanged += _ =>
         {
-            _data.ExternalPressureBound = _externalBound.Value;
-            PumpDataChanged?.Invoke(_address, _data);
+            _dataPayload.ExternalPressureBound = _externalBound.Value;
+            PumpDataChanged?.Invoke(_address, _dataPayload);
         };
         _externalBound.IsValid += value => value >= 0;
 
@@ -62,12 +62,12 @@ public sealed partial class PumpControl : BoxContainer
             _pumpDirection.AddItem(Loc.GetString($"air-alarm-ui-pump-direction-{value.ToString().ToLower()}"), (int) value);
         }
 
-        _pumpDirection.SelectId((int) _data.PumpDirection);
+        _pumpDirection.SelectId((int) _dataPayload.PumpDirection);
         _pumpDirection.OnItemSelected += args =>
         {
             _pumpDirection.SelectId(args.Id);
-            _data.PumpDirection = (VentPumpDirection) args.Id;
-            PumpDataChanged?.Invoke(_address, _data);
+            _dataPayload.PumpDirection = (VentPumpDirection) args.Id;
+            PumpDataChanged?.Invoke(_address, _dataPayload);
         };
 
         foreach (var value in Enum.GetValues<VentPressureBound>())
@@ -75,35 +75,35 @@ public sealed partial class PumpControl : BoxContainer
             _pressureCheck.AddItem(Loc.GetString($"air-alarm-ui-pressure-bound-{value.ToString().ToLower()}"), (int) value);
         }
 
-        _pressureCheck.SelectId((int) _data.PressureChecks);
+        _pressureCheck.SelectId((int) _dataPayload.PressureChecks);
         _pressureCheck.OnItemSelected += args =>
         {
             _pressureCheck.SelectId(args.Id);
-            _data.PressureChecks = (VentPressureBound) args.Id;
-            PumpDataChanged?.Invoke(_address, _data);
+            _dataPayload.PressureChecks = (VentPressureBound) args.Id;
+            PumpDataChanged?.Invoke(_address, _dataPayload);
         };
 
         _copySettings.OnPressed += _ =>
         {
-            PumpDataCopied?.Invoke(_data);
+            PumpDataCopied?.Invoke(_dataPayload);
         };
     }
 
-    public void ChangeData(GasVentPumpData data)
+    public void ChangeData(GasVentPumpData dataPayload)
     {
-        _data.Enabled = data.Enabled;
-        _enabled.Pressed = _data.Enabled;
+        _dataPayload.Enabled = dataPayload.Enabled;
+        _enabled.Pressed = _dataPayload.Enabled;
 
-        _data.PumpDirection = data.PumpDirection;
-        _pumpDirection.SelectId((int) _data.PumpDirection);
+        _dataPayload.PumpDirection = dataPayload.PumpDirection;
+        _pumpDirection.SelectId((int) _dataPayload.PumpDirection);
 
-        _data.PressureChecks = data.PressureChecks;
-        _pressureCheck.SelectId((int) _data.PressureChecks);
+        _dataPayload.PressureChecks = dataPayload.PressureChecks;
+        _pressureCheck.SelectId((int) _dataPayload.PressureChecks);
 
-        _data.ExternalPressureBound = data.ExternalPressureBound;
-        _externalBound.Value = _data.ExternalPressureBound;
+        _dataPayload.ExternalPressureBound = dataPayload.ExternalPressureBound;
+        _externalBound.Value = _dataPayload.ExternalPressureBound;
 
-        _data.InternalPressureBound = data.InternalPressureBound;
-        _internalBound.Value = _data.InternalPressureBound;
+        _dataPayload.InternalPressureBound = dataPayload.InternalPressureBound;
+        _internalBound.Value = _dataPayload.InternalPressureBound;
     }
 }
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs
index e197c72855..a339dad358 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.EntitySystems;
-using Content.Shared.Atmos.Monitor.Components;
+using Content.Shared.Atmos.Monitor;
 using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.Atmos.Prototypes;
 using Robust.Client.AutoGenerated;
@@ -16,7 +16,7 @@ public sealed partial class ScrubberControl : BoxContainer
     [Dependency] private IPrototypeManager _prototypeManager = default!;
     [Dependency] private IEntityManager _entMan = default!;
 
-    private GasVentScrubberData _data;
+    private GasVentScrubberData _dataPayload;
     private string _address;
 
     public event Action<string, IAtmosDeviceData>? ScrubberDataChanged;
@@ -34,7 +34,7 @@ public sealed partial class ScrubberControl : BoxContainer
     private GridContainer _gases => CGasContainer;
     private Dictionary<Gas, Button> _gasControls = new();
 
-    public ScrubberControl(GasVentScrubberData data, string address)
+    public ScrubberControl(GasVentScrubberData dataPayload, string address)
     {
 
         IoCManager.InjectDependencies(this);
@@ -44,30 +44,30 @@ public sealed partial class ScrubberControl : BoxContainer
 
         Name = address;
 
-        _data = data;
+        _dataPayload = dataPayload;
         _address = address;
 
         _addressLabel.Title = Loc.GetString("air-alarm-ui-atmos-net-device-label", ("address", $"{address}"));
 
-        _enabled.Pressed = data.Enabled;
+        _enabled.Pressed = dataPayload.Enabled;
         _enabled.OnToggled += _ =>
         {
-            _data.Enabled = _enabled.Pressed;
-            ScrubberDataChanged?.Invoke(_address, _data);
+            _dataPayload.Enabled = _enabled.Pressed;
+            ScrubberDataChanged?.Invoke(_address, _dataPayload);
         };
 
-        _wideNet.Pressed = data.WideNet;
+        _wideNet.Pressed = dataPayload.WideNet;
         _wideNet.OnToggled += _ =>
         {
-            _data.WideNet = _wideNet.Pressed;
-            ScrubberDataChanged?.Invoke(_address, _data);
+            _dataPayload.WideNet = _wideNet.Pressed;
+            ScrubberDataChanged?.Invoke(_address, _dataPayload);
         };
 
-        _volumeRate.Value = _data.VolumeRate;
+        _volumeRate.Value = _dataPayload.VolumeRate;
         _volumeRate.OnValueChanged += _ =>
         {
-            _data.VolumeRate = _volumeRate.Value;
-            ScrubberDataChanged?.Invoke(_address, _data);
+            _dataPayload.VolumeRate = _volumeRate.Value;
+            ScrubberDataChanged?.Invoke(_address, _dataPayload);
         };
         _volumeRate.IsValid += value => value >= 0;
 
@@ -76,31 +76,31 @@ public sealed partial class ScrubberControl : BoxContainer
             _pumpDirection.AddItem(Loc.GetString($"air-alarm-ui-pump-direction-{value.ToString().ToLower()}"), (int) value);
         }
 
-        _pumpDirection.SelectId((int) _data.PumpDirection);
+        _pumpDirection.SelectId((int) _dataPayload.PumpDirection);
         _pumpDirection.OnItemSelected += args =>
         {
             _pumpDirection.SelectId(args.Id);
-            _data.PumpDirection = (ScrubberPumpDirection) args.Id;
-            ScrubberDataChanged?.Invoke(_address, _data);
+            _dataPayload.PumpDirection = (ScrubberPumpDirection) args.Id;
+            ScrubberDataChanged?.Invoke(_address, _dataPayload);
         };
-        _pumpDirection.Disabled = data.AirAlarmPanicWireCut;
+        _pumpDirection.Disabled = dataPayload.AirAlarmPanicWireCut;
 
         _copySettings.OnPressed += _ =>
         {
-            ScrubberDataCopied?.Invoke(_data);
+            ScrubberDataCopied?.Invoke(_dataPayload);
         };
 
         var allGases = Enum.GetValues<Gas>();
         _selectAll.OnPressed += _ =>
         {
-            _data.FilterGases = new HashSet<Gas>(allGases);
-            ScrubberDataChanged?.Invoke(_address, _data);
+            _dataPayload.FilterGases = new HashSet<Gas>(allGases);
+            ScrubberDataChanged?.Invoke(_address, _dataPayload);
         };
 
         _deselectAll.OnPressed += _ =>
         {
-            _data.FilterGases = [];
-            ScrubberDataChanged?.Invoke(_address, _data);
+            _dataPayload.FilterGases = [];
+            ScrubberDataChanged?.Invoke(_address, _dataPayload);
         };
 
         foreach (var value in allGases)
@@ -114,16 +114,16 @@ public sealed partial class ScrubberControl : BoxContainer
                 Text = Loc.GetString(gasName),
                 ToggleMode = true,
                 HorizontalExpand = true,
-                Pressed = _data.FilterGases.Contains(value)
+                Pressed = _dataPayload.FilterGases.Contains(value)
             };
             gasButton.OnToggled += args =>
             {
                 if (args.Pressed)
-                    _data.FilterGases.Add(value);
+                    _dataPayload.FilterGases.Add(value);
                 else
-                    _data.FilterGases.Remove(value);
+                    _dataPayload.FilterGases.Remove(value);
 
-                ScrubberDataChanged?.Invoke(_address, _data);
+                ScrubberDataChanged?.Invoke(_address, _dataPayload);
             };
             _gasControls.Add(value, gasButton);
             _gases.AddChild(gasButton);
@@ -131,25 +131,25 @@ public sealed partial class ScrubberControl : BoxContainer
 
     }
 
-    public void ChangeData(GasVentScrubberData data)
+    public void ChangeData(GasVentScrubberData dataPayload)
     {
-        _data.Enabled = data.Enabled;
-        _enabled.Pressed = _data.Enabled;
+        _dataPayload.Enabled = dataPayload.Enabled;
+        _enabled.Pressed = _dataPayload.Enabled;
 
-        _data.PumpDirection = data.PumpDirection;
-        _pumpDirection.Select((int) _data.PumpDirection);
-        _pumpDirection.Disabled = data.AirAlarmPanicWireCut;
+        _dataPayload.PumpDirection = dataPayload.PumpDirection;
+        _pumpDirection.Select((int) _dataPayload.PumpDirection);
+        _pumpDirection.Disabled = dataPayload.AirAlarmPanicWireCut;
 
-        _data.VolumeRate = data.VolumeRate;
-        _volumeRate.Value = _data.VolumeRate;
+        _dataPayload.VolumeRate = dataPayload.VolumeRate;
+        _volumeRate.Value = _dataPayload.VolumeRate;
 
-        _data.WideNet = data.WideNet;
-        _wideNet.Pressed = _data.WideNet;
-        _data.FilterGases = data.FilterGases;
+        _dataPayload.WideNet = dataPayload.WideNet;
+        _wideNet.Pressed = _dataPayload.WideNet;
+        _dataPayload.FilterGases = dataPayload.FilterGases;
 
         foreach (var value in Enum.GetValues<Gas>())
         {
-            _gasControls[value].Pressed = data.FilterGases.Contains(value);
+            _gasControls[value].Pressed = dataPayload.FilterGases.Contains(value);
         }
     }
 }
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs
index ed7a9022e5..871338e119 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs
@@ -18,7 +18,7 @@ public sealed partial class SensorInfo : BoxContainer
     [Dependency] private IEntityManager _entMan = default!;
 
     public Action<string, AtmosMonitorThresholdType, AtmosAlarmThreshold, Gas?>? OnThresholdUpdate;
-    public event Action<AtmosSensorData>? SensorDataCopied;
+    public event Action<AtmosMonitorData>? SensorDataCopied;
     private string _address;
 
     private ThresholdControl _pressureThreshold;
@@ -27,7 +27,7 @@ public sealed partial class SensorInfo : BoxContainer
     private Dictionary<Gas, RichTextLabel> _gasLabels = new();
     private Button _copySettings => CCopySettings;
 
-    public SensorInfo(AtmosSensorData data, string address)
+    public SensorInfo(AtmosMonitorData dataPayload, string address)
     {
         IoCManager.InjectDependencies(this);
         var atmosphereSystem = _entMan.System<SharedAtmosphereSystem>();
@@ -36,37 +36,37 @@ public sealed partial class SensorInfo : BoxContainer
 
         _address = address;
 
-        SensorAddress.Title = Loc.GetString("air-alarm-ui-window-listing-title", ("address", _address), ("state", data.AlarmState));
+        SensorAddress.Title = Loc.GetString("air-alarm-ui-window-listing-title", ("address", _address), ("state", dataPayload.AlarmState));
 
         AlarmStateLabel.SetMarkup(Loc.GetString("air-alarm-ui-window-alarm-state-indicator",
-                    ("color", AirAlarmWindow.ColorForAlarm(data.AlarmState)),
-                    ("state", data.AlarmState)));
+                    ("color", AirAlarmWindow.ColorForAlarm(dataPayload.AlarmState)),
+                    ("state", dataPayload.AlarmState)));
         PressureLabel.SetMarkup(Loc.GetString("air-alarm-ui-window-pressure-indicator",
-                    ("color", AirAlarmWindow.ColorForThreshold(data.Pressure, data.PressureThreshold)),
-                    ("pressure", $"{data.Pressure:0.##}")));
+                    ("color", AirAlarmWindow.ColorForThreshold(dataPayload.Pressure, dataPayload.PressureThreshold)),
+                    ("pressure", $"{dataPayload.Pressure:0.##}")));
         TemperatureLabel.SetMarkup(Loc.GetString("air-alarm-ui-window-temperature-indicator",
-                ("color", AirAlarmWindow.ColorForThreshold(data.Temperature, data.TemperatureThreshold)),
-                ("tempC", $"{TemperatureHelpers.KelvinToCelsius(data.Temperature):0.#}"),
-                ("temperature", $"{data.Temperature:0.##}")));
+                ("color", AirAlarmWindow.ColorForThreshold(dataPayload.Temperature, dataPayload.TemperatureThreshold)),
+                ("tempC", $"{TemperatureHelpers.KelvinToCelsius(dataPayload.Temperature):0.#}"),
+                ("temperature", $"{dataPayload.Temperature:0.##}")));
 
-        foreach (var (gas, amount) in data.Gases)
+        foreach (var (gas, amount) in dataPayload.Gases)
         {
             var label = new RichTextLabel();
 
-            var fractionGas = amount / data.TotalMoles;
+            var fractionGas = amount / dataPayload.TotalMoles;
 
             ProtoId<GasPrototype> gasProtoId = atmosphereSystem.GetGas(gas);
             var gasName = _prototypeManager.Index(gasProtoId).Name;
 
             label.SetMarkup(Loc.GetString("air-alarm-ui-gases-indicator",
                 ("gas", Loc.GetString(gasName)),
-                ("color", AirAlarmWindow.ColorForThreshold(fractionGas, data.GasThresholds[gas])),
+                ("color", AirAlarmWindow.ColorForThreshold(fractionGas, dataPayload.GasThresholds[gas])),
                 ("amount", $"{amount:0.####}"),
                 ("percentage", $"{(100 * fractionGas):0.##}")));
             GasContainer.AddChild(label);
             _gasLabels.Add(gas, label);
 
-            var threshold = data.GasThresholds[gas];
+            var threshold = dataPayload.GasThresholds[gas];
             var gasThresholdControl = new ThresholdControl(Loc.GetString($"air-alarm-ui-thresholds-gas-title"), threshold, AtmosMonitorThresholdType.Gas, gas, 100);
             gasThresholdControl.Margin = new Thickness(20, 2, 2, 2);
             gasThresholdControl.ThresholdDataChanged += (type, alarmThreshold, arg3) =>
@@ -78,10 +78,10 @@ public sealed partial class SensorInfo : BoxContainer
             GasContainer.AddChild(gasThresholdControl);
         }
 
-        _pressureThreshold = new ThresholdControl(Loc.GetString("air-alarm-ui-thresholds-pressure-title"), data.PressureThreshold, AtmosMonitorThresholdType.Pressure);
+        _pressureThreshold = new ThresholdControl(Loc.GetString("air-alarm-ui-thresholds-pressure-title"), dataPayload.PressureThreshold, AtmosMonitorThresholdType.Pressure);
         PressureThresholdContainer.AddChild(_pressureThreshold);
         _temperatureThreshold = new ThresholdControl(Loc.GetString("air-alarm-ui-thresholds-temperature-title"),
-            data.TemperatureThreshold,
+            dataPayload.TemperatureThreshold,
             AtmosMonitorThresholdType.Temperature);
         TemperatureThresholdContainer.AddChild(_temperatureThreshold);
 
@@ -97,58 +97,58 @@ public sealed partial class SensorInfo : BoxContainer
 
         _copySettings.OnPressed += _ =>
         {
-            SensorDataCopied?.Invoke(data);
+            SensorDataCopied?.Invoke(dataPayload);
         };
     }
 
-    public void ChangeData(AtmosSensorData data)
+    public void ChangeData(AtmosMonitorData dataPayload)
     {
         IoCManager.InjectDependencies(this);
         var atmosphereSystem = _entMan.System<SharedAtmosphereSystem>();
 
-        SensorAddress.Title = Loc.GetString("air-alarm-ui-window-listing-title", ("address", _address), ("state", data.AlarmState));
+        SensorAddress.Title = Loc.GetString("air-alarm-ui-window-listing-title", ("address", _address), ("state", dataPayload.AlarmState));
 
         AlarmStateLabel.SetMarkup(Loc.GetString("air-alarm-ui-window-alarm-state-indicator",
-                    ("color", AirAlarmWindow.ColorForAlarm(data.AlarmState)),
-                    ("state", data.AlarmState)));
+                    ("color", AirAlarmWindow.ColorForAlarm(dataPayload.AlarmState)),
+                    ("state", dataPayload.AlarmState)));
 
         PressureLabel.SetMarkup(Loc.GetString("air-alarm-ui-window-pressure-indicator",
-                    ("color", AirAlarmWindow.ColorForThreshold(data.Pressure, data.PressureThreshold)),
-                    ("pressure", $"{data.Pressure:0.##}")));
+                    ("color", AirAlarmWindow.ColorForThreshold(dataPayload.Pressure, dataPayload.PressureThreshold)),
+                    ("pressure", $"{dataPayload.Pressure:0.##}")));
         TemperatureLabel.SetMarkup(Loc.GetString("air-alarm-ui-window-temperature-indicator",
-                ("color", AirAlarmWindow.ColorForThreshold(data.Temperature, data.TemperatureThreshold)),
-                ("tempC", $"{TemperatureHelpers.KelvinToCelsius(data.Temperature):0.#}"),
-                ("temperature", $"{data.Temperature:0.##}")));
+                ("color", AirAlarmWindow.ColorForThreshold(dataPayload.Temperature, dataPayload.TemperatureThreshold)),
+                ("tempC", $"{TemperatureHelpers.KelvinToCelsius(dataPayload.Temperature):0.#}"),
+                ("temperature", $"{dataPayload.Temperature:0.##}")));
 
-        foreach (var (gas, amount) in data.Gases)
+        foreach (var (gas, amount) in dataPayload.Gases)
         {
             if (!_gasLabels.TryGetValue(gas, out var label))
             {
                 continue;
             }
 
-            var fractionGas = amount / data.TotalMoles;
+            var fractionGas = amount / dataPayload.TotalMoles;
 
             ProtoId<GasPrototype> gasProtoId = atmosphereSystem.GetGas(gas);
             var gasName = _prototypeManager.Index(gasProtoId).Name;
 
             label.SetMarkup(Loc.GetString("air-alarm-ui-gases-indicator",
                 ("gas", Loc.GetString(gasName)),
-                ("color", AirAlarmWindow.ColorForThreshold(fractionGas, data.GasThresholds[gas])),
+                ("color", AirAlarmWindow.ColorForThreshold(fractionGas, dataPayload.GasThresholds[gas])),
                 ("amount", $"{amount:0.####}"),
                 ("percentage", $"{(100 * fractionGas):0.##}")));
         }
 
-        _pressureThreshold.UpdateThresholdData(data.PressureThreshold, data.Pressure);
-        _temperatureThreshold.UpdateThresholdData(data.TemperatureThreshold, data.Temperature);
+        _pressureThreshold.UpdateThresholdData(dataPayload.PressureThreshold, dataPayload.Pressure);
+        _temperatureThreshold.UpdateThresholdData(dataPayload.TemperatureThreshold, dataPayload.Temperature);
         foreach (var (gas, control) in _gasThresholds)
         {
-            if (!data.GasThresholds.TryGetValue(gas, out var threshold))
+            if (!dataPayload.GasThresholds.TryGetValue(gas, out var threshold))
             {
                 continue;
             }
 
-            control.UpdateThresholdData(threshold, data.Gases[gas] / data.TotalMoles);
+            control.UpdateThresholdData(threshold, dataPayload.Gases[gas] / dataPayload.TotalMoles);
         }
     }
 
diff --git a/Content.Client/Atmos/Rotting/RottingSystem.cs b/Content.Client/Atmos/Rotting/RottingSystem.cs
index aeda069789..b68209e78d 100644
--- a/Content.Client/Atmos/Rotting/RottingSystem.cs
+++ b/Content.Client/Atmos/Rotting/RottingSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos.Rotting;
+using Content.Shared.Atmos.Rotting;
 
 namespace Content.Client.Atmos.Rotting;
 
diff --git a/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs b/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs
index 56be898a01..a32dd3d9d7 100644
--- a/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.Piping.Binary.Components;
 using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.IdentityManagement;
diff --git a/Content.Client/Atmos/UI/GasPressureRegulatorBoundUserInterface.cs b/Content.Client/Atmos/UI/GasPressureRegulatorBoundUserInterface.cs
index 9d66a9985f..82785fe689 100644
--- a/Content.Client/Atmos/UI/GasPressureRegulatorBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/GasPressureRegulatorBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos.Piping.Binary.Components;
+using Content.Shared.Atmos.Piping.Binary.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Localizations;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml.cs b/Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml.cs
index a7c0570bac..9d4a029784 100644
--- a/Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml.cs
+++ b/Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs b/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs
index bd5b3954ee..21ca5b8ff4 100644
--- a/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Client.Power.EntitySystems;
+using Content.Client.Power.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.Atmos.Piping.Unary.Systems;
diff --git a/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs b/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs
index 0ef0d60a28..ae213df580 100644
--- a/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos.Piping.Binary.Components;
+using Content.Shared.Atmos.Piping.Binary.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Localizations;
 using JetBrains.Annotations;
diff --git a/Content.Client/Audio/ClientGlobalSoundSystem.cs b/Content.Client/Audio/ClientGlobalSoundSystem.cs
index b077c1c30f..d0f3ca41a8 100644
--- a/Content.Client/Audio/ClientGlobalSoundSystem.cs
+++ b/Content.Client/Audio/ClientGlobalSoundSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Audio;
+using Content.Shared.Audio;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Robust.Shared.Audio;
diff --git a/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs b/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs
index 26487fe24a..e8d9aab9ce 100644
--- a/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs
+++ b/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Client.GameTicking;
 using Content.Client.GameTicking.Managers;
 using Content.Client.Lobby;
 using Content.Shared.Audio.Events;
diff --git a/Content.Client/Audio/Midi/MidiFileCollectionManager.cs b/Content.Client/Audio/Midi/MidiFileCollectionManager.cs
index 0f8308ed8b..0c9d08a3a6 100644
--- a/Content.Client/Audio/Midi/MidiFileCollectionManager.cs
+++ b/Content.Client/Audio/Midi/MidiFileCollectionManager.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Robust.Shared.ContentPack;
diff --git a/Content.Client/BarSign/Ui/BarSignMenu.xaml b/Content.Client/BarSign/Ui/BarSignMenu.xaml
index 5b1155ae35..08f95509d5 100644
--- a/Content.Client/BarSign/Ui/BarSignMenu.xaml
+++ b/Content.Client/BarSign/Ui/BarSignMenu.xaml
@@ -1,7 +1,6 @@
 <controls:FancyWindow
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Title="{Loc 'barsign-ui-menu'}"
     MinSize="280 180"
     SetSize="280 180">
@@ -9,11 +8,9 @@
         <BoxContainer Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center">
             <BoxContainer Orientation="Vertical" HorizontalAlignment="Center">
                 <Label Text="{Loc 'barsign-ui-set-label'}" HorizontalAlignment="Center" StyleClasses="LabelSubText" Margin="30 0"/>
-                <customControls:HSeparator Margin="0 0 0 5"/>
+                <controls:Separator StyleClasses="LowDivider" Margin="0 0 0 5"/>
             </BoxContainer>
             <OptionButton Name="SignOptions" HorizontalAlignment="Center" VerticalAlignment="Center" MinSize="175 60" Margin="0 0 0 20"/>
         </BoxContainer>
     </BoxContainer>
 </controls:FancyWindow>
-
-
diff --git a/Content.Client/BarSign/Ui/BarSignMenu.xaml.cs b/Content.Client/BarSign/Ui/BarSignMenu.xaml.cs
index 0fbd282da8..6d26e7bff9 100644
--- a/Content.Client/BarSign/Ui/BarSignMenu.xaml.cs
+++ b/Content.Client/BarSign/Ui/BarSignMenu.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Controls;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.BarSign;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Beam/BeamSystem.cs b/Content.Client/Beam/BeamSystem.cs
index 379bc3af83..cd2a2c820b 100644
--- a/Content.Client/Beam/BeamSystem.cs
+++ b/Content.Client/Beam/BeamSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Beam;
+using Content.Shared.Beam;
 using Content.Shared.Beam.Components;
 using Robust.Client.GameObjects;
 
diff --git a/Content.Client/Bql/ToolshedVisualizeEui.cs b/Content.Client/Bql/ToolshedVisualizeEui.cs
index ccefc1228d..7b51fe974c 100644
--- a/Content.Client/Bql/ToolshedVisualizeEui.cs
+++ b/Content.Client/Bql/ToolshedVisualizeEui.cs
@@ -1,4 +1,4 @@
-using Content.Client.Eui;
+using Content.Client.Eui;
 using Content.Shared.Bql;
 using Content.Shared.Eui;
 using JetBrains.Annotations;
diff --git a/Content.Client/Bql/ToolshedVisualizeWindow.xaml.cs b/Content.Client/Bql/ToolshedVisualizeWindow.xaml.cs
index 35a7524a6f..1c8b341e88 100644
--- a/Content.Client/Bql/ToolshedVisualizeWindow.xaml.cs
+++ b/Content.Client/Bql/ToolshedVisualizeWindow.xaml.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/Cargo/Systems/ClientPriceGunSystem.cs b/Content.Client/Cargo/Systems/ClientPriceGunSystem.cs
index bfbe3d904e..0f3953d171 100644
--- a/Content.Client/Cargo/Systems/ClientPriceGunSystem.cs
+++ b/Content.Client/Cargo/Systems/ClientPriceGunSystem.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Cargo.Components;
-using Content.Shared.Timing;
 using Content.Shared.Cargo.Systems;
+using Content.Shared.Timing.Systems;
 
 namespace Content.Client.Cargo.Systems;
 
@@ -13,10 +13,7 @@ public sealed partial class ClientPriceGunSystem : SharedPriceGunSystem
 
     protected override bool GetPriceOrBounty(Entity<PriceGunComponent> entity, EntityUid target, EntityUid user)
     {
-        if (!TryComp(entity, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((entity, useDelay)))
-            return false;
-
         // It feels worse if the cooldown is predicted but the popup isn't! So only do the cooldown reset on the server.
-        return true;
+        return _useDelay.IsDelayed(entity.Owner);
     }
 }
diff --git a/Content.Client/Cargo/UI/BountyEntry.xaml b/Content.Client/Cargo/UI/BountyEntry.xaml
index 99874cf1a5..4aae433d26 100644
--- a/Content.Client/Cargo/UI/BountyEntry.xaml
+++ b/Content.Client/Cargo/UI/BountyEntry.xaml
@@ -1,5 +1,5 @@
-<BoxContainer xmlns="https://spacestation14.io"
-              xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+<BoxContainer xmlns="https://spacestation14.io"
+              xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
               Margin="10 10 10 0"
               HorizontalExpand="True"
               Visible="True">
@@ -28,7 +28,7 @@
                     <RichTextLabel Name="IdLabel" HorizontalAlignment="Right" Margin="0 0 5 0"/>
                 </BoxContainer>
             </BoxContainer>
-            <customControls:HSeparator Margin="5 10 5 10"/>
+            <controls:Separator StyleClasses="LowDivider" Margin="5 10 5 10"/>
             <BoxContainer>
                 <RichTextLabel Name="DescriptionLabel"/>
             </BoxContainer>
diff --git a/Content.Client/Cargo/UI/BountyHistoryEntry.xaml b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml
index 905cf020ed..1871b31fdc 100644
--- a/Content.Client/Cargo/UI/BountyHistoryEntry.xaml
+++ b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml
@@ -1,5 +1,5 @@
 <BoxContainer xmlns="https://spacestation14.io"
-                xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+              xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                 Margin="10 10 10 0"
                 HorizontalExpand="True">
     <PanelContainer StyleClasses="AngleRect" HorizontalExpand="True">
@@ -15,7 +15,7 @@
                     <RichTextLabel Name="IdLabel" HorizontalAlignment="Right" />
                 </BoxContainer>
             </BoxContainer>
-            <customControls:HSeparator Margin="5 10 5 10"/>
+            <controls:Separator StyleClasses="LowDivider" Margin="5 10 5 10"/>
             <RichTextLabel Name="NoticeLabel" />
         </BoxContainer>
     </PanelContainer>
diff --git a/Content.Client/Cargo/UI/CargoBountyMenu.xaml b/Content.Client/Cargo/UI/CargoBountyMenu.xaml
index 7d53ccf16e..5bddb91c1a 100644
--- a/Content.Client/Cargo/UI/CargoBountyMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoBountyMenu.xaml
@@ -1,4 +1,4 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                       Title="{Loc 'bounty-console-menu-title'}"
                       SetSize="550 420"
@@ -32,7 +32,7 @@
         </PanelContainer>
         <!-- Footer -->
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'bounty-console-flavor-left'}" StyleClasses="WindowFooterText" />
                 <Label Text="{Loc 'bounty-console-flavor-right'}" StyleClasses="WindowFooterText"
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
index 018ec3670b..f5b310dc19 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
@@ -1,4 +1,4 @@
-<controls:FancyWindow
+<controls:FancyWindow
     xmlns="https://spacestation14.io"
     xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
@@ -29,7 +29,7 @@
                           <Label Text="{Loc 'cargo-console-menu-account-name-label'}"
                               StyleClasses="LabelKeyText" />
 
-                          <PanelContainer StyleClasses="LowDivider" Margin="0 -2"/>
+                          <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" Margin="0 -2"/>
 
                           <RichTextLabel Name="AccountNameLabel"
                               Text="{Loc 'cargo-console-menu-account-name-none-text'}"
@@ -39,7 +39,7 @@
                           <Label Text="{Loc 'cargo-console-menu-points-label'}"
                               StyleClasses="LabelKeyText"/>
 
-                          <PanelContainer StyleClasses="LowDivider" Margin="0 -2"/>
+                          <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" Margin="0 -2"/>
 
                           <RichTextLabel Name="PointsLabel"
                               Text="$0"
@@ -49,7 +49,7 @@
                           <Label Text="{Loc 'cargo-console-menu-order-capacity-label'}"
                               StyleClasses="LabelKeyText" />
 
-                          <PanelContainer StyleClasses="LowDivider" Margin="0 -2 0 -1"/>
+                          <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" Margin="0 -2 0 -1"/>
 
                           <Label Name="ShuttleCapacityLabel"
                               Text="0/0"
@@ -57,7 +57,7 @@
                               Margin="4 0"/>
                       </GridContainer>
 
-                      <PanelContainer StyleClasses="LowDivider" Margin="0 4.5 -8 0"/>
+                      <controls:Separator StyleClasses="LowDivider" Margin="0 4.5 -8 0"/>
                   </BoxContainer>
 
                   <!-- Search -->
@@ -89,7 +89,7 @@
                   </ScrollContainer>
               </BoxContainer>
 
-              <PanelContainer StyleClasses="LowDivider" Margin="0 -8"/>
+              <controls:Separator StyleClasses="LowDivider" Margin="0 -8" Orientation="Vertical" MinHeight="2"/>
 
               <!-- Right Part -->
               <BoxContainer Orientation="Vertical"
@@ -199,7 +199,7 @@
         <BoxContainer Orientation="Vertical"
             VerticalAlignment="Bottom">
 
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
 
             <BoxContainer Orientation="Horizontal"
                 Margin="12 0 6 2"
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
index cb67ae8c17..c79128268d 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
@@ -161,7 +161,7 @@ namespace Content.Client.Cargo.UI
                         ProductName = { Text = prototype.Name },
                         MainButton = { ToolTip = prototype.Description },
                         PointCost = { Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", prototype.Cost.ToString())) },
-                        Icon = { Texture = _spriteSystem.Frame0(prototype.Icon) },
+                        Icon = { Texture = _spriteSystem.Frame0(prototype.Icon) }
                     };
                     button.MainButton.OnPressed += args =>
                     {
@@ -230,16 +230,12 @@ namespace Content.Client.Cargo.UI
                             "cargo-console-menu-order-row-title",
                             ("productName", productName),
                             ("orderAmount", order.OrderQuantity),
-                            ("orderPrice", productProto.Cost)),
+                            ("orderPrice", productProto.Cost))
                     },
 
                     Stride =
                     {
-                        PanelOverride = new StyleBoxFlat
-                        {
-                            BackgroundColor = account.Color,
-                            ContentMarginBottomOverride = 2,
-                        },
+                        ColorOverride = account.Color
                     },
 
                     Icon = { Texture = _spriteSystem.Frame0(product) },
diff --git a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml
index 638fbd6995..83c14a3d3a 100644
--- a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml
@@ -1,4 +1,5 @@
 <DefaultWindow xmlns="https://spacestation14.io"
+               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                Title="{Loc 'cargo-console-order-menu-title'}"
                MinSize="460 261">
     <BoxContainer Orientation="Vertical">
@@ -44,7 +45,7 @@
                      Value="1" />
         </GridContainer>
         <Control VerticalExpand="True"/>
-        <PanelContainer StyleClasses="LowDivider" Margin="0 6 0 2"/>
+        <controls:Separator StyleClasses="LowDivider" Margin="0 6 0 2"/>
         <Button Name="SubmitButton"
                 Access="Public"
                 Text="{Loc 'cargo-console-order-menu-submit-button'}"
diff --git a/Content.Client/Cargo/UI/CargoOrderRow.xaml b/Content.Client/Cargo/UI/CargoOrderRow.xaml
index 8f92a8c80c..7b56359dca 100644
--- a/Content.Client/Cargo/UI/CargoOrderRow.xaml
+++ b/Content.Client/Cargo/UI/CargoOrderRow.xaml
@@ -1,6 +1,6 @@
 <PanelContainer
     xmlns="https://spacestation14.io"
-    xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     HorizontalExpand="True"
     StyleClasses="BackgroundPanel">
 
@@ -22,9 +22,9 @@
                 </BoxContainer>
             </Control>
 
-            <PanelContainer Name="Stride"
+            <controls:Separator Name="Stride"
                 Access="Public"
-                StyleClasses="LowDivider" />
+                StyleClasses="LowDivider"/>
         </BoxContainer>
 
         <!-- Info -->
@@ -37,7 +37,7 @@
                          RectClipContent="True"
                          VerticalAlignment="Center"/>
 
-            <PanelContainer StyleClasses="LowDivider" Margin="4 0"/>
+            <controls:Separator StyleClasses="LowDivider" Margin="4 0" Orientation="Vertical" MinHeight="2"/>
 
             <BoxContainer Orientation="Vertical"
                           HorizontalExpand="True"
@@ -59,7 +59,7 @@
         </BoxContainer>
 
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
 
             <!-- Buttons -->
             <!-- Btn's position hardcoded (args.Button.Parent?.Parent?.Parent type) in CargoConsoleBUI 158 & 166 line -->
diff --git a/Content.Client/Cargo/UI/CargoOrderRow.xaml.cs b/Content.Client/Cargo/UI/CargoOrderRow.xaml.cs
index d2a23b5a2e..fac2bd16ae 100644
--- a/Content.Client/Cargo/UI/CargoOrderRow.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoOrderRow.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Cargo;
+using Content.Shared.Cargo;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Cargo/UI/CargoProductRow.xaml.cs b/Content.Client/Cargo/UI/CargoProductRow.xaml.cs
index 1c7f791604..f65af1ea0e 100644
--- a/Content.Client/Cargo/UI/CargoProductRow.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoProductRow.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Cargo;
+using Content.Shared.Cargo;
 using Content.Shared.Cargo.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/CartridgeLoader/Cartridges/CrewManifestUi.cs b/Content.Client/CartridgeLoader/Cartridges/CrewManifestUi.cs
index ed129dc9f6..7b76dd4db0 100644
--- a/Content.Client/CartridgeLoader/Cartridges/CrewManifestUi.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/CrewManifestUi.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Fragments;
+using Content.Client.UserInterface.Fragments;
 using Content.Shared.CartridgeLoader.Cartridges;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/CartridgeLoader/Cartridges/LogProbeUi.cs b/Content.Client/CartridgeLoader/Cartridges/LogProbeUi.cs
index 183de499a8..fedd99ee4f 100644
--- a/Content.Client/CartridgeLoader/Cartridges/LogProbeUi.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/LogProbeUi.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Fragments;
+using Content.Client.UserInterface.Fragments;
 using Content.Shared.CartridgeLoader;
 using Content.Shared.CartridgeLoader.Cartridges;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/CartridgeLoader/Cartridges/LogProbeUiEntry.xaml b/Content.Client/CartridgeLoader/Cartridges/LogProbeUiEntry.xaml
index 598acf36e7..2e81a272b6 100644
--- a/Content.Client/CartridgeLoader/Cartridges/LogProbeUiEntry.xaml
+++ b/Content.Client/CartridgeLoader/Cartridges/LogProbeUiEntry.xaml
@@ -1,5 +1,5 @@
-<BoxContainer xmlns="https://spacestation14.io"
-              xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+<BoxContainer xmlns="https://spacestation14.io"
+              xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
               Margin="4"
               Orientation="Vertical">
     <BoxContainer Orientation="Horizontal">
@@ -16,5 +16,5 @@
                SetWidth="390"
                ClipText="True"/>
     </BoxContainer>
-    <customControls:HSeparator Margin="0 5 0 5"/>
+    <controls:Separator StyleClasses="LowDivider" Margin="0 5 0 5"/>
 </BoxContainer>
diff --git a/Content.Client/CartridgeLoader/Cartridges/LogProbeUiEntry.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/LogProbeUiEntry.xaml.cs
index 369042d991..38fbcabdb2 100644
--- a/Content.Client/CartridgeLoader/Cartridges/LogProbeUiEntry.xaml.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/LogProbeUiEntry.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs
index d9569bd11d..3f44f61f1a 100644
--- a/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.CartridgeLoader.Cartridges;
+using Content.Shared.CartridgeLoader.Cartridges;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/CartridgeLoader/Cartridges/NetProbeUi.cs b/Content.Client/CartridgeLoader/Cartridges/NetProbeUi.cs
index 7ea6f46917..2bc0f2ee09 100644
--- a/Content.Client/CartridgeLoader/Cartridges/NetProbeUi.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/NetProbeUi.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Fragments;
+using Content.Client.UserInterface.Fragments;
 using Content.Shared.CartridgeLoader.Cartridges;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/CartridgeLoader/Cartridges/NetProbeUiFragment.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/NetProbeUiFragment.xaml.cs
index 5300040314..707bc5b6d9 100644
--- a/Content.Client/CartridgeLoader/Cartridges/NetProbeUiFragment.xaml.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/NetProbeUiFragment.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.CartridgeLoader.Cartridges;
+using Content.Shared.CartridgeLoader.Cartridges;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml
index fd5a7bb161..80b7a0c093 100644
--- a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml
+++ b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml
@@ -1,7 +1,6 @@
 <cartridges:NewsReaderUiFragment xmlns:cartridges="clr-namespace:Content.Client.CartridgeLoader.Cartridges"
                                xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                               xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
                                xmlns="https://spacestation14.io"
                                Margin="1 0 2 0"
                                Orientation="Vertical"
@@ -59,7 +58,7 @@
             ToolTip="{Loc news-reader-ui-mute-tooltip}"
             MinWidth="20"/>
         <RichTextLabel Margin="5,2,2,2" Name="ShareTime" VerticalAlignment="Top"/>
-        <customControls:VSeparator Margin="2 0"/>
+        <controls:Separator StyleClasses="LowDivider" Margin="2 0" Orientation="Vertical" MinHeight="5"/>
         <RichTextLabel Margin="5,2,2,2" Name="Author" VerticalAlignment="Top" HorizontalAlignment="Right"/>
     </BoxContainer>
 </cartridges:NewsReaderUiFragment>
diff --git a/Content.Client/CartridgeLoader/Cartridges/NotekeeperUi.cs b/Content.Client/CartridgeLoader/Cartridges/NotekeeperUi.cs
index da7041f4dd..a8ebe1f6ef 100644
--- a/Content.Client/CartridgeLoader/Cartridges/NotekeeperUi.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/NotekeeperUi.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Fragments;
+using Content.Client.UserInterface.Fragments;
 using Content.Shared.CartridgeLoader;
 using Content.Shared.CartridgeLoader.Cartridges;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/CartridgeLoader/Cartridges/NotekeeperUiFragment.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/NotekeeperUiFragment.xaml.cs
index 2504407fa9..831f55ebb8 100644
--- a/Content.Client/CartridgeLoader/Cartridges/NotekeeperUiFragment.xaml.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/NotekeeperUiFragment.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.xaml
index 6796b8bd9e..038b076998 100644
--- a/Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.xaml
+++ b/Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.xaml
@@ -31,17 +31,17 @@
                 <Label Name="PersonName" StyleClasses="LabelBig" />
                 <RichTextLabel Name="PersonState" HorizontalAlignment="Right" HorizontalExpand="True" />
             </BoxContainer>
-            <PanelContainer StyleClasses="LowDivider" Margin="0 5 0 5"/>
+            <controls:Separator StyleClasses="LowDivider" Margin="0 5 0 5"/>
             <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
                 <BoxContainer Name="DataContainer" Orientation="Vertical">
                     <RichTextLabel Name="TargetAge" />
                     <RichTextLabel Name="TargetJob" />
                     <RichTextLabel Name="TargetSpecies" />
                     <RichTextLabel Name="TargetGender" />
-                    <PanelContainer StyleClasses="LowDivider" Margin="0 5 0 5"/>
+                    <controls:Separator StyleClasses="LowDivider" Margin="0 5 0 5"/>
                     <RichTextLabel Name="InitiatorName" VerticalAlignment="Stretch"/>
                     <RichTextLabel Name="WantedReason" VerticalAlignment="Stretch"/>
-                    <PanelContainer StyleClasses="LowDivider" Margin="0 5 0 5" />
+                    <controls:Separator StyleClasses="LowDivider" Margin="0 5 0 5"/>
                     <TableContainer Name="HistoryTable" Columns="3" Visible="False" HorizontalAlignment="Stretch" />
                 </BoxContainer>
             </ScrollContainer>
diff --git a/Content.Client/Changeling/Systems/ChangelingLastResortSystem.cs b/Content.Client/Changeling/Systems/ClientChangelingLastResortSystem.cs
similarity index 64%
rename from Content.Client/Changeling/Systems/ChangelingLastResortSystem.cs
rename to Content.Client/Changeling/Systems/ClientChangelingLastResortSystem.cs
index 62560c4310..0308f8ee78 100644
--- a/Content.Client/Changeling/Systems/ChangelingLastResortSystem.cs
+++ b/Content.Client/Changeling/Systems/ClientChangelingLastResortSystem.cs
@@ -2,4 +2,4 @@ using Content.Shared.Changeling.Systems;
 
 namespace Content.Client.Changeling.Systems;
 
-public sealed partial class ChangelingLastResortSystem : SharedChangelingLastResortSystem;
+public sealed partial class ClientChangelingLastResortSystem : ChangelingLastResortSystem;
diff --git a/Content.Client/Changeling/UI/ChangelingTransformBoundUserInterface.cs b/Content.Client/Changeling/UI/ChangelingTransformBoundUserInterface.cs
index 5f96b536d9..2b0c5e34e1 100644
--- a/Content.Client/Changeling/UI/ChangelingTransformBoundUserInterface.cs
+++ b/Content.Client/Changeling/UI/ChangelingTransformBoundUserInterface.cs
@@ -33,12 +33,12 @@ public sealed partial class ChangelingTransformBoundUserInterface(EntityUid owne
 
         if (!EntMan.TryGetComponent<ChangelingIdentityComponent>(Owner, out var lingIdentity))
             return;
-        
+
         var manualDrop = true;
 
         if (EntMan.TryGetComponent<ChangelingTransformComponent>(Owner, out var lingTransform))
             manualDrop = lingTransform.ManualDrop;
-            
+
         var models = ConvertToButtons(lingIdentity.ConsumedIdentities, lingIdentity.CurrentIdentity, manualDrop);
 
         _menu.SetButtons(models);
@@ -64,7 +64,7 @@ public sealed partial class ChangelingTransformBoundUserInterface(EntityUid owne
                 IconSpecifier = RadialMenuIconSpecifier.With(identity.Identity.Value),
                 ToolTip = Loc.GetString("changeling-transform-bui-select-entity", ("entity", identity.Identity)),
                 BackgroundColor = (currentIdentity == identity.Identity) ? SelectedOptionBackground : null, // mark as selected
-                HoverBackgroundColor = (currentIdentity == identity.Identity) ? SelectedOptionHoverBackground : null
+                HoverBackgroundColor = (currentIdentity == identity.Identity) ? SelectedOptionHoverBackground : null,
             };
             buttons.Add(option);
 
@@ -79,18 +79,19 @@ public sealed partial class ChangelingTransformBoundUserInterface(EntityUid owne
                     ? Loc.GetString("changeling-transform-bui-drop-identity-cannot-drop")
                     : Loc.GetString("changeling-transform-bui-drop-identity-entity", ("entity", identity.Identity)),
                 BackgroundColor = (currentIdentity == identity.Identity) ? DisabledOptionBackground : null, // cannot drop your current identity
-                HoverBackgroundColor = (currentIdentity == identity.Identity) ? DisabledOptionHoverBackground : null
+                HoverBackgroundColor = (currentIdentity == identity.Identity) ? DisabledOptionHoverBackground : null,
             };
             dropButtons.Add(dropOption);
         }
-        
+
         if (canDrop)
         {
             // Menu category for dropping identities.
             var dropMenuButton = new RadialMenuNestedLayerOption(dropButtons)
             {
                 IconSpecifier = RadialMenuIconSpecifier.With(new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/delete.svg.192dpi.png"))),
-                ToolTip = Loc.GetString("changeling-transform-bui-drop-identity-menu")
+                ToolTip = Loc.GetString("changeling-transform-bui-drop-identity-menu"),
+                Order = 0, // Explicit first option.
             };
             buttons.Add(dropMenuButton);
         }
diff --git a/Content.Client/Changelog/ChangelogTab.xaml.cs b/Content.Client/Changelog/ChangelogTab.xaml.cs
index 3cbc2a4547..7a9cd97573 100644
--- a/Content.Client/Changelog/ChangelogTab.xaml.cs
+++ b/Content.Client/Changelog/ChangelogTab.xaml.cs
@@ -1,3 +1,4 @@
+using Content.Client.UserInterface.Controls;
 using System.Linq;
 using System.Numerics;
 using Content.Client.Resources;
@@ -121,7 +122,7 @@ public sealed partial class ChangelogTab : Control
                     };
 
                     readDivider.AddChild(hBox);
-                    readDivider.AddChild(new PanelContainer { StyleClasses = { StyleClass.LowDivider } });
+                    readDivider.AddChild(new Separator { StyleClasses = { StyleClass.LowDivider } });
                     ChangelogBody.AddChild(readDivider);
 
                     if (first)
diff --git a/Content.Client/Changelog/ChangelogWindow.xaml b/Content.Client/Changelog/ChangelogWindow.xaml
index 8325de02b5..d2223564a5 100644
--- a/Content.Client/Changelog/ChangelogWindow.xaml
+++ b/Content.Client/Changelog/ChangelogWindow.xaml
@@ -1,4 +1,5 @@
-<ui:ChangelogWindow xmlns="https://spacestation14.io"
+<ui:ChangelogWindow xmlns="https://spacestation14.io"
+                    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                     xmlns:ui="clr-namespace:Content.Client.Changelog"
                     Title="{Loc 'changelog-window-title'}"
                     MinSize="500 400"
@@ -7,7 +8,7 @@
     <PanelContainer StyleClasses="BackgroundPanel" />
     <BoxContainer Orientation="Vertical">
         <TabContainer Name="Tabs" Access="Public" HorizontalExpand="True" VerticalExpand="True" />
-        <PanelContainer StyleClasses="LowDivider" />
+        <controls:Separator StyleClasses="LowDivider"/>
         <Label Name="VersionLabel" Access="Public" HorizontalAlignment="Right" StyleClasses="LabelSubText" Margin="4 0" />
     </BoxContainer>
 </ui:ChangelogWindow>
diff --git a/Content.Client/Chat/UI/SpeechBubble.cs b/Content.Client/Chat/UI/SpeechBubble.cs
index 5d48a1f97a..f556e9a69d 100644
--- a/Content.Client/Chat/UI/SpeechBubble.cs
+++ b/Content.Client/Chat/UI/SpeechBubble.cs
@@ -217,7 +217,7 @@ namespace Content.Client.Chat.UI
                 OutlineColorOverride = Color.Transparent, // Corvax-SpeechBubble убрал обводку текста
             };
 
-            label.SetMessage(FormatSpeech(message.WrappedMessage, fontColor));
+            label.SetMessage(FormatSpeech(message.WrappedMessage, fontColor), tagsAllowed: null);
 
             var panel = new PanelContainer
             {
@@ -248,7 +248,7 @@ namespace Content.Client.Chat.UI
                     OutlineColorOverride = Color.Transparent, // Corvax-SpeechBubble
                 };
 
-                label.SetMessage(ExtractAndFormatSpeechSubstring(message, "BubbleContent", fontColor));
+                label.SetMessage(ExtractAndFormatSpeechSubstring(message, "BubbleContent", fontColor), tagsAllowed: null);
 
                 var unfanciedPanel = new PanelContainer
                 {
@@ -276,8 +276,8 @@ namespace Content.Client.Chat.UI
             };
 
             //We'll be honest. *Yes* this is hacky. Doing this in a cleaner way would require a bottom-up refactor of how saycode handles sending chat messages. -Myr
-            bubbleHeader.SetMessage(ExtractAndFormatSpeechSubstring(message, "BubbleHeader", fontColor));
-            bubbleContent.SetMessage(ExtractAndFormatSpeechSubstring(message, "BubbleContent", fontColor));
+            bubbleHeader.SetMessage(ExtractAndFormatSpeechSubstring(message, "BubbleHeader", fontColor), tagsAllowed:null);
+            bubbleContent.SetMessage(ExtractAndFormatSpeechSubstring(message, "BubbleContent", fontColor), tagsAllowed:null);
 
             //As for below: Some day this could probably be converted to xaml. But that is not today. -Myr
             var mainPanel = new PanelContainer
diff --git a/Content.Client/Chemistry/Components/SolutionItemStatusComponent.cs b/Content.Client/Chemistry/Components/SolutionItemStatusComponent.cs
index 58c5a05894..874b9c6ac0 100644
--- a/Content.Client/Chemistry/Components/SolutionItemStatusComponent.cs
+++ b/Content.Client/Chemistry/Components/SolutionItemStatusComponent.cs
@@ -1,4 +1,4 @@
-using Content.Client.Chemistry.EntitySystems;
+using Content.Client.Chemistry.EntitySystems;
 using Content.Client.Chemistry.UI;
 
 namespace Content.Client.Chemistry.Components;
diff --git a/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs b/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs
index 3a305ae2e6..580cd658c6 100644
--- a/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs
+++ b/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Atmos.Prototypes;
 using Content.Shared.Body;
diff --git a/Content.Client/Chemistry/EntitySystems/InjectorStatusControlSystem.cs b/Content.Client/Chemistry/EntitySystems/InjectorStatusControlSystem.cs
index 6a7bf0ac41..515a2baee2 100644
--- a/Content.Client/Chemistry/EntitySystems/InjectorStatusControlSystem.cs
+++ b/Content.Client/Chemistry/EntitySystems/InjectorStatusControlSystem.cs
@@ -1,4 +1,4 @@
-using Content.Client.Chemistry.UI;
+using Content.Client.Chemistry.UI;
 using Content.Client.Items;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
diff --git a/Content.Client/Chemistry/EntitySystems/SolutionItemStatusSystem.cs b/Content.Client/Chemistry/EntitySystems/SolutionItemStatusSystem.cs
index ed65577aa7..2b9d9b8659 100644
--- a/Content.Client/Chemistry/EntitySystems/SolutionItemStatusSystem.cs
+++ b/Content.Client/Chemistry/EntitySystems/SolutionItemStatusSystem.cs
@@ -1,4 +1,4 @@
-using Content.Client.Chemistry.Components;
+using Content.Client.Chemistry.Components;
 using Content.Client.Chemistry.UI;
 using Content.Client.Items;
 using Content.Shared.Chemistry.EntitySystems;
diff --git a/Content.Client/Chemistry/UI/SolutionStatusControl.cs b/Content.Client/Chemistry/UI/SolutionStatusControl.cs
index 8a551a262c..4f4f03e7a1 100644
--- a/Content.Client/Chemistry/UI/SolutionStatusControl.cs
+++ b/Content.Client/Chemistry/UI/SolutionStatusControl.cs
@@ -1,4 +1,4 @@
-using Content.Client.Chemistry.Components;
+using Content.Client.Chemistry.Components;
 using Content.Client.Chemistry.EntitySystems;
 using Content.Client.Items.UI;
 using Content.Client.Message;
diff --git a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
index 2d01098213..04109e91f1 100644
--- a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Chemistry/Visualizers/SmokeVisualizerSystem.cs b/Content.Client/Chemistry/Visualizers/SmokeVisualizerSystem.cs
index bf847320ee..bcbc217d3c 100644
--- a/Content.Client/Chemistry/Visualizers/SmokeVisualizerSystem.cs
+++ b/Content.Client/Chemistry/Visualizers/SmokeVisualizerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Smoking;
+using Content.Shared.Smoking;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Chemistry.Visualizers;
diff --git a/Content.Client/Cloning/UI/AcceptCloningEui.cs b/Content.Client/Cloning/UI/AcceptCloningEui.cs
index 99f4568e96..fd2e494a3c 100644
--- a/Content.Client/Cloning/UI/AcceptCloningEui.cs
+++ b/Content.Client/Cloning/UI/AcceptCloningEui.cs
@@ -1,4 +1,4 @@
-using Content.Client.Eui;
+using Content.Client.Eui;
 using Content.Shared.Cloning;
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs
index 12b9988edb..c8bad47bf0 100644
--- a/Content.Client/Clothing/ClientClothingSystem.cs
+++ b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -12,6 +12,7 @@ using Content.Shared.Item;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
+using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.TypeSerializers.Implementations;
 using Robust.Shared.Utility;
 using static Robust.Client.GameObjects.SpriteComponent;
@@ -47,6 +48,7 @@ public sealed partial class ClientClothingSystem : ClothingSystem
     };
 
     [Dependency] private IResourceCache _cache = default!;
+    [Dependency] private ISerializationManager _seriMan = default!;
     [Dependency] private DisplacementMapSystem _displacement = default!;
     [Dependency] private InventorySystem _inventorySystem = default!;
     [Dependency] private SpriteSystem _sprite = default!;
@@ -121,7 +123,11 @@ public sealed partial class ClientClothingSystem : ClothingSystem
             }
 
             ent.Comp.MappedLayer = key;
-            args.Layers.Add((key, layer));
+
+            // Create a copy of the layer, which might get modified.
+            PrototypeLayerData newLayer = new();
+            _seriMan.CopyTo(layer, ref newLayer, notNullableOverride: true);
+            args.Layers.Add((key, newLayer));
         }
     }
 
diff --git a/Content.Client/Clothing/Systems/ChameleonClothingSystem.cs b/Content.Client/Clothing/Systems/ChameleonClothingSystem.cs
index bcdb93e7ea..ccd1ebc99f 100644
--- a/Content.Client/Clothing/Systems/ChameleonClothingSystem.cs
+++ b/Content.Client/Clothing/Systems/ChameleonClothingSystem.cs
@@ -1,4 +1,4 @@
-using Content.Client.PDA;
+using Content.Client.PDA;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clothing.EntitySystems;
 using Robust.Client.GameObjects;
diff --git a/Content.Client/Commands/ActionsCommands.cs b/Content.Client/Commands/ActionsCommands.cs
index 56749ab1f5..d75ff17a02 100644
--- a/Content.Client/Commands/ActionsCommands.cs
+++ b/Content.Client/Commands/ActionsCommands.cs
@@ -1,4 +1,4 @@
-using Content.Client.Actions;
+using Content.Client.Actions;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 
diff --git a/Content.Client/Communications/CommunicationsConsoleComponent.cs b/Content.Client/Communications/CommunicationsConsoleComponent.cs
index d3db95d5bd..2c3f696653 100644
--- a/Content.Client/Communications/CommunicationsConsoleComponent.cs
+++ b/Content.Client/Communications/CommunicationsConsoleComponent.cs
@@ -15,5 +15,5 @@ public sealed partial class CommunicationsConsoleComponent : SharedCommunication
     /// If this isn't true, create a dummy entity or adjust the margins/scale in MessagingControls.xaml.
     /// </remarks>
     [DataField]
-    public EntProtoId ScreenDisplayId = "ScreenDummy";
+    public EntProtoId ScreenDisplayId = "Screen";
 }
diff --git a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
index cc0e06c9da..eb416c3f3c 100644
--- a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
+++ b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
@@ -2,7 +2,7 @@ using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.AlertLevel;
 using Content.Shared.Communications;
-using Content.Shared.Station;
+using Content.Shared.Station.Systems;
 using Robust.Client.UserInterface;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
@@ -18,12 +18,14 @@ namespace Content.Client.Communications.UI;
 public sealed partial class CommunicationsConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
 {
     [Dependency] private IConfigurationManager _cfg = default!;
-    [Dependency] private SharedStationSystem _station = default!;
+    [Dependency] private StationSystem _station = default!;
     [Dependency] private AlertLevelSystem _alertLevel = default!;
 
     [ViewVariables]
     private CommunicationsConsoleMenu? _menu;
 
+    private static readonly EntProtoId FallbackScreen = "Screen";
+
     /// <inheritdoc/>
     protected override void Open()
     {
@@ -38,6 +40,8 @@ public sealed partial class CommunicationsConsoleBoundUserInterface(EntityUid ow
 
         if (EntMan.TryGetComponent<CommunicationsConsoleComponent>(Owner, out var console))
             _menu.SetBroadcastDisplayEntity(console.ScreenDisplayId);
+        else
+            _menu.SetBroadcastDisplayEntity(FallbackScreen);
     }
 
     public void AlertLevelSelected(ProtoId<AlertLevelPrototype> level)
diff --git a/Content.Client/Communications/UI/Widgets/MessagingControls.xaml b/Content.Client/Communications/UI/Widgets/MessagingControls.xaml
index 284da9774d..4120b33fd2 100644
--- a/Content.Client/Communications/UI/Widgets/MessagingControls.xaml
+++ b/Content.Client/Communications/UI/Widgets/MessagingControls.xaml
@@ -25,12 +25,14 @@
         <Label StyleClasses="StatusFieldTitle" Align="Center" VAlign="Top"
             VerticalAlignment="Top"
             Text="{Loc 'comms-console-station-broadcast-header'}" />
-        <Label Name="BroadcastTopCharLimitLabel"
-            StyleClasses="CommsConsoleCharLimit" HorizontalAlignment="Center" Margin="0 10 0 0" />
-        <SpriteView Name="BroadcastEntityDisplay" Scale="8 8" SpriteOffset="True"
-            VerticalExpand="True" Margin="0 -124 0 -112" /> <!-- Forgive me for negamargin but there's just too much goddamn space - whatstone -->
-        <Label Name="BroadcastBottomCharLimitLabel"
-            StyleClasses="CommsConsoleCharLimit" HorizontalAlignment="Center" />
+        <BoxContainer Orientation="Vertical" VerticalExpand="True" VerticalAlignment="Center">
+            <Label Name="BroadcastTopCharLimitLabel"
+                StyleClasses="CommsConsoleCharLimit" HorizontalAlignment="Center" Margin="0 10 0 0" />
+            <SpriteView Name="BroadcastEntityDisplay" Scale="8 8" SpriteOffset="True"
+                Margin="0 -56 0 -56" /> <!-- Forgive me for negamargin but there's just too much goddamn space - whatstone -->
+            <Label Name="BroadcastBottomCharLimitLabel"
+                StyleClasses="CommsConsoleCharLimit" HorizontalAlignment="Center" />
+        </BoxContainer>
         <PanelContainer StyleClasses="BackgroundDark" Margin="10 6 6 6"
             HorizontalExpand="True" VerticalExpand="True">
             <TextEdit Name="ScreenMessageInput" MinHeight="40"
diff --git a/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs b/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs
index a3845ba1eb..a02fcffb70 100644
--- a/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs
+++ b/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using System.Text.RegularExpressions;
 using Content.Shared.Configurable;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Configurable/UI/ConfigurationMenu.cs b/Content.Client/Configurable/UI/ConfigurationMenu.cs
index 845c72f954..d34ab45d63 100644
--- a/Content.Client/Configurable/UI/ConfigurationMenu.cs
+++ b/Content.Client/Configurable/UI/ConfigurationMenu.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using System.Text.RegularExpressions;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
index ba1c36b4de..b3961cc489 100644
--- a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
+++ b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 using System.Numerics;
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets.Palette;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Construction.Prototypes;
 using Robust.Client.AutoGenerated;
@@ -290,8 +290,7 @@ namespace Content.Client.Construction.UI
                 return;
 
             button.Children.Single().Modulate = selected ? Color.Green : Color.White;
-            var buttonColor = selected ? StyleNano.ButtonColorDefault : Color.Transparent;
-            buttonPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = buttonColor };
+            buttonPanel.PanelOverride = new StyleBoxFlat(selected ? Palettes.Navy.Element : Color.Transparent);
         }
     }
 }
diff --git a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
index 67631ea58a..fa98d7bbe1 100644
--- a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
+++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Numerics;
 using Content.Client.Lobby;
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets.Palette;
 using Content.Client.UserInterface.Systems.MenuBar.Widgets;
 using Content.Shared.Construction.Prototypes;
 using Content.Shared.Whitelist;
@@ -361,7 +361,7 @@ namespace Content.Client.Construction.UI
 
                 var itemButtonPanelContainer = new PanelContainer
                 {
-                    PanelOverride = new StyleBoxFlat { BackgroundColor = StyleNano.ButtonColorDefault },
+                    PanelOverride = new StyleBoxFlat(Palettes.Navy.Element),
                     Children = { itemButton },
                 };
 
diff --git a/Content.Client/Cooldown/CooldownGraphic.cs b/Content.Client/Cooldown/CooldownGraphic.cs
index da7df88a95..e3a8d3ae93 100644
--- a/Content.Client/Cooldown/CooldownGraphic.cs
+++ b/Content.Client/Cooldown/CooldownGraphic.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
diff --git a/Content.Client/Corvax/Lobby/UI/LobbyServerHub.xaml.cs b/Content.Client/Corvax/Lobby/UI/LobbyServerHub.xaml.cs
index 0bc643c082..16e5d7f13c 100644
--- a/Content.Client/Corvax/Lobby/UI/LobbyServerHub.xaml.cs
+++ b/Content.Client/Corvax/Lobby/UI/LobbyServerHub.xaml.cs
@@ -206,12 +206,14 @@ public sealed partial class LobbyServerHub : BoxContainer
         }
     }
 
-    private static PanelContainer CreateDivider(bool vertical)
+    private static Separator CreateDivider(bool vertical)
     {
-        return new PanelContainer
+        return new Separator
         {
-            MinWidth = vertical ? 1 : 0,
-            MinHeight = vertical ? 0 : 1,
+            Orientation = vertical
+                ? Separator.OrientationMode.Vertical
+                : Separator.OrientationMode.Horizontal,
+            Thickness = 1,
             VerticalExpand = vertical,
             HorizontalExpand = !vertical,
             Margin = vertical ? new Thickness(0, 2) : new Thickness(0),
@@ -338,7 +340,7 @@ public sealed partial class LobbyServerHub : BoxContainer
                 ServerGrid.AddChild(sectionLabel);
             }
 
-            ServerGrid.AddChild(new HLine
+            ServerGrid.AddChild(new Separator
             {
                 Thickness = 2,
                 HorizontalExpand = true,
diff --git a/Content.Client/Corvax/SecApartment/SecApartmentWindow.xaml.cs b/Content.Client/Corvax/SecApartment/SecApartmentWindow.xaml.cs
index 2709628da6..6fbde35c15 100644
--- a/Content.Client/Corvax/SecApartment/SecApartmentWindow.xaml.cs
+++ b/Content.Client/Corvax/SecApartment/SecApartmentWindow.xaml.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Numerics;
 using Content.Client.Corvax.SecApartment.Stylesheets;
-using Content.Client.GameTicking.Managers;
+using Content.Client.GameTicking;
 using Content.Shared.SecApartment;
 using Content.Shared.StatusIcon;
 using Robust.Client.AutoGenerated;
diff --git a/Content.Client/Corvax/SecApartment/SquadEntry.xaml.cs b/Content.Client/Corvax/SecApartment/SquadEntry.xaml.cs
index 248b613a16..7b5dd350c0 100644
--- a/Content.Client/Corvax/SecApartment/SquadEntry.xaml.cs
+++ b/Content.Client/Corvax/SecApartment/SquadEntry.xaml.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Numerics;
 using Content.Client.Corvax.SecApartment.Stylesheets;
-using Content.Shared.Medical.SuitSensor;
+using Content.Shared.Medical.SuitSensors;
 using Content.Shared.SecApartment;
 using Content.Shared.StatusIcon;
 using Robust.Client.AutoGenerated;
@@ -186,7 +186,7 @@ public sealed partial class SquadEntry : PanelContainer
         Color backgroundColor;
         Color borderColor;
 
-        if (member.SensorStatus == null || !member.SensorStatus.IsAlive)
+        if (member.SensorStatus is not { } sensorStatus || !sensorStatus.IsAlive)
         {
             backgroundColor = Color.FromHex("#1a0a0a");
             borderColor = Color.FromHex("#990000");
@@ -245,15 +245,15 @@ public sealed partial class SquadEntry : PanelContainer
 
         var specifier = new SpriteSpecifier.Rsi(new ResPath("Interface/Alerts/human_crew_monitoring.rsi"), "alive");
 
-        if (member.SensorStatus != null)
+        if (member.SensorStatus is { } sensorStatus2)
         {
-            if (!member.SensorStatus.IsAlive)
+            if (!sensorStatus2.IsAlive)
             {
                 specifier = new SpriteSpecifier.Rsi(new ResPath("Interface/Alerts/human_crew_monitoring.rsi"), "dead");
             }
-            else if (member.SensorStatus.DamagePercentage != null)
+            else if (sensorStatus2.DamagePercentage is { } damagePercentage)
             {
-                var index = MathF.Round(4f * member.SensorStatus.DamagePercentage.Value);
+                var index = MathF.Round(4f * damagePercentage);
 
                 if (index >= 5)
                     specifier = new SpriteSpecifier.Rsi(new ResPath("Interface/Alerts/human_crew_monitoring.rsi"), "critical");
@@ -359,7 +359,7 @@ public sealed partial class SquadEntry : PanelContainer
         Color backgroundColor;
         Color borderColor;
 
-        if (status == null || !status.IsAlive)
+        if (status is not { } sensorStatus || !sensorStatus.IsAlive)
         {
             backgroundColor = Color.FromHex("#1a0a0a");
             borderColor = Color.FromHex("#990000");
@@ -400,18 +400,18 @@ public sealed partial class SquadEntry : PanelContainer
                             "alive"
                         );
 
-                        if (status != null)
+                        if (status is { } sensorStatus2)
                         {
-                            if (!status.IsAlive)
+                            if (!sensorStatus2.IsAlive)
                             {
                                 specifier = new SpriteSpecifier.Rsi(
                                     new ResPath("Interface/Alerts/human_crew_monitoring.rsi"),
                                     "dead"
                                 );
                             }
-                            else if (status.DamagePercentage != null)
+                            else if (sensorStatus2.DamagePercentage is { } damagePercentage)
                             {
-                                var index = MathF.Round(4f * status.DamagePercentage.Value);
+                                var index = MathF.Round(4f * damagePercentage);
                                 if (index >= 5)
                                     specifier = new SpriteSpecifier.Rsi(
                                         new ResPath("Interface/Alerts/human_crew_monitoring.rsi"),
diff --git a/Content.Client/Corvax/TTS/TTSSystem.Effects.cs b/Content.Client/Corvax/TTS/TTSSystem.Effects.cs
index 39a6b7ac0a..8b90d6b59f 100644
--- a/Content.Client/Corvax/TTS/TTSSystem.Effects.cs
+++ b/Content.Client/Corvax/TTS/TTSSystem.Effects.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Corvax.TTS;
 using Robust.Shared.Audio.Components;
+using Robust.Shared.Audio.Effects;
 
 namespace Content.Client.Corvax.TTS;
 
@@ -13,9 +14,9 @@ public sealed partial class TTSSystem
     private readonly object _radioEffectLock = new();
 
     /// <summary>
-    /// Clears all EFX-effects.
+    /// It frees up only the vocal effect and its auxiliary.
     /// </summary>
-    private void ShutdownEffects()
+    private void ShutdownVoiceEffect()
     {
         if (_cachedVoiceEffectEntity != null && !TerminatingOrDeleted(_cachedVoiceEffectEntity.Value))
         {
@@ -34,7 +35,13 @@ public sealed partial class TTSSystem
             Del(_voiceAuxiliaryEntity);
         }
         _voiceAuxiliaryEntity = null;
+    }
 
+    /// <summary>
+    /// It frees up only the radio effect and its auxiliary.
+    /// </summary>
+    private void ShutdownRadioEffect()
+    {
         if (_cachedRadioEffectEntity != null && !TerminatingOrDeleted(_cachedRadioEffectEntity.Value))
         {
             _audio.Stop(_cachedRadioEffectEntity);
@@ -54,21 +61,27 @@ public sealed partial class TTSSystem
         _radioAuxiliaryEntity = null;
     }
 
+    /// <summary>
+    /// Clears all EFX-effects.
+    /// </summary>
+    private void ShutdownEffects()
+    {
+        ShutdownVoiceEffect();
+        ShutdownRadioEffect();
+    }
+
     private void ApplyVoiceEffect((EntityUid Entity, AudioComponent Component) audio, TTSVoiceEffectPreset effect)
     {
+        if (!_ttsEnabled)
+            return;
+
         if (effect == TTSVoiceEffectPreset.None)
             return;
 
-        if (_cachedVoiceEffectEntity == null)
-        {
-            if (!EnsureVoiceEffectInitialized())
-            {
-                if (_cachedVoiceEffectEntity == null)
-                    return;
-            }
-        }
+        if (!EnsureVoiceEffectInitialized())
+            return;
 
-        if (_cachedVoiceEffectEntity == null || _voiceAuxiliaryEntity == null)
+        if (_voiceAuxiliaryEntity == null)
             return;
 
         try
@@ -84,13 +97,13 @@ public sealed partial class TTSSystem
 
     private void ApplyRadioEffect((EntityUid Entity, AudioComponent Component) audio)
     {
-        if (!EnsureRadioEffectInitialized())
-        {
-            if (_cachedRadioEffectEntity == null)
-                return;
-        }
+        if (!_ttsEnabled)
+            return;
 
-        if (_cachedRadioEffectEntity == null || _radioAuxiliaryEntity == null)
+        if (!EnsureRadioEffectInitialized())
+            return;
+
+        if (_radioAuxiliaryEntity == null)
             return;
 
         try
@@ -104,11 +117,60 @@ public sealed partial class TTSSystem
         }
     }
 
+    /// <summary>
+    /// Creates an effect and an auxiliary, configures the preset, and links them.
+    /// Rolls back everything created and returns null if any error occurs.
+    /// </summary>
+    private (EntityUid Effect, EntityUid Auxiliary)? TryCreateEffectWithAuxiliary(ReverbProperties preset, string debugName)
+    {
+        EntityUid? effectUid = null;
+        EntityUid? auxUid = null;
+
+        try
+        {
+            var (effect, effectComp) = _audio.CreateEffect();
+            effectUid = effect;
+
+            _audio.SetEffectPreset(effect, effectComp, preset);
+
+            var (aux, auxComp) = _audio.CreateAuxiliary();
+            auxUid = aux;
+
+            _audio.SetEffect(aux, auxComp, effect);
+
+            return (effect, aux);
+        }
+        catch (Exception ex)
+        {
+            _sawmill.Warning($"Failed to initialize {debugName} effect: {ex.Message}");
+            if (auxUid != null && !TerminatingOrDeleted(auxUid.Value))
+            {
+                if (TryComp<AudioAuxiliaryComponent>(auxUid.Value, out var auxComp))
+                {
+                    auxComp.Auxiliary?.SetEffect(null);
+                    auxComp.Auxiliary?.Dispose();
+                }
+                Del(auxUid.Value);
+            }
+
+            if (effectUid != null && !TerminatingOrDeleted(effectUid.Value))
+            {
+                _audio.Stop(effectUid.Value);
+                Del(effectUid.Value);
+            }
+
+            return null;
+        }
+    }
+
     /// <summary>
     /// Initializes voice effect upon first use, if necessary.
     /// </summary>
     private bool EnsureVoiceEffectInitialized()
     {
+        if (!_ttsEnabled)
+            return false;
+
         if (_voiceEffectPreset == TTSVoiceEffectPreset.None)
         {
             _cachedVoiceEffectEntity = null;
@@ -129,30 +191,15 @@ public sealed partial class TTSSystem
                 return false;
             }
 
-            try
-            {
-                _sawmill.Debug($"Initializing voice effect for preset: {_voiceEffectPreset}");
-
-                var effectResult = _audio.CreateEffect();
-                var (effectUid, effectComp) = effectResult;
-                _cachedVoiceEffectEntity = effectUid;
-
-                var preset = GetVoicePreset(_voiceEffectPreset);
-                _audio.SetEffectPreset(effectUid, effectComp, preset);
-
-                var (auxUid, auxComp) = _audio.CreateAuxiliary();
-                _voiceAuxiliaryEntity = auxUid;
-
-                _audio.SetEffect(auxUid, auxComp, effectUid);
-
-                _sawmill.Info($"Voice effect initialized: {_voiceEffectPreset}");
-                return true;
-            }
-            catch (Exception ex)
-            {
-                _sawmill.Warning($"Failed to initialize voice effect: {ex.Message}");
+            var result = TryCreateEffectWithAuxiliary(GetVoicePreset(_voiceEffectPreset), $"voice ({_voiceEffectPreset})");
+            if (result == null)
                 return false;
-            }
+
+            _cachedVoiceEffectEntity = result.Value.Effect;
+            _voiceAuxiliaryEntity = result.Value.Auxiliary;
+
+            _sawmill.Info($"Voice effect initialized: {_voiceEffectPreset}");
+            return true;
         }
     }
 
@@ -161,6 +208,9 @@ public sealed partial class TTSSystem
     /// </summary>
     private bool EnsureRadioEffectInitialized()
     {
+        if (!_ttsEnabled)
+            return false;
+
         if (_cachedRadioEffectEntity != null)
             return true;
 
@@ -169,27 +219,14 @@ public sealed partial class TTSSystem
             if (_cachedRadioEffectEntity != null)
                 return true;
 
-            try
-            {
-                var effectResult = _audio.CreateEffect();
-                var (effectUid, effectComp) = effectResult;
-                _cachedRadioEffectEntity = effectUid;
-
-                var radioPreset = CreateRadioPreset();
-                _audio.SetEffectPreset(effectUid, effectComp, radioPreset);
-
-                var (auxUid, auxComp) = _audio.CreateAuxiliary();
-                _radioAuxiliaryEntity = auxUid;
-
-                _audio.SetEffect(auxUid, auxComp, effectUid);
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                _sawmill.Warning($"Failed to initialize radio EFX effect: {ex.Message}");
+            var result = TryCreateEffectWithAuxiliary(CreateRadioPreset(), "radio");
+            if (result == null)
                 return false;
-            }
+
+            _cachedRadioEffectEntity = result.Value.Effect;
+            _radioAuxiliaryEntity = result.Value.Auxiliary;
+
+            return true;
         }
     }
 }
diff --git a/Content.Client/Corvax/TTS/TTSSystem.cs b/Content.Client/Corvax/TTS/TTSSystem.cs
index ebaf28e56f..27800ba043 100644
--- a/Content.Client/Corvax/TTS/TTSSystem.cs
+++ b/Content.Client/Corvax/TTS/TTSSystem.cs
@@ -49,6 +49,7 @@ public sealed partial class TTSSystem : EntitySystem
     private readonly HashSet<NetEntity> _playingEntities = new();
     private readonly Dictionary<NetEntity, Queue<PlayTTSEvent>> _entityQueues = new();
     private TTSVoiceEffectPreset _voiceEffectPreset = TTSVoiceEffectPreset.None;
+    private bool _ttsEnabled;
     private int _fileIdx = 0;
 
     public override void Initialize()
@@ -61,6 +62,7 @@ public sealed partial class TTSSystem : EntitySystem
         }
 
         _sawmill = Logger.GetSawmill("tts");
+        _cfg.OnValueChanged(CCCVars.TTSEnabled, OnTtsEnabledChanged, true);
         _cfg.OnValueChanged(CCCVars.TTSVoiceEffect, OnVoiceEffectChanged, true);
         _cfg.OnValueChanged(CCCVars.TTSRadioVolume, OnRadioVolumeChanged, true);
         _cfg.OnValueChanged(CCCVars.TTSVolume, OnVolumeChanged, true);
@@ -73,6 +75,7 @@ public sealed partial class TTSSystem : EntitySystem
     {
         base.Shutdown();
 
+        _cfg.UnsubValueChanged(CCCVars.TTSEnabled, OnTtsEnabledChanged);
         _cfg.UnsubValueChanged(CCCVars.TTSVoiceEffect, OnVoiceEffectChanged);
         _cfg.UnsubValueChanged(CCCVars.TTSRadioVolume, OnRadioVolumeChanged);
         _cfg.UnsubValueChanged(CCCVars.TTSVolume, OnVolumeChanged);
@@ -83,20 +86,21 @@ public sealed partial class TTSSystem : EntitySystem
         ShutdownEffects();
     }
 
+    private void OnTtsEnabledChanged(bool value)
+    {
+        _ttsEnabled = value;
+
+        if (!value)
+        {
+            ShutdownEffects();
+        }
+    }
+
     private void OnVoiceEffectChanged(int newValue)
     {
         _voiceEffectPreset = (TTSVoiceEffectPreset)newValue;
 
-        if (_cachedVoiceEffectEntity != null)
-        {
-            if (!TerminatingOrDeleted(_cachedVoiceEffectEntity.Value))
-                Del(_cachedVoiceEffectEntity.Value);
-
-            _cachedVoiceEffectEntity = null;
-        }
-
-        if (_voiceEffectPreset != TTSVoiceEffectPreset.None)
-            EnsureVoiceEffectInitialized();
+        ShutdownVoiceEffect();
     }
 
     private void OnVolumeChanged(float value)
@@ -124,6 +128,9 @@ public sealed partial class TTSSystem : EntitySystem
 
     private void OnPlayTTS(PlayTTSEvent ev)
     {
+        if (!_ttsEnabled)
+            return;
+
         // It will stop clogging up your memory if you turn off one of the sliders to 0
         if (ev.IsRadio && _radioVolume <= 0)
         {
diff --git a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
index 99ddb0c9aa..230d8c1595 100644
--- a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
+++ b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Crayon;
 using Content.Shared.Decals;
 using Robust.Client.GameObjects;
diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
index 631984f0b3..e42cea9c37 100644
--- a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
+++ b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
@@ -1,6 +1,5 @@
-using System.Collections.Generic;
 using System.Linq;
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets.Palette;
 using Content.Shared.Crayon;
 using Content.Shared.Decals;
 using Robust.Client.AutoGenerated;
@@ -9,9 +8,6 @@ using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Client.Utility;
-using Robust.Shared.Graphics;
-using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
@@ -110,10 +106,7 @@ namespace Content.Client.Crayon.UI
                     {
                         var panelContainer = new PanelContainer()
                         {
-                            PanelOverride = new StyleBoxFlat()
-                            {
-                                BackgroundColor = StyleNano.ButtonColorDefault,
-                            },
+                            PanelOverride = new StyleBoxFlat(Palettes.Navy.Element),
                             Children =
                             {
                                 button,
diff --git a/Content.Client/CrewManifest/UI/CrewManifestListing.cs b/Content.Client/CrewManifest/UI/CrewManifestListing.cs
index fb28c20ce3..b983c3d884 100644
--- a/Content.Client/CrewManifest/UI/CrewManifestListing.cs
+++ b/Content.Client/CrewManifest/UI/CrewManifestListing.cs
@@ -1,4 +1,4 @@
-using Content.Shared.CrewManifest;
+using Content.Shared.CrewManifest;
 using Content.Shared.Roles;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/CrewManifest/UI/CrewManifestSection.cs b/Content.Client/CrewManifest/UI/CrewManifestSection.cs
index 1e853bf153..f86b2e6781 100644
--- a/Content.Client/CrewManifest/UI/CrewManifestSection.cs
+++ b/Content.Client/CrewManifest/UI/CrewManifestSection.cs
@@ -1,4 +1,4 @@
-using Content.Shared.CrewManifest;
+using Content.Shared.CrewManifest;
 using Content.Shared.StatusIcon;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml
index f88fa07f5a..1017a67845 100644
--- a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml
+++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml
@@ -84,8 +84,8 @@
                                FontColorOverride="DarkGray" />
                         <Label Name="PersonDna" />
                     </BoxContainer>
-                    <PanelContainer StyleClasses="LowDivider"
-                                    Margin="0 5 0 5" />
+                    <controls:Separator StyleClasses="LowDivider"
+                                    Margin="0 5 0 5"/>
                     <BoxContainer Orientation="Horizontal"
                                   Margin="0 5 0 5">
                         <Label Name="StatusLabel"
@@ -119,7 +119,7 @@
         </BoxContainer>
         <!-- Footer -->
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal"
                           Margin="10 2 5 0"
                           VerticalAlignment="Bottom">
diff --git a/Content.Client/Damage/Systems/StaminaSystem.cs b/Content.Client/Damage/Systems/StaminaSystem.cs
index 6eeff69936..1acb22dec1 100644
--- a/Content.Client/Damage/Systems/StaminaSystem.cs
+++ b/Content.Client/Damage/Systems/StaminaSystem.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stunnable;
+using Content.Client.Stunnable;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Mobs;
diff --git a/Content.Client/DebugMon/DebugMonitorManager.cs b/Content.Client/DebugMon/DebugMonitorManager.cs
index c99d83cd3f..9e2b43e32e 100644
--- a/Content.Client/DebugMon/DebugMonitorManager.cs
+++ b/Content.Client/DebugMon/DebugMonitorManager.cs
@@ -1,4 +1,4 @@
-using Content.Client.Administration.Managers;
+using Content.Client.Administration.Managers;
 using Content.Shared.CCVar;
 using Robust.Client;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Decals/ToggleDecalCommand.cs b/Content.Client/Decals/ToggleDecalCommand.cs
index f357fa3159..573cfd4b48 100644
--- a/Content.Client/Decals/ToggleDecalCommand.cs
+++ b/Content.Client/Decals/ToggleDecalCommand.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Console;
+using Robust.Shared.Console;
 
 namespace Content.Client.Decals;
 
diff --git a/Content.Client/Decals/UI/PaletteColorPicker.xaml.cs b/Content.Client/Decals/UI/PaletteColorPicker.xaml.cs
index 692726732d..8ae272c1c4 100644
--- a/Content.Client/Decals/UI/PaletteColorPicker.xaml.cs
+++ b/Content.Client/Decals/UI/PaletteColorPicker.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Decals;
+using Content.Shared.Decals;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
diff --git a/Content.Client/Disposal/Unit/DisposalUnitSystem.cs b/Content.Client/Disposal/Unit/DisposalUnitSystem.cs
index 9bb0f88c46..2a23ad7bc0 100644
--- a/Content.Client/Disposal/Unit/DisposalUnitSystem.cs
+++ b/Content.Client/Disposal/Unit/DisposalUnitSystem.cs
@@ -47,7 +47,7 @@ public sealed partial class DisposalUnitSystem : SharedDisposalUnitSystem
             anim.AnimationTracks.Add(
                 new AnimationTrackPlaySound
                 {
-                    KeyFrames = { new AnimationTrackPlaySound.KeyFrame(_audioSystem.ResolveSound(ent.Comp.FlushSound), 0) }
+                    KeyFrames = { new AnimationTrackPlaySound.KeyFrame(_audioSystem.ResolveSound(ent.Comp.FlushSound), 0, () => ent.Comp.FlushSound.Params) }
                 }
             );
         }
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index d2404cc5a4..5934f890b6 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -29,8 +29,6 @@ using Content.Client.UserInterface;
 using Content.Client.Viewport;
 using Content.Client.Voting;
 using Content.Shared.Ame.Components;
-using Content.Shared.FeedbackSystem;
-using Content.Shared.Gravity;
 using Content.Shared.Localizations;
 using Robust.Client;
 using Robust.Client.Graphics;
@@ -133,8 +131,6 @@ namespace Content.Client.Entry
             _prototypeManager.RegisterIgnore("nukeopsRole");
             _prototypeManager.RegisterIgnore("stationGoal"); // Corvax-StationGoal
             _prototypeManager.RegisterIgnore("ghostRoleRaffleDecider");
-            _prototypeManager.RegisterIgnore("codewordGenerator");
-            _prototypeManager.RegisterIgnore("codewordFaction");
 
             _componentFactory.GenerateNetIds();
             _adminManager.Initialize();
diff --git a/Content.Client/Eui/BaseEui.cs b/Content.Client/Eui/BaseEui.cs
index 73f746698a..5c55b3821b 100644
--- a/Content.Client/Eui/BaseEui.cs
+++ b/Content.Client/Eui/BaseEui.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Eui;
+using Content.Shared.Eui;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 
diff --git a/Content.Client/Eui/EuiManager.cs b/Content.Client/Eui/EuiManager.cs
index 0682d6f879..e203eab33b 100644
--- a/Content.Client/Eui/EuiManager.cs
+++ b/Content.Client/Eui/EuiManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Shared.Eui;
 using Robust.Client.GameStates;
diff --git a/Content.Client/Explosion/ScatteringGrenadeSystem.cs b/Content.Client/Explosion/ScatteringGrenadeSystem.cs
index 38e99fda51..5f9bb7969f 100644
--- a/Content.Client/Explosion/ScatteringGrenadeSystem.cs
+++ b/Content.Client/Explosion/ScatteringGrenadeSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Explosion.EntitySystems;
+using Content.Shared.Explosion.EntitySystems;
 
 namespace Content.Client.Explosion;
 
diff --git a/Content.Client/Fax/UI/FaxWindow.xaml b/Content.Client/Fax/UI/FaxWindow.xaml
index 4161c1e307..a02d379427 100644
--- a/Content.Client/Fax/UI/FaxWindow.xaml
+++ b/Content.Client/Fax/UI/FaxWindow.xaml
@@ -1,5 +1,6 @@
 <DefaultWindow
     xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     Title="{Loc 'fax-machine-ui-window'}"
     MinSize="380 220">
     <BoxContainer Orientation="Vertical"
@@ -61,7 +62,7 @@
                    </BoxContainer>
                 </BoxContainer>
 
-                <PanelContainer StyleClasses="LowDivider" Margin="0 4 0 4"/>
+                <controls:Separator StyleClasses="LowDivider" Margin="0 4 0 4"/>
 
                 <!-- Send & Copy -->
                 <BoxContainer Orientation="Vertical">
diff --git a/Content.Client/FeedbackPopup/ClientFeedbackManager.cs b/Content.Client/FeedbackPopup/ClientFeedbackManager.cs
index 5b2b52b1b7..9be325319f 100644
--- a/Content.Client/FeedbackPopup/ClientFeedbackManager.cs
+++ b/Content.Client/FeedbackPopup/ClientFeedbackManager.cs
@@ -1,4 +1,4 @@
-using Content.Shared.FeedbackSystem;
+using Content.Shared.FeedbackSystem;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.FeedbackPopup;
@@ -34,9 +34,8 @@ public sealed class ClientFeedbackManager : SharedFeedbackManager
         if (prototypes == null)
             return;
 
-        var count = _displayedPopups.Count;
         _displayedPopups.UnionWith(prototypes);
-        InvokeDisplayedPopupsChanged(_displayedPopups.Count > count);
+        InvokeDisplayedPopupsChanged(false);
     }
 
     /// <inheritdoc />
diff --git a/Content.Client/FeedbackPopup/FeedbackEntry.xaml.cs b/Content.Client/FeedbackPopup/FeedbackEntry.xaml.cs
index a3a6cd9b4d..0f130e20da 100644
--- a/Content.Client/FeedbackPopup/FeedbackEntry.xaml.cs
+++ b/Content.Client/FeedbackPopup/FeedbackEntry.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.FeedbackSystem;
+using Content.Shared.FeedbackSystem;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/FeedbackPopup/FeedbackPopupSheetlet.cs b/Content.Client/FeedbackPopup/FeedbackPopupSheetlet.cs
index 7f6d513654..cc60e569da 100644
--- a/Content.Client/FeedbackPopup/FeedbackPopupSheetlet.cs
+++ b/Content.Client/FeedbackPopup/FeedbackPopupSheetlet.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/FeedbackPopup/FeedbackPopupWindow.xaml.cs b/Content.Client/FeedbackPopup/FeedbackPopupWindow.xaml.cs
index fba32eb0d8..254038f3c5 100644
--- a/Content.Client/FeedbackPopup/FeedbackPopupWindow.xaml.cs
+++ b/Content.Client/FeedbackPopup/FeedbackPopupWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Controls;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.FeedbackSystem;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/FlavorText/FlavorText.xaml.cs b/Content.Client/FlavorText/FlavorText.xaml.cs
index 91b59046a4..4fa9c6b79f 100644
--- a/Content.Client/FlavorText/FlavorText.xaml.cs
+++ b/Content.Client/FlavorText/FlavorText.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Utility;
diff --git a/Content.Client/Fluids/PuddleDebugOverlaySystem.cs b/Content.Client/Fluids/PuddleDebugOverlaySystem.cs
index d6b1e6cd25..e1905a543e 100644
--- a/Content.Client/Fluids/PuddleDebugOverlaySystem.cs
+++ b/Content.Client/Fluids/PuddleDebugOverlaySystem.cs
@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using Content.Shared.Fluids;
 using Robust.Client.Graphics;
 
diff --git a/Content.Client/Fluids/UI/AbsorbentItemStatus.xaml.cs b/Content.Client/Fluids/UI/AbsorbentItemStatus.xaml.cs
index fd3171a0d5..4eab4030ba 100644
--- a/Content.Client/Fluids/UI/AbsorbentItemStatus.xaml.cs
+++ b/Content.Client/Fluids/UI/AbsorbentItemStatus.xaml.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Fluids;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/GameTicking/ClientGameTicker.cs b/Content.Client/GameTicking/ClientGameTicker.cs
new file mode 100644
index 0000000000..4109a991f7
--- /dev/null
+++ b/Content.Client/GameTicking/ClientGameTicker.cs
@@ -0,0 +1,190 @@
+using System.Numerics;
+using Content.Client.Administration.Managers;
+using Content.Client.Gameplay;
+using Content.Client.Lobby;
+using Content.Client.RoundEnd;
+using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Prototypes;
+using Content.Shared.GameWindow;
+using Content.Shared.Maps;
+using Content.Shared.Roles;
+using JetBrains.Annotations;
+using Robust.Client.Graphics;
+using Robust.Client.State;
+using Robust.Client.UserInterface;
+using Robust.Shared.Audio;
+using Robust.Shared.EntitySerialization;
+using Robust.Shared.Map;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.GameTicking;
+
+[UsedImplicitly]
+public sealed partial class ClientGameTicker : GameTicker
+{
+    [Dependency] private IStateManager _stateManager = default!;
+    [Dependency] private IClientAdminManager _admin = default!;
+    [Dependency] private IClyde _clyde = default!;
+    [Dependency] private IUserInterfaceManager _userInterfaceManager = default!;
+
+    private Dictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>>  _jobsAvailable = new();
+    private Dictionary<NetEntity, string> _stationNames = new();
+    private Dictionary<NetEntity, ProtoId<JobWeightPrototype>?> _jobWeightsByStation = new();
+
+    [ViewVariables] public bool AreWeReady { get; private set; }
+    [ViewVariables] public bool IsGameStarted { get; private set; }
+    [ViewVariables] public ResolvedSoundSpecifier? RestartSound { get; private set; }
+    [ViewVariables] public ProtoId<LobbyBackgroundPrototype>? LobbyBackground { get; private set; }
+    [ViewVariables] public bool DisallowedLateJoin { get; private set; }
+    [ViewVariables] public string? ServerInfoBlob { get; private set; }
+    [ViewVariables] public TimeSpan StartTime { get; private set; }
+    [ViewVariables] public new bool Paused { get; private set; }
+
+    [ViewVariables] public IReadOnlyDictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>> JobsAvailable => _jobsAvailable;
+    [ViewVariables] public IReadOnlyDictionary<NetEntity, string> StationNames => _stationNames;
+    [ViewVariables] public IReadOnlyDictionary<NetEntity, ProtoId<JobWeightPrototype>?> JobWeightsByStation => _jobWeightsByStation;
+
+    public event Action? InfoBlobUpdated;
+    public event Action? LobbyStatusUpdated;
+    public event Action? LobbyLateJoinStatusUpdated;
+    public event Action<IReadOnlyDictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>>>? LobbyJobsAvailableUpdated;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _admin.AdminStatusUpdated += OnAdminUpdated;
+        OnAdminUpdated();
+    }
+
+    public override void Shutdown()
+    {
+        _admin.AdminStatusUpdated -= OnAdminUpdated;
+        base.Shutdown();
+    }
+
+    public override IReadOnlyList<EntityUid> LoadGameMap(GameMapPrototype proto,
+        out MapId mapId,
+        DeserializationOptions? options = null,
+        string? stationName = null,
+        Vector2? offset = null,
+        Angle? rot = null)
+    {
+        throw new NotImplementedException();
+    }
+
+    public override int ReadyPlayerCount()
+    {
+        throw new NotImplementedException();
+    }
+
+    public override void PlayerJoinGame(ICommonSession session, bool silent = false)
+    {
+        // TODO: Can probably move some logic into here :P
+    }
+
+    private void OnAdminUpdated()
+    {
+        // TODO: We REALLY should not be logging parent changed events for parents the client cannot see :V
+        // Hide some map/grid related logs from clients. This is to try prevent some easy metagaming by just
+        // reading the console. E.g., logs like this one could leak the nuke station/grid:
+        // > Grid NT-Arrivals 1101 (122/n25896) changed parent. Old parent: map 10 (121/n25895). New parent: FTL (123/n26470)
+#if !DEBUG
+            Map.Log.Level = _admin.IsAdmin() ? LogLevel.Info : LogLevel.Warning;
+#endif
+    }
+
+    [SubscribeNetworkEvent]
+    private void OnAttentionRequest(RequestWindowAttentionEvent ev)
+    {
+        _clyde.RequestWindowAttention();
+    }
+
+    [SubscribeNetworkEvent]
+    private void LateJoinStatus(TickerLateJoinStatusEvent message)
+    {
+        DisallowedLateJoin = message.Disallowed;
+        LobbyLateJoinStatusUpdated?.Invoke();
+    }
+
+    [SubscribeNetworkEvent]
+    private void UpdateJobsAvailable(TickerJobsAvailableEvent message)
+    {
+        _jobsAvailable.Clear();
+
+        foreach (var (job, data) in message.JobsAvailableByStation)
+        {
+            _jobsAvailable[job] = data;
+        }
+
+        _stationNames.Clear();
+        foreach (var weh in message.StationNames)
+        {
+            _stationNames[weh.Key] = weh.Value;
+        }
+
+        _jobWeightsByStation.Clear();
+        foreach (var (station, jobWeights) in message.JobWeightsByStation)
+        {
+            _jobWeightsByStation[station] = jobWeights;
+        }
+
+        LobbyJobsAvailableUpdated?.Invoke(JobsAvailable);
+    }
+
+    [SubscribeNetworkEvent]
+    private void JoinLobby(TickerJoinLobbyEvent message)
+    {
+        _stateManager.RequestStateChange<LobbyState>();
+    }
+
+    [SubscribeNetworkEvent]
+    private void ConnectionStatus(TickerConnectionStatusEvent message)
+    {
+        RoundStartTimeSpan = message.RoundStartTimeSpan;
+    }
+
+    [SubscribeNetworkEvent]
+    private void LobbyStatus(TickerLobbyStatusEvent message)
+    {
+        StartTime = message.StartTime;
+        RoundStartTimeSpan = message.RoundStartTimeSpan;
+        IsGameStarted = message.IsRoundStarted;
+        AreWeReady = message.YouAreReady;
+        LobbyBackground = message.LobbyBackground;
+        Paused = message.Paused;
+
+        LobbyStatusUpdated?.Invoke();
+    }
+
+    [SubscribeNetworkEvent]
+    private void LobbyInfo(TickerLobbyInfoEvent message)
+    {
+        ServerInfoBlob = message.TextBlob;
+
+        InfoBlobUpdated?.Invoke();
+    }
+
+    [SubscribeNetworkEvent]
+    private void JoinGame(TickerJoinGameEvent message)
+    {
+        _stateManager.RequestStateChange<GameplayState>();
+    }
+
+    [SubscribeNetworkEvent]
+    private void LobbyCountdown(TickerLobbyCountdownEvent message)
+    {
+        StartTime = message.StartTime;
+        Paused = message.Paused;
+    }
+
+    [SubscribeNetworkEvent]
+    private void RoundEnd(RoundEndMessageEvent message)
+    {
+        // Force an update in the event of this song being the same as the last.
+        RestartSound = message.RestartSound;
+
+        _userInterfaceManager.GetUIController<RoundEndSummaryUIController>().OpenRoundEndSummaryWindow(message);
+    }
+}
diff --git a/Content.Client/GameTicking/Managers/ClientGameTicker.cs b/Content.Client/GameTicking/Managers/ClientGameTicker.cs
deleted file mode 100644
index 021d3d6ca8..0000000000
--- a/Content.Client/GameTicking/Managers/ClientGameTicker.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-using Content.Client.Administration.Managers;
-using Content.Client.Gameplay;
-using Content.Client.Lobby;
-using Content.Client.RoundEnd;
-using Content.Shared.GameTicking;
-using Content.Shared.GameWindow;
-using Content.Shared.Roles;
-using JetBrains.Annotations;
-using Robust.Client.Graphics;
-using Robust.Client.State;
-using Robust.Client.UserInterface;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Audio;
-using Content.Shared.GameTicking.Prototypes;
-
-namespace Content.Client.GameTicking.Managers
-{
-    [UsedImplicitly]
-    public sealed partial class ClientGameTicker : SharedGameTicker
-    {
-        [Dependency] private IStateManager _stateManager = default!;
-        [Dependency] private IClientAdminManager _admin = default!;
-        [Dependency] private IClyde _clyde = default!;
-        [Dependency] private IUserInterfaceManager _userInterfaceManager = default!;
-
-        private Dictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>>  _jobsAvailable = new();
-        private Dictionary<NetEntity, string> _stationNames = new();
-        private Dictionary<NetEntity, ProtoId<JobWeightPrototype>?> _jobWeightsByStation = new();
-
-        [ViewVariables] public bool AreWeReady { get; private set; }
-        [ViewVariables] public bool IsGameStarted { get; private set; }
-        [ViewVariables] public ResolvedSoundSpecifier? RestartSound { get; private set; }
-        [ViewVariables] public ProtoId<LobbyBackgroundPrototype>? LobbyBackground { get; private set; }
-        [ViewVariables] public bool DisallowedLateJoin { get; private set; }
-        [ViewVariables] public string? ServerInfoBlob { get; private set; }
-        [ViewVariables] public TimeSpan StartTime { get; private set; }
-        [ViewVariables] public new bool Paused { get; private set; }
-
-        public override IReadOnlyList<(TimeSpan, string)> AllPreviousGameRules => new List<(TimeSpan, string)>();
-
-        [ViewVariables] public IReadOnlyDictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>> JobsAvailable => _jobsAvailable;
-        [ViewVariables] public IReadOnlyDictionary<NetEntity, string> StationNames => _stationNames;
-        [ViewVariables] public IReadOnlyDictionary<NetEntity, ProtoId<JobWeightPrototype>?> JobWeightsByStation => _jobWeightsByStation;
-
-        public event Action? InfoBlobUpdated;
-        public event Action? LobbyStatusUpdated;
-        public event Action? LobbyLateJoinStatusUpdated;
-        public event Action<IReadOnlyDictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>>>? LobbyJobsAvailableUpdated;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeNetworkEvent<TickerJoinLobbyEvent>(JoinLobby);
-            SubscribeNetworkEvent<TickerJoinGameEvent>(JoinGame);
-            SubscribeNetworkEvent<TickerConnectionStatusEvent>(ConnectionStatus);
-            SubscribeNetworkEvent<TickerLobbyStatusEvent>(LobbyStatus);
-            SubscribeNetworkEvent<TickerLobbyInfoEvent>(LobbyInfo);
-            SubscribeNetworkEvent<TickerLobbyCountdownEvent>(LobbyCountdown);
-            SubscribeNetworkEvent<RoundEndMessageEvent>(RoundEnd);
-            SubscribeNetworkEvent<RequestWindowAttentionEvent>(OnAttentionRequest);
-            SubscribeNetworkEvent<TickerLateJoinStatusEvent>(LateJoinStatus);
-            SubscribeNetworkEvent<TickerJobsAvailableEvent>(UpdateJobsAvailable);
-
-            _admin.AdminStatusUpdated += OnAdminUpdated;
-            OnAdminUpdated();
-        }
-
-        public override void Shutdown()
-        {
-            _admin.AdminStatusUpdated -= OnAdminUpdated;
-            base.Shutdown();
-        }
-
-        private void OnAdminUpdated()
-        {
-            // Hide some map/grid related logs from clients. This is to try prevent some easy metagaming by just
-            // reading the console. E.g., logs like this one could leak the nuke station/grid:
-            // > Grid NT-Arrivals 1101 (122/n25896) changed parent. Old parent: map 10 (121/n25895). New parent: FTL (123/n26470)
-#if !DEBUG
-            EntityManager.System<SharedMapSystem>().Log.Level = _admin.IsAdmin() ? LogLevel.Info : LogLevel.Warning;
-#endif
-        }
-
-        private void OnAttentionRequest(RequestWindowAttentionEvent ev)
-        {
-            _clyde.RequestWindowAttention();
-        }
-
-        private void LateJoinStatus(TickerLateJoinStatusEvent message)
-        {
-            DisallowedLateJoin = message.Disallowed;
-            LobbyLateJoinStatusUpdated?.Invoke();
-        }
-
-        private void UpdateJobsAvailable(TickerJobsAvailableEvent message)
-        {
-            _jobsAvailable.Clear();
-
-            foreach (var (job, data) in message.JobsAvailableByStation)
-            {
-                _jobsAvailable[job] = data;
-            }
-
-            _stationNames.Clear();
-            foreach (var weh in message.StationNames)
-            {
-                _stationNames[weh.Key] = weh.Value;
-            }
-
-            _jobWeightsByStation.Clear();
-            foreach (var (station, jobWeights) in message.JobWeightsByStation)
-            {
-                _jobWeightsByStation[station] = jobWeights;
-            }
-
-            LobbyJobsAvailableUpdated?.Invoke(JobsAvailable);
-        }
-
-        private void JoinLobby(TickerJoinLobbyEvent message)
-        {
-            _stateManager.RequestStateChange<LobbyState>();
-        }
-
-        private void ConnectionStatus(TickerConnectionStatusEvent message)
-        {
-            RoundStartTimeSpan = message.RoundStartTimeSpan;
-        }
-
-        private void LobbyStatus(TickerLobbyStatusEvent message)
-        {
-            StartTime = message.StartTime;
-            RoundStartTimeSpan = message.RoundStartTimeSpan;
-            IsGameStarted = message.IsRoundStarted;
-            AreWeReady = message.YouAreReady;
-            LobbyBackground = message.LobbyBackground;
-            Paused = message.Paused;
-
-            LobbyStatusUpdated?.Invoke();
-        }
-
-        private void LobbyInfo(TickerLobbyInfoEvent message)
-        {
-            ServerInfoBlob = message.TextBlob;
-
-            InfoBlobUpdated?.Invoke();
-        }
-
-        private void JoinGame(TickerJoinGameEvent message)
-        {
-            _stateManager.RequestStateChange<GameplayState>();
-        }
-
-        private void LobbyCountdown(TickerLobbyCountdownEvent message)
-        {
-            StartTime = message.StartTime;
-            Paused = message.Paused;
-        }
-
-        private void RoundEnd(RoundEndMessageEvent message)
-        {
-            // Force an update in the event of this song being the same as the last.
-            RestartSound = message.RestartSound;
-
-            _userInterfaceManager.GetUIController<RoundEndSummaryUIController>().OpenRoundEndSummaryWindow(message);
-        }
-    }
-}
diff --git a/Content.Client/GameTicking/Managers/TitleWindowManager.cs b/Content.Client/GameTicking/Managers/TitleWindowManager.cs
index b223070630..67fd001dfb 100644
--- a/Content.Client/GameTicking/Managers/TitleWindowManager.cs
+++ b/Content.Client/GameTicking/Managers/TitleWindowManager.cs
@@ -1,4 +1,4 @@
-using Content.Shared.CCVar;
+using Content.Shared.CCVar;
 using Robust.Client;
 using Robust.Client.Graphics;
 using Robust.Shared;
diff --git a/Content.Client/Ghost/Commands/ToggleGhostVisibilityCommand.cs b/Content.Client/Ghost/Commands/ToggleGhostVisibilityCommand.cs
index 0d846bdc9a..69a6679774 100644
--- a/Content.Client/Ghost/Commands/ToggleGhostVisibilityCommand.cs
+++ b/Content.Client/Ghost/Commands/ToggleGhostVisibilityCommand.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Console;
+using Robust.Shared.Console;
 
 namespace Content.Client.Ghost.Commands;
 
diff --git a/Content.Client/Ghost/UI/ReturnToBodyEui.cs b/Content.Client/Ghost/UI/ReturnToBodyEui.cs
index be755971ea..c7839d254f 100644
--- a/Content.Client/Ghost/UI/ReturnToBodyEui.cs
+++ b/Content.Client/Ghost/UI/ReturnToBodyEui.cs
@@ -1,4 +1,4 @@
-using Content.Client.Eui;
+using Content.Client.Eui;
 using Content.Shared.Ghost;
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
diff --git a/Content.Client/GhostKick/GhostKickManager.cs b/Content.Client/GhostKick/GhostKickManager.cs
index 16fe700e79..9004e958f0 100644
--- a/Content.Client/GhostKick/GhostKickManager.cs
+++ b/Content.Client/GhostKick/GhostKickManager.cs
@@ -1,4 +1,4 @@
-using Content.Shared.GhostKick;
+using Content.Shared.GhostKick;
 using Robust.Client;
 using Robust.Shared;
 using Robust.Shared.Configuration;
diff --git a/Content.Client/GlobalUsings.cs b/Content.Client/GlobalUsings.cs
index 6304445d8a..dde2f3c9b4 100644
--- a/Content.Client/GlobalUsings.cs
+++ b/Content.Client/GlobalUsings.cs
@@ -1,4 +1,4 @@
-// Global usings for Content.Client
+// Global usings for Content.Client
 
 global using System;
 global using System.Collections.Generic;
diff --git a/Content.Client/Graphics/OverlayResourceCache.cs b/Content.Client/Graphics/OverlayResourceCache.cs
index ef7ebfd2b7..0d818abe79 100644
--- a/Content.Client/Graphics/OverlayResourceCache.cs
+++ b/Content.Client/Graphics/OverlayResourceCache.cs
@@ -1,4 +1,4 @@
-using Robust.Client.Graphics;
+using Robust.Client.Graphics;
 
 namespace Content.Client.Graphics;
 
diff --git a/Content.Client/Guidebook/Components/GuidebookControlsTestComponent.cs b/Content.Client/Guidebook/Components/GuidebookControlsTestComponent.cs
index 10330b292d..c0c0063745 100644
--- a/Content.Client/Guidebook/Components/GuidebookControlsTestComponent.cs
+++ b/Content.Client/Guidebook/Components/GuidebookControlsTestComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Client.Guidebook.Components;
+namespace Content.Client.Guidebook.Components;
 
 /// <summary>
 /// This is used for the guidebook monkey.
diff --git a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
index b84d833628..3601bb53bb 100644
--- a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
+++ b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
@@ -1,4 +1,5 @@
-<BoxContainer xmlns="https://spacestation14.io"
+<BoxContainer xmlns="https://spacestation14.io"
+              xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
               Orientation="Vertical"
               HorizontalAlignment="Stretch"
               HorizontalExpand="True"
@@ -26,5 +27,5 @@
             </BoxContainer>
         </BoxContainer>
     </BoxContainer>
-    <PanelContainer StyleClasses="LowDivider" Margin="0 5 0 5" />
+    <controls:Separator StyleClasses="LowDivider" Margin="0 5 0 5"/>
 </BoxContainer>
diff --git a/Content.Client/Guidebook/Controls/GuideTechnologyEmbed.xaml b/Content.Client/Guidebook/Controls/GuideTechnologyEmbed.xaml
index 6d96f19972..63ba2d98fa 100644
--- a/Content.Client/Guidebook/Controls/GuideTechnologyEmbed.xaml
+++ b/Content.Client/Guidebook/Controls/GuideTechnologyEmbed.xaml
@@ -1,6 +1,6 @@
-<BoxContainer xmlns="https://spacestation14.io"
+<BoxContainer xmlns="https://spacestation14.io"
               xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-              xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+              xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
               Orientation="Vertical"
               Margin="5 5 5 5">
     <PanelContainer HorizontalExpand="True">
@@ -14,7 +14,7 @@
                     <RichTextLabel Name="NameLabel" VerticalAlignment="Bottom" HorizontalExpand="True"/>
                     <TextureRect Name="TechTexture" VerticalAlignment="Center"  HorizontalAlignment="Right"/>
                 </BoxContainer>
-                <customControls:HSeparator Margin="10 5 10 10"/>
+                <controls:Separator StyleClasses="LowDivider" Margin="10 5 10 10"/>
                 <RichTextLabel Name="DescriptionLabel"/>
             </BoxContainer>
         </BoxContainer>
diff --git a/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs b/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs
index 1e8b524997..64e71eca34 100644
--- a/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs
+++ b/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs
@@ -1,10 +1,10 @@
-using Content.Client.Guidebook.RichText;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Input;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using Content.Client.UserInterface.ControlExtensions;
+using Content.Client.UserInterface.RichText;
 
 namespace Content.Client.Guidebook.Controls;
 
@@ -28,7 +28,7 @@ public sealed class GuidebookRichPrototypeLink : Control, IPrototypeLinkControl
 
         DefaultCursorShape = CursorShape.Hand;
 
-        _richTextLabel.SetMessage(_message, null, TextLinkTag.LinkColor);
+        _richTextLabel.SetMessage(_message, null, TextLinkTag.DefaultLinkColor);
     }
 
     public GuidebookRichPrototypeLink() : base()
diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
index 9ee62e503b..9654bde3d7 100644
--- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
+++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
@@ -1,5 +1,4 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
-                xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
                 xmlns:fancyTree="clr-namespace:Content.Client.UserInterface.Controls.FancyTree"
                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                 SetSize="900 700"
@@ -10,7 +9,7 @@
         <!-- Guide select -->
         <BoxContainer Orientation="Horizontal" Name="TreeBox">
             <fancyTree:FancyTree Name="Tree" VerticalExpand="True" HorizontalExpand="True" Access="Public"/>
-            <cc:VSeparator StyleClasses="LowDivider" Margin="0 -2"/>
+            <controls:Separator StyleClasses="LowDivider" Margin="0 -2" Orientation="Vertical" MinHeight="5"/>
         </BoxContainer>
         <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
             <fancyTree:FancyTree Name="TableOfContents" HorizontalExpand="True"/>
diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
index 223376b0aa..08a6cfd3d1 100644
--- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
+++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
@@ -1,8 +1,8 @@
 using System.Linq;
-using Content.Client.Guidebook.RichText;
 using Content.Client.UserInterface.ControlExtensions;
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Controls.FancyTree;
+using Content.Client.UserInterface.RichText;
 using Content.Client.UserInterface.Systems.Info;
 using Content.Shared.Guidebook;
 using Robust.Client.AutoGenerated;
diff --git a/Content.Client/Guidebook/Richtext/TextLinkTag.cs b/Content.Client/Guidebook/Richtext/TextLinkTag.cs
deleted file mode 100644
index a551b18473..0000000000
--- a/Content.Client/Guidebook/Richtext/TextLinkTag.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using JetBrains.Annotations;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.RichText;
-using Robust.Shared.Input;
-using Robust.Shared.Utility;
-using Content.Client.UserInterface.ControlExtensions;
-
-namespace Content.Client.Guidebook.RichText;
-
-[UsedImplicitly]
-public sealed class TextLinkTag : IMarkupTagHandler
-{
-    public static Color LinkColor => Color.CornflowerBlue;
-
-    public string Name => "textlink";
-
-    /// <inheritdoc/>
-    public bool TryCreateControl(MarkupNode node, [NotNullWhen(true)] out Control? control)
-    {
-        if (!node.Value.TryGetString(out var text)
-            || !node.Attributes.TryGetValue("link", out var linkParameter)
-            || !linkParameter.TryGetString(out var link))
-        {
-            control = null;
-            return false;
-        }
-
-        var label = new Label();
-        label.Text = text;
-
-        label.MouseFilter = Control.MouseFilterMode.Stop;
-        label.FontColorOverride = LinkColor;
-        label.DefaultCursorShape = Control.CursorShape.Hand;
-
-        label.OnMouseEntered += _ => label.FontColorOverride = Color.LightSkyBlue;
-        label.OnMouseExited += _ => label.FontColorOverride = Color.CornflowerBlue;
-        label.OnKeyBindDown += args => OnKeybindDown(args, link, label);
-
-        control = label;
-        return true;
-    }
-
-    private void OnKeybindDown(GUIBoundKeyEventArgs args, string link, Control? control)
-    {
-        if (args.Function != EngineKeyFunctions.UIClick)
-            return;
-
-        if (control == null)
-            return;
-
-        if (control.TryGetParentHandler<ILinkClickHandler>(out var handler))
-            handler.HandleClick(link);
-        else
-            Logger.Warning("Warning! No valid ILinkClickHandler found.");
-    }
-}
-
-public interface ILinkClickHandler
-{
-    public void HandleClick(string link);
-}
diff --git a/Content.Client/Hands/UI/HandVirtualItemStatus.xaml.cs b/Content.Client/Hands/UI/HandVirtualItemStatus.xaml.cs
index 2ecdbb070c..ce4cda6639 100644
--- a/Content.Client/Hands/UI/HandVirtualItemStatus.xaml.cs
+++ b/Content.Client/Hands/UI/HandVirtualItemStatus.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.UserInterface;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
 
 namespace Content.Client.Hands.UI
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
index baea03c892..dc64fca723 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Shared.MedicalScanner;
+using Content.Shared.MedicalScanner;
 using JetBrains.Annotations;
 using Robust.Client.UserInterface;
 
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerControl.xaml b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerControl.xaml
index 06c6528f59..9d4ea64549 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerControl.xaml
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerControl.xaml
@@ -1,5 +1,6 @@
 <BoxContainer
     xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     VerticalExpand="True"
     Orientation="Vertical">
     <Label
@@ -22,7 +23,7 @@
                    Text="{Loc 'health-analyzer-window-entity-unknown-text'}" />
         </BoxContainer>
 
-        <PanelContainer StyleClasses="LowDivider" />
+        <controls:Separator StyleClasses="LowDivider"/>
 
         <GridContainer Margin="0 5 0 0" Columns="2">
             <Label Text="{Loc 'health-analyzer-window-entity-status-text'}" />
@@ -36,13 +37,13 @@
         </GridContainer>
     </BoxContainer>
 
-    <PanelContainer Name="AlertsDivider" Visible="False" StyleClasses="LowDivider" />
+    <controls:Separator Name="AlertsDivider" Visible="False" StyleClasses="LowDivider"/>
 
     <BoxContainer Name="AlertsContainer" Visible="False" Margin="0 5" Orientation="Vertical" HorizontalAlignment="Center">
 
     </BoxContainer>
 
-    <PanelContainer StyleClasses="LowDivider" />
+    <controls:Separator StyleClasses="LowDivider"/>
 
     <BoxContainer
         Name="GroupsContainer"
diff --git a/Content.Client/Holopad/HolopadWindow.xaml b/Content.Client/Holopad/HolopadWindow.xaml
index 1eb4e14784..a75838df8f 100644
--- a/Content.Client/Holopad/HolopadWindow.xaml
+++ b/Content.Client/Holopad/HolopadWindow.xaml
@@ -103,7 +103,7 @@
 
         <!-- Footer -->
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'holopad-window-flavor-left'}" StyleClasses="WindowFooterText" />
                 <Label Text="{Loc 'holopad-window-flavor-right'}" StyleClasses="WindowFooterText"
diff --git a/Content.Client/Holopad/HolopadWindow.xaml.cs b/Content.Client/Holopad/HolopadWindow.xaml.cs
index efca274ccb..00367592d5 100644
--- a/Content.Client/Holopad/HolopadWindow.xaml.cs
+++ b/Content.Client/Holopad/HolopadWindow.xaml.cs
@@ -61,7 +61,7 @@ public sealed partial class HolopadWindow : FancyWindow
         RequestStationAiButton.OnPressed += args => { OnHolopadRequestStationAiMessage(); };
 
         // XML formatting
-        AnswerCallButton.AddStyleClass("ButtonAccept");
+        AnswerCallButton.AddStyleClass(StyleClass.Positive);
         EndCallButton.AddStyleClass(StyleClass.Negative);
         StartBroadcastButton.AddStyleClass(StyleClass.Negative);
 
diff --git a/Content.Client/Implants/ChameleonControllerSystem.cs b/Content.Client/Implants/ChameleonControllerSystem.cs
index 7db4b37ef2..4b14a94e76 100644
--- a/Content.Client/Implants/ChameleonControllerSystem.cs
+++ b/Content.Client/Implants/ChameleonControllerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Implants;
+using Content.Shared.Implants;
 
 namespace Content.Client.Implants;
 
diff --git a/Content.Client/Implants/ImplanterSystem.cs b/Content.Client/Implants/ImplanterSystem.cs
index 14af16b352..8c8e8e57c6 100644
--- a/Content.Client/Implants/ImplanterSystem.cs
+++ b/Content.Client/Implants/ImplanterSystem.cs
@@ -1,4 +1,4 @@
-using Content.Client.Implants.UI;
+using Content.Client.Implants.UI;
 using Content.Client.Items;
 using Content.Shared.Implants;
 using Content.Shared.Implants.Components;
diff --git a/Content.Client/Implants/UI/ChameleonControllerBoundUserInterface.cs b/Content.Client/Implants/UI/ChameleonControllerBoundUserInterface.cs
index 42b891ff50..796b45da5b 100644
--- a/Content.Client/Implants/UI/ChameleonControllerBoundUserInterface.cs
+++ b/Content.Client/Implants/UI/ChameleonControllerBoundUserInterface.cs
@@ -1,8 +1,6 @@
-using Content.Shared.Clothing;
 using Content.Shared.Implants;
-using Content.Shared.Preferences.Loadouts;
-using Content.Shared.Roles;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using JetBrains.Annotations;
 using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
diff --git a/Content.Client/Info/DevInfoBanner.cs b/Content.Client/Info/DevInfoBanner.cs
index 0599b355f5..0bfa0e9bde 100644
--- a/Content.Client/Info/DevInfoBanner.cs
+++ b/Content.Client/Info/DevInfoBanner.cs
@@ -1,12 +1,8 @@
-using Content.Client.Changelog;
 using Content.Client.Credits;
 using Content.Shared.CCVar;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Configuration;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using Robust.Shared.Utility;
 
 namespace Content.Client.Info
 {
@@ -23,15 +19,15 @@ namespace Content.Client.Info
             var cfg = IoCManager.Resolve<IConfigurationManager>();
 
             var bugReport = cfg.GetCVar(CCVars.InfoLinksBugReport);
-            if (bugReport != "")
+            if (!string.IsNullOrWhiteSpace(bugReport))
             {
                 var reportButton = new Button {Text = Loc.GetString("server-info-report-button")};
-                reportButton.OnPressed += args => uriOpener.OpenUri(bugReport);
+                reportButton.OnPressed += _ => uriOpener.OpenUri(bugReport);
                 buttons.AddChild(reportButton);
             }
 
             var creditsButton = new Button {Text = Loc.GetString("server-info-credits-button")};
-            creditsButton.OnPressed += args => new CreditsWindow().Open();
+            creditsButton.OnPressed += _ => new CreditsWindow().Open();
             buttons.AddChild(creditsButton);
         }
     }
diff --git a/Content.Client/Info/Info.xaml.cs b/Content.Client/Info/Info.xaml.cs
index 1cd8b401e3..df4d8f548d 100644
--- a/Content.Client/Info/Info.xaml.cs
+++ b/Content.Client/Info/Info.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/Info/InfoControlsSection.xaml.cs b/Content.Client/Info/InfoControlsSection.xaml.cs
index a999373674..d2cddb27a6 100644
--- a/Content.Client/Info/InfoControlsSection.xaml.cs
+++ b/Content.Client/Info/InfoControlsSection.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Info/LinkBanner.cs b/Content.Client/Info/LinkBanner.cs
index 7366a8f856..7ed3a7ce8d 100644
--- a/Content.Client/Info/LinkBanner.cs
+++ b/Content.Client/Info/LinkBanner.cs
@@ -1,4 +1,4 @@
-using Content.Client.Changelog;
+using Content.Client.Changelog;
 using Content.Client.UserInterface.Systems.EscapeMenu;
 using Content.Client.UserInterface.Systems.Guidebook;
 using Content.Shared.CCVar;
diff --git a/Content.Client/Info/PlaytimeStats/PlaytimeStatsEntry.xaml b/Content.Client/Info/PlaytimeStats/PlaytimeStatsEntry.xaml
index 0f973b7689..c09bfca1ed 100644
--- a/Content.Client/Info/PlaytimeStats/PlaytimeStatsEntry.xaml
+++ b/Content.Client/Info/PlaytimeStats/PlaytimeStatsEntry.xaml
@@ -1,5 +1,5 @@
 <ContainerButton xmlns="https://spacestation14.io"
-                 xmlns:customControls1="clr-namespace:Content.Client.Administration.UI.CustomControls">
+                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <PanelContainer Name="BackgroundColorPanel"/>
     <BoxContainer Orientation="Horizontal"
                   HorizontalExpand="True"
@@ -9,7 +9,7 @@
                HorizontalExpand="True"
                ClipText="True"
                Margin="5,5,5,5"/>
-        <customControls1:VSeparator/>
+        <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
         <Label Name="PlaytimeLabel"
                SizeFlagsStretchRatio="3"
                HorizontalExpand="True"
diff --git a/Content.Client/Info/PlaytimeStats/PlaytimeStatsHeader.xaml b/Content.Client/Info/PlaytimeStats/PlaytimeStatsHeader.xaml
index d83e794472..11e1b43ee4 100644
--- a/Content.Client/Info/PlaytimeStats/PlaytimeStatsHeader.xaml
+++ b/Content.Client/Info/PlaytimeStats/PlaytimeStatsHeader.xaml
@@ -1,5 +1,5 @@
 <Control xmlns="https://spacestation14.io"
-                 xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls">
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <PanelContainer Name="BackgroundColorPlaytimePanel" Access="Public"/>
     <BoxContainer Orientation="Vertical"
                   HorizontalExpand="True">
@@ -13,7 +13,7 @@
                    Text="{Loc ui-playtime-header-role-type}"
                    MouseFilter="Pass"
                    Margin="5,5,5,5"/>
-            <customControls:VSeparator/>
+            <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
             <Label Name="PlaytimeLabel"
                    SizeFlagsStretchRatio="3"
                    HorizontalExpand="True"
@@ -23,6 +23,6 @@
                    Margin="5,5,5,5"/>
         </BoxContainer>
         <!-- Horizontal Separator -->
-        <customControls:HSeparator/>
+        <controls:Separator StyleClasses="LowDivider"/>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/Info/PlaytimeStats/PlaytimeStatsWindow.xaml b/Content.Client/Info/PlaytimeStats/PlaytimeStatsWindow.xaml
index b38394d9a3..d70cd5c63d 100644
--- a/Content.Client/Info/PlaytimeStats/PlaytimeStatsWindow.xaml
+++ b/Content.Client/Info/PlaytimeStats/PlaytimeStatsWindow.xaml
@@ -1,7 +1,6 @@
 <ui:FancyWindow xmlns="https://spacestation14.io"
                 xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
                 xmlns:pt="clr-namespace:Content.Client.Info.PlaytimeStats"
-                xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
                 VerticalExpand="True" HorizontalExpand="True"
                 Title="{Loc ui-playtime-stats-title}"
                 SetSize="600 400">
@@ -17,7 +16,7 @@
                 <BoxContainer Orientation="Vertical" Name="RolesPlaytimeList">
                     <!-- Table Header -->
                     <pt:PlaytimeStatsHeader Name="ListHeader" />
-                    <customControls:HSeparator />
+                    <ui:Separator StyleClasses="LowDivider" MinWidth="2" />
                 </BoxContainer>
             </ScrollContainer>
         </BoxContainer>
diff --git a/Content.Client/Info/RulesControl.xaml.cs b/Content.Client/Info/RulesControl.xaml.cs
index 2d4f6fce7b..8a44dffad2 100644
--- a/Content.Client/Info/RulesControl.xaml.cs
+++ b/Content.Client/Info/RulesControl.xaml.cs
@@ -1,5 +1,5 @@
-using Content.Client.Guidebook;
-using Content.Client.Guidebook.RichText;
+using Content.Client.Guidebook;
+using Content.Client.UserInterface.RichText;
 using Content.Client.UserInterface.Systems.Info;
 using Content.Shared.Guidebook;
 using Robust.Client.AutoGenerated;
diff --git a/Content.Client/Instruments/InstrumentSystem.MidiParsing.cs b/Content.Client/Instruments/InstrumentSystem.MidiParsing.cs
index 16aed930f6..cdc3f7b979 100644
--- a/Content.Client/Instruments/InstrumentSystem.MidiParsing.cs
+++ b/Content.Client/Instruments/InstrumentSystem.MidiParsing.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Instruments;
 using Robust.Shared.Audio.Midi;
 
diff --git a/Content.Client/Instruments/MidiParser/MidiInstrument.cs b/Content.Client/Instruments/MidiParser/MidiInstrument.cs
index 93946496eb..c8fde35af0 100644
--- a/Content.Client/Instruments/MidiParser/MidiInstrument.cs
+++ b/Content.Client/Instruments/MidiParser/MidiInstrument.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Utility;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Instruments.MidiParser;
 
diff --git a/Content.Client/Instruments/MidiParser/MidiParser.cs b/Content.Client/Instruments/MidiParser/MidiParser.cs
index 0b65e472fc..514b6aaa72 100644
--- a/Content.Client/Instruments/MidiParser/MidiParser.cs
+++ b/Content.Client/Instruments/MidiParser/MidiParser.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using Content.Shared.Instruments;
 
diff --git a/Content.Client/Instruments/MidiParser/MidiStreamWrapper.cs b/Content.Client/Instruments/MidiParser/MidiStreamWrapper.cs
index 1886417a56..e4754f6b1b 100644
--- a/Content.Client/Instruments/MidiParser/MidiStreamWrapper.cs
+++ b/Content.Client/Instruments/MidiParser/MidiStreamWrapper.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Text;
 
 namespace Content.Client.Instruments.MidiParser;
diff --git a/Content.Client/Instruments/UI/ChannelItem.xaml.cs b/Content.Client/Instruments/UI/ChannelItem.xaml.cs
index bf297af25f..ca43dc71b4 100644
--- a/Content.Client/Instruments/UI/ChannelItem.xaml.cs
+++ b/Content.Client/Instruments/UI/ChannelItem.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Instruments/UI/ChannelsControl.xaml b/Content.Client/Instruments/UI/ChannelsControl.xaml
index b3c69d660a..f52b622c5f 100644
--- a/Content.Client/Instruments/UI/ChannelsControl.xaml
+++ b/Content.Client/Instruments/UI/ChannelsControl.xaml
@@ -1,27 +1,27 @@
-<Control xmlns="https://spacestation14.io"
-         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
-    <BoxContainer Orientation="Vertical">
-        <ScrollContainer MinHeight="90">
-            <BoxContainer Orientation="Vertical" Name="ChannelsContainer" SeparationOverride="3" />
-        </ScrollContainer>
-        <controls:HSpacer Spacing="10" />
-        <GridContainer Columns="5" HSeparationOverride="1" VSeparationOverride="1">
-            <!-- Name display selector -->
-            <Label Text="{Loc 'instruments-component-channels-name-display-selector-label'}" />
-            <controls:VSpacer Spacing="10" />
-            <Button Name="TrackSelectorButton"
-                    Text="{Loc 'instruments-component-channels-name-display-selector-track-button'}"
-                    HorizontalExpand="true"
-                    StyleClasses="OpenBoth" />
-            <Button Name="ProgramSelectorButton"
-                    Text="{Loc 'instruments-component-channels-name-display-selector-program-button'}"
-                    Pressed="True"
-                    HorizontalExpand="true"
-                    StyleClasses="OpenBoth" />
-            <Button Name="InstrumentSelectorButton"
-                    Text="{Loc 'instruments-component-channels-name-display-selector-instrument-button'}"
-                    HorizontalExpand="true"
-                    StyleClasses="OpenBoth" />
-        </GridContainer>
-    </BoxContainer>
-</Control>
+<BoxContainer xmlns="https://spacestation14.io"
+              xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+              Orientation="Vertical"
+              VerticalExpand="True">
+    <ScrollContainer MinHeight="90" VerticalExpand="True">
+        <BoxContainer Orientation="Vertical" Name="ChannelsContainer" SeparationOverride="3" VerticalExpand="True"/>
+    </ScrollContainer>
+    <controls:HSpacer Spacing="10" />
+    <GridContainer Columns="5" HSeparationOverride="1" VSeparationOverride="1">
+        <!-- Name display selector -->
+        <Label Text="{Loc 'instruments-component-channels-name-display-selector-label'}" />
+        <controls:VSpacer Spacing="10" />
+        <Button Name="TrackSelectorButton"
+                Text="{Loc 'instruments-component-channels-name-display-selector-track-button'}"
+                HorizontalExpand="True"
+                StyleClasses="OpenBoth" />
+        <Button Name="ProgramSelectorButton"
+                Text="{Loc 'instruments-component-channels-name-display-selector-program-button'}"
+                Pressed="True"
+                HorizontalExpand="True"
+                StyleClasses="OpenBoth" />
+        <Button Name="InstrumentSelectorButton"
+                Text="{Loc 'instruments-component-channels-name-display-selector-instrument-button'}"
+                HorizontalExpand="True"
+                StyleClasses="OpenBoth" />
+    </GridContainer>
+</BoxContainer>
diff --git a/Content.Client/Instruments/UI/ChannelsControl.xaml.cs b/Content.Client/Instruments/UI/ChannelsControl.xaml.cs
index adfebdb6d0..2b688a187c 100644
--- a/Content.Client/Instruments/UI/ChannelsControl.xaml.cs
+++ b/Content.Client/Instruments/UI/ChannelsControl.xaml.cs
@@ -1,5 +1,4 @@
 using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Audio.Midi;
@@ -7,7 +6,7 @@ using Robust.Shared.Audio.Midi;
 namespace Content.Client.Instruments.UI;
 
 [GenerateTypedNameReferences]
-public sealed partial class ChannelsControl : Control
+public sealed partial class ChannelsControl : BoxContainer
 {
     /// <summary>
     /// Raised when a channel is toggled.
diff --git a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
index 4daecc86df..92cc856d28 100644
--- a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
+++ b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
@@ -85,9 +85,12 @@ public sealed partial class InstrumentBoundUserInterface : BoundUserInterface
 
         // Initialize controls used to configure various system parameters.
         // Append any additional configuration controls here.
-        _instrumentMenu.AddConfigurationControl(
+        var channels = _instrumentMenu.AddConfigurationControl(
             _loc.GetString("instruments-component-menu-channels-label"),
             _channelsControl);
+        channels.Panel.VerticalExpand = true;
+        channels.VerticalExpand = true;
+
         _instrumentMenu.AddConfigurationControl(
             _loc.GetString("instruments-component-midi-file-collection-label"),
             _midiCollectionUtilsControl);
diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml b/Content.Client/Instruments/UI/InstrumentMenu.xaml
index f9f024de95..cf58db70a0 100644
--- a/Content.Client/Instruments/UI/InstrumentMenu.xaml
+++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml
@@ -1,7 +1,7 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                       xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                      MinSize="480 270"
+                      MinSize="480 440"
                       SetSize="500 500">
     <BoxContainer Orientation="Vertical" Margin="1,0,0,5" SeparationOverride="10">
         <TabContainer Name="MainTabContainer" VerticalExpand="True">
diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
index 995d5e95c1..5002389e66 100644
--- a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
+++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
@@ -78,37 +78,22 @@ public sealed partial class InstrumentMenu : FancyWindow
     /// </summary>
     /// <param name="name">The string to display on the tab header for this configuration.</param>
     /// <param name="ctrl">The control used for this configuration.</param>
-    public void AddConfigurationControl(string name, Control ctrl)
+    /// <returns>The new control.</param>
+    public MidiConfigurationControl AddConfigurationControl(string name, Control ctrl)
     {
         var formatted = new FormattedMessage();
-        var styleBox = new StyleBoxFlat
-        {
-            BorderColor = Color.FromHex("#3D4059"),
-            BorderThickness = new Thickness(2),
-        };
-
-        var panel = new PanelContainer
-        {
-            PanelOverride = styleBox,
-            Margin = new Thickness(0, 0, 0, 10),
-        };
-
-        var header = new RichTextLabel
-        {
-            StyleClasses = { StyleClass.LabelKeyText },
-            Margin = new Thickness(10, 0, 0, 0),
-        };
+        var cfgCtrl = new MidiConfigurationControl();
 
         ctrl.VerticalExpand = true;
         ctrl.Margin = new Thickness(5);
 
         formatted.AddMarkupOrThrow($"[bold]{name}[/bold]");
-        header.SetMessage(formatted, Color.FromHex("#A88B5E"));
+        cfgCtrl.Header.SetMessage(formatted, Color.FromHex("#A88B5E"));
 
-        panel.AddChild(ctrl);
+        cfgCtrl.Panel.AddChild(ctrl);
 
-        ConfigurationItemsContainer.AddChild(header);
-        ConfigurationItemsContainer.AddChild(panel);
+        ConfigurationItemsContainer.AddChild(cfgCtrl);
+        return cfgCtrl;
     }
 
     /// <summary>
diff --git a/Content.Client/Instruments/UI/MidiCollectionUtilsControl.xaml b/Content.Client/Instruments/UI/MidiCollectionUtilsControl.xaml
index 83ea995ad6..2e4fe9dc00 100644
--- a/Content.Client/Instruments/UI/MidiCollectionUtilsControl.xaml
+++ b/Content.Client/Instruments/UI/MidiCollectionUtilsControl.xaml
@@ -1,17 +1,16 @@
-<Control xmlns="https://spacestation14.io"
-         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
-    <BoxContainer Orientation="Vertical">
-        <Label Name="MidiCountLabel" />
-        <BoxContainer Orientation="Horizontal">
-            <Button Name="OpenDirectoryButton"
-                    Text="{Loc 'instruments-component-midi-file-collection-open-dir-button'}" HorizontalExpand="true"
-                    VerticalExpand="true" StyleClasses="OpenRight" />
-            <Button Name="ReloadCollectionButton"
-                    Text="{Loc 'instruments-component-midi-file-collection-reload-button'}" HorizontalExpand="true"
-                    VerticalExpand="true" StyleClasses="OpenBoth" />
-            <controls:ConfirmButton Name="DeleteAllButton"
-                                    Text="{Loc 'instruments-component-midi-file-collection-delete-all-button'}"
-                                    HorizontalExpand="true" VerticalExpand="true" StyleClasses="OpenLeft" />
-        </BoxContainer>
+<BoxContainer xmlns="https://spacestation14.io"
+                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                Orientation="Vertical">
+    <Label Name="MidiCountLabel" />
+    <BoxContainer Orientation="Horizontal">
+        <Button Name="OpenDirectoryButton"
+                Text="{Loc 'instruments-component-midi-file-collection-open-dir-button'}" HorizontalExpand="true"
+                VerticalExpand="true" StyleClasses="OpenRight" />
+        <Button Name="ReloadCollectionButton"
+                Text="{Loc 'instruments-component-midi-file-collection-reload-button'}" HorizontalExpand="true"
+                VerticalExpand="true" StyleClasses="OpenBoth" />
+        <controls:ConfirmButton Name="DeleteAllButton"
+                                Text="{Loc 'instruments-component-midi-file-collection-delete-all-button'}"
+                                HorizontalExpand="true" VerticalExpand="true" StyleClasses="OpenLeft" />
     </BoxContainer>
-</Control>
+</BoxContainer>
diff --git a/Content.Client/Instruments/UI/MidiCollectionUtilsControl.xaml.cs b/Content.Client/Instruments/UI/MidiCollectionUtilsControl.xaml.cs
index de76f01626..0f4d7dcdab 100644
--- a/Content.Client/Instruments/UI/MidiCollectionUtilsControl.xaml.cs
+++ b/Content.Client/Instruments/UI/MidiCollectionUtilsControl.xaml.cs
@@ -2,7 +2,6 @@ using System.Linq;
 using Content.Client.Audio.Midi;
 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.ContentPack;
@@ -10,7 +9,7 @@ using Robust.Shared.ContentPack;
 namespace Content.Client.Instruments.UI;
 
 [GenerateTypedNameReferences]
-public sealed partial class MidiCollectionUtilsControl : Control
+public sealed partial class MidiCollectionUtilsControl : BoxContainer
 {
     [Dependency] private MidiFileCollectionManager _midiCollection = default!;
     [Dependency] private IResourceManager _resourceManager = default!;
diff --git a/Content.Client/Instruments/UI/MidiConfigurationControl.xaml b/Content.Client/Instruments/UI/MidiConfigurationControl.xaml
new file mode 100644
index 0000000000..a37dfc1bca
--- /dev/null
+++ b/Content.Client/Instruments/UI/MidiConfigurationControl.xaml
@@ -0,0 +1,16 @@
+<BoxContainer xmlns="https://spacestation14.io"
+              xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+              Orientation="Vertical">
+    <RichTextLabel Name="Header"
+                   Access="Public"
+                   StyleClasses="LabelKeyText"
+                   Margin="10 0 0 0"/>
+    <PanelContainer Name="Panel"
+                    Access="Public"
+                    Margin="0 0 0 10">
+        <PanelContainer.PanelOverride>
+            <gfx:StyleBoxFlat BorderColor="#3D4059"
+                              BorderThickness="2"/>
+        </PanelContainer.PanelOverride>
+    </PanelContainer>
+</BoxContainer>
diff --git a/Content.Client/Instruments/UI/MidiConfigurationControl.xaml.cs b/Content.Client/Instruments/UI/MidiConfigurationControl.xaml.cs
new file mode 100644
index 0000000000..c6dd8d2605
--- /dev/null
+++ b/Content.Client/Instruments/UI/MidiConfigurationControl.xaml.cs
@@ -0,0 +1,7 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.Instruments.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class MidiConfigurationControl : BoxContainer;
diff --git a/Content.Client/Instruments/UI/MinVolumeControl.xaml b/Content.Client/Instruments/UI/MinVolumeControl.xaml
index 8508d69cf7..631c92a0d8 100644
--- a/Content.Client/Instruments/UI/MinVolumeControl.xaml
+++ b/Content.Client/Instruments/UI/MinVolumeControl.xaml
@@ -1,6 +1,4 @@
-<Control xmlns="https://spacestation14.io">
-    <BoxContainer Orientation="Horizontal" VerticalExpand="True" Margin="2 2 0 0">
-        <Slider Name="MidiMinVolumeSlider" HorizontalExpand="True" MinValue="0" MaxValue="127" />
-        <Label Name="MidiMinVolumeValueLabel" MinWidth="28" Margin="6 0 3 0" Align="Right" />
-    </BoxContainer>
-</Control>
+<BoxContainer xmlns="https://spacestation14.io" Orientation="Horizontal" VerticalExpand="True" Margin="2 2 0 0">
+    <Slider Name="MidiMinVolumeSlider" HorizontalExpand="True" MinValue="0" MaxValue="127" />
+    <Label Name="MidiMinVolumeValueLabel" MinWidth="28" Margin="6 0 3 0" Align="Right" />
+</BoxContainer>
diff --git a/Content.Client/Instruments/UI/MinVolumeControl.xaml.cs b/Content.Client/Instruments/UI/MinVolumeControl.xaml.cs
index 41fa7dd11e..5da75bdb99 100644
--- a/Content.Client/Instruments/UI/MinVolumeControl.xaml.cs
+++ b/Content.Client/Instruments/UI/MinVolumeControl.xaml.cs
@@ -1,12 +1,13 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Input;
 
 namespace Content.Client.Instruments.UI;
 
 [GenerateTypedNameReferences]
-public sealed partial class MinVolumeControl : Control
+public sealed partial class MinVolumeControl : BoxContainer
 {
     /// <summary>
     /// Raised when the user changes the min volume for MIDI input.
diff --git a/Content.Client/Interaction/DragDropHelper.cs b/Content.Client/Interaction/DragDropHelper.cs
index 162e84eb5f..3f5ebe9d66 100644
--- a/Content.Client/Interaction/DragDropHelper.cs
+++ b/Content.Client/Interaction/DragDropHelper.cs
@@ -1,4 +1,4 @@
-using Content.Shared.CCVar;
+using Content.Shared.CCVar;
 using Robust.Client.Input;
 using Robust.Shared.Configuration;
 using Robust.Shared.Map;
diff --git a/Content.Client/Inventory/VirtualItemSystem.cs b/Content.Client/Inventory/VirtualItemSystem.cs
index b5632b8fb5..4e6d7e6676 100644
--- a/Content.Client/Inventory/VirtualItemSystem.cs
+++ b/Content.Client/Inventory/VirtualItemSystem.cs
@@ -1,4 +1,4 @@
-using Content.Client.Hands.UI;
+using Content.Client.Hands.UI;
 using Content.Client.Items;
 using Content.Shared.Inventory.VirtualItem;
 
diff --git a/Content.Client/Items/ItemStatusMessages.cs b/Content.Client/Items/ItemStatusMessages.cs
index 3af02f0a4f..4ff239fbd8 100644
--- a/Content.Client/Items/ItemStatusMessages.cs
+++ b/Content.Client/Items/ItemStatusMessages.cs
@@ -1,4 +1,4 @@
-using Robust.Client.UserInterface;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Items
 {
diff --git a/Content.Client/Items/Systems/ItemSystem.cs b/Content.Client/Items/Systems/ItemSystem.cs
index f827e7340e..7649dcef05 100644
--- a/Content.Client/Items/Systems/ItemSystem.cs
+++ b/Content.Client/Items/Systems/ItemSystem.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.Hands;
 using Content.Shared.Inventory.Events;
diff --git a/Content.Client/Items/UI/PollingItemStatusControl.cs b/Content.Client/Items/UI/PollingItemStatusControl.cs
index 39cffb06f6..c98c9dcfc0 100644
--- a/Content.Client/Items/UI/PollingItemStatusControl.cs
+++ b/Content.Client/Items/UI/PollingItemStatusControl.cs
@@ -1,4 +1,4 @@
-using Robust.Client.UserInterface;
+using Robust.Client.UserInterface;
 using Robust.Shared.Timing;
 
 namespace Content.Client.Items.UI;
diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
index cf0b5634c5..a95d51af74 100644
--- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
+++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
@@ -1,4 +1,4 @@
-<controls:FancyWindow
+<controls:FancyWindow
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
@@ -95,7 +95,7 @@
         </BoxContainer>
          <!-- Footer -->
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'microwave-menu-footer-flavor-left'}" StyleClasses="WindowFooterText" />
                 <Label Text="{Loc 'microwave-menu-footer-flavor-right'}" StyleClasses="WindowFooterText"
diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
index 0716a1f5a8..bcb2332e8f 100644
--- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
+++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
index 21b1e28830..e8a62f7b7e 100644
--- a/Content.Client/LateJoin/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -1,14 +1,13 @@
 using System.Linq;
 using System.Numerics;
 using Content.Client.CrewManifest;
-using Content.Client.GameTicking.Managers;
+using Content.Client.GameTicking;
 using Content.Client.Lobby;
 using Content.Client.UserInterface.Controls;
 using Content.Client.Players.PlayTimeTracking;
 using Content.Shared.CCVar;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
-using Content.Shared.StatusIcon;
 using Robust.Client.Console;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Launcher/LauncherConnectingGui.xaml b/Content.Client/Launcher/LauncherConnectingGui.xaml
index a8e5a63704..653937ea33 100644
--- a/Content.Client/Launcher/LauncherConnectingGui.xaml
+++ b/Content.Client/Launcher/LauncherConnectingGui.xaml
@@ -13,7 +13,7 @@
                 <Button Name="ExitButton" Text="{Loc 'connecting-exit'}"
                         HorizontalAlignment="Right" HorizontalExpand="True" />
             </BoxContainer>
-            <controls:HighDivider />
+            <controls:Separator StyleClasses="HighDivider"/>
             <BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="4 4 4 0">
                 <Control VerticalExpand="True" Margin="0 0 0 8">
                     <BoxContainer Orientation="Vertical" Name="ConnectingStatus">
diff --git a/Content.Client/Light/Controls/LightReplacerStatusControl.cs b/Content.Client/Light/Controls/LightReplacerStatusControl.cs
index ebca12dd1e..06edd1543d 100644
--- a/Content.Client/Light/Controls/LightReplacerStatusControl.cs
+++ b/Content.Client/Light/Controls/LightReplacerStatusControl.cs
@@ -1,4 +1,4 @@
-using Content.Client.Message;
+using Content.Client.Message;
 using Content.Client.Stylesheets;
 using Content.Shared.Light.Components;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Light/EntitySystems/LightReplacerStatusControlSystem.cs b/Content.Client/Light/EntitySystems/LightReplacerStatusControlSystem.cs
index ea52c92f2b..a0f404162b 100644
--- a/Content.Client/Light/EntitySystems/LightReplacerStatusControlSystem.cs
+++ b/Content.Client/Light/EntitySystems/LightReplacerStatusControlSystem.cs
@@ -1,4 +1,4 @@
-using Content.Client.Items;
+using Content.Client.Items;
 using Content.Client.Light.Controls;
 using Content.Shared.Light.Components;
 
diff --git a/Content.Client/Light/EntitySystems/SunShadowSystem.cs b/Content.Client/Light/EntitySystems/SunShadowSystem.cs
index 873abd5817..1d9297026c 100644
--- a/Content.Client/Light/EntitySystems/SunShadowSystem.cs
+++ b/Content.Client/Light/EntitySystems/SunShadowSystem.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.Contracts;
 using System.Numerics;
-using Content.Client.GameTicking.Managers;
+using Content.Shared.GameTicking;
 using Content.Shared.Light.Components;
 using Content.Shared.Light.EntitySystems;
 using Robust.Shared.Timing;
@@ -10,7 +10,7 @@ namespace Content.Client.Light.EntitySystems;
 
 public sealed partial class SunShadowSystem : SharedSunShadowSystem
 {
-    [Dependency] private ClientGameTicker _ticker = default!;
+    [Dependency] private GameTicker _ticker = default!;
     [Dependency] private IGameTiming _timing = default!;
     [Dependency] private MetaDataSystem _metadata = default!;
 
diff --git a/Content.Client/Light/LightCycleSystem.cs b/Content.Client/Light/LightCycleSystem.cs
index 373431e2ef..dfb07e0faa 100644
--- a/Content.Client/Light/LightCycleSystem.cs
+++ b/Content.Client/Light/LightCycleSystem.cs
@@ -1,5 +1,4 @@
-using Content.Client.GameTicking.Managers;
-using Content.Shared;
+using Content.Shared.GameTicking;
 using Content.Shared.Light.Components;
 using Content.Shared.Light.EntitySystems;
 using Robust.Shared.Map.Components;
@@ -10,7 +9,7 @@ namespace Content.Client.Light;
 /// <inheritdoc/>
 public sealed partial class LightCycleSystem : SharedLightCycleSystem
 {
-    [Dependency] private ClientGameTicker _ticker = default!;
+    [Dependency] private GameTicker _ticker = default!;
     [Dependency] private IGameTiming _timing = default!;
     [Dependency] private MetaDataSystem _metadata = default!;
 
diff --git a/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs b/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs
index 561cda1aa3..3f90be8bd3 100644
--- a/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs
+++ b/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs
@@ -127,7 +127,7 @@ public sealed partial class PoweredLightVisualizerSystem : VisualizerSystem<Powe
             {
                 KeyFrames =
                 {
-                    new AnimationTrackPlaySound.KeyFrame(sound, 0.5f)
+                    new AnimationTrackPlaySound.KeyFrame(sound, 0.5f, () => comp.BlinkingSound.Params)
                 }
             });
         }
diff --git a/Content.Client/Lightning/Components/LightningComponent.cs b/Content.Client/Lightning/Components/LightningComponent.cs
index 521641c763..e4b987d357 100644
--- a/Content.Client/Lightning/Components/LightningComponent.cs
+++ b/Content.Client/Lightning/Components/LightningComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Lightning.Components;
+using Content.Shared.Lightning.Components;
 
 namespace Content.Client.Lightning.Components;
 [RegisterComponent]
diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
index 6e8b00a3b2..b5373e0622 100644
--- a/Content.Client/Lobby/LobbyState.cs
+++ b/Content.Client/Lobby/LobbyState.cs
@@ -1,5 +1,5 @@
 using Content.Client.Audio;
-using Content.Client.GameTicking.Managers;
+using Content.Client.GameTicking;
 using Content.Client.LateJoin;
 using Content.Client.Lobby.UI;
 using Content.Client.Message;
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
index 76986e010d..a27937c280 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
@@ -1,7 +1,7 @@
 <BoxContainer xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          xmlns:humanoid="clr-namespace:Content.Client.Humanoid"
-         xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
          xmlns:ui="clr-namespace:Content.Client.Lobby.UI"
          xmlns:profile="clr-namespace:Content.Client.Lobby.UI.ProfileEditorControls"
          HorizontalExpand="True">
@@ -28,7 +28,7 @@
                     <ui:HighlightedContainer>
                         <BoxContainer Orientation="Vertical">
                             <Label Text="{Loc 'humanoid-profile-editor-randomize'}" HorizontalAlignment="Center"/>
-                            <PanelContainer StyleClasses="LowDivider" Margin="0 10"/>
+                            <controls:Separator StyleClasses="LowDivider" Margin="0 10"/>
                             <GridContainer Columns="2" MinWidth="250" HorizontalExpand="True">
                                 <ui:RandomizeLockButton For="Name" LabelText="{Loc 'humanoid-profile-editor-randomize-name-button'}"/>
                                 <ui:RandomizeLockButton For="Species" LabelText="{Loc 'humanoid-profile-editor-randomize-species-button'}"/>
@@ -157,7 +157,7 @@
             <profile:ProfilePreviewSpriteView Name="SpriteView" Scale="8 8" Margin="4" SizeFlagsStretchRatio="1" />
             <BoxContainer Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 5">
                 <Button Name="SpriteRotateLeft" Text="◀" StyleClasses="OpenRight" />
-                <cc:VSeparator Margin="2 0 3 0" />
+                <controls:Separator StyleClasses="LowDivider" Margin="2 0 3 0" Orientation="Vertical" MinHeight="5"/>
                 <Button Name="SpriteRotateRight" Text="▶" StyleClasses="OpenLeft" />
             </BoxContainer>
         </BoxContainer>
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 8dc4dce6a6..215fe6ff43 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -265,7 +265,7 @@ namespace Content.Client.Lobby.UI
                 (int)PreferenceUnavailableMode.StayInLobby);
             PreferenceUnavailableButton.AddItem(
                 Loc.GetString("humanoid-profile-editor-preference-unavailable-spawn-as-overflow-button",
-                              ("overflowJob", Loc.GetString(SharedGameTicker.FallbackOverflowJobName))),
+                              ("overflowJob", Loc.GetString(GameTicker.FallbackOverflowJobName))),
                 (int)PreferenceUnavailableMode.SpawnAsOverflow);
 
             PreferenceUnavailableButton.OnItemSelected += args =>
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index 52eed6825a..1eb55dc73e 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -5,7 +5,6 @@
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:vote="clr-namespace:Content.Client.Voting.UI"
-    xmlns:style="clr-namespace:Content.Client.Stylesheets"
     xmlns:lobbyUi="clr-namespace:Content.Client.Lobby.UI"
     xmlns:corvaxLobby="clr-namespace:Content.Client.Corvax.Lobby.UI"
     xmlns:info="clr-namespace:Content.Client.Info"
@@ -79,7 +78,7 @@
                                HorizontalExpand="True" HorizontalAlignment="Center" />
                     </BoxContainer>
                     <!-- Gold line -->
-                    <controls:HLine StyleClasses="highlight" Thickness="2" />
+                    <controls:Separator StyleClasses="highlight"/>
                     <controls:HSpacer Spacing="10" />
                     <!-- Voting & misc button bar -->
                     <BoxContainer Orientation="Horizontal" MinSize="0 40" HorizontalAlignment="Right">
@@ -103,7 +102,7 @@
                     <controls:HSpacer Spacing="5" />
                     <BoxContainer MinHeight="10" />
                     <!-- Gold line -->
-                    <controls:HLine StyleClasses="highlight" Thickness="2" Access="Public" />
+                    <controls:Separator StyleClasses="highlight" Access="Public"/>
                     <controls:HSpacer Spacing="10" />
                     <widgets:ChatBox Name="Chat" Access="Public" VerticalExpand="True" Margin="3 3 3 3" MinHeight="50" />
                 </BoxContainer>
diff --git a/Content.Client/Lobby/UI/ProfileEditorControls/ProfilePreviewSpriteView.Humanoid.cs b/Content.Client/Lobby/UI/ProfileEditorControls/ProfilePreviewSpriteView.Humanoid.cs
index d8190eca4a..427a13a757 100644
--- a/Content.Client/Lobby/UI/ProfileEditorControls/ProfilePreviewSpriteView.Humanoid.cs
+++ b/Content.Client/Lobby/UI/ProfileEditorControls/ProfilePreviewSpriteView.Humanoid.cs
@@ -1,15 +1,12 @@
 using System.Linq;
-using Content.Client.Humanoid;
-using Content.Client.Station;
 using Content.Shared.Body;
 using Content.Shared.Clothing;
 using Content.Shared.GameTicking;
-using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Inventory;
 using Content.Shared.Preferences;
 using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Roles;
+using Content.Shared.Station.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
@@ -80,7 +77,7 @@ public sealed partial class ProfilePreviewSpriteView
     {
         var highPriorityJob = profile.JobPriorities.FirstOrDefault(p => p.Value == JobPriority.High).Key;
         // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract (what is resharper smoking?)
-        return _prototypeManager.Index<JobPrototype>(highPriorityJob.Id ?? SharedGameTicker.FallbackOverflowJob);
+        return _prototypeManager.Index<JobPrototype>(highPriorityJob.Id ?? GameTicker.FallbackOverflowJob);
     }
 
     private void GiveDummyLoadout(RoleLoadout? roleLoadout)
diff --git a/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs b/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
index 3423b23c6c..2de90acde4 100644
--- a/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
+++ b/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.Parallax.Data;
+using Content.Client.Parallax.Data;
 using Robust.Client.AutoGenerated;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/MapText/MapTextComponent.cs b/Content.Client/MapText/MapTextComponent.cs
index f70b3c8dd4..5b0ce12f71 100644
--- a/Content.Client/MapText/MapTextComponent.cs
+++ b/Content.Client/MapText/MapTextComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.MapText;
+using Content.Shared.MapText;
 using Robust.Client.Graphics;
 
 namespace Content.Client.MapText;
diff --git a/Content.Client/MapText/MapTextOverlay.cs b/Content.Client/MapText/MapTextOverlay.cs
index 70e708bba8..719e3b0cbe 100644
--- a/Content.Client/MapText/MapTextOverlay.cs
+++ b/Content.Client/MapText/MapTextOverlay.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Shared.MapText;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
diff --git a/Content.Client/MapText/MapTextSystem.cs b/Content.Client/MapText/MapTextSystem.cs
index 909b72b46d..82e31ce47d 100644
--- a/Content.Client/MapText/MapTextSystem.cs
+++ b/Content.Client/MapText/MapTextSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.MapText;
+using Content.Shared.MapText;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Mapping/MappingActionsButton.xaml.cs b/Content.Client/Mapping/MappingActionsButton.xaml.cs
index 1a2f2c069f..c8f589f13e 100644
--- a/Content.Client/Mapping/MappingActionsButton.xaml.cs
+++ b/Content.Client/Mapping/MappingActionsButton.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/Mapping/MappingDoNotMeasure.xaml.cs b/Content.Client/Mapping/MappingDoNotMeasure.xaml.cs
index c4cb560234..a45f20248a 100644
--- a/Content.Client/Mapping/MappingDoNotMeasure.xaml.cs
+++ b/Content.Client/Mapping/MappingDoNotMeasure.xaml.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Mapping/MappingManager.cs b/Content.Client/Mapping/MappingManager.cs
index 17cc629c59..13bc7cb77f 100644
--- a/Content.Client/Mapping/MappingManager.cs
+++ b/Content.Client/Mapping/MappingManager.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Text;
 using System.Threading.Tasks;
 using Content.Shared.Mapping;
diff --git a/Content.Client/Mapping/MappingOverlay.cs b/Content.Client/Mapping/MappingOverlay.cs
index 026f50450c..0adda6fcc0 100644
--- a/Content.Client/Mapping/MappingOverlay.cs
+++ b/Content.Client/Mapping/MappingOverlay.cs
@@ -1,4 +1,4 @@
-using Robust.Client.GameObjects;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Player;
diff --git a/Content.Client/Mapping/MappingPrototype.cs b/Content.Client/Mapping/MappingPrototype.cs
index eff2dfab15..417a09776b 100644
--- a/Content.Client/Mapping/MappingPrototype.cs
+++ b/Content.Client/Mapping/MappingPrototype.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Decals;
+using Content.Shared.Decals;
 using Content.Shared.Maps;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Client/Mapping/MappingScreen.xaml.cs b/Content.Client/Mapping/MappingScreen.xaml.cs
index 1608a1f54e..b1b4c3b1de 100644
--- a/Content.Client/Mapping/MappingScreen.xaml.cs
+++ b/Content.Client/Mapping/MappingScreen.xaml.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Numerics;
 using Content.Client.Decals;
 using Content.Client.Decals.UI;
diff --git a/Content.Client/Mapping/MappingSpawnButton.xaml.cs b/Content.Client/Mapping/MappingSpawnButton.xaml.cs
index 29fb884ed6..18ab6db2af 100644
--- a/Content.Client/Mapping/MappingSpawnButton.xaml.cs
+++ b/Content.Client/Mapping/MappingSpawnButton.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml
index d12b90918b..1a9b699bfa 100644
--- a/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml
+++ b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml
@@ -1,4 +1,5 @@
 <Control xmlns="https://spacestation14.io"
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
          xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
          MouseFilter="Stop">
     <PanelContainer StyleClasses="BackgroundPanelOpenLeft"/>
@@ -15,7 +16,7 @@
                        HorizontalExpand="True" VAlign="Center" StyleClasses="FancyWindowTitle" />
             </BoxContainer>
         </Control>
-        <PanelContainer StyleClasses="LowDivider" Margin="0 0 1 0"/>
+        <controls:Separator StyleClasses="LowDivider" Margin="0 0 1 0"/>
         <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc news-write-ui-article-name-label}" Margin="17 10 0 9" VerticalAlignment="Center"/>
             <LineEdit Name="TitleField" Margin="6 10 0 9" MinWidth="260" MinHeight="23" Access="Public"/>
diff --git a/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs
index 20e23d2359..18886c19e9 100644
--- a/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs
+++ b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.Message;
+using Content.Client.Message;
 using Content.Client.RichText;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.RichText;
diff --git a/Content.Client/Materials/MaterialReclaimerSystem.cs b/Content.Client/Materials/MaterialReclaimerSystem.cs
index 9fbfa3b384..9674b7c2f4 100644
--- a/Content.Client/Materials/MaterialReclaimerSystem.cs
+++ b/Content.Client/Materials/MaterialReclaimerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Materials;
+using Content.Shared.Materials;
 
 namespace Content.Client.Materials;
 
diff --git a/Content.Client/Materials/UI/MaterialDisplay.xaml.cs b/Content.Client/Materials/UI/MaterialDisplay.xaml.cs
index d40f896b09..5b26468901 100644
--- a/Content.Client/Materials/UI/MaterialDisplay.xaml.cs
+++ b/Content.Client/Materials/UI/MaterialDisplay.xaml.cs
@@ -87,7 +87,7 @@ public sealed partial class MaterialDisplay : PanelContainer
             {
                 Name = $"{sheetsToEject}",
                 Access = AccessLevel.Public,
-                Text = Loc.GetString($"{sheetsToEject}"),
+                Text = sheetsToEject.ToString(),
                 MinWidth = 45,
                 StyleClasses = { styleClass }
             };
diff --git a/Content.Client/Mech/MechAssemblyVisualizerSystem.cs b/Content.Client/Mech/MechAssemblyVisualizerSystem.cs
index 958855a186..d73c1388c5 100644
--- a/Content.Client/Mech/MechAssemblyVisualizerSystem.cs
+++ b/Content.Client/Mech/MechAssemblyVisualizerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mech;
+using Content.Shared.Mech;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Mech;
diff --git a/Content.Client/Mech/MechAssemblyVisualsComponent.cs b/Content.Client/Mech/MechAssemblyVisualsComponent.cs
index c4cba0aa0a..5b7335e076 100644
--- a/Content.Client/Mech/MechAssemblyVisualsComponent.cs
+++ b/Content.Client/Mech/MechAssemblyVisualsComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Client.Mech;
+namespace Content.Client.Mech;
 
 /// <summary>
 /// This is used for visualizing mech constructions
diff --git a/Content.Client/Mech/MechSystem.cs b/Content.Client/Mech/MechSystem.cs
index 5320f29aea..965adea621 100644
--- a/Content.Client/Mech/MechSystem.cs
+++ b/Content.Client/Mech/MechSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mech;
+using Content.Shared.Mech;
 using Content.Shared.Mech.Components;
 using Content.Shared.Mech.EntitySystems;
 using Robust.Client.GameObjects;
diff --git a/Content.Client/Mech/Ui/Equipment/MechGrabberUi.cs b/Content.Client/Mech/Ui/Equipment/MechGrabberUi.cs
index 4bb9961fc4..0aa3c8b16b 100644
--- a/Content.Client/Mech/Ui/Equipment/MechGrabberUi.cs
+++ b/Content.Client/Mech/Ui/Equipment/MechGrabberUi.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Fragments;
+using Content.Client.UserInterface.Fragments;
 using Content.Shared.Mech;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Mech/Ui/Equipment/MechGrabberUiFragment.xaml.cs b/Content.Client/Mech/Ui/Equipment/MechGrabberUiFragment.xaml.cs
index ad95bf2fbd..41d6e643ee 100644
--- a/Content.Client/Mech/Ui/Equipment/MechGrabberUiFragment.xaml.cs
+++ b/Content.Client/Mech/Ui/Equipment/MechGrabberUiFragment.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mech;
+using Content.Shared.Mech;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Mech/Ui/MechEquipmentControl.xaml b/Content.Client/Mech/Ui/MechEquipmentControl.xaml
index 19263dd3c9..fcf5fa2ee8 100644
--- a/Content.Client/Mech/Ui/MechEquipmentControl.xaml
+++ b/Content.Client/Mech/Ui/MechEquipmentControl.xaml
@@ -1,5 +1,5 @@
 <Control xmlns="https://spacestation14.io"
-         xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls">
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <Button Disabled="True"
             Margin="0 0 0 0"
             HorizontalExpand="True"
@@ -19,7 +19,7 @@
                     <TextureButton Name="RemoveButton" Scale="0.5 0.5"></TextureButton>
                 </BoxContainer>
             </BoxContainer>
-            <customControls:HSeparator Name="Separator" StyleClasses="LowDivider" Visible="False"/>
+            <controls:Separator Name="Separator" StyleClasses="LowDivider" Visible="False"/>
             <BoxContainer Name="CustomControlContainer" Margin="0 10 0 0" HorizontalExpand="True" VerticalExpand="True"></BoxContainer>
         </BoxContainer>
     </Button>
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
index 86e1ce689a..637cd44870 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
@@ -40,7 +40,7 @@
 
         <!-- Footer -->
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc crew-monitoring-ui-flavor-left-label}" StyleClasses="WindowFooterText" />
                 <Label Text="{Loc crew-monitoring-ui-flavor-right-label}" StyleClasses="WindowFooterText"
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
index ad7c2dad02..ef0b22097a 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
@@ -4,7 +4,7 @@ using System.Numerics;
 using Content.Client.Pinpointer.UI;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Controls;
-using Content.Shared.Medical.SuitSensor;
+using Content.Shared.Medical.SuitSensors;
 using Content.Shared.StatusIcon;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
@@ -98,8 +98,9 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
         var uniqueSensors = uniqueSensorsMap.Values.ToList();
 
         // Order sensor data
-        var orderedSensors = uniqueSensors.OrderBy(n => n.Name).OrderBy(j => j.Job);
-        var assignedSensors = new HashSet<SuitSensorStatus>();
+        // TODO too much evil LINQ going on here
+        var orderedSensors = uniqueSensors.OrderBy(n => n.Name).ThenBy(j => j.Job);
+        var assignedSensors = new List<SuitSensorStatus>();
         var departments = uniqueSensors.SelectMany(d => d.JobDepartments).Distinct().OrderBy(n => n);
 
         // Create department labels and populate lists
diff --git a/Content.Client/Medical/Cryogenics/CryoPodSystem.cs b/Content.Client/Medical/Cryogenics/CryoPodSystem.cs
index d24f59579b..e413458f38 100644
--- a/Content.Client/Medical/Cryogenics/CryoPodSystem.cs
+++ b/Content.Client/Medical/Cryogenics/CryoPodSystem.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Shared.Medical.Cryogenics;
 using Robust.Client.GameObjects;
 
diff --git a/Content.Client/MedicalScanner/MedicalScannerComponent.cs b/Content.Client/MedicalScanner/MedicalScannerComponent.cs
index 4b3318b49d..9f4fd922ca 100644
--- a/Content.Client/MedicalScanner/MedicalScannerComponent.cs
+++ b/Content.Client/MedicalScanner/MedicalScannerComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.MedicalScanner;
+using Content.Shared.MedicalScanner;
 
 namespace Content.Client.MedicalScanner;
 
diff --git a/Content.Client/Mind/MindSystem.cs b/Content.Client/Mind/MindSystem.cs
index c0a50373eb..33667df87a 100644
--- a/Content.Client/Mind/MindSystem.cs
+++ b/Content.Client/Mind/MindSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mind;
+using Content.Shared.Mind;
 
 namespace Content.Client.Mind;
 
diff --git a/Content.Client/Mobs/Systems/DeathgaspSystem.cs b/Content.Client/Mobs/Systems/DeathgaspSystem.cs
index b8dcd03759..80389037e8 100644
--- a/Content.Client/Mobs/Systems/DeathgaspSystem.cs
+++ b/Content.Client/Mobs/Systems/DeathgaspSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mobs;
+using Content.Shared.Mobs;
 
 namespace Content.Client.Mobs;
 
diff --git a/Content.Client/MouseRotator/MouseRotatorSystem.cs b/Content.Client/MouseRotator/MouseRotatorSystem.cs
index cea4c5b0b8..0fe88ff74b 100644
--- a/Content.Client/MouseRotator/MouseRotatorSystem.cs
+++ b/Content.Client/MouseRotator/MouseRotatorSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.MouseRotator;
+using Content.Shared.MouseRotator;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Player;
diff --git a/Content.Client/Movement/Systems/ClientSpriteMovementSystem.cs b/Content.Client/Movement/Systems/ClientSpriteMovementSystem.cs
index ff706ea35e..9a8688a629 100644
--- a/Content.Client/Movement/Systems/ClientSpriteMovementSystem.cs
+++ b/Content.Client/Movement/Systems/ClientSpriteMovementSystem.cs
@@ -1,30 +1,36 @@
 using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Events;
 using Content.Shared.Movement.Systems;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Movement.Systems;
 
 /// <summary>
-/// Controls the switching of motion and standing still animation
+/// Controls the switching of motion and standing still animation.
 /// </summary>
 public sealed partial class ClientSpriteMovementSystem : SharedSpriteMovementSystem
 {
     [Dependency] private SpriteSystem _sprite = default!;
-    [Dependency] private EntityQuery<SpriteComponent> _spriteQuery = default!;
+    [Dependency] private EntityQuery<SpriteComponent> _spriteQuery;
 
-    public override void Initialize()
+    protected override void OnSpriteMoveInput(Entity<SpriteMovementComponent> ent, ref SpriteMoveEvent args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<SpriteMovementComponent, AfterAutoHandleStateEvent>(OnAfterAutoHandleState);
+        base.OnSpriteMoveInput(ent, ref args);
+        UpdateSprite(ent, args.IsMoving);
     }
 
+    [SubscribeLocalEvent]
     private void OnAfterAutoHandleState(Entity<SpriteMovementComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        UpdateSprite(ent, ent.Comp.IsMoving);
+    }
+
+    private void UpdateSprite(Entity<SpriteMovementComponent> ent, bool isMoving)
     {
         if (!_spriteQuery.TryGetComponent(ent, out var sprite))
             return;
 
-        if (ent.Comp.IsMoving)
+        if (isMoving)
         {
             foreach (var (layer, state) in ent.Comp.MovementLayers)
             {
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs
index f85220a926..5ecd91f3bd 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Client.NetworkConfigurator.Systems;
+using Content.Client.NetworkConfigurator.Systems;
 using Content.Shared.DeviceNetwork;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
index 0afda39b1d..73d1967f28 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.DeviceNetwork;
 using Robust.Client.AutoGenerated;
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml
index a512e694f6..8c0f9403db 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml
@@ -1,6 +1,5 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                xmlns:networkConfigurator="clr-namespace:Content.Client.NetworkConfigurator"
                 Title="Network Configurator" MinSize="620 400" RectClipContent="True">
     <BoxContainer Orientation="Vertical" VerticalExpand="True">
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
@@ -29,7 +28,7 @@
             </BoxContainer>
             <Control HorizontalExpand="True"/>
             <Control>
-                <Button Name="ButtonOk" MinHeight="26" StyleClasses="ButtonColorGreen" Text="{Loc signal-port-selector-menu-done}"></Button>
+                <Button Name="ButtonOk" MinHeight="26" StyleClasses="positive" Text="{Loc signal-port-selector-menu-done}"></Button>
             </Control>
         </BoxContainer>
         <Control SetHeight="28" Margin="1 0 2 1">
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs
index 6294facaee..34532c516f 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Controls;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.DeviceNetwork;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/NightVision/NightVisionSystem.cs b/Content.Client/NightVision/NightVisionSystem.cs
index 8934032c72..6a689eedc0 100644
--- a/Content.Client/NightVision/NightVisionSystem.cs
+++ b/Content.Client/NightVision/NightVisionSystem.cs
@@ -2,6 +2,7 @@ using Content.Client.Overlays;
 using Content.Shared.GameTicking;
 using Content.Shared.NightVision;
 using Content.Shared.Overlays;
+using Content.Shared.StatusEffectNew;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Player;
@@ -41,6 +42,24 @@ public sealed partial class NightVisionSystem : SharedNightVisionSystem
         RefreshOverlay(ent);
     }
 
+    [SubscribeLocalEvent]
+    private void OnCompEquip(Entity<NightVisionComponent> ent, ref StatusEffectAppliedEvent args)
+    {
+        if (!ent.Comp.RelayOverlay)
+            return;
+
+        RefreshOverlay(args.Target);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnCompEquip(Entity<NightVisionComponent> ent, ref StatusEffectRemovedEvent args)
+    {
+        if (!ent.Comp.RelayOverlay)
+            return;
+
+        RefreshOverlay(args.Target);
+    }
+
     [SubscribeNetworkEvent]
     private void OnRoundRestart(RoundRestartCleanupEvent args)
     {
diff --git a/Content.Client/NodeContainer/NodeGroupSystem.cs b/Content.Client/NodeContainer/NodeGroupSystem.cs
index 200781a274..84331b9879 100644
--- a/Content.Client/NodeContainer/NodeGroupSystem.cs
+++ b/Content.Client/NodeContainer/NodeGroupSystem.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.NodeContainer;
 using JetBrains.Annotations;
diff --git a/Content.Client/NodeContainer/NodeVisCommand.cs b/Content.Client/NodeContainer/NodeVisCommand.cs
index 8a3160f757..ba905de42b 100644
--- a/Content.Client/NodeContainer/NodeVisCommand.cs
+++ b/Content.Client/NodeContainer/NodeVisCommand.cs
@@ -1,4 +1,4 @@
-using Content.Client.Administration.Managers;
+using Content.Client.Administration.Managers;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 
diff --git a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs
index af7a11319d..6f6a47ebf3 100644
--- a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs
+++ b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Shared.CCVar;
+using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.NukeOps;
 using JetBrains.Annotations;
diff --git a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
index b030badc67..7ac86a17d5 100644
--- a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
+++ b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.NukeOps;
 using Robust.Client.AutoGenerated;
diff --git a/Content.Client/Nutrition/EntitySystems/InfantSystem.cs b/Content.Client/Nutrition/EntitySystems/InfantSystem.cs
index d6fef2ddd8..99ddb2fdc5 100644
--- a/Content.Client/Nutrition/EntitySystems/InfantSystem.cs
+++ b/Content.Client/Nutrition/EntitySystems/InfantSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Nutrition.AnimalHusbandry;
+using Content.Shared.Nutrition.AnimalHusbandry;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Nutrition.EntitySystems;
diff --git a/Content.Client/Options/OptionsVisualizerComponent.cs b/Content.Client/Options/OptionsVisualizerComponent.cs
index 87999f381c..dadece1fa0 100644
--- a/Content.Client/Options/OptionsVisualizerComponent.cs
+++ b/Content.Client/Options/OptionsVisualizerComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.CCVar;
+using Content.Shared.CCVar;
 
 namespace Content.Client.Options;
 
diff --git a/Content.Client/Options/OptionsVisualizerSystem.cs b/Content.Client/Options/OptionsVisualizerSystem.cs
index 15af9eb08b..25feffbcf2 100644
--- a/Content.Client/Options/OptionsVisualizerSystem.cs
+++ b/Content.Client/Options/OptionsVisualizerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.CCVar;
+using Content.Shared.CCVar;
 using Robust.Client.GameObjects;
 using Robust.Shared.Configuration;
 using Robust.Shared.Reflection;
diff --git a/Content.Client/Options/UI/EscapeMenu.xaml b/Content.Client/Options/UI/EscapeMenu.xaml
index 05566d8257..2dda87eb1f 100644
--- a/Content.Client/Options/UI/EscapeMenu.xaml
+++ b/Content.Client/Options/UI/EscapeMenu.xaml
@@ -1,23 +1,24 @@
 <ui1:EscapeMenu xmlns="https://spacestation14.io"
+                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                 xmlns:changelog="clr-namespace:Content.Client.Changelog"
                 xmlns:ui="clr-namespace:Content.Client.Voting.UI"
                 xmlns:ui1="clr-namespace:Content.Client.Options.UI"
-                xmlns:system="clr-namespace:System;assembly=System.Runtime"
                 Title="{Loc 'ui-escape-title'}"
                 Resizable="False">
 
     <BoxContainer Orientation="Vertical" SeparationOverride="4" MinWidth="150">
         <ui:VoteCallMenuButton />
-        <PanelContainer StyleClasses="LowDivider" Margin="0 2.5 0 2.5" />
+        <controls:Separator StyleClasses="LowDivider" Margin="0 2.5 0 2.5"/>
         <Button Access="Public" Name="RulesButton" Text="{Loc 'ui-escape-rules'}" StyleClasses="OpenLeft" />
         <Button Access="Public" Name="GuidebookButton" Text="{Loc 'ui-escape-guidebook'}" StyleClasses="OpenBoth" />
         <Button Access="Public" Name="WikiButton" Text="{Loc 'ui-escape-wiki'}" StyleClasses="OpenBoth" />
         <changelog:ChangelogButton Access="Public" Name="ChangelogButton" StyleClasses="OpenBoth"/>
         <Button Access="Public" Name="FeedbackButton" Text="{Loc 'ui-escape-feedback'}" StyleClasses="OpenBoth"/>
+        <Button Access="Public" Name="BugReportButton" Text="{Loc 'ui-escape-bug-report'}" StyleClasses="OpenBoth"/>
         <Button Access="Public" Name="AdminRemarksButton" Text="{Loc 'ui-escape-remarks'}" StyleClasses="OpenRight"/>
-        <PanelContainer StyleClasses="LowDivider" Margin="0 2.5 0 2.5" />
+        <controls:Separator StyleClasses="LowDivider" Margin="0 2.5 0 2.5"/>
         <Button Access="Public" Name="OptionsButton" Text="{Loc 'ui-escape-options'}" />
-        <PanelContainer StyleClasses="LowDivider" Margin="0 2.5 0 2.5" />
+        <controls:Separator StyleClasses="LowDivider" Margin="0 2.5 0 2.5"/>
         <Button Access="Public" Name="DisconnectButton" Text="{Loc 'ui-escape-disconnect'}" StyleClasses="negative OpenLeft" />
         <Button Access="Public" Name="QuitButton" Text="{Loc 'ui-escape-quit'}" StyleClasses="negative OpenRight" />
     </BoxContainer>
diff --git a/Content.Client/Options/UI/EscapeMenu.xaml.cs b/Content.Client/Options/UI/EscapeMenu.xaml.cs
index f88e7edec3..08143fe93c 100644
--- a/Content.Client/Options/UI/EscapeMenu.xaml.cs
+++ b/Content.Client/Options/UI/EscapeMenu.xaml.cs
@@ -1,15 +1,31 @@
+using Content.Shared.CCVar;
 using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Configuration;
 
-namespace Content.Client.Options.UI
+namespace Content.Client.Options.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class EscapeMenu : DefaultWindow
 {
-    [GenerateTypedNameReferences]
-    public sealed partial class EscapeMenu : DefaultWindow
+    public EscapeMenu()
     {
-        public EscapeMenu()
+        RobustXamlLoader.Load(this);
+
+        // TODO: removed with https://github.com/space-wizards/space-station-14/pull/44431
+        var uriOpener = IoCManager.Resolve<IUriOpener>();
+        var cfg = IoCManager.Resolve<IConfigurationManager>();
+
+        var bugReport = cfg.GetCVar(CCVars.InfoLinksBugReport);
+        if (!string.IsNullOrWhiteSpace(bugReport))
         {
-            RobustXamlLoader.Load(this);
+            BugReportButton.OnPressed += _ => uriOpener.OpenUri(bugReport);
+        }
+        else
+        {
+            BugReportButton.Visible = false;
         }
     }
 }
diff --git a/Content.Client/Options/UI/OptionDropDown.xaml.cs b/Content.Client/Options/UI/OptionDropDown.xaml.cs
index 506e241a06..e038053503 100644
--- a/Content.Client/Options/UI/OptionDropDown.xaml.cs
+++ b/Content.Client/Options/UI/OptionDropDown.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 
 namespace Content.Client.Options.UI;
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml b/Content.Client/Options/UI/Tabs/MiscTab.xaml
index 42142efc94..c1733e209d 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml
@@ -18,7 +18,6 @@
                 <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'}" />
-                <CheckBox Name="ChatFollowButton" Text="{Loc 'ui-options-chat-follow-button'}" />
                 <Label Text="{Loc 'ui-options-general-cursor'}"
                        StyleClasses="LabelKeyText"/>
                 <CheckBox Name="ShowHeldItemCheckBox" Text="{Loc 'ui-options-show-held-item'}" />
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
index a8e7256b43..13a542875d 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Client.UserInterface.Screens;
 using Content.Shared.CCVar;
 using Content.Shared.HUD;
@@ -52,7 +52,6 @@ public sealed partial class MiscTab : Control
         Control.AddOptionCheckBox(CCVars.ChatEnableFancyBubbles, FancySpeechBubblesCheckBox);
         Control.AddOptionCheckBox(CCVars.ChatFancyNameBackground, FancyNameBackgroundsCheckBox);
         Control.AddOptionCheckBox(CCVars.StaticStorageUI, StaticStorageUI);
-        Control.AddOptionCheckBox(CCVars.InterfaceChatFollowButton, ChatFollowButton);
 
         Control.Initialize();
     }
diff --git a/Content.Client/Orbit/OrbitVisualsSystem.cs b/Content.Client/Orbit/OrbitVisualsSystem.cs
index d793c4297c..9f8ddfdb9f 100644
--- a/Content.Client/Orbit/OrbitVisualsSystem.cs
+++ b/Content.Client/Orbit/OrbitVisualsSystem.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Shared.Follower.Components;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
diff --git a/Content.Client/Overlays/ImageOverlay.cs b/Content.Client/Overlays/ImageOverlay.cs
new file mode 100644
index 0000000000..18c43739d3
--- /dev/null
+++ b/Content.Client/Overlays/ImageOverlay.cs
@@ -0,0 +1,84 @@
+using System.Numerics;
+using Content.Client.Resources;
+using Content.Shared.Overlays;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Enums;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Overlays;
+
+/// <summary>
+/// Creates overlay image placed over user screen
+/// </summary>
+public sealed partial class ImageOverlay : Overlay
+{
+    [Dependency] private IResourceCache _resourceCache = default!;
+    [Dependency] private IEyeManager _eyeManager = default!;
+
+    /// <inheritdoc/>
+    public override OverlaySpace Space => OverlaySpace.ScreenSpace;
+
+    private readonly List<(ResPath Path, Color Color, Vector2 Scale)> _texturesToDraw = new();
+
+    public ImageOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+    }
+
+    /// <summary>
+    /// updates the list of active overlay textures.
+    /// </summary>
+    public void UpdateState(List<ImageOverlayComponent> components)
+    {
+        _texturesToDraw.Clear();
+        foreach (var comp in components)
+        {
+            if (comp.Active)
+                _texturesToDraw.Add((comp.PathToOverlayImage, comp.AdditionalColorOverlay, comp.Scale));
+        }
+    }
+
+    /// <summary>
+    /// Activates or deactivates the overlay texture.
+    /// </summary>
+    public void SetActive(ImageOverlayComponent comp, bool isActive)
+    {
+        if (comp.Active == isActive) return; // prevents repetitious calls of this method
+        comp.Active = isActive;
+
+        var overlayPair = (comp.PathToOverlayImage, comp.AdditionalColorOverlay, comp.Scale);
+        if (isActive)
+            _texturesToDraw.Add(overlayPair);
+        else
+            _texturesToDraw.Remove(overlayPair);
+    }
+
+    /// <inheritdoc />
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (args.Viewport.Eye != _eyeManager.CurrentEye)
+            return;
+
+        var zoomFactor = _eyeManager.CurrentEye.Zoom.X;
+        var screenRect = args.ViewportBounds;
+
+        foreach (var (path, color, scale) in _texturesToDraw)
+        {
+            var texture = _resourceCache.GetTexture(path);
+            var sc = args.ScreenHandle;
+
+            sc.DrawRect(screenRect, color);
+
+            var regionWidth = texture.Width * (1 / scale.X) * zoomFactor;
+            var regionHeight = texture.Height * (1 / scale.Y) * zoomFactor;
+
+            var left = (texture.Width / 2f) - (regionWidth / 2f);
+            var top = (texture.Height / 2f) - (regionHeight / 2f);
+
+            var subRegion = UIBox2.FromDimensions(left, top, regionWidth, regionHeight);
+
+            sc.DrawTextureRectRegion(texture, screenRect, subRegion);
+        }
+    }
+}
diff --git a/Content.Client/Overlays/ImageOverlaySystem.cs b/Content.Client/Overlays/ImageOverlaySystem.cs
new file mode 100644
index 0000000000..1f1deaf605
--- /dev/null
+++ b/Content.Client/Overlays/ImageOverlaySystem.cs
@@ -0,0 +1,50 @@
+using Content.Shared.Clothing;
+using Content.Shared.Inventory.Events;
+using Content.Shared.Overlays;
+using Robust.Client.Graphics;
+
+namespace Content.Client.Overlays;
+
+/// <summary>
+/// Adds image overlay when wearing item with <see cref="ImageOverlayComponent"/>
+/// </summary>
+public sealed partial class ImageOverlaySystem : EquipmentHudSystem<ImageOverlayComponent>
+{
+    [Dependency] private IOverlayManager _overlayMan = default!;
+
+    private ImageOverlay _overlay = default!;
+
+    /// <inheritdoc />
+    public override void Initialize()
+    {
+        base.Initialize();
+        _overlay = new();
+    }
+
+    [SubscribeLocalEvent]
+    private void OnItemToggled(Entity<ImageOverlayComponent> ent, ref ItemMaskToggledEvent args)
+    {
+        _overlay.SetActive(ent.Comp, !args.Mask.Comp.IsToggled);
+    }
+
+    /// <inheritdoc />
+    protected override void UpdateInternal(RefreshEquipmentHudEvent<ImageOverlayComponent> component)
+    {
+        base.UpdateInternal(component);
+        if (component.Components.Count == 0)
+        {
+            _overlayMan.RemoveOverlay(_overlay);
+            return;
+        }
+
+        _overlayMan.AddOverlay(_overlay);
+        _overlay.UpdateState(component.Components);
+    }
+
+    /// <inheritdoc />
+    protected override void DeactivateInternal()
+    {
+        base.DeactivateInternal();
+        _overlayMan.RemoveOverlay(_overlay);
+    }
+}
diff --git a/Content.Client/PDA/PdaBorderColorComponent.cs b/Content.Client/PDA/PdaBorderColorComponent.cs
index f8e81962e4..2add74e1de 100644
--- a/Content.Client/PDA/PdaBorderColorComponent.cs
+++ b/Content.Client/PDA/PdaBorderColorComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Client.PDA;
+namespace Content.Client.PDA;
 
 /// <summary>
 /// Used for specifying the pda windows border colors
diff --git a/Content.Client/PDA/PdaMenu.xaml.cs b/Content.Client/PDA/PdaMenu.xaml.cs
index caf5e0528e..c144cca7a2 100644
--- a/Content.Client/PDA/PdaMenu.xaml.cs
+++ b/Content.Client/PDA/PdaMenu.xaml.cs
@@ -1,9 +1,9 @@
-using Content.Client.GameTicking.Managers;
 using Content.Shared.PDA;
 using Robust.Shared.Utility;
 using Content.Shared.CartridgeLoader;
 using Content.Client.Message;
 using Content.Shared.AlertLevel;
+using Content.Shared.GameTicking;
 using Robust.Client.UserInterface;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
@@ -20,7 +20,7 @@ namespace Content.Client.PDA
         [Dependency] private IGameTiming _gameTiming = default!;
         [Dependency] private IEntitySystemManager _entitySystem = default!;
         private readonly AlertLevelSystem _alert = default!;
-        private readonly ClientGameTicker _gameTicker;
+        private readonly GameTicker _gameTicker;
 
         public const int HomeView = 0;
         public const int ProgramListView = 1;
@@ -45,7 +45,7 @@ namespace Content.Client.PDA
         {
             IoCManager.InjectDependencies(this);
             _alert = _entitySystem.GetEntitySystem<AlertLevelSystem>();
-            _gameTicker = _entitySystem.GetEntitySystem<ClientGameTicker>();
+            _gameTicker = _entitySystem.GetEntitySystem<GameTicker>();
             RobustXamlLoader.Load(this);
 
             ViewContainer.OnChildAdded += control => control.Visible = false;
diff --git a/Content.Client/PDA/PdaNavigationButton.xaml.cs b/Content.Client/PDA/PdaNavigationButton.xaml.cs
index 2ad72a29f0..077c730aef 100644
--- a/Content.Client/PDA/PdaNavigationButton.xaml.cs
+++ b/Content.Client/PDA/PdaNavigationButton.xaml.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/PDA/PdaProgramItem.xaml.cs b/Content.Client/PDA/PdaProgramItem.xaml.cs
index 64dd300994..7a8737017c 100644
--- a/Content.Client/PDA/PdaProgramItem.xaml.cs
+++ b/Content.Client/PDA/PdaProgramItem.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.CartridgeLoader;
+using Content.Shared.CartridgeLoader;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/PDA/PdaSettingsButton.xaml.cs b/Content.Client/PDA/PdaSettingsButton.xaml.cs
index f460f60200..8de2edde3e 100644
--- a/Content.Client/PDA/PdaSettingsButton.xaml.cs
+++ b/Content.Client/PDA/PdaSettingsButton.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/PDA/PdaWindow.xaml.cs b/Content.Client/PDA/PdaWindow.xaml.cs
index 1c8a24cdb4..2dfad6f4b7 100644
--- a/Content.Client/PDA/PdaWindow.xaml.cs
+++ b/Content.Client/PDA/PdaWindow.xaml.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Parallax/Managers/GeneratedParallaxCache.cs b/Content.Client/Parallax/Managers/GeneratedParallaxCache.cs
index 80e7566af3..6aaa46997c 100644
--- a/Content.Client/Parallax/Managers/GeneratedParallaxCache.cs
+++ b/Content.Client/Parallax/Managers/GeneratedParallaxCache.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Content.Client.Parallax.Data;
diff --git a/Content.Client/Parallax/ParallaxControl.cs b/Content.Client/Parallax/ParallaxControl.cs
index 2b32bc263a..a8fd93cdd3 100644
--- a/Content.Client/Parallax/ParallaxControl.cs
+++ b/Content.Client/Parallax/ParallaxControl.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Client.Parallax.Data;
 using Content.Client.Parallax.Managers;
 using Robust.Client.Graphics;
diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs
index 93306f2fd1..3d48f6192a 100644
--- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs
+++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Singularity.Components;
+using Content.Shared.Singularity.Components;
 using Robust.Client.UserInterface;
 
 namespace Content.Client.ParticleAccelerator.UI
diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml
index d05262f72d..976e86dad8 100644
--- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml
+++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml
@@ -93,7 +93,7 @@
                 </BoxContainer>
             </BoxContainer>
 
-            <PanelContainer StyleClasses="LowDivider" Margin="0 -8" HorizontalAlignment="Right"/>
+            <controls:Separator StyleClasses="LowDivider" Margin="0 -8" HorizontalAlignment="Right" Orientation="Vertical" MinHeight="2"/>
 
             <!-- PA Visual part -->
             <BoxContainer Orientation="Vertical"
diff --git a/Content.Client/Physics/Controllers/ConveyorController.cs b/Content.Client/Physics/Controllers/ConveyorController.cs
index 20304923a4..3492b9b615 100644
--- a/Content.Client/Physics/Controllers/ConveyorController.cs
+++ b/Content.Client/Physics/Controllers/ConveyorController.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Physics.Controllers;
+using Content.Shared.Physics.Controllers;
 
 namespace Content.Client.Physics.Controllers;
 
diff --git a/Content.Client/Pinpointer/UI/StationMapWindow.xaml b/Content.Client/Pinpointer/UI/StationMapWindow.xaml
index cecd7e8479..6698918bdb 100644
--- a/Content.Client/Pinpointer/UI/StationMapWindow.xaml
+++ b/Content.Client/Pinpointer/UI/StationMapWindow.xaml
@@ -29,7 +29,7 @@
 
         <!-- Footer -->
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 0 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'station-map-user-interface-flavor-left'}" StyleClasses="WindowFooterText" />
                 <Label Text="{Loc 'station-map-user-interface-flavor-right'}" StyleClasses="WindowFooterText"
diff --git a/Content.Client/Players/PlayerSystem.cs b/Content.Client/Players/PlayerSystem.cs
index 0b29b1fbbc..ed63a03486 100644
--- a/Content.Client/Players/PlayerSystem.cs
+++ b/Content.Client/Players/PlayerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Players;
+using Content.Shared.Players;
 using Robust.Shared.Player;
 
 namespace Content.Client.Players;
diff --git a/Content.Client/Players/RateLimiting/PlayerRateLimitManager.cs b/Content.Client/Players/RateLimiting/PlayerRateLimitManager.cs
index e79eadd92b..2f41d5e046 100644
--- a/Content.Client/Players/RateLimiting/PlayerRateLimitManager.cs
+++ b/Content.Client/Players/RateLimiting/PlayerRateLimitManager.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Players.RateLimiting;
+using Content.Shared.Players.RateLimiting;
 using Robust.Shared.Player;
 
 namespace Content.Client.Players.RateLimiting;
diff --git a/Content.Client/PneumaticCannon/PneumaticCannonSystem.cs b/Content.Client/PneumaticCannon/PneumaticCannonSystem.cs
index 907196b431..afc92172b3 100644
--- a/Content.Client/PneumaticCannon/PneumaticCannonSystem.cs
+++ b/Content.Client/PneumaticCannon/PneumaticCannonSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.PneumaticCannon;
+using Content.Shared.PneumaticCannon;
 
 namespace Content.Client.PneumaticCannon;
 
diff --git a/Content.Client/Pointing/Components/RoguePointingArrowComponent.cs b/Content.Client/Pointing/Components/RoguePointingArrowComponent.cs
index 2d1a101d9f..e88e1d83d9 100644
--- a/Content.Client/Pointing/Components/RoguePointingArrowComponent.cs
+++ b/Content.Client/Pointing/Components/RoguePointingArrowComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Pointing.Components;
+using Content.Shared.Pointing.Components;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Client/Points/PointSystem.cs b/Content.Client/Points/PointSystem.cs
index 0a59efa29c..8616e6859c 100644
--- a/Content.Client/Points/PointSystem.cs
+++ b/Content.Client/Points/PointSystem.cs
@@ -1,4 +1,4 @@
-using Content.Client.CharacterInfo;
+using Content.Client.CharacterInfo;
 using Content.Client.Message;
 using Content.Shared.Points;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs
index 11d5b02a5c..74ea178d38 100644
--- a/Content.Client/Popups/PopupSystem.cs
+++ b/Content.Client/Popups/PopupSystem.cs
@@ -82,7 +82,7 @@ public sealed partial class PopupSystem : SharedPopupSystem
     /// </summary>
     private void PopupInternal(string? message, PopupType type, EntityCoordinates coordinates, EntityUid? entity, bool recordReplay)
     {
-        if (message == null)
+        if (string.IsNullOrWhiteSpace(message))
             return;
 
         if (recordReplay && _replayRecording.IsRecording)
@@ -114,7 +114,7 @@ public sealed partial class PopupSystem : SharedPopupSystem
     /// </summary>
     private void PopupCursorInternal(string? message, PopupType type, bool recordReplay)
     {
-        if (message == null)
+        if (string.IsNullOrWhiteSpace(message))
             return;
 
         if (recordReplay && _replayRecording.IsRecording)
@@ -149,7 +149,7 @@ public sealed partial class PopupSystem : SharedPopupSystem
     /// <param name="type">Used to customize how this popup should appear visually.</param>
     public void PopupCursor(string? message, PopupType type = PopupType.Small)
     {
-        if (!Timing.IsFirstTimePredicted || message is null)
+        if (!Timing.IsFirstTimePredicted || string.IsNullOrWhiteSpace(message))
             return;
 
         _predictionInstances.Add(new PopupCursorEvent.PredictionInstance(message, type, Timing.CurTick));
@@ -176,7 +176,7 @@ public sealed partial class PopupSystem : SharedPopupSystem
 
     public override void PopupCoordinates(string? message, EntityCoordinates coordinates, PopupType type = PopupType.Small, int predictionKey = 0)
     {
-        if (!Timing.IsFirstTimePredicted || message is null)
+        if (!Timing.IsFirstTimePredicted || string.IsNullOrWhiteSpace(message))
             return;
 
         _predictionInstances.Add(new PopupCoordinatesEvent.PredictionInstance(message, type, Timing.CurTick, predictionKey));
@@ -203,7 +203,7 @@ public sealed partial class PopupSystem : SharedPopupSystem
 
     public override void PopupEntity(string? message, EntityUid uid, PopupType type = PopupType.Small)
     {
-        if (!Timing.IsFirstTimePredicted || message is null)
+        if (!Timing.IsFirstTimePredicted || string.IsNullOrWhiteSpace(message))
             return;
 
         if (!TryComp(uid, out TransformComponent? transform))
diff --git a/Content.Client/Power/APC/UI/ApcMenu.xaml b/Content.Client/Power/APC/UI/ApcMenu.xaml
index 24b1371f36..68d708df73 100644
--- a/Content.Client/Power/APC/UI/ApcMenu.xaml
+++ b/Content.Client/Power/APC/UI/ApcMenu.xaml
@@ -43,7 +43,7 @@
 
         <!-- Footer -->
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'apc-menu-flavor-left'}" StyleClasses="WindowFooterText" />
                 <Label Text="{Loc 'apc-menu-flavor-right'}" StyleClasses="WindowFooterText"
diff --git a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
index df45853bfb..35b51f10c7 100644
--- a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
+++ b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 using Robust.Client.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Client/Power/Battery/BatteryBoundUserInterface.cs b/Content.Client/Power/Battery/BatteryBoundUserInterface.cs
index 09b1f2ca16..5f765ae1c5 100644
--- a/Content.Client/Power/Battery/BatteryBoundUserInterface.cs
+++ b/Content.Client/Power/Battery/BatteryBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface;
+using Content.Client.UserInterface;
 using Content.Shared.Power;
 using JetBrains.Annotations;
 using Robust.Client.Timing;
diff --git a/Content.Client/Power/Battery/BatteryMenu.xaml b/Content.Client/Power/Battery/BatteryMenu.xaml
index 3602126cd4..7095e87d07 100644
--- a/Content.Client/Power/Battery/BatteryMenu.xaml
+++ b/Content.Client/Power/Battery/BatteryMenu.xaml
@@ -1,7 +1,6 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                       SetSize="650 330"
                       Resizable="False">
     <BoxContainer Orientation="Vertical">
@@ -133,7 +132,7 @@
 
         <!-- Footer -->
         <BoxContainer Name="Footer" Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'battery-menu-footer-left'}" StyleClasses="WindowFooterText" />
                 <Label Text="{Loc 'battery-menu-footer-right'}" StyleClasses="WindowFooterText"
diff --git a/Content.Client/Power/Battery/BatteryMenu.xaml.cs b/Content.Client/Power/Battery/BatteryMenu.xaml.cs
index 523aa901ae..b82adac7f6 100644
--- a/Content.Client/Power/Battery/BatteryMenu.xaml.cs
+++ b/Content.Client/Power/Battery/BatteryMenu.xaml.cs
@@ -1,5 +1,5 @@
-using System.Diagnostics.CodeAnalysis;
-using Content.Client.Stylesheets;
+using System.Diagnostics.CodeAnalysis;
+using Content.Client.Stylesheets.Palette;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Power;
 using Content.Shared.Rounding;
@@ -29,10 +29,10 @@ public sealed partial class BatteryMenu : FancyWindow
     // Colors used for the storage cell bar graphic.
     private static readonly Color[] StorageColors =
     [
-        StyleNano.DangerousRedFore,
+        Palettes.Status.Critical,
         Color.FromHex("#C49438"),
         Color.FromHex("#B3BF28"),
-        StyleNano.GoodGreenFore,
+        Palettes.Status.Good
     ];
 
     // StorageColors but dimmed for "off" bars.
diff --git a/Content.Client/Power/Components/ApcPowerReceiverComponent.cs b/Content.Client/Power/Components/ApcPowerReceiverComponent.cs
index 7a02ce7536..a37a0f948e 100644
--- a/Content.Client/Power/Components/ApcPowerReceiverComponent.cs
+++ b/Content.Client/Power/Components/ApcPowerReceiverComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Power.Components;
+using Content.Shared.Power.Components;
 
 namespace Content.Client.Power.Components;
 
diff --git a/Content.Client/Power/Generator/GeneratorWindow.xaml b/Content.Client/Power/Generator/GeneratorWindow.xaml
index f59e07a131..6a690d5a0b 100644
--- a/Content.Client/Power/Generator/GeneratorWindow.xaml
+++ b/Content.Client/Power/Generator/GeneratorWindow.xaml
@@ -1,5 +1,4 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
-                xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                 MinSize="450 250"
                 SetSize="450 250"
@@ -40,7 +39,7 @@
             </GridContainer>
             <Label Margin="2 0 0 0" Name="CloggedLabel" FontColorOverride="Red" Text="{Loc 'portable-generator-ui-clogged'}" />
         </BoxContainer>
-        <cc:VSeparator StyleClasses="LowDivider"/>
+        <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
         <PanelContainer Margin="12 0 0 0" StyleClasses="BackgroundPanelDark" VerticalAlignment="Center">
             <SpriteView Name="EntityView" SetSize="64 64" Scale="2 2" OverrideDirection="South" Margin="15"/>
         </PanelContainer>
diff --git a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs
index b33615ee0e..d77f3bf7de 100644
--- a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs
+++ b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.DoAfter;
+using Content.Client.DoAfter;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Power.Generator;
 using Robust.Client.AutoGenerated;
diff --git a/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs b/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs
index 9fa3b0c68f..51404f8f71 100644
--- a/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs
+++ b/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Power.Generator;
+using Content.Shared.Power.Generator;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Power/PowerCharge/PowerChargeBoundUserInterface.cs b/Content.Client/Power/PowerCharge/PowerChargeBoundUserInterface.cs
index 7a36b8ddf5..ada6e1a16f 100644
--- a/Content.Client/Power/PowerCharge/PowerChargeBoundUserInterface.cs
+++ b/Content.Client/Power/PowerCharge/PowerChargeBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Power;
+using Content.Shared.Power;
 using Robust.Client.UserInterface;
 
 namespace Content.Client.Power.PowerCharge;
diff --git a/Content.Client/Power/PowerCharge/PowerChargeComponent.cs b/Content.Client/Power/PowerCharge/PowerChargeComponent.cs
index ab5baa4e2f..0b397e8fd7 100644
--- a/Content.Client/Power/PowerCharge/PowerChargeComponent.cs
+++ b/Content.Client/Power/PowerCharge/PowerChargeComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Power;
+using Content.Shared.Power;
 
 namespace Content.Client.Power.PowerCharge;
 
diff --git a/Content.Client/Power/PowerCharge/PowerChargeWindow.xaml.cs b/Content.Client/Power/PowerCharge/PowerChargeWindow.xaml.cs
index 5423910b7a..14f23bd8e8 100644
--- a/Content.Client/Power/PowerCharge/PowerChargeWindow.xaml.cs
+++ b/Content.Client/Power/PowerCharge/PowerChargeWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets.Palette;
+using Content.Client.Stylesheets.Palette;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Power;
 using Robust.Client.AutoGenerated;
diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml b/Content.Client/Power/PowerMonitoringWindow.xaml
index 494e3d16f6..8beb2c112a 100644
--- a/Content.Client/Power/PowerMonitoringWindow.xaml
+++ b/Content.Client/Power/PowerMonitoringWindow.xaml
@@ -1,7 +1,6 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                xmlns:ui="clr-namespace:Content.Client.Power"
                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-               xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                Title="{Loc 'power-monitoring-window-title'}"
                Resizable="False"
                SetSize="1120 750"
@@ -105,7 +104,7 @@
 
         <!-- Footer -->
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'power-monitoring-window-flavor-left'}" StyleClasses="WindowFooterText" />
                 <Label Text="{Loc 'power-monitoring-window-flavor-right'}" StyleClasses="WindowFooterText"
diff --git a/Content.Client/Power/SMES/SmesSystem.cs b/Content.Client/Power/SMES/SmesSystem.cs
index 66fcf4e06e..0b28e17007 100644
--- a/Content.Client/Power/SMES/SmesSystem.cs
+++ b/Content.Client/Power/SMES/SmesSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Power;
+using Content.Shared.Power;
 using Content.Shared.SMES;
 using Robust.Client.GameObjects;
 
diff --git a/Content.Client/RCD/RCDMenuBoundUserInterface.cs b/Content.Client/RCD/RCDMenuBoundUserInterface.cs
index 8b0ddf7fcb..b0f6a48719 100644
--- a/Content.Client/RCD/RCDMenuBoundUserInterface.cs
+++ b/Content.Client/RCD/RCDMenuBoundUserInterface.cs
@@ -22,14 +22,14 @@ public sealed partial class RCDMenuBoundUserInterface : BoundUserInterface
 
     private const string TopLevelActionCategory = "Main";
 
-    private static readonly Dictionary<string, (string Tooltip, SpriteSpecifier Sprite)> PrototypesGroupingInfo
+    private static readonly Dictionary<string, (string Tooltip, int Order, SpriteSpecifier Sprite)> PrototypesGroupingInfo
         = new()
         {
-            ["WallsAndFlooring"] = ("rcd-component-walls-and-flooring", new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Radial/RCD/walls_and_flooring.png"))),
-            ["WindowsAndGrilles"] = ("rcd-component-windows-and-grilles", new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Radial/RCD/windows_and_grilles.png"))),
-            ["Airlocks"] = ("rcd-component-airlocks", new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Radial/RCD/airlocks.png"))),
-            ["Electrical"] = ("rcd-component-electrical", new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Radial/RCD/multicoil.png"))),
-            ["Lighting"] = ("rcd-component-lighting", new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Radial/RCD/lighting.png"))),
+            ["WallsAndFlooring"] = ("rcd-component-walls-and-flooring", 0, new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Radial/RCD/walls_and_flooring.png"))),
+            ["WindowsAndGrilles"] = ("rcd-component-windows-and-grilles", 1, new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Radial/RCD/windows_and_grilles.png"))),
+            ["Airlocks"] = ("rcd-component-airlocks", 2, new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Radial/RCD/airlocks.png"))),
+            ["Electrical"] = ("rcd-component-electrical", 3, new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Radial/RCD/multicoil.png"))),
+            ["Lighting"] = ("rcd-component-lighting", 4, new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Radial/RCD/lighting.png"))),
         };
 
     private SimpleRadialMenu? _menu;
@@ -65,7 +65,8 @@ public sealed partial class RCDMenuBoundUserInterface : BoundUserInterface
                 var topLevelActionOption = new RadialMenuActionOption<RCDPrototype>(HandleMenuOptionClick, prototype)
                 {
                     IconSpecifier = RadialMenuIconSpecifier.With(prototype.Sprite),
-                    ToolTip = GetTooltip(prototype)
+                    ToolTip = GetTooltip(prototype),
+                    Order = prototype.MenuOrder,
                 };
                 topLevelActions.Add(topLevelActionOption);
                 continue;
@@ -83,7 +84,8 @@ public sealed partial class RCDMenuBoundUserInterface : BoundUserInterface
             var actionOption = new RadialMenuActionOption<RCDPrototype>(HandleMenuOptionClick, prototype)
             {
                 IconSpecifier = RadialMenuIconSpecifier.With(prototype.Sprite),
-                ToolTip = GetTooltip(prototype)
+                ToolTip = GetTooltip(prototype),
+                Order = prototype.MenuOrder,
             };
             list.Add(actionOption);
         }
@@ -96,7 +98,8 @@ public sealed partial class RCDMenuBoundUserInterface : BoundUserInterface
             models[i] = new RadialMenuNestedLayerOption(list)
             {
                 IconSpecifier = RadialMenuIconSpecifier.With(groupInfo.Sprite),
-                ToolTip = Loc.GetString(groupInfo.Tooltip)
+                ToolTip = Loc.GetString(groupInfo.Tooltip),
+                Order = groupInfo.Order,
             };
             i++;
         }
diff --git a/Content.Client/Radio/Ui/IntercomMenu.xaml b/Content.Client/Radio/Ui/IntercomMenu.xaml
index aed4fc754e..304bb8c4bb 100644
--- a/Content.Client/Radio/Ui/IntercomMenu.xaml
+++ b/Content.Client/Radio/Ui/IntercomMenu.xaml
@@ -1,4 +1,4 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                      Title="{Loc 'intercom-menu-title'}"
                      MinSize="300 170"
@@ -19,7 +19,7 @@
             <Button Name="SpeakerButton" ToggleMode="True" Text="{Loc 'intercom-button-text-speaker'}" StyleClasses="OpenLeft" MinWidth="70"/>
         </BoxContainer>
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'intercom-flavor-text-left'}" StyleClasses="WindowFooterText"
                        HorizontalAlignment="Left" HorizontalExpand="True"  Margin="0 0 5 0" />
diff --git a/Content.Client/RatKing/RatKingSystem.cs b/Content.Client/RatKing/RatKingSystem.cs
index 31b02fd5c3..1a5e812dfb 100644
--- a/Content.Client/RatKing/RatKingSystem.cs
+++ b/Content.Client/RatKing/RatKingSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.RatKing;
+using Content.Shared.RatKing;
 
 namespace Content.Client.RatKing;
 
diff --git a/Content.Client/Remotes/UI/DoorRemoteBoundUserInterface.cs b/Content.Client/Remotes/UI/DoorRemoteBoundUserInterface.cs
index d2ed89c100..3c19858745 100644
--- a/Content.Client/Remotes/UI/DoorRemoteBoundUserInterface.cs
+++ b/Content.Client/Remotes/UI/DoorRemoteBoundUserInterface.cs
@@ -47,7 +47,8 @@ public sealed class DoorRemoteBoundUserInterface(EntityUid owner, Enum uiKey) :
                 IconSpecifier = RadialMenuIconSpecifier.With(modeOption.Icon),
                 ToolTip = Loc.GetString(modeOption.Tooltip),
                 BackgroundColor = optionCustomColor,
-                HoverBackgroundColor = optionHoverCustomColor
+                HoverBackgroundColor = optionHoverCustomColor,
+                Order = i
             };
             options.Add(option);
         }
diff --git a/Content.Client/Replay/ReplayToggleScreenshotModeCommand.cs b/Content.Client/Replay/ReplayToggleScreenshotModeCommand.cs
index 19c591dd62..b6711eae9b 100644
--- a/Content.Client/Replay/ReplayToggleScreenshotModeCommand.cs
+++ b/Content.Client/Replay/ReplayToggleScreenshotModeCommand.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Systems.Chat;
+using Content.Client.UserInterface.Systems.Chat;
 using Content.Shared.Chat;
 using Robust.Client.Replays.Commands;
 using Robust.Client.Replays.UI;
diff --git a/Content.Client/Replay/UI/Loading/ReplayLoadingFailed.cs b/Content.Client/Replay/UI/Loading/ReplayLoadingFailed.cs
index 8180647e3c..e00307036c 100644
--- a/Content.Client/Replay/UI/Loading/ReplayLoadingFailed.cs
+++ b/Content.Client/Replay/UI/Loading/ReplayLoadingFailed.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets;
 using Robust.Client.State;
 using Robust.Client.UserInterface;
 using Robust.Shared.Utility;
diff --git a/Content.Client/Replay/UI/Loading/ReplayLoadingFailedControl.xaml.cs b/Content.Client/Replay/UI/Loading/ReplayLoadingFailedControl.xaml.cs
index 088c9a291a..65f2db8241 100644
--- a/Content.Client/Replay/UI/Loading/ReplayLoadingFailedControl.xaml.cs
+++ b/Content.Client/Replay/UI/Loading/ReplayLoadingFailedControl.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -14,7 +14,7 @@ public sealed partial class ReplayLoadingFailedControl : Control
     {
         RobustXamlLoader.Load(this);
 
-        Stylesheet = stylesheet.SheetSpace;
+        Stylesheet = stylesheet.SheetSystem;
         LayoutContainer.SetAnchorPreset(this, LayoutContainer.LayoutPreset.Wide);
     }
 
diff --git a/Content.Client/Research/ResearchSystem.cs b/Content.Client/Research/ResearchSystem.cs
index 46801bf5e0..7a8f31c424 100644
--- a/Content.Client/Research/ResearchSystem.cs
+++ b/Content.Client/Research/ResearchSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Research.Systems;
+using Content.Shared.Research.Systems;
 
 namespace Content.Client.Research;
 
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml b/Content.Client/Research/UI/ResearchConsoleMenu.xaml
index 35df11287e..a865b32f52 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml
@@ -1,6 +1,5 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                      xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
                       Title="{Loc 'research-console-menu-title'}"
                       MinSize="625 400"
                       SetSize="760 550"> <!-- Corvax-Localization -->
@@ -33,7 +32,7 @@
                           Margin="10 0 10 10"
                           MinWidth="175">
                 <Label Text="{Loc 'research-console-available-text'}" HorizontalAlignment="Center"/>
-                <customControls:HSeparator StyleClasses="LowDivider" Margin="0 0 0 10"/>
+                <controls:Separator StyleClasses="LowDivider" Margin="0 0 0 10"/>
                 <PanelContainer VerticalExpand="True" StyleClasses="PanelDeep">
                     <ScrollContainer
                         HScrollEnabled="False"
@@ -48,7 +47,7 @@
                 </PanelContainer>
                 <Control MinHeight="10"/>
                 <Label Text="{Loc 'research-console-unlocked-text'}" HorizontalAlignment="Center"/>
-                <customControls:HSeparator StyleClasses="LowDivider" Margin="0 0 0 10"/>
+                <controls:Separator StyleClasses="LowDivider" Margin="0 0 0 10"/>
                 <PanelContainer VerticalExpand="True" StyleClasses="PanelDeep">
                     <ScrollContainer
                         HScrollEnabled="False"
diff --git a/Content.Client/Research/UI/TechnologyCardControl.xaml b/Content.Client/Research/UI/TechnologyCardControl.xaml
index f04036081d..b0567e7e09 100644
--- a/Content.Client/Research/UI/TechnologyCardControl.xaml
+++ b/Content.Client/Research/UI/TechnologyCardControl.xaml
@@ -1,5 +1,5 @@
-<Control xmlns="https://spacestation14.io"
-         xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls">
+<Control xmlns="https://spacestation14.io"
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <BoxContainer Name="MainContainer" Orientation="Vertical" Margin="10 0 10 10">
         <PanelContainer Name="Background"
                         Access="Public"
@@ -27,7 +27,7 @@
                             <Label Name="TechnologyNameLabel" StyleClasses="LabelKeyText" HorizontalExpand="True"/>
                             <TextureRect Name="DisciplineTexture" TextureScale="2 2" VerticalAlignment="Top" HorizontalAlignment="Right"/>
                         </BoxContainer>
-                        <customControls:HSeparator StyleClasses="LowDivider" Margin="0 5 0 5"/>
+                        <controls:Separator StyleClasses="LowDivider" Margin="0 5 0 5"/>
                         <BoxContainer Orientation="Horizontal">
                             <RichTextLabel Name="TierLabel" HorizontalAlignment="Left" StyleClasses="LabelSubText" HorizontalExpand="True"/>
                             <Button Name="ResearchButton" Text="{Loc 'research-console-menu-server-research-button'}"/>
diff --git a/Content.Client/Research/UI/TechnologyCardControl.xaml.cs b/Content.Client/Research/UI/TechnologyCardControl.xaml.cs
index 292ed0ebe0..21f03d8ee4 100644
--- a/Content.Client/Research/UI/TechnologyCardControl.xaml.cs
+++ b/Content.Client/Research/UI/TechnologyCardControl.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Research.Prototypes;
+using Content.Shared.Research.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Revenant/CorporealSystem.cs b/Content.Client/Revenant/CorporealSystem.cs
index f22e1b61d0..b385310a29 100644
--- a/Content.Client/Revenant/CorporealSystem.cs
+++ b/Content.Client/Revenant/CorporealSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Revenant.EntitySystems;
+using Content.Shared.Revenant.EntitySystems;
 
 namespace Content.Client.Revenant;
 
diff --git a/Content.Client/Revenant/RevenantOverloadedLightsSystem.cs b/Content.Client/Revenant/RevenantOverloadedLightsSystem.cs
index 4716f3f9e8..7801894d1a 100644
--- a/Content.Client/Revenant/RevenantOverloadedLightsSystem.cs
+++ b/Content.Client/Revenant/RevenantOverloadedLightsSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Revenant.Components;
+using Content.Shared.Revenant.Components;
 using Content.Shared.Revenant.EntitySystems;
 using Robust.Client.GameObjects;
 
diff --git a/Content.Client/Revolutionary/UI/DeconvertedEui.cs b/Content.Client/Revolutionary/UI/DeconvertedEui.cs
index 33495f8a97..1cef39607e 100644
--- a/Content.Client/Revolutionary/UI/DeconvertedEui.cs
+++ b/Content.Client/Revolutionary/UI/DeconvertedEui.cs
@@ -1,4 +1,4 @@
-using Content.Client.Eui;
+using Content.Client.Eui;
 
 namespace Content.Client.Revolutionary.UI;
 
diff --git a/Content.Client/RichText/UserFormattableTags.cs b/Content.Client/RichText/UserFormattableTags.cs
index 302394c384..4e7472e701 100644
--- a/Content.Client/RichText/UserFormattableTags.cs
+++ b/Content.Client/RichText/UserFormattableTags.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.RichText;
+using Content.Client.UserInterface.RichText;
 using Robust.Client.UserInterface.RichText;
 
 namespace Content.Client.RichText;
diff --git a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml
index a3b3978790..1f45f26ebf 100644
--- a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml
+++ b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml
@@ -1,4 +1,4 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                      Title="{Loc 'robotics-console-window-title'}"
                      MinSize="600 450">
@@ -12,7 +12,7 @@
             </ScrollContainer>
         </BoxContainer>
 
-        <PanelContainer StyleClasses="LowDivider" Margin="0 5 0 5"/>
+        <controls:Separator StyleClasses="LowDivider" Margin="0 5 0 5"/>
 
         <!-- Selected borg info -->
         <Label Name="SelectCyborg" Text="{Loc 'robotics-console-select-cyborg'}" HorizontalAlignment="Center"/>
diff --git a/Content.Client/Roles/RoleSystem.cs b/Content.Client/Roles/RoleSystem.cs
index 4417eff4bc..39534a5b21 100644
--- a/Content.Client/Roles/RoleSystem.cs
+++ b/Content.Client/Roles/RoleSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Roles;
+using Content.Shared.Roles;
 
 namespace Content.Client.Roles;
 
diff --git a/Content.Client/RoundEnd/RoundEndSummaryUIController.cs b/Content.Client/RoundEnd/RoundEndSummaryUIController.cs
index 0e8f5c5017..3ef81afaf5 100644
--- a/Content.Client/RoundEnd/RoundEndSummaryUIController.cs
+++ b/Content.Client/RoundEnd/RoundEndSummaryUIController.cs
@@ -1,4 +1,4 @@
-using Content.Client.GameTicking.Managers;
+using Content.Client.GameTicking;
 using Content.Shared.GameTicking;
 using Content.Shared.Input;
 using JetBrains.Annotations;
diff --git a/Content.Client/SSDIndicator/SSDIndicatorSystem.cs b/Content.Client/SSDIndicator/SSDIndicatorSystem.cs
index 7e7c73f43c..bfe4d41361 100644
--- a/Content.Client/SSDIndicator/SSDIndicatorSystem.cs
+++ b/Content.Client/SSDIndicator/SSDIndicatorSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.CCVar;
+using Content.Shared.CCVar;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.NPC;
diff --git a/Content.Client/Salvage/UI/JobEntry.xaml b/Content.Client/Salvage/UI/JobEntry.xaml
index bad88f89b7..764178be91 100644
--- a/Content.Client/Salvage/UI/JobEntry.xaml
+++ b/Content.Client/Salvage/UI/JobEntry.xaml
@@ -1,5 +1,5 @@
-<BoxContainer xmlns="https://spacestation14.io"
-              xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+<BoxContainer xmlns="https://spacestation14.io"
+              xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
               Margin="10 10 10 0"
               HorizontalExpand="True"
               Visible="True">
@@ -7,7 +7,7 @@
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <BoxContainer HorizontalExpand="True" Orientation="Vertical" MaxWidth="380">
                 <RichTextLabel Name="NameLabel" StyleClasses="LabelKeyText"/>
-                <customControls:HSeparator Margin="0 0 0 5"/>
+                <controls:Separator StyleClasses="LowDivider" Margin="0 0 0 5"/>
                 <RichTextLabel Name="DescriptionLabel" HorizontalExpand="True"/>
                 <Control MinHeight="10"/>
                 <RichTextLabel Name="ManifestLabel"/>
diff --git a/Content.Client/Salvage/UI/OfferingWindow.xaml b/Content.Client/Salvage/UI/OfferingWindow.xaml
index 63b41aa652..8fde6bbf3e 100644
--- a/Content.Client/Salvage/UI/OfferingWindow.xaml
+++ b/Content.Client/Salvage/UI/OfferingWindow.xaml
@@ -28,7 +28,7 @@
             <Label Name="NextOfferText" Text="0.00"
                    Margin="5"/>
         </BoxContainer>
-        <controls:HLine Color="#404040" Thickness="2" Margin="0 5 0 5"/>
+        <controls:Separator ColorOverride="#404040" Margin="0 5 0 5"/>
         <BoxContainer Name="Container"
                       Orientation="Horizontal"
                       Margin="5 0 5 0"/>
diff --git a/Content.Client/Salvage/UI/SalvageJobBoardMenu.xaml b/Content.Client/Salvage/UI/SalvageJobBoardMenu.xaml
index 66295b65b6..827cecd2f3 100644
--- a/Content.Client/Salvage/UI/SalvageJobBoardMenu.xaml
+++ b/Content.Client/Salvage/UI/SalvageJobBoardMenu.xaml
@@ -1,4 +1,4 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
                       xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                       Title="{Loc 'job-board-ui-window-title'}"
@@ -30,7 +30,7 @@
         </PanelContainer>
         <!-- Footer -->
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'bounty-console-flavor-right'}" StyleClasses="WindowFooterText"
                        HorizontalAlignment="Right" HorizontalExpand="True"  Margin="0 0 5 0" />
diff --git a/Content.Client/Security/Ui/GenpopLockerMenu.xaml.cs b/Content.Client/Security/Ui/GenpopLockerMenu.xaml.cs
index 138c4c822b..db29a0ed5d 100644
--- a/Content.Client/Security/Ui/GenpopLockerMenu.xaml.cs
+++ b/Content.Client/Security/Ui/GenpopLockerMenu.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.Message;
+using Content.Client.Message;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Access.Components;
 using Content.Shared.CCVar;
diff --git a/Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs b/Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs
index 16115ba507..165b5c2d3a 100644
--- a/Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs
+++ b/Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Numerics;
 using Content.Client.Computer;
 using Content.Client.Stylesheets;
@@ -169,7 +169,7 @@ public sealed partial class SensorMonitoringWindow : FancyWindow, IComputerWindo
                 });
 
                 Asdf.AddChild(new GraphView(stream.Samples, startTime, curTime, maxValue * 1.1f, this) { MinHeight = 150 });
-                Asdf.AddChild(new PanelContainer { StyleClasses = { StyleClass.LowDivider } });
+                Asdf.AddChild(new Separator { StyleClasses = { StyleClass.LowDivider } });
             }
         }
     }
diff --git a/Content.Client/Shuttles/ClientArrivalsSystem.cs b/Content.Client/Shuttles/ClientArrivalsSystem.cs
new file mode 100644
index 0000000000..28a2ce1825
--- /dev/null
+++ b/Content.Client/Shuttles/ClientArrivalsSystem.cs
@@ -0,0 +1,6 @@
+using Content.Shared.Shuttles.Systems;
+
+namespace Content.Client.Shuttles;
+
+/// <inheritdoc/>
+public sealed partial class ClientArrivalsSystem : ArrivalsSystem;
diff --git a/Content.Client/Silicons/Borgs/BorgMenu.xaml b/Content.Client/Silicons/Borgs/BorgMenu.xaml
index f3a145eecc..dd1efb776d 100644
--- a/Content.Client/Silicons/Borgs/BorgMenu.xaml
+++ b/Content.Client/Silicons/Borgs/BorgMenu.xaml
@@ -1,6 +1,5 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                      xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
                       Title="{Loc 'borg-ui-menu-title'}"
                       MinSize="600 350"
                       SetSize="650 450">
@@ -15,13 +14,13 @@
                 <Control MinWidth="5"/>
                 <Button Name="EjectBatteryButton" Text="{Loc 'borg-ui-remove-battery'}" StyleClasses="OpenLeft"/>
             </BoxContainer>
-            <customControls:HSeparator Margin="0 10 0 10"/>
+            <controls:Separator StyleClasses="LowDivider" Margin="0 10 0 10"/>
             <PanelContainer VerticalExpand="True" StyleClasses="PanelDeep">
                 <BoxContainer HorizontalAlignment="Center" VerticalAlignment="Center">
                     <SpriteView Name="BorgSprite" Scale="5 5"/>
                 </BoxContainer>
             </PanelContainer>
-            <customControls:HSeparator Margin="0 10 0 10"/>
+            <controls:Separator StyleClasses="LowDivider" Margin="0 10 0 10"/>
             <BoxContainer Orientation="Horizontal">
                 <LineEdit Name="NameLineEdit" HorizontalExpand="True"/>
                 <Label Name="NameIdentifierLabel" Margin="10 0 0 0"/>
@@ -31,7 +30,7 @@
                 <SpriteView Name="BrainView" HorizontalAlignment="Left" VerticalAlignment="Center"/>
             </Button>
         </BoxContainer>
-        <customControls:VSeparator/>
+        <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
         <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True" Margin="15 10 15 15">
             <Label Text="{Loc 'borg-ui-modules-label'}" Margin="0 0 0 5"/>
             <PanelContainer VerticalExpand="True" StyleClasses="PanelDeep">
diff --git a/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml b/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml
index f51c2f53fd..2a30042d4d 100644
--- a/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml
+++ b/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml
@@ -1,6 +1,5 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                      xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
                       Title="{Loc 'borg-select-type-menu-title'}"
                       SetSize="550 300">
     <BoxContainer Orientation="Vertical">
@@ -13,7 +12,7 @@
                 </ScrollContainer>
             </BoxContainer>
 
-            <customControls:VSeparator />
+            <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
 
             <!-- Right pane: information about selected borg module, confirm button. -->
             <BoxContainer Orientation="Vertical" HorizontalExpand="True" Margin="2 0">
diff --git a/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs b/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs
index 6336321716..e1ff5b9fa5 100644
--- a/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs
+++ b/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Systems.Guidebook;
 using Content.Shared.Guidebook;
diff --git a/Content.Client/Silicons/Borgs/BorgSelectTypeUserInterface.cs b/Content.Client/Silicons/Borgs/BorgSelectTypeUserInterface.cs
index 69a55dd38b..bbccb5460e 100644
--- a/Content.Client/Silicons/Borgs/BorgSelectTypeUserInterface.cs
+++ b/Content.Client/Silicons/Borgs/BorgSelectTypeUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Silicons.Borgs.Components;
+using Content.Shared.Silicons.Borgs.Components;
 using JetBrains.Annotations;
 using Robust.Client.UserInterface;
 
diff --git a/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs b/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs
index 00f19bc091..2e071f91ad 100644
--- a/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs
+++ b/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Components;
 using Content.Shared.Silicons.Borgs;
 using Content.Shared.Silicons.Borgs.Components;
 using Robust.Client.GameObjects;
diff --git a/Content.Client/Silicons/Borgs/BorgSystem.Battery.cs b/Content.Client/Silicons/Borgs/BorgSystem.Battery.cs
index 6b946f9cf8..a50a47a212 100644
--- a/Content.Client/Silicons/Borgs/BorgSystem.Battery.cs
+++ b/Content.Client/Silicons/Borgs/BorgSystem.Battery.cs
@@ -1,4 +1,4 @@
-using Content.Shared.PowerCell.Components;
+using Content.Shared.PowerCell.Components;
 using Content.Shared.Silicons.Borgs.Components;
 using Robust.Shared.Player;
 
diff --git a/Content.Client/Silicons/Borgs/BorgSystem.cs b/Content.Client/Silicons/Borgs/BorgSystem.cs
index 647e4d3ec7..c1dcb38b27 100644
--- a/Content.Client/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Client/Silicons/Borgs/BorgSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Alert;
+using Content.Shared.Alert;
 using Content.Shared.Mobs;
 using Content.Shared.Power.EntitySystems;
 using Content.Shared.PowerCell;
@@ -104,6 +104,9 @@ public sealed partial class BorgSystem : SharedBorgSystem
         if (!_appearance.TryGetData(uid, MMIVisuals.HasMind, out bool hasMind))
             hasMind = false;
 
+        var lightColor = Color.White;
+        var lightVisible = false;
+
         _sprite.LayerSetVisible((uid, sprite), MMIVisualLayers.Brain, brain);
         if (!brain)
         {
@@ -115,6 +118,18 @@ public sealed partial class BorgSystem : SharedBorgSystem
                 ? component.HasMindState
                 : component.NoMindState;
             _sprite.LayerSetRsiState((uid, sprite), MMIVisualLayers.Base, state);
+
+            lightColor = hasMind
+                ? component.HasMindLightColor
+                : component.NoMindLightColor;
+            lightVisible = true;
+        }
+
+        // Update color if it exists.
+        if (_sprite.LayerMapTryGet((uid, sprite), MMIVisualLayers.Unlit, out var layerIndex, logMissing: false))
+        {
+            _sprite.LayerSetVisible((uid, sprite), layerIndex, lightVisible);
+            _sprite.LayerSetColor((uid, sprite), layerIndex, lightColor);
         }
     }
 
diff --git a/Content.Client/Silicons/Bots/HugBotSystem.cs b/Content.Client/Silicons/Bots/HugBotSystem.cs
index b40fe51974..6bd4caf9ff 100644
--- a/Content.Client/Silicons/Bots/HugBotSystem.cs
+++ b/Content.Client/Silicons/Bots/HugBotSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Silicons.Bots;
+using Content.Shared.Silicons.Bots;
 
 namespace Content.Client.Silicons.Bots;
 
diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml
index 05cd04ed83..50702ec2c7 100644
--- a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml
+++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml
@@ -1,9 +1,9 @@
-<BoxContainer
+<BoxContainer
     xmlns="https://spacestation14.io"
     xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     Orientation="Vertical">
-    <customControls:HSeparator></customControls:HSeparator>
+    <controls:Separator StyleClasses="LowDivider"/>
     <BoxContainer>
         <BoxContainer
             Orientation="Vertical"
diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml.cs b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml.cs
index b07e53d225..12c8a677c5 100644
--- a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml.cs
+++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Silicons.Laws;
+using Content.Shared.Silicons.Laws;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs
index 03c74032f7..5960582e5a 100644
--- a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs
+++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs
@@ -1,4 +1,4 @@
-using Content.Client.Eui;
+using Content.Client.Eui;
 using Content.Shared.Eui;
 using Content.Shared.Silicons.Laws;
 
diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs
index 372961ea9a..27cee84f64 100644
--- a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs
+++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.FixedPoint;
 using Content.Shared.Silicons.Laws;
diff --git a/Content.Client/Silicons/Laws/SiliconLawSystem.cs b/Content.Client/Silicons/Laws/SiliconLawSystem.cs
index 34ca7b86ff..8735043ee9 100644
--- a/Content.Client/Silicons/Laws/SiliconLawSystem.cs
+++ b/Content.Client/Silicons/Laws/SiliconLawSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Silicons.Laws;
+using Content.Shared.Silicons.Laws;
 
 namespace Content.Client.Silicons.Laws;
 
diff --git a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml
index 1dfb0f1e6b..2819ff95b3 100644
--- a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml
+++ b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml
@@ -1,6 +1,6 @@
 <Button
     xmlns="https://spacestation14.io"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     Margin="0 0 0 5"
     StyleClasses="ButtonSquare">
     <PanelContainer
@@ -19,9 +19,8 @@
                 </BoxContainer>
                 <TextureRect Name="LawSelectedIcon" TexturePath="/Textures/Interface/Alerts/Abilities/silenced.png" />
             </BoxContainer>
-            <customControls:HSeparator Margin="0 5 0 5" />
+            <controls:Separator StyleClasses="LowDivider" Margin="0 5 0 5"/>
             <RichTextLabel Name="LawLabel" />
         </BoxContainer>
     </PanelContainer>
 </Button>
-
diff --git a/Content.Client/Silicons/Laws/Ui/SiliconLawMenu.xaml b/Content.Client/Silicons/Laws/Ui/SiliconLawMenu.xaml
index 7d5a1f3770..58b5ff507e 100644
--- a/Content.Client/Silicons/Laws/Ui/SiliconLawMenu.xaml
+++ b/Content.Client/Silicons/Laws/Ui/SiliconLawMenu.xaml
@@ -55,7 +55,7 @@
         <!-- Footer -->
         <BoxContainer Orientation="Vertical" Margin="0 5 0 0">
             <PanelContainer />
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <!--Todo: Change Logo based on Laws (Change to Syndicate Logo when Emagged)-->
             <BoxContainer Name="Footer" Orientation="Horizontal" Margin="10 0 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'laws-window-footer-left'}" StyleClasses="WindowFooterText" />
diff --git a/Content.Client/Silicons/StationAi/StationAiBoundUserInterface.cs b/Content.Client/Silicons/StationAi/StationAiBoundUserInterface.cs
index a59f3b578b..c72139ef05 100644
--- a/Content.Client/Silicons/StationAi/StationAiBoundUserInterface.cs
+++ b/Content.Client/Silicons/StationAi/StationAiBoundUserInterface.cs
@@ -19,7 +19,7 @@ public sealed class StationAiBoundUserInterface(EntityUid owner, Enum uiKey) : B
         _menu.Track(Owner);
         var buttonModels = ConvertToButtons(ev.Actions);
         _menu.SetButtons(buttonModels);
-        
+
         _menu.Open();
     }
 
@@ -32,7 +32,8 @@ public sealed class StationAiBoundUserInterface(EntityUid owner, Enum uiKey) : B
             models[i] = new RadialMenuActionOption<BaseStationAiAction>(HandleRadialMenuClick, action.Event)
             {
                 IconSpecifier = RadialMenuIconSpecifier.With(action.Sprite),
-                ToolTip = action.Tooltip
+                ToolTip = action.Tooltip,
+                Order = action.Order,
             };
         }
 
diff --git a/Content.Client/Silicons/StationAi/StationAiFixerConsoleWindow.xaml b/Content.Client/Silicons/StationAi/StationAiFixerConsoleWindow.xaml
index e0af97eb2a..d0e01cd8b1 100644
--- a/Content.Client/Silicons/StationAi/StationAiFixerConsoleWindow.xaml
+++ b/Content.Client/Silicons/StationAi/StationAiFixerConsoleWindow.xaml
@@ -39,7 +39,7 @@
             </BoxContainer>
 
             <!-- Central divider -->
-            <PanelContainer StyleClasses="LowDivider" VerticalExpand="True" Margin="0 0 0 0" SetWidth="2"/>
+            <controls:Separator StyleClasses="LowDivider" VerticalExpand="True" SetWidth="2" Orientation="Vertical" MinHeight="2"/>
 
             <!-- Right side - control panel -->
             <BoxContainer VerticalExpand="True" HorizontalExpand="True" Orientation="Vertical" MinWidth="225" Margin="10 10 10 10">
@@ -156,7 +156,7 @@
 
         <!-- Footer -->
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'station-ai-fixer-console-window-flavor-left'}" StyleClasses="WindowFooterText" />
                 <Label Text="{Loc 'station-ai-fixer-console-window-flavor-right'}" StyleClasses="WindowFooterText"
diff --git a/Content.Client/Silicons/StationAi/StationAiSystem.Airlock.cs b/Content.Client/Silicons/StationAi/StationAiSystem.Airlock.cs
index d5bc764b34..f98868886c 100644
--- a/Content.Client/Silicons/StationAi/StationAiSystem.Airlock.cs
+++ b/Content.Client/Silicons/StationAi/StationAiSystem.Airlock.cs
@@ -30,7 +30,8 @@ public sealed partial class StationAiSystem
                 Event = new StationAiBoltEvent
                 {
                     Bolted = !ent.Comp.BoltsDown,
-                }
+                },
+                Order = 1,
             }
         );
     }
@@ -49,7 +50,8 @@ public sealed partial class StationAiSystem
                 Event = new StationAiEmergencyAccessEvent
                 {
                     EmergencyAccess = !ent.Comp.EmergencyAccess,
-                }
+                },
+                Order = 2,
             }
         );
     }
@@ -68,7 +70,8 @@ public sealed partial class StationAiSystem
                 Event = new StationAiElectrifiedEvent
                 {
                     Electrified = !ent.Comp.Enabled,
-                }
+                },
+                Order = 3,
             }
         );
     }
diff --git a/Content.Client/Silicons/StationAi/StationAiSystem.Light.cs b/Content.Client/Silicons/StationAi/StationAiSystem.Light.cs
index cf2f613620..bc2ecf5a3c 100644
--- a/Content.Client/Silicons/StationAi/StationAiSystem.Light.cs
+++ b/Content.Client/Silicons/StationAi/StationAiSystem.Light.cs
@@ -26,7 +26,8 @@ public sealed partial class StationAiSystem
             Event = new StationAiLightEvent()
             {
                 Enabled = !toggle.Activated
-            }
+            },
+            Order = 4,
         });
     }
 }
diff --git a/Content.Client/Singularity/Systems/EmitterSystem.cs b/Content.Client/Singularity/Systems/EmitterSystem.cs
index 8516bdb0dc..9f39fe3bc4 100644
--- a/Content.Client/Singularity/Systems/EmitterSystem.cs
+++ b/Content.Client/Singularity/Systems/EmitterSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Singularity.Components;
+using Content.Shared.Singularity.Components;
 using Content.Shared.Singularity.EntitySystems;
 using Robust.Client.GameObjects;
 
diff --git a/Content.Client/Singularity/Systems/SingularitySystem.cs b/Content.Client/Singularity/Systems/SingularitySystem.cs
index 366a1de671..3e209c6de9 100644
--- a/Content.Client/Singularity/Systems/SingularitySystem.cs
+++ b/Content.Client/Singularity/Systems/SingularitySystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Singularity;
+using Content.Shared.Singularity;
 using Content.Shared.Singularity.Components;
 using Content.Shared.Singularity.EntitySystems;
 using Robust.Client.GameObjects;
diff --git a/Content.Client/SmartFridge/SmartFridgeMenu.xaml b/Content.Client/SmartFridge/SmartFridgeMenu.xaml
index 73cb0f3925..140a6f31ab 100644
--- a/Content.Client/SmartFridge/SmartFridgeMenu.xaml
+++ b/Content.Client/SmartFridge/SmartFridgeMenu.xaml
@@ -11,7 +11,7 @@
         <co:SearchListContainer Name="VendingContents" VerticalExpand="True" Margin="4 4"/>
          <!-- Footer -->
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
                 <Label Name="LeftFlavorLabel" StyleClasses="WindowFooterText" />
                 <Label Text="{Loc 'vending-machine-flavor-right'}" StyleClasses="WindowFooterText"
diff --git a/Content.Client/Sound/EmitSoundSystem.cs b/Content.Client/Sound/EmitSoundSystem.cs
index 9d7188d0d1..3c0a5cfef9 100644
--- a/Content.Client/Sound/EmitSoundSystem.cs
+++ b/Content.Client/Sound/EmitSoundSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Sound;
+using Content.Shared.Sound;
 
 namespace Content.Client.Sound;
 
diff --git a/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml b/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml
index ef4379e6cb..996c494952 100644
--- a/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml
+++ b/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml
@@ -1,6 +1,7 @@
-<controls:SprayPainterDecals
+<ui:SprayPainterDecals
     xmlns="https://spacestation14.io"
-    xmlns:controls="clr-namespace:Content.Client.SprayPainter.UI">
+    xmlns:ui="clr-namespace:Content.Client.SprayPainter.UI"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <BoxContainer Orientation="Vertical">
         <BoxContainer>
             <Label Text="{Loc 'spray-painter-selected-decals'}" />
@@ -12,7 +13,7 @@
             </GridContainer>
         </ScrollContainer>
 
-        <PanelContainer StyleClasses="LowDivider" />
+        <controls:Separator StyleClasses="LowDivider"/>
         <BoxContainer Orientation="Vertical">
             <ColorSelectorSliders Name="ColorSelector" IsAlphaVisible="True">
                 <BoxContainer HorizontalAlignment="Right" VerticalAlignment="Top" SetHeight="29">
@@ -38,4 +39,4 @@
             </Button>
         </BoxContainer>
     </BoxContainer>
-</controls:SprayPainterDecals>
+</ui:SprayPainterDecals>
diff --git a/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml.cs b/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml.cs
index 66530eba91..620e991155 100644
--- a/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml.cs
+++ b/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml.cs
@@ -1,5 +1,5 @@
 using Content.Client.Decals.UI;
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets.Palette;
 using Content.Shared.Decals;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
@@ -89,10 +89,7 @@ public sealed partial class SprayPainterDecals : Control
             {
                 var panelContainer = new PanelContainer()
                 {
-                    PanelOverride = new StyleBoxFlat()
-                    {
-                        BackgroundColor = StyleNano.ButtonColorDefault,
-                    },
+                    PanelOverride = new StyleBoxFlat(Palettes.Navy.Element),
                     Children =
                     {
                         button,
diff --git a/Content.Client/Sprite/SimpleSpriteOverlaySystem.cs b/Content.Client/Sprite/SimpleSpriteOverlaySystem.cs
index 570a682830..59cffaa1a0 100644
--- a/Content.Client/Sprite/SimpleSpriteOverlaySystem.cs
+++ b/Content.Client/Sprite/SimpleSpriteOverlaySystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Sprite;
+using Content.Shared.Sprite;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Sprite;
diff --git a/Content.Client/Station/ClientStationSystem.cs b/Content.Client/Station/ClientStationSystem.cs
new file mode 100644
index 0000000000..d1b0b3bbc0
--- /dev/null
+++ b/Content.Client/Station/ClientStationSystem.cs
@@ -0,0 +1,6 @@
+using Content.Shared.Station.Systems;
+
+namespace Content.Client.Station;
+
+/// <inheritdoc/>
+public sealed partial class ClientStationSystem : StationSystem;
diff --git a/Content.Client/Station/StationSpawningSystem.cs b/Content.Client/Station/StationSpawningSystem.cs
deleted file mode 100644
index 42dc677895..0000000000
--- a/Content.Client/Station/StationSpawningSystem.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using Content.Shared.Station;
-
-namespace Content.Client.Station;
-
-public sealed partial class StationSpawningSystem : SharedStationSpawningSystem;
diff --git a/Content.Client/Station/StationSystem.cs b/Content.Client/Station/StationSystem.cs
deleted file mode 100644
index e1ccd14d7b..0000000000
--- a/Content.Client/Station/StationSystem.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Content.Shared.Station;
-
-namespace Content.Client.Station;
-
-/// <inheritdoc/>
-public sealed partial class StationSystem : SharedStationSystem;
diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs
index c77735060b..e20caf59aa 100644
--- a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs
+++ b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Station;
+using Content.Shared.Station.Systems;
 using Content.Shared.StationRecords;
 using Content.Shared.StationRecords.Components;
 using Content.Shared.StationRecords.Systems;
@@ -11,7 +11,7 @@ public sealed partial class GeneralStationRecordConsoleBoundUserInterface : Boun
     [ViewVariables]
     private GeneralStationRecordConsoleWindow? _window;
 
-    [Dependency] private SharedStationSystem _stationSys = default!;
+    [Dependency] private StationSystem _stationSys = default!;
     [Dependency] private StationRecordsSystem _recordsSys = default!;
 
     public GeneralStationRecordConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleSystem.cs b/Content.Client/StationRecords/GeneralStationRecordConsoleSystem.cs
index 2c769c7ec4..3e2e8dbd3b 100644
--- a/Content.Client/StationRecords/GeneralStationRecordConsoleSystem.cs
+++ b/Content.Client/StationRecords/GeneralStationRecordConsoleSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.StationRecords;
+using Content.Shared.StationRecords;
 using Content.Shared.StationRecords.Components;
 using Content.Shared.StationRecords.Systems;
 
diff --git a/Content.Client/StationTeleporter/StationTeleporterConsoleWindow.xaml b/Content.Client/StationTeleporter/StationTeleporterConsoleWindow.xaml
index b3672ebc45..f5022a80cd 100644
--- a/Content.Client/StationTeleporter/StationTeleporterConsoleWindow.xaml
+++ b/Content.Client/StationTeleporter/StationTeleporterConsoleWindow.xaml
@@ -37,7 +37,7 @@
 
         <!-- Footer -->
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'teleporter-console-user-interface-flavor-left'}" StyleClasses="WindowFooterText" />
                 <Label Text="{Loc 'teleporter-console-user-interface-flavor-right'}" StyleClasses="WindowFooterText"
diff --git a/Content.Client/Storage/Components/StorageContainerVisualsComponent.cs b/Content.Client/Storage/Components/StorageContainerVisualsComponent.cs
index 9ef6c65e89..08e8139e1f 100644
--- a/Content.Client/Storage/Components/StorageContainerVisualsComponent.cs
+++ b/Content.Client/Storage/Components/StorageContainerVisualsComponent.cs
@@ -1,4 +1,4 @@
-using Content.Client.Chemistry.Visualizers;
+using Content.Client.Chemistry.Visualizers;
 using Content.Shared.Chemistry.Components;
 
 namespace Content.Client.Storage.Components;
diff --git a/Content.Client/Storage/Systems/EntityStorageSystem.cs b/Content.Client/Storage/Systems/EntityStorageSystem.cs
index e05e370922..c84d7fd8ce 100644
--- a/Content.Client/Storage/Systems/EntityStorageSystem.cs
+++ b/Content.Client/Storage/Systems/EntityStorageSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Storage.EntitySystems;
+using Content.Shared.Storage.EntitySystems;
 
 namespace Content.Client.Storage.Systems;
 
diff --git a/Content.Client/Storage/Systems/StorageContainerVisualsSystem.cs b/Content.Client/Storage/Systems/StorageContainerVisualsSystem.cs
index c5b19651da..f1fd359607 100644
--- a/Content.Client/Storage/Systems/StorageContainerVisualsSystem.cs
+++ b/Content.Client/Storage/Systems/StorageContainerVisualsSystem.cs
@@ -1,4 +1,4 @@
-using Content.Client.Storage.Components;
+using Content.Client.Storage.Components;
 using Content.Shared.Rounding;
 using Content.Shared.Storage;
 using Robust.Client.GameObjects;
diff --git a/Content.Client/Store/StoreSystem.cs b/Content.Client/Store/StoreSystem.cs
index 3ab2f61aca..6789146399 100644
--- a/Content.Client/Store/StoreSystem.cs
+++ b/Content.Client/Store/StoreSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Store;
+using Content.Shared.Store;
 
 namespace Content.Client.Store;
 
diff --git a/Content.Client/Store/Ui/StoreListingControl.xaml b/Content.Client/Store/Ui/StoreListingControl.xaml
index b779672726..af7200b46e 100644
--- a/Content.Client/Store/Ui/StoreListingControl.xaml
+++ b/Content.Client/Store/Ui/StoreListingControl.xaml
@@ -1,9 +1,10 @@
-<Control xmlns="https://spacestation14.io">
+<Control xmlns="https://spacestation14.io"
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <BoxContainer Margin="8,0,8,8" Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
             <Label Name="StoreItemName" HorizontalExpand="True" />
         </BoxContainer>
-        <PanelContainer StyleClasses="HighDivider" Margin="0,1,0,2"/>
+        <controls:Separator StyleClasses="HighDivider" Margin="0,1,0,2"/>
         <BoxContainer HorizontalExpand="True" Orientation="Horizontal">
             <BoxContainer Orientation="Vertical" VerticalAlignment="Center" Margin="0,0,4,0">
                 <TextureRect
diff --git a/Content.Client/Store/Ui/StoreListingControl.xaml.cs b/Content.Client/Store/Ui/StoreListingControl.xaml.cs
index 341dc78ec9..8951c0b9e9 100644
--- a/Content.Client/Store/Ui/StoreListingControl.xaml.cs
+++ b/Content.Client/Store/Ui/StoreListingControl.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.GameTicking.Managers;
+using Content.Shared.GameTicking;
 using Content.Shared.Store;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
@@ -15,7 +15,7 @@ public sealed partial class StoreListingControl : Control
     [Dependency] private IPrototypeManager _prototype = default!;
     [Dependency] private IEntityManager _entity = default!;
     [Dependency] private IGameTiming _timing = default!;
-    private readonly ClientGameTicker _ticker;
+    private readonly GameTicker _ticker;
 
     private readonly ListingDataWithCostModifiers _data;
 
@@ -27,7 +27,7 @@ public sealed partial class StoreListingControl : Control
         IoCManager.InjectDependencies(this);
         RobustXamlLoader.Load(this);
 
-        _ticker = _entity.System<ClientGameTicker>();
+        _ticker = _entity.System<GameTicker>();
 
         _data = data;
         _hasBalance = hasBalance;
diff --git a/Content.Client/Store/Ui/StoreMenu.xaml b/Content.Client/Store/Ui/StoreMenu.xaml
index 4e9d22dc2e..313a1a4516 100644
--- a/Content.Client/Store/Ui/StoreMenu.xaml
+++ b/Content.Client/Store/Ui/StoreMenu.xaml
@@ -1,5 +1,6 @@
 <DefaultWindow
     xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
     Title="{Loc 'store-ui-default-title'}"
     MinSize="512 512"
@@ -59,7 +60,7 @@
 
         <!-- Footer -->
         <BoxContainer Orientation="Vertical" Name="TraitorFooter">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'store-ui-traitor-flavor'}" StyleClasses="WindowFooterText" />
                 <Label Text="{Loc 'store-ui-traitor-warning'}" StyleClasses="WindowFooterText"
diff --git a/Content.Client/Stylesheets/BaseStylesheet.Fonts.cs b/Content.Client/Stylesheets/BaseStylesheet.Fonts.cs
index 7ea15fd54e..38f14d1075 100644
--- a/Content.Client/Stylesheets/BaseStylesheet.Fonts.cs
+++ b/Content.Client/Stylesheets/BaseStylesheet.Fonts.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets.Fonts;
+using Content.Client.Stylesheets.Fonts;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/Stylesheets/BaseStylesheet.Resources.cs b/Content.Client/Stylesheets/BaseStylesheet.Resources.cs
index 96e260a17a..6cf5400c8e 100644
--- a/Content.Client/Stylesheets/BaseStylesheet.Resources.cs
+++ b/Content.Client/Stylesheets/BaseStylesheet.Resources.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Utility;
 
diff --git a/Content.Client/Stylesheets/BaseStylesheet.Sheetlets.cs b/Content.Client/Stylesheets/BaseStylesheet.Sheetlets.cs
index 0e219fdbd7..694e26834a 100644
--- a/Content.Client/Stylesheets/BaseStylesheet.Sheetlets.cs
+++ b/Content.Client/Stylesheets/BaseStylesheet.Sheetlets.cs
@@ -1,4 +1,4 @@
-using Robust.Client.UserInterface;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Stylesheets;
 
diff --git a/Content.Client/Stylesheets/BaseStylesheet.Textures.cs b/Content.Client/Stylesheets/BaseStylesheet.Textures.cs
index a951d88373..6a70522e1d 100644
--- a/Content.Client/Stylesheets/BaseStylesheet.Textures.cs
+++ b/Content.Client/Stylesheets/BaseStylesheet.Textures.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Utility;
diff --git a/Content.Client/Stylesheets/BaseStylesheet.cs b/Content.Client/Stylesheets/BaseStylesheet.cs
index 6c12dfd7e3..a311a79904 100644
--- a/Content.Client/Stylesheets/BaseStylesheet.cs
+++ b/Content.Client/Stylesheets/BaseStylesheet.cs
@@ -1,4 +1,4 @@
-namespace Content.Client.Stylesheets;
+namespace Content.Client.Stylesheets;
 
 public abstract partial class BaseStylesheet
 {
diff --git a/Content.Client/Stylesheets/Colorspace/ColorExtensions.cs b/Content.Client/Stylesheets/Colorspace/ColorExtensions.cs
index 6af9308bbc..33ec5f5898 100644
--- a/Content.Client/Stylesheets/Colorspace/ColorExtensions.cs
+++ b/Content.Client/Stylesheets/Colorspace/ColorExtensions.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using JetBrains.Annotations;
 using Robust.Shared.Utility;
 
diff --git a/Content.Client/Stylesheets/CommonSheetletAttribute.cs b/Content.Client/Stylesheets/CommonSheetletAttribute.cs
index 1fdf78a502..4d7e8318a2 100644
--- a/Content.Client/Stylesheets/CommonSheetletAttribute.cs
+++ b/Content.Client/Stylesheets/CommonSheetletAttribute.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace Content.Client.Stylesheets;
 
diff --git a/Content.Client/Stylesheets/Fonts/NotoFontFamilyStack.cs b/Content.Client/Stylesheets/Fonts/NotoFontFamilyStack.cs
index 9239e5d1a1..99f2027d6f 100644
--- a/Content.Client/Stylesheets/Fonts/NotoFontFamilyStack.cs
+++ b/Content.Client/Stylesheets/Fonts/NotoFontFamilyStack.cs
@@ -1,4 +1,4 @@
-using Content.Client.Resources;
+using Content.Client.Resources;
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
diff --git a/Content.Client/Stylesheets/ISheetletConfig.cs b/Content.Client/Stylesheets/ISheetletConfig.cs
index 277006c6f8..7faf7b7723 100644
--- a/Content.Client/Stylesheets/ISheetletConfig.cs
+++ b/Content.Client/Stylesheets/ISheetletConfig.cs
@@ -1,4 +1,4 @@
-namespace Content.Client.Stylesheets;
+namespace Content.Client.Stylesheets;
 
 public interface ISheetletConfig : IStyleResources
 {
diff --git a/Content.Client/Stylesheets/IStyleResources.cs b/Content.Client/Stylesheets/IStyleResources.cs
index ed842ace81..ce4aa35056 100644
--- a/Content.Client/Stylesheets/IStyleResources.cs
+++ b/Content.Client/Stylesheets/IStyleResources.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Utility;
diff --git a/Content.Client/Stylesheets/PalettedStylesheet.Palettes.cs b/Content.Client/Stylesheets/PalettedStylesheet.Palettes.cs
index e8fe7174f4..5b475f4381 100644
--- a/Content.Client/Stylesheets/PalettedStylesheet.Palettes.cs
+++ b/Content.Client/Stylesheets/PalettedStylesheet.Palettes.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets.Palette;
+using Content.Client.Stylesheets.Palette;
 
 namespace Content.Client.Stylesheets;
 
diff --git a/Content.Client/Stylesheets/PalettedStylesheet.cs b/Content.Client/Stylesheets/PalettedStylesheet.cs
index 682a50c228..73c966f7e1 100644
--- a/Content.Client/Stylesheets/PalettedStylesheet.cs
+++ b/Content.Client/Stylesheets/PalettedStylesheet.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace Content.Client.Stylesheets;
 
diff --git a/Content.Client/Stylesheets/Sheetlet.cs b/Content.Client/Stylesheets/Sheetlet.cs
index b5a4cf855f..f46cd7f4a3 100644
--- a/Content.Client/Stylesheets/Sheetlet.cs
+++ b/Content.Client/Stylesheets/Sheetlet.cs
@@ -1,4 +1,4 @@
-using Robust.Client.ResourceManagement;
+using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 
 namespace Content.Client.Stylesheets;
diff --git a/Content.Client/Stylesheets/Sheetlets/CheckboxSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/CheckboxSheetlet.cs
index 67ad4b293f..1c053d0166 100644
--- a/Content.Client/Stylesheets/Sheetlets/CheckboxSheetlet.cs
+++ b/Content.Client/Stylesheets/Sheetlets/CheckboxSheetlet.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.SheetletConfigs;
 using Content.Client.Stylesheets.Stylesheets;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/Stylesheets/Sheetlets/DividersSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/DividersSheetlet.cs
deleted file mode 100644
index 41226c7100..0000000000
--- a/Content.Client/Stylesheets/Sheetlets/DividersSheetlet.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Numerics;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using static Content.Client.Stylesheets.StylesheetHelpers;
-
-namespace Content.Client.Stylesheets.Sheetlets;
-
-[CommonSheetlet]
-public sealed class DividersSheetlet : Sheetlet<PalettedStylesheet>
-{
-    public override StyleRule[] GetRules(PalettedStylesheet sheet, object config)
-    {
-        var boxHighDivider = new StyleBoxFlat
-        {
-            BackgroundColor = sheet.HighlightPalette.Base,
-            ContentMarginBottomOverride = 2,
-            ContentMarginLeftOverride = 2,
-        };
-
-        var boxLowDivider = new StyleBoxFlat(sheet.SecondaryPalette.TextDark);
-
-        // high divider and low divider styles are VERY inconsistent but its too much of a pain to change right now (also HighDivider has its own Control ???)
-        // i dont think theres a good resolution to this besides just deleting HighDivider. HighDivider is barely used but LowDivider is used everywhere.
-        return
-        [
-            E<PanelContainer>()
-                .Class(StyleClass.LowDivider)
-                .Panel(boxLowDivider)
-                .MinSize(new Vector2(2, 2)),
-            E<PanelContainer>().Class(StyleClass.HighDivider).Panel(boxHighDivider),
-        ];
-    }
-}
diff --git a/Content.Client/Stylesheets/Sheetlets/FancyTreeSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/FancyTreeSheetlet.cs
index 6912dc1ee0..3ceffbc57c 100644
--- a/Content.Client/Stylesheets/Sheetlets/FancyTreeSheetlet.cs
+++ b/Content.Client/Stylesheets/Sheetlets/FancyTreeSheetlet.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Controls.FancyTree;
+using Content.Client.UserInterface.Controls.FancyTree;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/Stylesheets/Sheetlets/HLineSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/HLineSheetlet.cs
deleted file mode 100644
index bfd8ac6d1a..0000000000
--- a/Content.Client/Stylesheets/Sheetlets/HLineSheetlet.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Content.Client.UserInterface.Controls;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using static Content.Client.Stylesheets.StylesheetHelpers;
-
-namespace Content.Client.Stylesheets.Sheetlets;
-
-[CommonSheetlet]
-public sealed class HLineSheetlet : Sheetlet<PalettedStylesheet>
-{
-    public override StyleRule[] GetRules(PalettedStylesheet sheet, object config)
-    {
-        return
-        [
-            E<HLine>()
-                .Class(StyleClass.Positive)
-                .Panel(new StyleBoxFlat(sheet.PositivePalette.Text)),
-            E<HLine>()
-                .Class(StyleClass.Highlight)
-                .Panel(new StyleBoxFlat(sheet.HighlightPalette.Text)),
-            E<HLine>()
-                .Class(StyleClass.Negative)
-                .Panel(new StyleBoxFlat(sheet.NegativePalette.Text)),
-        ];
-    }
-}
diff --git a/Content.Client/Stylesheets/Sheetlets/Hud/ChatSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/Hud/ChatSheetlet.cs
index ca721c5895..140e58918f 100644
--- a/Content.Client/Stylesheets/Sheetlets/Hud/ChatSheetlet.cs
+++ b/Content.Client/Stylesheets/Sheetlets/Hud/ChatSheetlet.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.SheetletConfigs;
 using Content.Client.Stylesheets.Stylesheets;
 using Content.Client.UserInterface.Systems.Chat.Controls;
 using Robust.Client.Graphics;
diff --git a/Content.Client/Stylesheets/Sheetlets/Hud/ItemStatusSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/Hud/ItemStatusSheetlet.cs
index cc95d1783a..112c2dff91 100644
--- a/Content.Client/Stylesheets/Sheetlets/Hud/ItemStatusSheetlet.cs
+++ b/Content.Client/Stylesheets/Sheetlets/Hud/ItemStatusSheetlet.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets.Fonts;
+using Content.Client.Stylesheets.Fonts;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using static Content.Client.Stylesheets.StylesheetHelpers;
diff --git a/Content.Client/Stylesheets/Sheetlets/Hud/TooltipSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/Hud/TooltipSheetlet.cs
index 16a5cfe62f..39f7a983e4 100644
--- a/Content.Client/Stylesheets/Sheetlets/Hud/TooltipSheetlet.cs
+++ b/Content.Client/Stylesheets/Sheetlets/Hud/TooltipSheetlet.cs
@@ -1,4 +1,4 @@
-using Content.Client.Examine;
+using Content.Client.Examine;
 using Content.Client.Stylesheets.Fonts;
 using Content.Client.Stylesheets.SheetletConfigs;
 using Content.Client.Stylesheets.Stylesheets;
diff --git a/Content.Client/Stylesheets/Sheetlets/ItemListSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/ItemListSheetlet.cs
index 26a8210c1c..21b567c3aa 100644
--- a/Content.Client/Stylesheets/Sheetlets/ItemListSheetlet.cs
+++ b/Content.Client/Stylesheets/Sheetlets/ItemListSheetlet.cs
@@ -1,4 +1,4 @@
-using Robust.Client.Graphics;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using static Content.Client.Stylesheets.StylesheetHelpers;
diff --git a/Content.Client/Stylesheets/Sheetlets/LineEditSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/LineEditSheetlet.cs
index b478af5bd0..419f66a282 100644
--- a/Content.Client/Stylesheets/Sheetlets/LineEditSheetlet.cs
+++ b/Content.Client/Stylesheets/Sheetlets/LineEditSheetlet.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.SheetletConfigs;
 using Content.Client.Stylesheets.Stylesheets;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Stylesheets/Sheetlets/MenuButtonSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/MenuButtonSheetlet.cs
index 7f08978263..cf8809e2e3 100644
--- a/Content.Client/Stylesheets/Sheetlets/MenuButtonSheetlet.cs
+++ b/Content.Client/Stylesheets/Sheetlets/MenuButtonSheetlet.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Client.Stylesheets.Fonts;
 using Content.Client.Stylesheets.SheetletConfigs;
 using Content.Client.Stylesheets.Stylesheets;
diff --git a/Content.Client/Stylesheets/Sheetlets/PlaceholderSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/PlaceholderSheetlet.cs
index eed7062392..afae729819 100644
--- a/Content.Client/Stylesheets/Sheetlets/PlaceholderSheetlet.cs
+++ b/Content.Client/Stylesheets/Sheetlets/PlaceholderSheetlet.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.SheetletConfigs;
 using Content.Client.Stylesheets.Stylesheets;
 using Content.Client.UserInterface.Controls;
 using Robust.Client.Graphics;
diff --git a/Content.Client/Stylesheets/Sheetlets/RadialMenuSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/RadialMenuSheetlet.cs
index 20f7eab335..785650b375 100644
--- a/Content.Client/Stylesheets/Sheetlets/RadialMenuSheetlet.cs
+++ b/Content.Client/Stylesheets/Sheetlets/RadialMenuSheetlet.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.SheetletConfigs;
 using Content.Client.Stylesheets.Stylesheets;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/Stylesheets/Sheetlets/SeparatorSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/SeparatorSheetlet.cs
new file mode 100644
index 0000000000..68c9693928
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/SeparatorSheetlet.cs
@@ -0,0 +1,26 @@
+using Content.Client.UserInterface.Controls;
+using Robust.Client.UserInterface;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class SeparatorSheetlet : Sheetlet<PalettedStylesheet>
+{
+    public override StyleRule[] GetRules(PalettedStylesheet sheet, object config)
+    {
+        return
+        [
+            E<Separator>().Class(StyleClass.LowDivider)
+                .Prop(Separator.StylePropertyColor, sheet.SecondaryPalette.TextDark),
+            E<Separator>().Class(StyleClass.HighDivider)
+                .Prop(Separator.StylePropertyColor, sheet.HighlightPalette.Base),
+            E<Separator>().Class(StyleClass.Positive)
+                .Prop(Separator.StylePropertyColor, sheet.PositivePalette.Text),
+            E<Separator>().Class(StyleClass.Highlight)
+                .Prop(Separator.StylePropertyColor, sheet.HighlightPalette.Text),
+            E<Separator>().Class(StyleClass.Negative)
+                .Prop(Separator.StylePropertyColor, sheet.NegativePalette.Text),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/SliderSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/SliderSheetlet.cs
index 5ef1c0e6c5..5ecbe57010 100644
--- a/Content.Client/Stylesheets/Sheetlets/SliderSheetlet.cs
+++ b/Content.Client/Stylesheets/Sheetlets/SliderSheetlet.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.SheetletConfigs;
 using Content.Client.Stylesheets.Stylesheets;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Stylesheets/Sheetlets/StripebackSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/StripebackSheetlet.cs
index dc0c8dc011..ad755edc2c 100644
--- a/Content.Client/Stylesheets/Sheetlets/StripebackSheetlet.cs
+++ b/Content.Client/Stylesheets/Sheetlets/StripebackSheetlet.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.SheetletConfigs;
 using Content.Client.Stylesheets.Stylesheets;
 using Content.Client.UserInterface.Controls;
 using Robust.Client.Graphics;
diff --git a/Content.Client/Stylesheets/Sheetlets/SwitchButtonSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/SwitchButtonSheetlet.cs
index fea9241950..64201a7336 100644
--- a/Content.Client/Stylesheets/Sheetlets/SwitchButtonSheetlet.cs
+++ b/Content.Client/Stylesheets/Sheetlets/SwitchButtonSheetlet.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.SheetletConfigs;
 using Content.Client.Stylesheets.Stylesheets;
 using Content.Client.UserInterface.Controls;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Stylesheets/Sheetlets/TabContainerSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/TabContainerSheetlet.cs
index de6add06d6..681584f397 100644
--- a/Content.Client/Stylesheets/Sheetlets/TabContainerSheetlet.cs
+++ b/Content.Client/Stylesheets/Sheetlets/TabContainerSheetlet.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.SheetletConfigs;
 using Content.Client.Stylesheets.Stylesheets;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Stylesheets/Sheetlets/WindowSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/WindowSheetlet.cs
index 143baec992..d8d57ed497 100644
--- a/Content.Client/Stylesheets/Sheetlets/WindowSheetlet.cs
+++ b/Content.Client/Stylesheets/Sheetlets/WindowSheetlet.cs
@@ -1,4 +1,4 @@
-using Content.Client.Resources;
+using Content.Client.Resources;
 using Content.Client.Stylesheets.Fonts;
 using Content.Client.Stylesheets.Palette;
 using Content.Client.Stylesheets.SheetletConfigs;
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index 901b92f2c6..8aa20422b4 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -8,38 +8,15 @@ using Content.Client.Silicons.Laws.SiliconLawEditUi;
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Controls.FancyTree;
 using Content.Client.Verbs.UI;
-using Content.Shared.Verbs;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Graphics;
 using static Robust.Client.UserInterface.StylesheetHelpers;
 
 namespace Content.Client.Stylesheets
 {
-    public static class ResCacheExtension
-    {
-        public static Font NotoStack(this IResourceCache resCache, string variation = "Regular", int size = 10, bool display = false)
-        {
-            var ds = display ? "Display" : "";
-            var sv = variation.StartsWith("Bold", StringComparison.Ordinal) ? "Bold" : "Regular";
-            return resCache.GetFont
-            (
-                // Ew, but ok
-                new[]
-                {
-                    $"/Fonts/NotoSans{ds}/NotoSans{ds}-{variation}.ttf",
-                    $"/Fonts/NotoSans/NotoSansSymbols-{sv}.ttf",
-                    "/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf"
-                },
-                size
-            );
-
-        }
-
-    }
     // STLYE SHEETS WERE A MISTAKE. KILL ALL OF THIS WITH FIRE
     [Obsolete("Please use the new sheetlet system to define styles, and remove all references to this class as it may be deleted in the future")]
     // i did :)
@@ -48,8 +25,6 @@ namespace Content.Client.Stylesheets
         public const string StyleClassBorderedWindowPanel = "BorderedWindowPanel";
         public const string StyleClassInventorySlotBackground = "InventorySlotBackground";
         public const string StyleClassHandSlotHighlight = "HandSlotHighlight";
-        public const string StyleClassChatPanel = "ChatPanel";
-        public const string StyleClassChatSubPanel = "ChatSubPanel";
         public const string StyleClassHotbarPanel = "HotbarPanel";
         public const string StyleClassTooltipPanel = "tooltipBox";
         public const string StyleClassTooltipAlertTitle = "tooltipAlertTitle";
@@ -63,9 +38,6 @@ namespace Content.Client.Stylesheets
         public const string StyleClassHotbarSlotNumber = "hotbarSlotNumber";
         public const string StyleClassActionSearchBox = "actionSearchBox";
         public const string StyleClassActionMenuItemRevoked = "actionMenuItemRevoked";
-        public const string StyleClassChatLineEdit = "chatLineEdit";
-        public const string StyleClassChatChannelSelectorButton = "chatSelectorOptionButton";
-        public const string StyleClassChatFilterOptionButton = "chatFilterOptionButton";
         public const string StyleClassStorageButton = "storageButton";
 
         public const string StyleClassConsoleHeading = "ConsoleHeading";
@@ -154,8 +126,6 @@ namespace Content.Client.Stylesheets
         public const string StyleClassButtonColorRed = "ButtonColorRed";
         public const string StyleClassButtonColorGreen = "ButtonColorGreen";
 
-        public static readonly Color ChatBackgroundColor = Color.FromHex("#25252ADD");
-
         // i'm not sure what the missing symbols were referencing, and this is getting obseleted anyway so:
         public const string ButtonOpenRight = "OpenRight";
         public const string ButtonOpenLeft = "OpenLeft";
@@ -165,33 +135,12 @@ namespace Content.Client.Stylesheets
         public const string StyleClassLabelHeading = "LabelHeading";
         public const string StyleClassLabelSubText = "LabelSubText";
         public const string StyleClassRedTopButton = "negative";
-        public const string ClassHighDivider = "HighDivider";
-        public const string ClassLowDivider = "LowDivider";
         public const string ClassAngleRect = "AngleRect";
 
-
         public override Stylesheet Stylesheet { get; }
 
         public StyleNano(IResourceCache resCache) : base(resCache)
         {
-            var notoSans8 = resCache.NotoStack(size: 8);
-            var notoSans10 = resCache.NotoStack(size: 10);
-            var notoSansItalic10 = resCache.NotoStack(variation: "Italic", size: 10);
-            var notoSans12 = resCache.NotoStack(size: 12);
-            var notoSansItalic12 = resCache.NotoStack(variation: "Italic", size: 12);
-            var notoSansBold12 = resCache.NotoStack(variation: "Bold", size: 12);
-            var notoSansBoldItalic12 = resCache.NotoStack(variation: "BoldItalic", size: 12);
-            var notoSansBoldItalic14 = resCache.NotoStack(variation: "BoldItalic", size: 14);
-            var notoSansBoldItalic16 = resCache.NotoStack(variation: "BoldItalic", size: 16);
-            var notoSansDisplayBold14 = resCache.NotoStack(variation: "Bold", display: true, size: 14);
-            var notoSansDisplayBold16 = resCache.NotoStack(variation: "Bold", display: true, size: 16);
-            var notoSans15 = resCache.NotoStack(variation: "Regular", size: 15);
-            var notoSans16 = resCache.NotoStack(variation: "Regular", size: 16);
-            var notoSansBold16 = resCache.NotoStack(variation: "Bold", size: 16);
-            var notoSansBold18 = resCache.NotoStack(variation: "Bold", size: 18);
-            var notoSansBold20 = resCache.NotoStack(variation: "Bold", size: 20);
-            var notoSansMono = resCache.GetFont("/EngineFonts/NotoSans/NotoSansMono-Regular.ttf", size: 12);
-
             var windowHeaderTex = resCache.GetTexture("/Textures/Interface/Nano/window_header.png");
             var windowHeader = new StyleBoxTexture
             {
@@ -334,22 +283,6 @@ namespace Content.Client.Stylesheets
             };
             topButtonSquare.SetPatchMargin(StyleBox.Margin.Horizontal, 0);
 
-            var chatChannelButtonTex = resCache.GetTexture("/Textures/Interface/Nano/rounded_button.svg.96dpi.png");
-            var chatChannelButton = new StyleBoxTexture
-            {
-                Texture = chatChannelButtonTex,
-            };
-            chatChannelButton.SetPatchMargin(StyleBox.Margin.All, 5);
-            chatChannelButton.SetPadding(StyleBox.Margin.All, 2);
-
-            var chatFilterButtonTex = resCache.GetTexture("/Textures/Interface/Nano/rounded_button_bordered.svg.96dpi.png");
-            var chatFilterButton = new StyleBoxTexture
-            {
-                Texture = chatFilterButtonTex,
-            };
-            chatFilterButton.SetPatchMargin(StyleBox.Margin.All, 5);
-            chatFilterButton.SetPadding(StyleBox.Margin.All, 2);
-
             var outputPanelScrollDownButtonTex = resCache.GetTexture("/Textures/Interface/Nano/rounded_button_half_bordered.svg.96dpi.png");
             var outputPanelScrollDownButton = new StyleBoxTexture
             {
@@ -376,17 +309,6 @@ namespace Content.Client.Stylesheets
             lineEdit.SetPatchMargin(StyleBox.Margin.All, 3);
             lineEdit.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5);
 
-            var chatBg = new StyleBoxFlat
-            {
-                BackgroundColor = ChatBackgroundColor
-            };
-
-            var chatSubBg = new StyleBoxFlat
-            {
-                BackgroundColor = ChatBackgroundColor,
-            };
-            chatSubBg.SetContentMarginOverride(StyleBox.Margin.All, 2);
-
             var actionSearchBoxTex = resCache.GetTexture("/Textures/Interface/Nano/black_panel_dark_thin_border.png");
             var actionSearchBox = new StyleBoxTexture
             {
@@ -526,8 +448,6 @@ namespace Content.Client.Stylesheets
             var sliderFillBlue = new StyleBoxTexture(sliderFillBox) { Modulate = Color.Blue };
             var sliderFillWhite = new StyleBoxTexture(sliderFillBox) { Modulate = Color.White };
 
-            var boxFont13 = resCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13);
-
             // Default paper background:
             var paperBackground = new StyleBoxTexture
             {
@@ -546,15 +466,12 @@ namespace Content.Client.Stylesheets
 
             Stylesheet = new Stylesheet(BaseRules.Concat(new[]
             {
-                Element().Class("monospace")
-                    .Prop("font", notoSansMono),
                 // Window title.
                 new StyleRule(
                     new SelectorElement(typeof(Label), new[] {DefaultWindow.StyleClassWindowTitle}, null, null),
                     new[]
                     {
                         new StyleProperty(Label.StylePropertyFontColor, NanoGold),
-                        new StyleProperty(Label.StylePropertyFont, notoSansDisplayBold14),
                     }),
                 // Alert (white) window title.
                 new StyleRule(
@@ -562,7 +479,6 @@ namespace Content.Client.Stylesheets
                     new[]
                     {
                         new StyleProperty(Label.StylePropertyFontColor, Color.White),
-                        new StyleProperty(Label.StylePropertyFont, notoSansDisplayBold14),
                     }),
                 // Window background.
                 new StyleRule(
@@ -683,7 +599,6 @@ namespace Content.Client.Stylesheets
                 // ItemStatus for hands
                 Element()
                     .Class(StyleClassItemStatusNotHeld)
-                    .Prop("font", notoSansItalic10)
                     .Prop("font-color", ItemStatusNotHeldColor)
                     .Prop(nameof(Control.Margin), new Thickness(4, 0, 0, 2)),
 
@@ -716,19 +631,6 @@ namespace Content.Client.Stylesheets
                     .Pseudo(ContainerButton.StylePseudoClassDisabled)
                     .Prop(Control.StylePropertyModulateSelf, ButtonColorContextDisabled),
 
-                // Context Menu Labels
-                Element<RichTextLabel>().Class(InteractionVerb.DefaultTextStyleClass)
-                    .Prop(Label.StylePropertyFont, notoSansBoldItalic12),
-
-                Element<RichTextLabel>().Class(ActivationVerb.DefaultTextStyleClass)
-                    .Prop(Label.StylePropertyFont, notoSansBold12),
-
-                Element<RichTextLabel>().Class(AlternativeVerb.DefaultTextStyleClass)
-                    .Prop(Label.StylePropertyFont, notoSansItalic12),
-
-                Element<RichTextLabel>().Class(Verb.DefaultTextStyleClass)
-                    .Prop(Label.StylePropertyFont, notoSans12),
-
                 Element<TextureRect>().Class(ContextMenuElement.StyleClassContextMenuExpansionTexture)
                     .Prop(TextureRect.StylePropertyTexture, contextMenuExpansionTexture),
 
@@ -824,15 +726,6 @@ namespace Content.Client.Stylesheets
                     .Pseudo(ContainerButton.StylePseudoClassDisabled)
                     .Prop(Control.StylePropertyModulateSelf, new Color(10, 10, 12)),
 
-                // Main menu: Make those buttons bigger.
-                new StyleRule(new SelectorChild(
-                    new SelectorElement(typeof(Button), null, "mainMenu", null),
-                    new SelectorElement(typeof(Label), null, null, null)),
-                    new[]
-                    {
-                        new StyleProperty("font", notoSansBold16),
-                    }),
-
                 // Main menu: also make those buttons slightly more separated.
                 new StyleRule(new SelectorElement(typeof(BoxContainer), null, "mainMenuVBox", null),
                     new[]
@@ -864,21 +757,6 @@ namespace Content.Client.Stylesheets
                 Element<TextEdit>().Pseudo(TextEdit.StylePseudoClassPlaceholder)
                     .Prop("font-color", Color.Gray),
 
-                // chat subpanels (chat lineedit backing, popup backings)
-                new StyleRule(new SelectorElement(typeof(PanelContainer), new[] {StyleClassChatPanel}, null, null),
-                    new[]
-                    {
-                        new StyleProperty(PanelContainer.StylePropertyPanel, chatBg),
-                    }),
-
-                // Chat lineedit - we don't actually draw a stylebox around the lineedit itself, we put it around the
-                // input + other buttons, so we must clear the default stylebox
-                new StyleRule(new SelectorElement(typeof(LineEdit), new[] {StyleClassChatLineEdit}, null, null),
-                    new[]
-                    {
-                        new StyleProperty(LineEdit.StylePropertyStyleBox, new StyleBoxEmpty()),
-                    }),
-
                 // Action searchbox lineedit
                 new StyleRule(new SelectorElement(typeof(LineEdit), new[] {StyleClassActionSearchBox}, null, null),
                     new[]
@@ -940,77 +818,11 @@ namespace Content.Client.Stylesheets
                     new StyleProperty(PanelContainer.StylePropertyPanel, whisperBox)
                 }),
 
-                new StyleRule(new SelectorChild(
-                    new SelectorElement(typeof(PanelContainer), new[] {"speechBox", "whisperBox"}, null, null),
-                    new SelectorElement(typeof(RichTextLabel), new[] {"bubbleContent"}, null, null)),
-                    new[]
-                {
-                    new StyleProperty("font", notoSansItalic12),
-                }),
-
-                new StyleRule(new SelectorChild(
-                    new SelectorElement(typeof(PanelContainer), new[] {"speechBox", "emoteBox"}, null, null),
-                    new SelectorElement(typeof(RichTextLabel), null, null, null)),
-                    new[]
-                {
-                    new StyleProperty("font", notoSansItalic12),
-                }),
-
                 new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassLabelKeyText}, null, null), new[]
                 {
-                    new StyleProperty(Label.StylePropertyFont, notoSansBold12),
                     new StyleProperty( Control.StylePropertyModulateSelf, NanoGold)
                 }),
 
-                // alert tooltip
-                new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipAlertTitle}, null, null), new[]
-                {
-                    new StyleProperty("font", notoSansBold18)
-                }),
-                new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipAlertDescription}, null, null), new[]
-                {
-                    new StyleProperty("font", notoSans16)
-                }),
-                new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipAlertCooldown}, null, null), new[]
-                {
-                    new StyleProperty("font", notoSans16)
-                }),
-
-                // action tooltip
-                new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipActionTitle}, null, null), new[]
-                {
-                    new StyleProperty("font", notoSansBold16)
-                }),
-                new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipActionDescription}, null, null), new[]
-                {
-                    new StyleProperty("font", notoSans15)
-                }),
-                new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipActionCooldown}, null, null), new[]
-                {
-                    new StyleProperty("font", notoSans15)
-                }),
-                new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipActionRequirements}, null, null), new[]
-                {
-                    new StyleProperty("font", notoSans15)
-                }),
-                new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassTooltipActionCharges}, null, null), new[]
-                {
-                    new StyleProperty("font", notoSans15)
-                }),
-
-                // small number for the entity counter in the entity menu
-                // new StyleRule(new SelectorElement(typeof(Label), new[] {ContextMenuElement.StyleClassEntityMenuIconLabel}, null, null), new[]
-                // {
-                //     new StyleProperty("font", notoSans10),
-                //     new StyleProperty(Label.StylePropertyAlignMode, Label.AlignMode.Right),
-                // }),
-
-                // hotbar slot
-                new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassHotbarSlotNumber}, null, null), new[]
-                {
-                    new StyleProperty("font", notoSansDisplayBold16)
-                }),
-
                 // Entity tooltip
                 new StyleRule(
                     new SelectorElement(typeof(PanelContainer), new[] {ExamineSystem.StyleClassEntityTooltip}, null,
@@ -1077,14 +889,12 @@ namespace Content.Client.Stylesheets
                 new StyleRule(
                     new SelectorElement(typeof(Label), new[] {Placeholder.StyleClassPlaceholderText}, null, null), new[]
                     {
-                        new StyleProperty(Label.StylePropertyFont, notoSans16),
                         new StyleProperty(Label.StylePropertyFontColor, new Color(103, 103, 103, 128)),
                     }),
 
                 // Big Label
                 new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassLabelHeading}, null, null), new[]
                 {
-                    new StyleProperty(Label.StylePropertyFont, notoSansBold16),
                     new StyleProperty(Label.StylePropertyFontColor, NanoGold),
                 }),
 
@@ -1092,40 +902,27 @@ namespace Content.Client.Stylesheets
                 new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassLabelHeadingBigger}, null, null),
                     new[]
                     {
-                        new StyleProperty(Label.StylePropertyFont, notoSansBold20),
                         new StyleProperty(Label.StylePropertyFontColor, NanoGold),
                     }),
 
                 // Small Label
                 new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassLabelSubText}, null, null), new[]
                 {
-                    new StyleProperty(Label.StylePropertyFont, notoSans10),
                     new StyleProperty(Label.StylePropertyFontColor, Color.DarkGray),
                 }),
 
                 // Label Key
                 new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassLabelKeyText}, null, null), new[]
                 {
-                    new StyleProperty(Label.StylePropertyFont, notoSansBold12),
                     new StyleProperty(Label.StylePropertyFontColor, NanoGold)
                 }),
 
                 new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassLabelSecondaryColor}, null, null),
                     new[]
                     {
-                        new StyleProperty(Label.StylePropertyFont, notoSans12),
                         new StyleProperty(Label.StylePropertyFontColor, Color.DarkGray),
                     }),
 
-                // Big Button
-                new StyleRule(new SelectorChild(
-                    new SelectorElement(typeof(Button), new[] {StyleClassButtonBig}, null, null),
-                    new SelectorElement(typeof(Label), null, null, null)),
-                    new[]
-                    {
-                        new StyleProperty("font", notoSans16)
-                    }),
-
                 //APC and SMES power state label colors
                 new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassPowerStateNone}, null, null), new[]
                 {
@@ -1214,15 +1011,8 @@ namespace Content.Client.Stylesheets
                         new StyleProperty(StripeBack.StylePropertyBackground, stripeBack),
                     }),
 
-                // StyleClassItemStatus
-                new StyleRule(SelectorElement.Class(StyleClassItemStatus), new[]
-                {
-                    new StyleProperty("font", notoSans10),
-                }),
-
                 Element()
                     .Class(StyleClassItemStatusNotHeld)
-                    .Prop("font", notoSansItalic10)
                     .Prop("font-color", ItemStatusNotHeldColor),
 
                 Element<RichTextLabel>()
@@ -1265,34 +1055,6 @@ namespace Content.Client.Stylesheets
                     new StyleProperty(Slider.StylePropertyFill, sliderFillWhite),
                 }),
 
-                // chat channel option selector
-                new StyleRule(new SelectorElement(typeof(Button), new[] {StyleClassChatChannelSelectorButton}, null, null), new[]
-                {
-                    new StyleProperty(Button.StylePropertyStyleBox, chatChannelButton),
-                }),
-
-                // chat filter button
-                new StyleRule(new SelectorElement(typeof(ContainerButton), new[] {StyleClassChatFilterOptionButton}, null, null), new[]
-                {
-                    new StyleProperty(ContainerButton.StylePropertyStyleBox, chatFilterButton),
-                }),
-                new StyleRule(new SelectorElement(typeof(ContainerButton), new[] {StyleClassChatFilterOptionButton}, null, new[] {ContainerButton.StylePseudoClassNormal}), new[]
-                {
-                    new StyleProperty(Control.StylePropertyModulateSelf, ButtonColorDefault),
-                }),
-                new StyleRule(new SelectorElement(typeof(ContainerButton), new[] {StyleClassChatFilterOptionButton}, null, new[] {ContainerButton.StylePseudoClassHover}), new[]
-                {
-                    new StyleProperty(Control.StylePropertyModulateSelf, ButtonColorHovered),
-                }),
-                new StyleRule(new SelectorElement(typeof(ContainerButton), new[] {StyleClassChatFilterOptionButton}, null, new[] {ContainerButton.StylePseudoClassPressed}), new[]
-                {
-                    new StyleProperty(Control.StylePropertyModulateSelf, ButtonColorPressed),
-                }),
-                new StyleRule(new SelectorElement(typeof(ContainerButton), new[] {StyleClassChatFilterOptionButton}, null, new[] {ContainerButton.StylePseudoClassDisabled}), new[]
-                {
-                    new StyleProperty(Control.StylePropertyModulateSelf, ButtonColorDisabled),
-                }),
-
                 // output panel scroll button
                 Element<Button>()
                     .Class(OutputPanel.StyleClassOutputPanelScrollDownButton)
@@ -1334,18 +1096,6 @@ namespace Content.Client.Stylesheets
                 Element<PanelContainer>().Class(OptionButton.StyleClassOptionsBackground)
                     .Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat(Color.FromHex("#25252A"))),
 
-                new StyleRule(new SelectorElement(typeof(PanelContainer), new []{ ClassHighDivider}, null, null), new []
-                {
-                    new StyleProperty(PanelContainer.StylePropertyPanel, new StyleBoxFlat { BackgroundColor = NanoGold, ContentMarginBottomOverride = 2, ContentMarginLeftOverride = 2}),
-                }),
-
-                // Labels ---
-                Element<Label>().Class(StyleClassLabelBig)
-                    .Prop(Label.StylePropertyFont, notoSans16),
-
-                Element<Label>().Class(StyleClassLabelSmall)
-                 .Prop(Label.StylePropertyFont, notoSans10),
-
                 // Different Background shapes ---
                 Element<PanelContainer>().Class(ClassAngleRect)
                     .Prop(PanelContainer.StylePropertyPanel, BaseAngleRect)
@@ -1360,18 +1110,8 @@ namespace Content.Client.Stylesheets
                     .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#25252A")),
                 // ---
 
-                // Dividers
-                Element<PanelContainer>().Class(ClassLowDivider)
-                    .Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat
-                    {
-                        BackgroundColor = Color.FromHex("#444"),
-                        ContentMarginLeftOverride = 2,
-                        ContentMarginBottomOverride = 2
-                    }),
-
                 // Window Headers
                 Element<Label>().Class("FancyWindowTitle")
-                    .Prop("font", boxFont13)
                     .Prop("font-color", NanoGold),
 
                 Element<PanelContainer>().Class("WindowHeadingBackground")
@@ -1407,7 +1147,6 @@ namespace Content.Client.Stylesheets
                     .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#757575")),
 
                 Element<Label>().Class("WindowFooterText")
-                    .Prop(Label.StylePropertyFont, notoSans8)
                     .Prop(Label.StylePropertyFontColor, Color.FromHex("#757575")),
 
                 // X Texture button ---
@@ -1435,11 +1174,9 @@ namespace Content.Client.Stylesheets
                 Element<PanelContainer>().Class("PaperDefaultBorder")
                     .Prop(PanelContainer.StylePropertyPanel, paperBackground),
                 Element<RichTextLabel>().Class("PaperWrittenText")
-                    .Prop(Label.StylePropertyFont, notoSans12)
                     .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#111111")),
 
                 Element<RichTextLabel>().Class("LabelSubText")
-                    .Prop(Label.StylePropertyFont, notoSans10)
                     .Prop(Label.StylePropertyFontColor, Color.DarkGray),
 
                 Element<LineEdit>().Class("PaperLineEdit")
@@ -1485,9 +1222,6 @@ namespace Content.Client.Stylesheets
                 Element<Button>().Class("ButtonSmall")
                     .Prop(ContainerButton.StylePropertyStyleBox, smallButtonBase),
 
-                Child().Parent(Element<Button>().Class("ButtonSmall"))
-                    .Child(Element<Label>())
-                    .Prop(Label.StylePropertyFont, notoSans8),
                 // ---
 
                 Element<Label>().Class("StatusFieldTitle")
@@ -1571,11 +1305,9 @@ namespace Content.Client.Stylesheets
 
                 //PDA - Text
                 Element<Label>().Class("PdaContentFooterText")
-                    .Prop(Label.StylePropertyFont, notoSans10)
                     .Prop(Label.StylePropertyFontColor, Color.FromHex("#757575")),
 
                 Element<Label>().Class("PdaWindowFooterText")
-                    .Prop(Label.StylePropertyFont, notoSans10)
                     .Prop(Label.StylePropertyFontColor, Color.FromHex("#333d3b")),
 
                 // Fancy Tree
@@ -1622,7 +1354,6 @@ namespace Content.Client.Stylesheets
                         BorderThickness= new Thickness(0, 0, 0, 1),
                     }),
 
-
                 Element<PanelContainer>().Class("DefaultBorderTop")
                     .Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat
                     {
diff --git a/Content.Client/Stylesheets/StyleProperties.cs b/Content.Client/Stylesheets/StyleProperties.cs
index cc6ca12688..13a3b33559 100644
--- a/Content.Client/Stylesheets/StyleProperties.cs
+++ b/Content.Client/Stylesheets/StyleProperties.cs
@@ -1,4 +1,4 @@
-namespace Content.Client.Stylesheets;
+namespace Content.Client.Stylesheets;
 
 public sealed class StyleProperties
 {
diff --git a/Content.Client/Stylesheets/StyleSpace.cs b/Content.Client/Stylesheets/StyleSpace.cs
index 637b4999d0..615c53ec45 100644
--- a/Content.Client/Stylesheets/StyleSpace.cs
+++ b/Content.Client/Stylesheets/StyleSpace.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Client.Resources;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
@@ -80,20 +80,6 @@ namespace Content.Client.Stylesheets
                     .Prop(Label.StylePropertyFont, notoSans10)
                     .Prop(Label.StylePropertyFontColor, Color.DarkGray),
 
-                Element<PanelContainer>().Class(StyleClass.HighDivider)
-                    .Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat
-                    {
-                        BackgroundColor = SpaceRed, ContentMarginBottomOverride = 2, ContentMarginLeftOverride = 2
-                    }),
-
-                Element<PanelContainer>().Class(StyleClass.LowDivider)
-                    .Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat
-                    {
-                        BackgroundColor = Color.FromHex("#444"),
-                        ContentMarginLeftOverride = 2,
-                        ContentMarginBottomOverride = 2
-                    }),
-
                 // Shapes for the buttons.
                 Element<ContainerButton>().Class(ContainerButton.StyleClassButton)
                     .Prop(ContainerButton.StylePropertyStyleBox, BaseButton),
diff --git a/Content.Client/Stylesheets/StylesheetHelpers.cs b/Content.Client/Stylesheets/StylesheetHelpers.cs
index 2cd2ec4e2b..0531dfe659 100644
--- a/Content.Client/Stylesheets/StylesheetHelpers.cs
+++ b/Content.Client/Stylesheets/StylesheetHelpers.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/Stylesheets/Stylesheets/NanotrasenStylesheet.Palettes.cs b/Content.Client/Stylesheets/Stylesheets/NanotrasenStylesheet.Palettes.cs
index 097d54d581..3866535f51 100644
--- a/Content.Client/Stylesheets/Stylesheets/NanotrasenStylesheet.Palettes.cs
+++ b/Content.Client/Stylesheets/Stylesheets/NanotrasenStylesheet.Palettes.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets.Palette;
+using Content.Client.Stylesheets.Palette;
 
 namespace Content.Client.Stylesheets.Stylesheets;
 
diff --git a/Content.Client/Stylesheets/Stylesheets/NanotrasenStylesheet.cs b/Content.Client/Stylesheets/Stylesheets/NanotrasenStylesheet.cs
index eb8472d98e..eb88854315 100644
--- a/Content.Client/Stylesheets/Stylesheets/NanotrasenStylesheet.cs
+++ b/Content.Client/Stylesheets/Stylesheets/NanotrasenStylesheet.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Client.Stylesheets.Fonts;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
index bcd899a029..58dd9b0728 100644
--- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
+++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
@@ -180,9 +180,10 @@ public sealed partial class SurveillanceCameraMonitorWindow : DefaultWindow
     private int AddSubnet(ProtoId<DeviceFrequencyPrototype> subnet)
     {
         var name = subnet;
-        if (_prototypeManager.TryIndex(subnet, out var frequency))
+        if (_prototypeManager.TryIndex(subnet, out var frequency)
+            && frequency.Name != null)
         {
-            name = Loc.GetString(frequency.Name ?? subnet);
+            name = Loc.GetString(frequency.Name);
         }
 
         SubnetSelector.AddItem(name);
diff --git a/Content.Client/Tabletop/UI/TabletopWindow.xaml.cs b/Content.Client/Tabletop/UI/TabletopWindow.xaml.cs
index 11eb38708c..d7954cd854 100644
--- a/Content.Client/Tabletop/UI/TabletopWindow.xaml.cs
+++ b/Content.Client/Tabletop/UI/TabletopWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
diff --git a/Content.Client/Teleportation/PortalSystem.cs b/Content.Client/Teleportation/PortalSystem.cs
index 9ed497f1e9..f958584d76 100644
--- a/Content.Client/Teleportation/PortalSystem.cs
+++ b/Content.Client/Teleportation/PortalSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Teleportation.Systems;
+using Content.Shared.Teleportation.Systems;
 
 namespace Content.Client.Teleportation;
 
diff --git a/Content.Client/Teleportation/TeleportLocationsSystem.cs b/Content.Client/Teleportation/TeleportLocationsSystem.cs
index d191b8d385..90326078e4 100644
--- a/Content.Client/Teleportation/TeleportLocationsSystem.cs
+++ b/Content.Client/Teleportation/TeleportLocationsSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Teleportation.Systems;
+using Content.Shared.Teleportation.Systems;
 
 namespace Content.Client.Teleportation;
 
diff --git a/Content.Client/Teleportation/Ui/TeleportLocationsBoundUserInterface.cs b/Content.Client/Teleportation/Ui/TeleportLocationsBoundUserInterface.cs
index 80b4f30094..8faa65bfab 100644
--- a/Content.Client/Teleportation/Ui/TeleportLocationsBoundUserInterface.cs
+++ b/Content.Client/Teleportation/Ui/TeleportLocationsBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Teleportation;
+using Content.Shared.Teleportation;
 using Content.Shared.Teleportation.Components;
 using JetBrains.Annotations;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Teleportation/Ui/TeleportMenu.xaml.cs b/Content.Client/Teleportation/Ui/TeleportMenu.xaml.cs
index 1a730bf747..5c085347a0 100644
--- a/Content.Client/Teleportation/Ui/TeleportMenu.xaml.cs
+++ b/Content.Client/Teleportation/Ui/TeleportMenu.xaml.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Shared.Teleportation.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
diff --git a/Content.Client/Temperature/Systems/TemperatureSystem.cs b/Content.Client/Temperature/Systems/TemperatureSystem.cs
index 6980591a81..fb6e398041 100644
--- a/Content.Client/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Client/Temperature/Systems/TemperatureSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Temperature.Systems;
+using Content.Shared.Temperature.Systems;
 
 namespace Content.Client.Temperature.Systems;
 
diff --git a/Content.Client/Thief/ThiefBackpackMenu.xaml b/Content.Client/Thief/ThiefBackpackMenu.xaml
index 125ddacd34..49b3f9e64f 100644
--- a/Content.Client/Thief/ThiefBackpackMenu.xaml
+++ b/Content.Client/Thief/ThiefBackpackMenu.xaml
@@ -5,7 +5,7 @@
 	<BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
 		<!-- First Informational panel -->
 		<Label Name="Description" Margin="5 5"/>
-		<controls:HLine Color="#404040" Thickness="2" Margin="0 5"/>
+		<controls:Separator ColorOverride="#404040" Margin="0 5"/>
 		<Label Name="SelectedSets" Text="{Loc 'thief-backpack-window-selected'}" Margin="5 5"/>
 
 		<!-- Second sets panel -->
diff --git a/Content.Client/Thief/ThiefBackpackSet.xaml b/Content.Client/Thief/ThiefBackpackSet.xaml
index 817de21031..380fd7fd95 100644
--- a/Content.Client/Thief/ThiefBackpackSet.xaml
+++ b/Content.Client/Thief/ThiefBackpackSet.xaml
@@ -11,7 +11,7 @@
 				<Label Name="SetName" Text="Set" StyleClasses="highlight"></Label>
 				<Button Margin="0 10" Name="SetButton" Text="Select" StyleClasses="OpenRight" Access="Public" HorizontalAlignment="Right"/>
 			</GridContainer>
-			<controls:HLine Color="#404040" Thickness="1" Margin="0 5"/>
+			<controls:Separator ColorOverride="#404040" Thickness="1" Margin="0 5"/>
 			<!-- Icon and Description -->
 			<GridContainer Margin="0 5" Columns="2">
 				<TextureRect Name="Icon" Margin="10" Stretch="KeepAspectCentered"
diff --git a/Content.Client/Throwing/ThrownItemVisualizerSystem.cs b/Content.Client/Throwing/ThrownItemVisualizerSystem.cs
index c218257f1d..ba9017efd5 100644
--- a/Content.Client/Throwing/ThrownItemVisualizerSystem.cs
+++ b/Content.Client/Throwing/ThrownItemVisualizerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Throwing;
+using Content.Shared.Throwing;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
diff --git a/Content.Client/Toggleable/ToggleableVisualsSystem.cs b/Content.Client/Toggleable/ToggleableVisualsSystem.cs
index 95f8af65ea..335240ed5a 100644
--- a/Content.Client/Toggleable/ToggleableVisualsSystem.cs
+++ b/Content.Client/Toggleable/ToggleableVisualsSystem.cs
@@ -8,6 +8,7 @@ using Content.Shared.Item;
 using Content.Shared.Light.Components;
 using Content.Shared.Toggleable;
 using Robust.Client.GameObjects;
+using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Toggleable;
@@ -20,6 +21,7 @@ namespace Content.Client.Toggleable;
 /// <see cref="ToggleableVisualsComponent"/>
 public sealed partial class ToggleableVisualsSystem : VisualizerSystem<ToggleableVisualsComponent>
 {
+    [Dependency] private ISerializationManager _seriMan = default!;
     [Dependency] private SharedItemSystem _item = default!;
     [Dependency] private SharedPointLightSystem _pointLight = default!;
 
@@ -104,7 +106,10 @@ public sealed partial class ToggleableVisualsSystem : VisualizerSystem<Toggleabl
             if (modulateColor)
                 layer.Color = color;
 
-            args.Layers.Add((key, layer));
+            // Create a copy of the layer, which might get modified.
+            PrototypeLayerData newLayer = new();
+            _seriMan.CopyTo(layer, ref newLayer, notNullableOverride: true);
+            args.Layers.Add((key, newLayer));
         }
     }
 
diff --git a/Content.Client/Trigger/Systems/LightBehaviorOnTriggerSystem.cs b/Content.Client/Trigger/Systems/LightBehaviorOnTriggerSystem.cs
index 0ab3bbf16d..c2c67f8690 100644
--- a/Content.Client/Trigger/Systems/LightBehaviorOnTriggerSystem.cs
+++ b/Content.Client/Trigger/Systems/LightBehaviorOnTriggerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Client.Light.EntitySystems;
+using Content.Client.Light.EntitySystems;
 using Content.Shared.Trigger;
 using Content.Shared.Trigger.Components.Effects;
 using Robust.Shared.Timing;
diff --git a/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs b/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs
index 23ebf50333..626b7d6221 100644
--- a/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs
+++ b/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs
@@ -35,7 +35,7 @@ public sealed partial class TimerTriggerVisualizerSystem : VisualizerSystem<Time
             ent.Comp.PrimingAnimation.AnimationTracks.Add(
                 new AnimationTrackPlaySound()
                 {
-                    KeyFrames = { new AnimationTrackPlaySound.KeyFrame(_audioSystem.ResolveSound(ent.Comp.PrimingSound), 0) }
+                    KeyFrames = { new AnimationTrackPlaySound.KeyFrame(_audioSystem.ResolveSound(ent.Comp.PrimingSound), 0, () => ent.Comp.PrimingSound.Params) }
                 }
             );
         }
diff --git a/Content.Client/Trigger/UI/TimerTriggerStatusControl.cs b/Content.Client/Trigger/UI/TimerTriggerStatusControl.cs
index 9185211ad5..08ab49cf76 100644
--- a/Content.Client/Trigger/UI/TimerTriggerStatusControl.cs
+++ b/Content.Client/Trigger/UI/TimerTriggerStatusControl.cs
@@ -31,7 +31,9 @@ public sealed partial class TimerTriggerStatusControl : PollingItemStatusControl
 
     protected override void Update(in Data data)
     {
-        var markup = Loc.GetString("timer-trigger-status-delay", ("delay", data.Delay.TotalSeconds));
+        var markup = _parent.Comp.Examinable
+            ? Loc.GetString("timer-trigger-status-delay", ("delay", data.Delay.TotalSeconds.ToString("F2")))
+            : Loc.GetString("timer-trigger-status-delay-unknown");
         _label.SetMarkup(markup);
     }
 
diff --git a/Content.Client/TurretController/TurretControllerWindow.xaml b/Content.Client/TurretController/TurretControllerWindow.xaml
index 5f4af68f91..997b6251b6 100644
--- a/Content.Client/TurretController/TurretControllerWindow.xaml
+++ b/Content.Client/TurretController/TurretControllerWindow.xaml
@@ -42,11 +42,7 @@
                             <Label Name="TurretStatusHeader" Text="{Loc 'turret-controls-window-turret-status-label'}" StyleClasses="ConsoleSubHeading"
                                    HorizontalAlignment="Center" />
 
-                            <PanelContainer StyleClasses="LowDivider" HorizontalExpand="True" Margin="-5 5 -5 5" SetHeight="2">
-                                <PanelContainer.PanelOverride>
-                                    <gfx:StyleBoxFlat BackgroundColor="#FFFFFF" />
-                                </PanelContainer.PanelOverride>
-                            </PanelContainer>
+                            <controls:Separator StyleClasses="LowDivider" HorizontalExpand="True" Margin="-5 5 -5 5" SetHeight="2" ColorOverride="#FFFFFF"/>
 
                             <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True">
                                 <Label Name="NoLinkedTurretsText" Text="{Loc 'turret-controls-window-no-turrets'}" StyleClasses="ConsoleText"
@@ -71,11 +67,7 @@
                             <Label Text="{Loc 'turret-controls-window-armament-controls-label'}" StyleClasses="ConsoleSubHeading"
                                    HorizontalAlignment="Center" Margin="0 5 0 5" />
 
-                            <PanelContainer StyleClasses="LowDivider" HorizontalExpand="True" SetHeight="2">
-                                <PanelContainer.PanelOverride>
-                                    <gfx:StyleBoxFlat BackgroundColor="#FFFFFF" />
-                                </PanelContainer.PanelOverride>
-                            </PanelContainer>
+                            <controls:Separator StyleClasses="LowDivider" HorizontalExpand="True" SetHeight="2" ColorOverride="#FFFFFF"/>
 
                             <BoxContainer Orientation="Horizontal" Margin="10 10 10 10">
                                 <controls:MonotoneButton Name="SafeButton" Text="{Loc 'turret-controls-window-safe'}"
@@ -99,11 +91,7 @@
                             <Label Text="{Loc 'turret-controls-window-targeting-controls-label'}" StyleClasses="ConsoleSubHeading"
                                    HorizontalAlignment="Center" Margin="0 5 0 5" />
 
-                            <PanelContainer StyleClasses="LowDivider" HorizontalExpand="True" SetHeight="2">
-                                <PanelContainer.PanelOverride>
-                                    <gfx:StyleBoxFlat BackgroundColor="#FFFFFF" />
-                                </PanelContainer.PanelOverride>
-                            </PanelContainer>
+                            <controls:Separator StyleClasses="LowDivider" HorizontalExpand="True" SetHeight="2" ColorOverride="#FFFFFF"/>
 
                             <!-- Access configuration -->
                             <access:GroupedAccessLevelChecklist Name="AccessConfiguration"/>
diff --git a/Content.Client/TurretController/TurretControllerWindow.xaml.cs b/Content.Client/TurretController/TurretControllerWindow.xaml.cs
index 17e362e258..b1aa9ffbdb 100644
--- a/Content.Client/TurretController/TurretControllerWindow.xaml.cs
+++ b/Content.Client/TurretController/TurretControllerWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets.Fonts;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Access;
 using Content.Shared.Access.Systems;
@@ -69,7 +69,7 @@ public sealed partial class TurretControllerWindow : BaseWindow
         AccessConfiguration.OnAccessLevelsChangedEvent += OnAccessLevelsChanged;
 
         // Override footer font
-        var smallFont = _cache.NotoStack(size: 8);
+        var smallFont = new NotoFontFamilyStack(_cache).GetFont(8);
         Footer.FontOverride = smallFont;
     }
 
diff --git a/Content.Client/UserInterface/BoundKeyHelpers.cs b/Content.Client/UserInterface/BoundKeyHelpers.cs
index ce4e5d1f46..d643774194 100644
--- a/Content.Client/UserInterface/BoundKeyHelpers.cs
+++ b/Content.Client/UserInterface/BoundKeyHelpers.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Robust.Client.Input;
 using Robust.Shared.Input;
 using Robust.Shared.Utility;
diff --git a/Content.Client/UserInterface/BuiPreTickUpdateSystem.cs b/Content.Client/UserInterface/BuiPreTickUpdateSystem.cs
index cee832cbf5..4051e6e2e8 100644
--- a/Content.Client/UserInterface/BuiPreTickUpdateSystem.cs
+++ b/Content.Client/UserInterface/BuiPreTickUpdateSystem.cs
@@ -1,4 +1,4 @@
-using Robust.Client.GameObjects;
+using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Timing;
diff --git a/Content.Client/UserInterface/BuiPredictionState.cs b/Content.Client/UserInterface/BuiPredictionState.cs
index e3299e03f3..bd1342e1e0 100644
--- a/Content.Client/UserInterface/BuiPredictionState.cs
+++ b/Content.Client/UserInterface/BuiPredictionState.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Robust.Client.Timing;
 using Robust.Shared.Timing;
 
diff --git a/Content.Client/UserInterface/Controls/ClipControl.cs b/Content.Client/UserInterface/Controls/ClipControl.cs
index 1fca3c0f47..e78891b954 100644
--- a/Content.Client/UserInterface/Controls/ClipControl.cs
+++ b/Content.Client/UserInterface/Controls/ClipControl.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 
diff --git a/Content.Client/UserInterface/Controls/ConfirmButton.cs b/Content.Client/UserInterface/Controls/ConfirmButton.cs
index d50e62b941..0c271a6380 100644
--- a/Content.Client/UserInterface/Controls/ConfirmButton.cs
+++ b/Content.Client/UserInterface/Controls/ConfirmButton.cs
@@ -1,4 +1,4 @@
-using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
 
 namespace Content.Client.UserInterface.Controls;
diff --git a/Content.Client/UserInterface/Controls/FancyWindow.xaml b/Content.Client/UserInterface/Controls/FancyWindow.xaml
index 3ec29054ae..c2475e2125 100644
--- a/Content.Client/UserInterface/Controls/FancyWindow.xaml
+++ b/Content.Client/UserInterface/Controls/FancyWindow.xaml
@@ -16,7 +16,7 @@
                                VerticalAlignment="Center" />
             </BoxContainer>
         </Control>
-        <PanelContainer StyleClasses="LowDivider" />
+        <controls:Separator StyleClasses="LowDivider"/>
         <Control Access="Public" Name="ContentsContainer" StyleClasses="WindowContentsContainer" RectClipContent="True" VerticalExpand="true" />
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs b/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
index 91a19a24d8..1ab3b442a9 100644
--- a/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
+++ b/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Client.Guidebook;
 using Content.Client.Guidebook.Components;
 using Content.Client.Stylesheets;
diff --git a/Content.Client/UserInterface/Controls/HLine.cs b/Content.Client/UserInterface/Controls/HLine.cs
deleted file mode 100644
index 849f5003d0..0000000000
--- a/Content.Client/UserInterface/Controls/HLine.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Client.Stylesheets;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Maths;
-
-namespace Content.Client.UserInterface.Controls;
-
-public sealed class HLine : PanelContainer
-{
-    public Color? Color
-    {
-        get
-        {
-            StyleBox box;
-            if (PanelOverride != null)
-                box = PanelOverride;
-            if (TryGetStyleProperty<StyleBox>(StylePropertyPanel, out var _box))
-                box = _box;
-            else
-                return null;
-
-            if (box is StyleBoxFlat boxFlat)
-                return boxFlat.BackgroundColor;
-            return null;
-        }
-        set =>
-            // should use style classes instead in ui code but keeping this functionality for consistency
-            PanelOverride = new StyleBoxFlat() { BackgroundColor = value!.Value };
-    }
-
-    public float? Thickness
-    {
-        get => MinHeight;
-        set => MinHeight = value!.Value;
-    }
-
-    public HLine()
-    {
-    }
-}
diff --git a/Content.Client/UserInterface/Controls/HSpacer.cs b/Content.Client/UserInterface/Controls/HSpacer.cs
index 104bf55924..f2d93fedf7 100644
--- a/Content.Client/UserInterface/Controls/HSpacer.cs
+++ b/Content.Client/UserInterface/Controls/HSpacer.cs
@@ -1,4 +1,4 @@
-using Robust.Client.Graphics;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Maths;
diff --git a/Content.Client/UserInterface/Controls/HighDivider.cs b/Content.Client/UserInterface/Controls/HighDivider.cs
deleted file mode 100644
index 1b15badcb2..0000000000
--- a/Content.Client/UserInterface/Controls/HighDivider.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Content.Client.Stylesheets;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-
-namespace Content.Client.UserInterface.Controls
-{
-    public sealed class HighDivider : Control
-    {
-        public HighDivider()
-        {
-            Children.Add(new PanelContainer {StyleClasses = {StyleClass.HighDivider}});
-        }
-    }
-}
diff --git a/Content.Client/UserInterface/Controls/MainViewport.cs b/Content.Client/UserInterface/Controls/MainViewport.cs
index 6cd3f11e22..2f138bb0bb 100644
--- a/Content.Client/UserInterface/Controls/MainViewport.cs
+++ b/Content.Client/UserInterface/Controls/MainViewport.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Client.Viewport;
 using Content.Shared.CCVar;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/UserInterface/Controls/OnOffButton.xaml.cs b/Content.Client/UserInterface/Controls/OnOffButton.xaml.cs
index a1ed8aa7b7..3d6ecfb444 100644
--- a/Content.Client/UserInterface/Controls/OnOffButton.xaml.cs
+++ b/Content.Client/UserInterface/Controls/OnOffButton.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/UserInterface/Controls/ProgressTextureRect.cs b/Content.Client/UserInterface/Controls/ProgressTextureRect.cs
index 8454ae0892..33e7f823af 100644
--- a/Content.Client/UserInterface/Controls/ProgressTextureRect.cs
+++ b/Content.Client/UserInterface/Controls/ProgressTextureRect.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Client.UserInterface.Systems;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/UserInterface/Controls/RadialMenuOptionComparer.cs b/Content.Client/UserInterface/Controls/RadialMenuOptionComparer.cs
new file mode 100644
index 0000000000..87de05783d
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/RadialMenuOptionComparer.cs
@@ -0,0 +1,46 @@
+namespace Content.Client.UserInterface.Controls;
+
+/// <summary>
+/// A class to compare radial menu options.
+/// Orders options in ascending order (null last!), then alphabetical tooltip (null last!).
+/// </summary>
+public sealed class RadialMenuOptionComparer : IComparer<RadialMenuOptionBase>
+{
+    /// <summary/>
+    /// Compares two RadialMenuOptionBase.
+    /// <seealso cref="IComparer{RadialMenuOptionBase}.Compare(RadialMenuOptionBase?, RadialMenuOptionBase?)"/>
+    /// </summary>
+    public int Compare(RadialMenuOptionBase? x, RadialMenuOptionBase? y)
+    {
+        if (ReferenceEquals(x, y))
+            return 0;
+
+        if (y == null)
+            return -1;
+
+        if (x == null)
+            return 1;
+
+        // First sort by order, then by tooltip.
+        // Any non-null order value comes before null.
+        if (y.Order != x.Order)
+        {
+            if (y?.Order is null)
+                return -1;
+
+            if (x?.Order is null)
+                return 1;
+
+            return x.Order < y.Order ? -1 : 1;
+        }
+
+        // Sort by tooltip: non-null order values come before null ones.
+        if (y?.ToolTip is null)
+            return -1;
+
+        if (x?.ToolTip is null)
+            return 1;
+
+        return string.Compare(x.ToolTip, y.ToolTip, StringComparison.Ordinal);
+    }
+}
diff --git a/Content.Client/UserInterface/Controls/SearchListContainer.cs b/Content.Client/UserInterface/Controls/SearchListContainer.cs
index 603d7f184c..1e096f83b6 100644
--- a/Content.Client/UserInterface/Controls/SearchListContainer.cs
+++ b/Content.Client/UserInterface/Controls/SearchListContainer.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.UserInterface.Controls;
diff --git a/Content.Client/UserInterface/Controls/SegmentedBarChart.cs b/Content.Client/UserInterface/Controls/SegmentedBarChart.cs
index a8c8c80688..ec92d7cb70 100644
--- a/Content.Client/UserInterface/Controls/SegmentedBarChart.cs
+++ b/Content.Client/UserInterface/Controls/SegmentedBarChart.cs
@@ -333,7 +333,7 @@ public sealed class SegmentedBarChart : Control
 
             yield return (entry, xStart, xEnd);
 
-            xStart = xEnd + gapWidth;
+            xStart = MathF.Min(xEnd + gapWidth, chartWidth);
         }
     }
 
diff --git a/Content.Client/UserInterface/Controls/Separator.cs b/Content.Client/UserInterface/Controls/Separator.cs
new file mode 100644
index 0000000000..efcec4d54b
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/Separator.cs
@@ -0,0 +1,82 @@
+using System.Numerics;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.UserInterface.Controls;
+
+/// <summary>
+/// A horizontal or vertical separator.
+/// </summary>
+public sealed class Separator : Control
+{
+    public const string StylePropertyColor = "separator-color";
+
+    private static readonly Color DefaultColor = Color.FromHex("#3D4059");
+
+    public OrientationMode Orientation
+    {
+        get;
+        set
+        {
+            if (value is not (OrientationMode.Horizontal or OrientationMode.Vertical))
+                throw new ArgumentOutOfRangeException(nameof(value));
+
+            if (field == value)
+                return;
+
+            field = value;
+            InvalidateMeasure();
+        }
+    }
+
+    /// <summary>
+    /// Line thickness in UI units. The line is centered when the layout allocates extra space.
+    /// </summary>
+    public float Thickness
+    {
+        get;
+        set
+        {
+            if (!float.IsFinite(value) || value < 0)
+                throw new ArgumentOutOfRangeException(nameof(value));
+
+            if (field.Equals(value))
+                return;
+
+            field = value;
+            InvalidateMeasure();
+        }
+    } = 2;
+
+    /// <summary>
+    /// Overrides the stylesheet color when set.
+    /// </summary>
+    public Color? ColorOverride { get; set; }
+
+    protected override Vector2 MeasureOverride(Vector2 availableSize)
+    {
+        return Orientation == OrientationMode.Horizontal
+            ? new Vector2(0, Thickness)
+            : new Vector2(Thickness, 0);
+    }
+
+    protected override void Draw(DrawingHandleScreen handle)
+    {
+        base.Draw(handle);
+
+        var color = ColorOverride ?? StylePropertyDefault(StylePropertyColor, DefaultColor);
+        var size = (Vector2) PixelSize;
+        if (Orientation == OrientationMode.Horizontal)
+            size.Y = Math.Min(size.Y, Thickness * UIScale);
+        else
+            size.X = Math.Min(size.X, Thickness * UIScale);
+
+        handle.DrawRect(UIBox2.FromDimensions((PixelSize - size) / 2, size), color);
+    }
+
+    public enum OrientationMode : byte
+    {
+        Horizontal,
+        Vertical
+    }
+}
diff --git a/Content.Client/UserInterface/Controls/SimpleRadialMenu.xaml.cs b/Content.Client/UserInterface/Controls/SimpleRadialMenu.xaml.cs
index bbd52a1cf9..a97b781990 100644
--- a/Content.Client/UserInterface/Controls/SimpleRadialMenu.xaml.cs
+++ b/Content.Client/UserInterface/Controls/SimpleRadialMenu.xaml.cs
@@ -16,6 +16,8 @@ namespace Content.Client.UserInterface.Controls;
 [GenerateTypedNameReferences]
 public sealed partial class SimpleRadialMenu : RadialMenu
 {
+    static readonly private RadialMenuOptionComparer Comparer = new();
+
     private EntityUid? _attachMenuToEntity;
 
     [Dependency] private IClyde _clyde = default!;
@@ -86,13 +88,13 @@ public sealed partial class SimpleRadialMenu : RadialMenu
         switch (models)
         {
             case RadialMenuOptionBase[] asArray:
-                Array.Sort(asArray, CompareByTooltip);
+                Array.Sort(asArray, Comparer);
                 return asArray;
             case List<RadialMenuOptionBase> asList:
-                asList.Sort(CompareByTooltip);
+                asList.Sort(Comparer);
                 return asList;
             default:
-                return models.OrderBy(x => x.ToolTip);
+                return models.Order(Comparer);
         }
     }
 
@@ -251,20 +253,6 @@ public sealed partial class SimpleRadialMenu : RadialMenu
         }
     }
 
-    private static int CompareByTooltip(RadialMenuOptionBase x, RadialMenuOptionBase y)
-    {
-        if (ReferenceEquals(x, y))
-            return 0;
-
-        if (y?.ToolTip is null)
-            return 1;
-
-        if (x?.ToolTip is null)
-            return -1;
-
-        return string.Compare(x.ToolTip, y.ToolTip, StringComparison.Ordinal);
-    }
-
     #region target entity tracking
 
     protected override void FrameUpdate(FrameEventArgs args)
@@ -350,14 +338,24 @@ public sealed record RadialMenuEntityPrototypeIconSpecifier(EntProtoId ProtoId)
 /// <summary> Container for common options for radial menu button. </summary>
 public abstract class RadialMenuOptionBase
 {
-    /// <summary> Tooltip to be displayed when button is hovered. </summary>
+    /// <summary>
+    /// Tooltip to be displayed when button is hovered.
+    /// Used for ordering if no order is given.
+    /// </summary>
     public string? ToolTip { get; init; }
 
+    /// <summary>
+    /// The relative order of the option in the menu.
+    /// Lower values will be placed before higher values, and any null values will be ordered after.
+    /// </summary>
+    public int? Order { get; init; }
+
     /// <summary>
     /// Color for button background.
     /// Is used only with sector radial (<see cref="SimpleRadialMenuSettings.UseSectors"/>).
     /// </summary>
     public Color? BackgroundColor { get; set; }
+
     /// <summary>
     /// Color for button background when it is hovered.
     /// Is used only with sector radial (<see cref="SimpleRadialMenuSettings.UseSectors"/>).
diff --git a/Content.Client/UserInterface/Controls/SlotButton.cs b/Content.Client/UserInterface/Controls/SlotButton.cs
index c33782371f..1c5afdea12 100644
--- a/Content.Client/UserInterface/Controls/SlotButton.cs
+++ b/Content.Client/UserInterface/Controls/SlotButton.cs
@@ -1,4 +1,4 @@
-using static Content.Client.Inventory.ClientInventorySystem;
+using static Content.Client.Inventory.ClientInventorySystem;
 
 namespace Content.Client.UserInterface.Controls
 {
diff --git a/Content.Client/UserInterface/Controls/SwitchButton.cs b/Content.Client/UserInterface/Controls/SwitchButton.cs
index c3aedea7f2..239be78813 100644
--- a/Content.Client/UserInterface/Controls/SwitchButton.cs
+++ b/Content.Client/UserInterface/Controls/SwitchButton.cs
@@ -146,14 +146,11 @@ namespace Content.Client.UserInterface.Controls
 
             if (relevantChangeMade)
             {
-                Label.RemoveStyleClass("dummy");
-                TrackFill.RemoveStyleClass("dummy");
-                TrackOutline.RemoveStyleClass("dummy");
-                ThumbFill.RemoveStyleClass("dummy");
-                ThumbOutline.RemoveStyleClass("dummy");
-                Symbol.RemoveStyleClass("dummy");
-                OffStateLabel.RemoveStyleClass("dummy");
-                OnStateLabel.RemoveStyleClass("dummy");
+                foreach (var c in Children)
+                {
+                    c.AddStyleClass("dummy");
+                    c.RemoveStyleClass("dummy");
+                }
             }
 
             // no base.DrawModeChanged() call - ContainerButton's pseudoclass handling
diff --git a/Content.Client/UserInterface/Controls/TextLinkLabel.cs b/Content.Client/UserInterface/Controls/TextLinkLabel.cs
new file mode 100644
index 0000000000..afd4fa48a1
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/TextLinkLabel.cs
@@ -0,0 +1,85 @@
+using Content.Client.UserInterface.ControlExtensions;
+using Content.Client.UserInterface.RichText;
+using Content.Shared.Chat;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Input;
+using Robust.Shared.Utility;
+
+
+namespace Content.Client.UserInterface.Controls;
+
+/// <summary>
+/// Carries link data parsed and resolved from a TextLink <see cref="MarkupNode"/>,
+/// only one LinkType field per link should be populated at a time.
+/// </summary>
+public sealed partial class TextLinkLabel : Label
+{
+    public string? LinkString { get; init; } // default links
+    public NetEntity? LinkEntity { get; init; } // entity links
+    public Color LinkColor { get; set; }
+
+    [Dependency] private IEntityManager _entity = default!;
+    private bool canClickLink;
+
+    public TextLinkLabel()
+    {
+        IoCManager.InjectDependencies(this);
+        OnKeyBindDown += OnKeybindDown;
+        OnMouseEntered += _ => OnHoverChanged(true);
+        OnMouseExited += _ => OnHoverChanged(false);
+    }
+
+    /// <summary>
+    /// Refreshes the label's properties based on the current link target
+    /// and the viewer's permission to follow it. <br />Call after construction,
+    /// and whenever that permission could have changed.
+    /// </summary>
+    /// <param name="visible">Whether the label should be shown at all. Defaults to true.</param>
+    /// <param name="clickable">Additional override to force the label non-clickable. Defaults to true.</param>
+    public void UpdateLabelProperties(SharedChatSystem chatSystem, bool? visible = null, bool? clickable = null)
+    {
+        visible ??= true;
+        Visible = visible.Value;
+        clickable ??= true;
+
+        canClickLink = (LinkString != null || (LinkEntity is { } netEntity && chatSystem.CanClickMessageSender(netEntity))) && (bool)clickable;
+
+        MouseFilter = canClickLink ? MouseFilterMode.Stop : MouseFilterMode.Ignore;
+        DefaultCursorShape = canClickLink ? CursorShape.Hand : CursorShape.Arrow;
+
+        OnHoverChanged(false);
+    }
+
+    private void OnHoverChanged(bool hovering)
+    {
+        FontColorOverride = (canClickLink, hovering) switch
+        {
+            (true, true) => Color.LightSkyBlue, // clickable and currently hovered
+            _ => LinkColor, // not clickable, or not hovered
+        };
+    }
+
+    /// <summary>
+    /// Delegates click to the nearest ancestor ILinkClickHandler or IEntityLinkClickHandler;
+    /// TextLinkLabel has no idea what a click actually does.
+    /// </summary>
+    private void OnKeybindDown(GUIBoundKeyEventArgs args)
+    {
+        if (args.Function != EngineKeyFunctions.UIClick)
+            return;
+
+        if (LinkString is null && LinkEntity is null)
+            return;
+
+        if (LinkEntity is { } entity &&
+            this.TryGetParentHandler<IEntityLinkClickHandler>(out var entityLinkClickHandler))
+        {
+            entityLinkClickHandler.HandleClick(entity);
+        }
+        else if (LinkString != null && this.TryGetParentHandler<ILinkClickHandler>(out var linkClickHandler))
+        {
+            linkClickHandler.HandleClick(LinkString);
+        }
+    }
+}
diff --git a/Content.Client/UserInterface/Controls/VSpacer.cs b/Content.Client/UserInterface/Controls/VSpacer.cs
index 346e5e4f16..9933525ea4 100644
--- a/Content.Client/UserInterface/Controls/VSpacer.cs
+++ b/Content.Client/UserInterface/Controls/VSpacer.cs
@@ -1,4 +1,4 @@
-using Robust.Client.Graphics;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Maths;
diff --git a/Content.Client/UserInterface/Fragments/UIFragment.cs b/Content.Client/UserInterface/Fragments/UIFragment.cs
index cadedb38c9..74f1c9699a 100644
--- a/Content.Client/UserInterface/Fragments/UIFragment.cs
+++ b/Content.Client/UserInterface/Fragments/UIFragment.cs
@@ -1,4 +1,4 @@
-using Robust.Client.GameObjects;
+using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 
 namespace Content.Client.UserInterface.Fragments;
diff --git a/Content.Client/UserInterface/Fragments/UiFragmentComponent.cs b/Content.Client/UserInterface/Fragments/UiFragmentComponent.cs
index ba2f80d98f..3801715091 100644
--- a/Content.Client/UserInterface/Fragments/UiFragmentComponent.cs
+++ b/Content.Client/UserInterface/Fragments/UiFragmentComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Client.UserInterface.Fragments;
+namespace Content.Client.UserInterface.Fragments;
 
 /// <summary>
 /// The component used for defining a ui fragment to attach to an entity
diff --git a/Content.Client/UserInterface/InputCoalescer.cs b/Content.Client/UserInterface/InputCoalescer.cs
index 613f517166..089d1df0b5 100644
--- a/Content.Client/UserInterface/InputCoalescer.cs
+++ b/Content.Client/UserInterface/InputCoalescer.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Content.Client.UserInterface;
 
diff --git a/Content.Client/UserInterface/RichText/TextLinkTag.Entity.cs b/Content.Client/UserInterface/RichText/TextLinkTag.Entity.cs
new file mode 100644
index 0000000000..3b1b94f1e1
--- /dev/null
+++ b/Content.Client/UserInterface/RichText/TextLinkTag.Entity.cs
@@ -0,0 +1,60 @@
+using Content.Shared.Chat;
+using Content.Client.UserInterface.Systems.Chat;
+using Robust.Shared.GameObjects.Components.Localization;
+using Robust.Shared.Utility;
+
+namespace Content.Client.UserInterface.RichText;
+
+public sealed partial class TextLinkTag
+{
+    /// <summary>
+    ///entity="<NetEntity>" resolver. Clickable only if the local viewer is
+    /// currently allowed to click chat names.
+    /// </summary>
+    private bool TryResolveEntityLink(MarkupNode node, out LinkData data)
+    {
+        data = default;
+
+        if (!node.Attributes.TryGetValue(EntityAttributeName, out var entParam) ||
+            !entParam.TryGetString(out var entStr))
+        {
+            return false;
+        }
+
+        if (!NetEntity.TryParse(entStr, out var netEntity))
+            return false;
+
+        var color = GetLinkColor(node, netEntity);
+
+        data = new LinkData(LinkString: null, LinkEntity: netEntity, Color: color);
+        return true;
+    }
+
+    /// <summary>
+    /// Sets LinkColor if TextLink param and ChatNameColors Cvar allow.
+    /// </summary>
+    private Color? GetLinkColor(MarkupNode node, NetEntity netEntity)
+    {
+        if (!node.Attributes.TryGetValue(UseEntityNameColorAttributeName, out var useNameColorParam) ||
+            !useNameColorParam.TryGetString(out var useNameColorStr) ||
+            !bool.TryParse(useNameColorStr, out var useNameColor) ||
+            !useNameColor)
+        {
+            return null;
+        }
+
+        var chatUi = _ui.GetUIController<ChatUIController>();
+
+        if (!chatUi.ChatNameColorsEnabled)
+            return null;
+
+        if (!_entity.TryGetEntity(netEntity, out var uid) || !_entity.EntityExists(uid))
+            return null;
+
+        if (!_entity.TryGetComponent<GrammarComponent>(uid, out var grammar) || grammar.ProperNoun != true)
+            return null;
+
+        var name = _entity.GetComponent<MetaDataComponent>(uid.Value).EntityName;
+        return Color.FromHex(chatUi.GetNameColor(name));
+    }
+}
diff --git a/Content.Client/UserInterface/RichText/TextLinkTag.Plain.cs b/Content.Client/UserInterface/RichText/TextLinkTag.Plain.cs
new file mode 100644
index 0000000000..9defaf0253
--- /dev/null
+++ b/Content.Client/UserInterface/RichText/TextLinkTag.Plain.cs
@@ -0,0 +1,21 @@
+using Robust.Shared.Utility;
+
+namespace Content.Client.UserInterface.RichText;
+
+public sealed partial class TextLinkTag
+{
+    ///<summary>link="<string>" resolver. Always clickable, uses DefaultLinkColor for color.</summary>
+    private bool TryResolvePlainLink(MarkupNode node, out LinkData data)
+    {
+        data = default;
+
+        if (!node.Attributes.TryGetValue(LinkAttributeName, out var linkParam) ||
+            !linkParam.TryGetString(out var linkStr))
+        {
+            return false;
+        }
+
+        data = new LinkData(LinkString: linkStr, LinkEntity: null, Color: null);
+        return true;
+    }
+}
diff --git a/Content.Client/UserInterface/RichText/TextLinkTag.cs b/Content.Client/UserInterface/RichText/TextLinkTag.cs
new file mode 100644
index 0000000000..98fde7e8ac
--- /dev/null
+++ b/Content.Client/UserInterface/RichText/TextLinkTag.cs
@@ -0,0 +1,140 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Client.Stylesheets.Fonts;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.RichText;
+using Robust.Shared.Utility;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Chat;
+using Robust.Client.ResourceManagement;
+
+namespace Content.Client.UserInterface.RichText;
+
+/// <summary>
+/// Markup tag handler for <c>[textlink="LinkText"]</c> nodes. Renders a link
+/// <see cref="Label"/> in rich text, covering two link types:
+/// <list type="bullet">
+/// <item><description>link="GuideEntryPrototypeID" — a plain link.</description></item>
+/// <item><description>entity="NetEntity" — an entity link.</description></item>
+/// </list>
+/// Optional parameters:
+/// <list type="bullet">
+/// <item><description>color="HexColor" — color override.</description></item>
+/// <item><description>entitynamecolor="Bool" — entity links only; opt into using the entity's name color.</description></item>
+/// </list>
+/// </summary>
+[UsedImplicitly]
+public sealed partial class TextLinkTag : IMarkupTagHandler
+{
+    [Dependency] private IEntityManager _entity = default!;
+    [Dependency] private IUserInterfaceManager _ui = default!;
+    [Dependency] private IResourceCache _cache = default!;
+    private SharedChatSystem? _chat;
+
+    public string Name => "textlink";
+    public static Color DefaultLinkColor => Color.CornflowerBlue;
+    private const string EntityAttributeName = "entity";
+    private const string LinkAttributeName = "link";
+    private const string ColorOverrideAttributeName = "color"; // DefaultLinkColor override
+    private const string UseEntityNameColorAttributeName = "entitynamecolor"; // entity links only: opt into per-entity name coloring
+
+    private delegate bool TryResolveLink(MarkupNode node, out LinkData data);
+    private readonly (string AttributeName, TryResolveLink Resolver)[] _resolvers; // for parsing link to correct resolver
+    /// <summary>
+    /// Resolved Link Data, LinkString and LinkEntity should not be populated at the same time
+    /// </summary>
+    private readonly record struct LinkData(string? LinkString, NetEntity? LinkEntity, Color? Color);
+
+    public TextLinkTag()
+    {
+        _resolvers =
+        [
+            (EntityAttributeName, TryResolveEntityLink),
+            (LinkAttributeName, TryResolvePlainLink),
+        ];
+    }
+
+    /// <summary>
+    ///  Takes a TextLink <see cref="MarkupNode"/>, parses it and creates a TextLink <see cref="Label"/>.
+    /// Fails if it cannot parse link content, or if the resolver cannot create valid <see cref="LinkData"/>.
+    /// </summary>
+    public bool TryCreateControl(MarkupNode node, [NotNullWhen(true)] out Control? control)
+    {
+        control = null;
+        LinkData linkData = default;
+
+        var linkTypeResolved = false;
+
+        if (!node.Value.TryGetString(out var text))
+        {
+            return false;
+        }
+
+        foreach (var (attrname, resolver) in _resolvers)
+        {
+            if (!node.Attributes.ContainsKey(attrname))
+                continue;
+
+            if(!resolver(node, out linkData))
+            {
+                return false;
+            }
+
+            linkTypeResolved = true;
+            break;
+        }
+
+        if (!linkTypeResolved)
+        {
+            return false;
+        }
+
+
+        // color= > resolver-supplied color > default
+        var linkColor = ResolveColorOverride(node) ?? linkData.Color ?? DefaultLinkColor;
+        var linkLabel = new TextLinkLabel() { Text = text, LinkString = linkData.LinkString, LinkEntity = linkData.LinkEntity, LinkColor = linkColor};
+
+        // eat my ass about where this magic number comes from
+        // our UI stack is awful. Finding this magic number was awful.
+        // The entire system is full of TODOs and unhelpful obsoletes that just say to go to another system which is using the EXACT SAME OBSOLETED OBJECTS
+        var boldFont = new NotoFontFamilyStack(_cache).GetFont(FontTag.DefaultSize, FontKind.Bold);
+        if (linkData.LinkEntity is not null)
+        {
+            linkLabel.FontOverride = boldFont;
+        }
+
+        _chat ??= _entity.System<SharedChatSystem>();
+        linkLabel.UpdateLabelProperties(_chat);
+
+        control = linkLabel;
+        return true;
+    }
+
+    private static Color? ResolveColorOverride(MarkupNode node)
+    {
+        if (!node.Attributes.TryGetValue(ColorOverrideAttributeName, out var colorParam) ||
+            !colorParam.TryGetString(out var colorStr))
+        {
+            return null;
+        }
+
+        return Color.TryFromHex(colorStr, out var color) ? color : null;
+    }
+}
+
+/// <summary>
+/// Implement on a control to receive clicks on nested [textlink link=] nodes.
+/// </summary>
+public interface ILinkClickHandler
+{
+    public void HandleClick(string link);
+}
+
+/// <summary>
+/// Implement on a control to receive clicks on nested [textlink entity=] nodes.
+/// </summary>
+public interface IEntityLinkClickHandler
+{
+    public void HandleClick(NetEntity netEntity);
+}
diff --git a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
index 12f8422aeb..d9cd9fb396 100644
--- a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
+++ b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Client.UserInterface.Systems.Chat.Widgets;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
index 1b64609d93..69c48f881d 100644
--- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
+++ b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
@@ -288,8 +288,8 @@ public sealed class ActionButton : Control, IEntityControl
     public void UpdateBackground()
     {
         _controller ??= UserInterfaceManager.GetUIController<ActionUIController>();
-        if (Action != null ||
-            _controller.IsDragging && GetPositionInParent() == Parent?.ChildCount - 1)
+        if (Action != null
+            || _controller.IsDragging && (Parent == null || GetPositionInParent() == Parent?.ChildCount - 1))
         {
             Button.Texture = _slotBackground;
         }
diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionPageButtons.xaml.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionPageButtons.xaml.cs
index 9610ad6ae5..e92717d617 100644
--- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionPageButtons.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Actions/Controls/ActionPageButtons.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/UserInterface/Systems/Actions/Widgets/ActionsBar.xaml.cs b/Content.Client/UserInterface/Systems/Actions/Widgets/ActionsBar.xaml.cs
index 8e95992ff6..25b670bf6e 100644
--- a/Content.Client/UserInterface/Systems/Actions/Widgets/ActionsBar.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Actions/Widgets/ActionsBar.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/UserInterface/Systems/Actions/Windows/ActionsWindow.xaml.cs b/Content.Client/UserInterface/Systems/Actions/Windows/ActionsWindow.xaml.cs
index 4aaabb3d05..50bdb0cac5 100644
--- a/Content.Client/UserInterface/Systems/Actions/Windows/ActionsWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Actions/Windows/ActionsWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
index df4c6247e8..bfb7e8251f 100644
--- a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
+++ b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
@@ -1,4 +1,4 @@
-using Content.Client.Administration.Managers;
+using Content.Client.Administration.Managers;
 using Content.Client.Administration.Systems;
 using Content.Client.Administration.UI;
 using Content.Client.Administration.UI.Tabs.ObjectsTab;
diff --git a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
index d9ac734a4b..2a7b797e13 100644
--- a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
+++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
@@ -4,7 +4,7 @@ using Content.Client.Resources;
 using Content.Client.Stylesheets;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.EntitySystems;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Systems;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/UserInterface/Systems/Character/Controls/CharacterObjectiveControl.xaml.cs b/Content.Client/UserInterface/Systems/Character/Controls/CharacterObjectiveControl.xaml.cs
index e17c8aca2f..4d82ddb869 100644
--- a/Content.Client/UserInterface/Systems/Character/Controls/CharacterObjectiveControl.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Character/Controls/CharacterObjectiveControl.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/UserInterface/Systems/Character/Windows/CharacterWindow.xaml.cs b/Content.Client/UserInterface/Systems/Character/Windows/CharacterWindow.xaml.cs
index 5876b56aa5..ce4cf6c686 100644
--- a/Content.Client/UserInterface/Systems/Character/Windows/CharacterWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Character/Windows/CharacterWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index 74ad0ef0d2..856ae98026 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -68,9 +68,11 @@ public sealed partial class ChatUIController : UIController
     [UISystemDependency] private readonly MindSystem? _mindSystem = default!;
     [UISystemDependency] private readonly RoleCodewordSystem? _roleCodewordSystem = default!;
 
+    private SharedChatSystem? _sharedChatSys;
     private static readonly ProtoId<ColorPalettePrototype> ChatNamePalette = "ChatNames";
     private string[] _chatNameColors = default!;
     private bool _chatNameColorsEnabled;
+    public bool ChatNameColorsEnabled { get; private set; }
 
     private ISawmill _sawmill = default!;
 
@@ -187,7 +189,7 @@ public sealed partial class ChatUIController : UIController
         SubscribeNetworkEvent<DamageForceSayEvent>(OnDamageForceSay);
         _config.OnValueChanged(CCVars.ChatEnableColorName, (value) => { _chatNameColorsEnabled = value; });
         _chatNameColorsEnabled = _config.GetCVar(CCVars.ChatEnableColorName);
-
+        ChatNameColorsEnabled = _chatNameColorsEnabled;
         _speechBubbleRoot = new LayoutContainer();
 
         UpdateChannelPermissions();
@@ -428,8 +430,8 @@ public sealed partial class ChatUIController : UIController
     private void OnAttachedChanged(EntityUid uid)
     {
         UpdateChannelPermissions();
-
         UpdateAutoFillHighlights();
+        UpdateLinkLabels();
     }
 
     private void AddSpeechBubble(ChatMessage msg, SpeechBubble.SpeechType speechType)
@@ -952,6 +954,16 @@ public sealed partial class ChatUIController : UIController
         }
     }
 
+    private void UpdateLinkLabels()
+    {
+        _sharedChatSys ??= _ent.System<SharedChatSystem>();
+
+        foreach (var chat in _chats)
+        {
+            chat.UpdateTextLinkLabelProperties(_sharedChatSys);
+        }
+    }
+
     /// <summary>
     /// Returns the chat name color for a mob
     /// </summary>
diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterButton.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterButton.cs
index c5b810ced3..ace95836e3 100644
--- a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterButton.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterButton.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Client.Resources;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterCheckbox.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterCheckbox.cs
index 9cf890354d..6e30ca41c3 100644
--- a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterCheckbox.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterCheckbox.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chat;
+using Content.Shared.Chat;
 using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.UserInterface.Systems.Chat.Controls;
diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.xaml.cs
index e9345d25f9..087c368f7b 100644
--- a/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chat;
+using Content.Shared.Chat;
 using Content.Shared.Input;
 using Robust.Client.UserInterface.Controls;
 
diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChatPopupButton.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChatPopupButton.cs
index e284eda2b6..639406dcc7 100644
--- a/Content.Client/UserInterface/Systems/Chat/Controls/ChatPopupButton.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Controls/ChatPopupButton.cs
@@ -1,4 +1,4 @@
-using Robust.Client.UserInterface;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
 
diff --git a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
index 31cf35bfbd..b2062c72fb 100644
--- a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
+++ b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
@@ -1,14 +1,12 @@
 <widgets:ChatBox
     xmlns="https://spacestation14.io"
-    xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
     xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.Chat.Widgets"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Systems.Chat.Controls"
     MouseFilter="Stop"
     HorizontalExpand="True"
     VerticalExpand="True"
     MinSize="465 225">
-    <PanelContainer Name="ChatWindowPanel" Access="Public" HorizontalExpand="True" VerticalExpand="True"
-                    StyleClasses="StyleNano.StyleClassChatPanel">
+    <PanelContainer Name="ChatWindowPanel" Access="Public" HorizontalExpand="True" VerticalExpand="True">
         <BoxContainer Orientation="Vertical" SeparationOverride="4" HorizontalExpand="True" VerticalExpand="True">
             <OutputPanel Name="Contents" HorizontalExpand="True" VerticalExpand="True" Margin="8 8 8 4" ShowScrollDownButton="True" />
             <controls:ChatInputBox HorizontalExpand="True" Name="ChatInput" Access="Public" Margin="2"/>
diff --git a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
index 721eaa2ff1..f5545a496f 100644
--- a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
@@ -1,9 +1,10 @@
+using Content.Client.UserInterface.Controls;
+using Content.Client.UserInterface.RichText;
 using Content.Client.UserInterface.Systems.Chat.Controls;
 using Content.Shared.Chat;
 using Content.Shared.Input;
 using Robust.Client.Audio;
 using Robust.Client.AutoGenerated;
-using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -17,7 +18,7 @@ namespace Content.Client.UserInterface.Systems.Chat.Widgets;
 
 [GenerateTypedNameReferences]
 [Virtual]
-public partial class ChatBox : UIWidget
+public partial class ChatBox : UIWidget, IEntityLinkClickHandler
 {
     [Dependency] private IEntityManager _entManager = default!;
     [Dependency] private ILogManager _log = default!;
@@ -91,6 +92,20 @@ public partial class ChatBox : UIWidget
         }
     }
 
+    /// <summary>
+    /// Calls update function on every child <see cref="TextLinkLabel"/> in the ChatBox's OutputPanel "Contents"
+    /// </summary>
+    public void UpdateTextLinkLabelProperties(SharedChatSystem _sharedChatSys)
+    {
+        foreach (var contentsChild in Contents.Children)
+        {
+            if (contentsChild is TextLinkLabel textLinkLabel)
+            {
+                textLinkLabel.UpdateLabelProperties(_sharedChatSys);
+            }
+        }
+    }
+
     private void OnChannelFilter(ChatChannel channel, bool active)
     {
         Contents.Clear();
@@ -157,6 +172,15 @@ public partial class ChatBox : UIWidget
         ChatInput.ChannelSelector.Select(toSelect);
     }
 
+    /// <summary>
+    /// Sends a message to the server when this chat message is clicked.
+    /// </summary>
+    /// <param name="netEntity">Target entity of our event</param>
+    public void HandleClick(NetEntity netEntity)
+    {
+        _entManager.RaisePredictiveEvent(new ChatLinkClickedRequestEvent(netEntity));
+    }
+
     private void OnInputKeyBindDown(GUIBoundKeyEventArgs args)
     {
         if (args.Function == EngineKeyFunctions.TextReleaseFocus)
diff --git a/Content.Client/UserInterface/Systems/DecalPlacer/DecalPlacerUIController.cs b/Content.Client/UserInterface/Systems/DecalPlacer/DecalPlacerUIController.cs
index 7bfd99ed2f..d384d5ec3a 100644
--- a/Content.Client/UserInterface/Systems/DecalPlacer/DecalPlacerUIController.cs
+++ b/Content.Client/UserInterface/Systems/DecalPlacer/DecalPlacerUIController.cs
@@ -1,4 +1,4 @@
-using Content.Client.Decals.UI;
+using Content.Client.Decals.UI;
 using Content.Client.Gameplay;
 using Content.Client.Sandbox;
 using Content.Shared.Decals;
diff --git a/Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs b/Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs
index ddd2692b96..6417dfa5bc 100644
--- a/Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs
+++ b/Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs
@@ -140,7 +140,7 @@ public sealed partial class EmotesUIController : UIController, IOnStateChanged<G
         Dictionary<EmoteCategory, List<RadialMenuOptionBase>> emotesByCategory = new();
         foreach (var emote in emotePrototypes)
         {
-            if(emote.Category == EmoteCategory.Invalid)
+            if (emote.Category == EmoteCategory.Invalid)
                 continue;
 
             // only valid emotes that have ways to be triggered by chat and player have access / no restriction on
diff --git a/Content.Client/UserInterface/Systems/EscapeMenu/EscapeContextUIController.cs b/Content.Client/UserInterface/Systems/EscapeMenu/EscapeContextUIController.cs
index 663a6ea0d5..0f090d553d 100644
--- a/Content.Client/UserInterface/Systems/EscapeMenu/EscapeContextUIController.cs
+++ b/Content.Client/UserInterface/Systems/EscapeMenu/EscapeContextUIController.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Systems.Info;
+using Content.Client.UserInterface.Systems.Info;
 using Content.Shared.Input;
 using JetBrains.Annotations;
 using Robust.Client.Input;
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml
index 141b56c132..12f147ff61 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml
@@ -1,9 +1,10 @@
-<DefaultWindow xmlns="https://spacestation14.io" Title="{Loc 'ghost-target-window-title'}" MinSize="450 450"
+<DefaultWindow xmlns="https://spacestation14.io"
+               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls" Title="{Loc 'ghost-target-window-title'}" MinSize="450 450"
                SetSize="450 500">
     <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="0.4">
         <BoxContainer Orientation="Vertical" Margin="0 4 0 4">
             <RichTextLabel Text="{Loc 'ghost-target-window-warp-to-title'}" HorizontalAlignment="Center" />
-            <PanelContainer StyleClasses="LowDivider" Margin="0 5" />
+            <controls:Separator StyleClasses="LowDivider" Margin="0 5"/>
             <BoxContainer Orientation="Horizontal" Align="Center">
                 <Button Name="GhostnadoButton" Text="{Loc 'ghost-target-window-warp-to-most-followed'}"
                         ToolTip="{Loc 'ghost-target-window-warp-to-most-followed-tooltip'}"
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml.cs
index 31d0e5c68b..fb7395587c 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Ghost.Roles;
+using Content.Shared.Ghost.Roles;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml
index e24455bdf5..77db41dc43 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml
@@ -1,8 +1,9 @@
 <BoxContainer xmlns="https://spacestation14.io"
+              xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
               Orientation="Vertical">
     <Label Name="Title"
            StyleClasses="LabelKeyText"/>
-    <PanelContainer StyleClasses="HighDivider" />
+    <controls:Separator StyleClasses="HighDivider"/>
     <RichTextLabel Name="Description"
                    Margin="0 4"/>
 </BoxContainer>
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs
index fd89488aa4..a0d7c0e9d9 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs
@@ -1,4 +1,4 @@
-using Content.Client.Eui;
+using Content.Client.Eui;
 using Content.Shared.Eui;
 using Content.Shared.Ghost.Roles;
 using Content.Shared.Ghost.Roles.Raffles;
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
index 3dc3bc3e31..6835ca6b7a 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Shared.Ghost.Roles.Raffles;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/UserInterface/Systems/Hands/Controls/HandButton.cs b/Content.Client/UserInterface/Systems/Hands/Controls/HandButton.cs
index d5794f7195..2e8aa62779 100644
--- a/Content.Client/UserInterface/Systems/Hands/Controls/HandButton.cs
+++ b/Content.Client/UserInterface/Systems/Hands/Controls/HandButton.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Controls;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Hands.Components;
 
 namespace Content.Client.UserInterface.Systems.Hands.Controls;
diff --git a/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs b/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs
index 8924d998fa..0477a3bbf6 100644
--- a/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs
+++ b/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs
@@ -6,7 +6,8 @@ using Content.Client.UserInterface.Systems.Hotbar.Widgets;
 using Content.Shared.Hands.Components;
 using Content.Shared.Input;
 using Content.Shared.Inventory.VirtualItem;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controllers;
@@ -373,7 +374,8 @@ public sealed partial class HandsUIController : UIController, IOnStateEntered<Ga
                 hand.CooldownDisplay.Visible = false;
                 continue;
             }
-            var delay = _useDelay.GetLastEndingDelay((hand.Entity.Value, useDelay));
+
+            _useDelay.GetLastActiveDelay((hand.Entity.Value, useDelay), out var delay);
 
             hand.CooldownDisplay.Visible = true;
             hand.CooldownDisplay.FromTime(delay.StartTime, delay.EndTime);
diff --git a/Content.Client/UserInterface/Systems/Hotbar/HotbarUIController.cs b/Content.Client/UserInterface/Systems/Hotbar/HotbarUIController.cs
index c567fb55fc..c69be00979 100644
--- a/Content.Client/UserInterface/Systems/Hotbar/HotbarUIController.cs
+++ b/Content.Client/UserInterface/Systems/Hotbar/HotbarUIController.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Systems.Gameplay;
+using Content.Client.UserInterface.Systems.Gameplay;
 using Content.Client.UserInterface.Systems.Hands;
 using Content.Client.UserInterface.Systems.Hands.Controls;
 using Content.Client.UserInterface.Systems.Hotbar.Widgets;
diff --git a/Content.Client/UserInterface/Systems/Hotbar/Widgets/HotbarGui.xaml.cs b/Content.Client/UserInterface/Systems/Hotbar/Widgets/HotbarGui.xaml.cs
index 81dfffb062..cc74bec075 100644
--- a/Content.Client/UserInterface/Systems/Hotbar/Widgets/HotbarGui.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Hotbar/Widgets/HotbarGui.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Hands.Components;
+using Content.Shared.Hands.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/UserInterface/Systems/Inventory/Controls/InventoryDisplay.cs b/Content.Client/UserInterface/Systems/Inventory/Controls/InventoryDisplay.cs
index 0d49a5b53c..e3e367bccd 100644
--- a/Content.Client/UserInterface/Systems/Inventory/Controls/InventoryDisplay.cs
+++ b/Content.Client/UserInterface/Systems/Inventory/Controls/InventoryDisplay.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Client.UserInterface.Controls;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/UserInterface/Systems/Inventory/Controls/ItemSlotButtonContainer.cs b/Content.Client/UserInterface/Systems/Inventory/Controls/ItemSlotButtonContainer.cs
index 7a027fc4f8..322167f089 100644
--- a/Content.Client/UserInterface/Systems/Inventory/Controls/ItemSlotButtonContainer.cs
+++ b/Content.Client/UserInterface/Systems/Inventory/Controls/ItemSlotButtonContainer.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Controls;
+using Content.Client.UserInterface.Controls;
 
 namespace Content.Client.UserInterface.Systems.Inventory.Controls;
 
diff --git a/Content.Client/UserInterface/Systems/Inventory/Controls/ItemSlotUIContainer.cs b/Content.Client/UserInterface/Systems/Inventory/Controls/ItemSlotUIContainer.cs
index cd18c3e696..9fd734378d 100644
--- a/Content.Client/UserInterface/Systems/Inventory/Controls/ItemSlotUIContainer.cs
+++ b/Content.Client/UserInterface/Systems/Inventory/Controls/ItemSlotUIContainer.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.Controls;
 
diff --git a/Content.Client/UserInterface/Systems/Inventory/Widgets/InventoryGui.xaml.cs b/Content.Client/UserInterface/Systems/Inventory/Widgets/InventoryGui.xaml.cs
index 90154c5a9f..7d0c34debb 100644
--- a/Content.Client/UserInterface/Systems/Inventory/Widgets/InventoryGui.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Inventory/Widgets/InventoryGui.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/UserInterface/Systems/Inventory/Windows/StrippingWindow.xaml.cs b/Content.Client/UserInterface/Systems/Inventory/Windows/StrippingWindow.xaml.cs
index c2bd69a440..4efac224fa 100644
--- a/Content.Client/UserInterface/Systems/Inventory/Windows/StrippingWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Inventory/Windows/StrippingWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml.cs b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml.cs
index e39af3a8fc..0ccfb45382 100644
--- a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml.cs
+++ b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveBriefingControl.xaml.cs b/Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveBriefingControl.xaml.cs
index 9ca361a5bf..f5ac96d98b 100644
--- a/Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveBriefingControl.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveBriefingControl.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveConditionsControl.xaml.cs b/Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveConditionsControl.xaml.cs
index a43a5c91aa..465e4f54d5 100644
--- a/Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveConditionsControl.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveConditionsControl.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
diff --git a/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml.cs b/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml.cs
index 5c81349a40..f69554bf0b 100644
--- a/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.Markers;
+using Content.Client.Markers;
 using Content.Client.SubFloor;
 using Content.Client.Stylesheets;
 using Content.Shared.Silicons.StationAi;
diff --git a/Content.Client/UserInterface/XamlExtensions/TextureExtension.cs b/Content.Client/UserInterface/XamlExtensions/TextureExtension.cs
index 4a64b466c3..8a9e5c00f0 100644
--- a/Content.Client/UserInterface/XamlExtensions/TextureExtension.cs
+++ b/Content.Client/UserInterface/XamlExtensions/TextureExtension.cs
@@ -1,4 +1,4 @@
-using Content.Client.Resources;
+using Content.Client.Resources;
 using JetBrains.Annotations;
 using Robust.Client.ResourceManagement;
 
diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml
index 44b1ff95e7..ebb2cd4ae2 100644
--- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml
+++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml
@@ -2,14 +2,13 @@
     xmlns="https://spacestation14.io"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-    xmlns:co="clr-namespace:Content.Client.UserInterface.Controls"
     MinHeight="210">
     <BoxContainer Name="MainContainer" Orientation="Vertical">
         <LineEdit Name="SearchBar" PlaceHolder="{Loc 'vending-machine-component-search-filter'}" HorizontalExpand="True"  Margin ="4 4"/>
-        <co:SearchListContainer Name="VendingContents" VerticalExpand="True" Margin="4 4"/>
+        <controls:SearchListContainer Name="VendingContents" VerticalExpand="True" Margin="4 4"/>
          <!-- Footer -->
         <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
+            <controls:Separator StyleClasses="LowDivider"/>
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
                 <Label Text="{Loc 'vending-machine-flavor-left'}" StyleClasses="WindowFooterText" />
                 <Label Text="{Loc 'vending-machine-flavor-right'}" StyleClasses="WindowFooterText"
diff --git a/Content.Client/Verbs/UI/ConfirmationMenuElement.cs b/Content.Client/Verbs/UI/ConfirmationMenuElement.cs
index 1b9348cb6b..b8881b96c1 100644
--- a/Content.Client/Verbs/UI/ConfirmationMenuElement.cs
+++ b/Content.Client/Verbs/UI/ConfirmationMenuElement.cs
@@ -1,4 +1,4 @@
-using Content.Client.ContextMenu.UI;
+using Content.Client.ContextMenu.UI;
 using Content.Shared.Verbs;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
diff --git a/Content.Client/Viewport/IMainViewport.cs b/Content.Client/Viewport/IMainViewport.cs
index 01abbd4137..9ef720de06 100644
--- a/Content.Client/Viewport/IMainViewport.cs
+++ b/Content.Client/Viewport/IMainViewport.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Controls;
+using Content.Client.UserInterface.Controls;
 
 namespace Content.Client.Viewport
 {
diff --git a/Content.Client/Viewport/ViewportExt.cs b/Content.Client/Viewport/ViewportExt.cs
index 74c2b499dc..61e34c203e 100644
--- a/Content.Client/Viewport/ViewportExt.cs
+++ b/Content.Client/Viewport/ViewportExt.cs
@@ -1,4 +1,4 @@
-using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.CustomControls;
 
 namespace Content.Client.Viewport
 {
diff --git a/Content.Client/Voting/UI/VoteCallMenu.xaml b/Content.Client/Voting/UI/VoteCallMenu.xaml
index cee37a3ff8..654213804c 100644
--- a/Content.Client/Voting/UI/VoteCallMenu.xaml
+++ b/Content.Client/Voting/UI/VoteCallMenu.xaml
@@ -10,7 +10,7 @@
             <TextureButton Name="CloseButton" StyleClasses="windowCloseButton"
                            VerticalAlignment="Center" />
         </BoxContainer>
-        <controls:HighDivider />
+        <controls:Separator StyleClasses="HighDivider"/>
 
         <BoxContainer Orientation="Vertical" Margin="8 2 8 0" VerticalExpand="True" VerticalAlignment="Top">
             <BoxContainer Orientation="Vertical">
@@ -26,7 +26,7 @@
 
         <Button Margin="8 32 8 2" Name="CreateButton" Text="{Loc 'ui-vote-create-button'}" />
 
-        <PanelContainer StyleClasses="LowDivider" />
+        <controls:Separator StyleClasses="LowDivider"/>
         <Label Margin="12 0 0 0" StyleClasses="LabelSubText" Text="{Loc 'ui-vote-fluff'}" />
     </BoxContainer>
 </ui:VoteCallMenu>
diff --git a/Content.Client/Voting/UI/VoteCallMenuButton.cs b/Content.Client/Voting/UI/VoteCallMenuButton.cs
index 27490eaaa3..466266eb4c 100644
--- a/Content.Client/Voting/UI/VoteCallMenuButton.cs
+++ b/Content.Client/Voting/UI/VoteCallMenuButton.cs
@@ -1,4 +1,4 @@
-using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.Controls;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.BasicEntity.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.BasicEntity.cs
index 669bc3ec40..2ba224a39b 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.BasicEntity.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.BasicEntity.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Weapons.Ranged.Components;
 
 namespace Content.Client.Weapons.Ranged.Systems;
 
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.CustomAmmoCounter.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.CustomAmmoCounter.cs
index 0213ce1d1e..10e6e38b9b 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.CustomAmmoCounter.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.CustomAmmoCounter.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Weapons.Ranged.Components;
 
 namespace Content.Client.Weapons.Ranged.Systems;
 
diff --git a/Content.Client/Weather/WeatherSystem.cs b/Content.Client/Weather/WeatherSystem.cs
index db420cb679..40c5bba5b3 100644
--- a/Content.Client/Weather/WeatherSystem.cs
+++ b/Content.Client/Weather/WeatherSystem.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared.CCVar;
 using Content.Shared.Light.Components;
 using Content.Shared.StatusEffectNew.Components;
 using Content.Shared.Weather;
@@ -7,6 +8,7 @@ using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Shared.Audio.Components;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
@@ -19,15 +21,19 @@ public sealed partial class WeatherSystem : SharedWeatherSystem
     [Dependency] private AudioSystem _audio = default!;
     [Dependency] private MapSystem _mapSystem = default!;
     [Dependency] private SharedTransformSystem _transform = default!;
+    [Dependency] private IConfigurationManager _cfg = default!;
 
     [Dependency] private EntityQuery<AudioComponent> _audioQuery = default!;
     [Dependency] private EntityQuery<MapGridComponent> _gridQuery = default!;
     [Dependency] private EntityQuery<RoofComponent> _roofQuery = default!;
 
+    private float _weatherGain;
+
     public override void Initialize()
     {
         base.Initialize();
 
+        Subs.CVar(_cfg, CCVars.AmbienceVolume, value => _weatherGain = value, true);
         SubscribeLocalEvent<WeatherStatusEffectComponent, ComponentShutdown>(OnComponentShutdown);
     }
 
@@ -129,6 +135,7 @@ public sealed partial class WeatherSystem : SharedWeatherSystem
 
             var alpha = GetWeatherPercent((uid, status));
             alpha *= SharedAudioSystem.VolumeToGain(weather.Sound.Params.Volume);
+            alpha *= _weatherGain;
             _audio.SetGain(weather.Stream, alpha, audio);
             audio.Occlusion = occlusion;
         }
diff --git a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml
index 14db2bdf60..e08a641abd 100644
--- a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml
+++ b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml
@@ -1,7 +1,6 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
     xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
     xmlns:ui="clr-namespace:Content.Client.Xenoarchaeology.Ui"
     Title="{Loc 'analysis-console-menu-title'}"
     MinSize="700 350"
@@ -16,7 +15,7 @@
                     <SpriteView Name="ArtifactView" Scale="4 4" HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalExpand="True" VerticalExpand="True"/>
                 </BoxContainer>
             </PanelContainer>
-            <customControls:HSeparator StyleClasses="HighDivider" Margin="0 15 0 10"/>
+            <controls:Separator StyleClasses="HighDivider" Margin="0 15 0 10"/>
             <BoxContainer Name="ExtractContainer" Orientation="Vertical" VerticalExpand="True" Visible="False">
                 <PanelContainer HorizontalExpand="True" VerticalExpand="True" RectClipContent="True">
                     <PanelContainer.PanelOverride>
@@ -69,7 +68,7 @@
                 </BoxContainer>
             </BoxContainer>
         </BoxContainer>
-        <customControls:VSeparator StyleClasses="LowDivider" />
+        <controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
         <BoxContainer HorizontalExpand="True" VerticalExpand="True">
             <PanelContainer Margin="10 10 10 10" HorizontalExpand="True" RectClipContent="True">
                 <PanelContainer.PanelOverride>
diff --git a/Content.Docfx/docfx.json b/Content.Docfx/docfx.json
index b5ca8035ee..3ba4e66708 100644
--- a/Content.Docfx/docfx.json
+++ b/Content.Docfx/docfx.json
@@ -131,4 +131,4 @@
     "cleanupCacheHistory": false,
     "disableGitFeatures": false
   }
-}
\ No newline at end of file
+}
diff --git a/Content.Docfx/toc.yml b/Content.Docfx/toc.yml
index 5009f2f9b0..a64413d90b 100644
--- a/Content.Docfx/toc.yml
+++ b/Content.Docfx/toc.yml
@@ -15,4 +15,4 @@
   
 # Unit testing
 - name: Content.Tests
-  href: api/Content.Tests/
\ No newline at end of file
+  href: api/Content.Tests/
diff --git a/Content.IntegrationTests/AssemblyInfo.cs b/Content.IntegrationTests/AssemblyInfo.cs
index b8a88e2623..4b33754a82 100644
--- a/Content.IntegrationTests/AssemblyInfo.cs
+++ b/Content.IntegrationTests/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-[assembly: Parallelizable(ParallelScope.Children)]
+[assembly: Parallelizable(ParallelScope.Children)]
 
 // I don't know why this parallelism limit was originally put here.
 // I *do* know that I tried removing it, and ran into the following .NET runtime problem:
diff --git a/Content.IntegrationTests/Pair/TestPair.Helpers.cs b/Content.IntegrationTests/Pair/TestPair.Helpers.cs
index 25cb78ec35..bae6f886f2 100644
--- a/Content.IntegrationTests/Pair/TestPair.Helpers.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Helpers.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Preferences.Managers;
diff --git a/Content.IntegrationTests/Pair/TestPair.Recycle.cs b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
index 887361a872..8e67627cdb 100644
--- a/Content.IntegrationTests/Pair/TestPair.Recycle.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
@@ -35,7 +35,7 @@ public sealed partial class TestPair
     protected override async Task Recycle(PairSettings next, TextWriter testOut)
     {
         // Move to pre-round lobby. Required to toggle dummy ticker on and off
-        var gameTicker = Server.System<GameTicker>();
+        var gameTicker = Server.System<ServerGameTicker>();
         if (gameTicker.RunLevel != GameRunLevel.PreRoundLobby)
         {
             await testOut.WriteLineAsync($"Recycling: {Watch.Elapsed.TotalMilliseconds} ms: Restarting round.");
@@ -68,7 +68,7 @@ public sealed partial class TestPair
         Assert.That(cfg.GetCVar(CCVars.GameLobbyEnabled), Is.EqualTo(settings.InLobby));
         Assert.That(cfg.GetCVar(CCVars.GameDummyTicker), Is.EqualTo(settings.DummyTicker));
 
-        var ticker = Server.System<GameTicker>();
+        var ticker = Server.System<ServerGameTicker>();
         Assert.That(ticker.DummyTicker, Is.EqualTo(settings.DummyTicker));
 
         var expectPreRound = settings.InLobby | settings.DummyTicker;
diff --git a/Content.IntegrationTests/Pair/TestPair.cs b/Content.IntegrationTests/Pair/TestPair.cs
index 81f99146f7..6c6c69a778 100644
--- a/Content.IntegrationTests/Pair/TestPair.cs
+++ b/Content.IntegrationTests/Pair/TestPair.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System.Collections.Generic;
 using Content.Client.IoC;
 using Content.Client.Parallax.Managers;
@@ -40,7 +40,7 @@ public sealed partial class TestPair : RobustIntegrationTest.TestPair
         var settings = (PoolSettings)Settings;
         if (!settings.DummyTicker)
         {
-            var gameTicker = Server.System<GameTicker>();
+            var gameTicker = Server.System<ServerGameTicker>();
             await Server.WaitPost(() => gameTicker.RestartRound());
         }
     }
diff --git a/Content.IntegrationTests/PoolManagerTestEventHandler.cs b/Content.IntegrationTests/PoolManagerTestEventHandler.cs
index be4c746a60..ffdfa8065a 100644
--- a/Content.IntegrationTests/PoolManagerTestEventHandler.cs
+++ b/Content.IntegrationTests/PoolManagerTestEventHandler.cs
@@ -1,4 +1,4 @@
-namespace Content.IntegrationTests;
+namespace Content.IntegrationTests;
 
 [SetUpFixture]
 public sealed class PoolManagerTestEventHandler
diff --git a/Content.IntegrationTests/PoolSettings.cs b/Content.IntegrationTests/PoolSettings.cs
index fe37c38fe3..5b445c404f 100644
--- a/Content.IntegrationTests/PoolSettings.cs
+++ b/Content.IntegrationTests/PoolSettings.cs
@@ -1,4 +1,4 @@
-namespace Content.IntegrationTests;
+namespace Content.IntegrationTests;
 
 /// <inheritdoc/>
 public sealed class PoolSettings : PairSettings
diff --git a/Content.IntegrationTests/Tests/Actions/RetractableItemActionTest.cs b/Content.IntegrationTests/Tests/Actions/RetractableItemActionTest.cs
index d1befce12c..05199a5a18 100644
--- a/Content.IntegrationTests/Tests/Actions/RetractableItemActionTest.cs
+++ b/Content.IntegrationTests/Tests/Actions/RetractableItemActionTest.cs
@@ -9,7 +9,7 @@ namespace Content.IntegrationTests.Tests.Actions;
 
 public sealed class RetractableItemActionTest : InteractionTest
 {
-    private static readonly EntProtoId ArmBladeActionProtoId = "ActionRetractableItemArmBlade";
+    private static readonly EntProtoId ArmbladeActionProtoId = "ActionRetractableItemArmblade";
 
     /// <summary>
     /// Gives the player the arm blade action, then activates it and makes sure they are given the blade.
@@ -29,7 +29,7 @@ public sealed class RetractableItemActionTest : InteractionTest
             Assert.That(heldItem, Is.Null, $"Player is holding an item ({SEntMan.ToPrettyString(heldItem)}) at start of test.");
 
             // Inspect the action prototype to find the item it spawns
-            var armBladeActionProto = ProtoMan.Index(ArmBladeActionProtoId);
+            var armBladeActionProto = ProtoMan.Index(ArmbladeActionProtoId);
 
             // Find the component
             Assert.That(armBladeActionProto.TryComp<RetractableItemActionComponent>(out var actionComp, SEntMan.ComponentFactory));
@@ -37,7 +37,7 @@ public sealed class RetractableItemActionTest : InteractionTest
             var spawnedProtoId = actionComp!.SpawnedPrototype;
 
             // Add the action to the player
-            var actionUid = actionsSystem.AddAction(playerUid, ArmBladeActionProtoId);
+            var actionUid = actionsSystem.AddAction(playerUid, ArmbladeActionProtoId);
             // Make sure the player has the action now
             Assert.That(actionUid, Is.Not.Null, "Failed to add action to player.");
             var actionEnt = actionsSystem.GetAction(actionUid);
diff --git a/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs b/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs
index d53b07b552..0992111e6c 100644
--- a/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs
+++ b/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using Content.IntegrationTests.Fixtures;
@@ -25,7 +25,7 @@ public sealed class AddTests : GameTest
 
     [SidedDependency(Side.Server)] private readonly IAdminLogManager _sAdminLogManager = null!;
     [SidedDependency(Side.Server)] private readonly IServerDbManager _sDbManager = null!;
-    [SidedDependency(Side.Server)] private readonly GameTicker _sGameTicker = null!;
+    [SidedDependency(Side.Server)] private readonly ServerGameTicker _sGameTicker = null!;
     [SidedDependency(Side.Server)] private readonly IPlayerManager _sPlayerManager = null!;
 
     [Test]
@@ -238,7 +238,7 @@ public sealed class PreRoundAddTests : GameTest
 
     [SidedDependency(Side.Server)] private readonly IAdminLogManager _sAdminLogManager = null!;
     [SidedDependency(Side.Server)] private readonly IServerDbManager _sDbManager = null!;
-    [SidedDependency(Side.Server)] private readonly GameTicker _sGameTicker = null!;
+    [SidedDependency(Side.Server)] private readonly ServerGameTicker _sGameTicker = null!;
 
     [Test]
     public async Task PreRoundAddAndGetSingle()
diff --git a/Content.IntegrationTests/Tests/Administration/Logs/QueryTests.cs b/Content.IntegrationTests/Tests/Administration/Logs/QueryTests.cs
index 55b36ebae1..8567c70012 100644
--- a/Content.IntegrationTests/Tests/Administration/Logs/QueryTests.cs
+++ b/Content.IntegrationTests/Tests/Administration/Logs/QueryTests.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Content.IntegrationTests.Fixtures;
 using Content.Server.Administration.Logs;
@@ -31,7 +31,7 @@ public sealed class QueryTests : GameTest
         var sPlayers = server.ResolveDependency<IPlayerManager>();
 
         var sAdminLogSystem = server.ResolveDependency<IAdminLogManager>();
-        var sGamerTicker = sSystems.GetEntitySystem<GameTicker>();
+        var sGamerTicker = sSystems.GetEntitySystem<ServerGameTicker>();
 
         var date = DateTime.UtcNow;
         var guid = Guid.NewGuid();
diff --git a/Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs b/Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs
index d3da7f1107..2023867eed 100644
--- a/Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs
+++ b/Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.IntegrationTests.Fixtures.Attributes;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Prototypes;
diff --git a/Content.IntegrationTests/Tests/Atmos/GasMixtureTest.cs b/Content.IntegrationTests/Tests/Atmos/GasMixtureTest.cs
index f8e165fec2..550e377f22 100644
--- a/Content.IntegrationTests/Tests/Atmos/GasMixtureTest.cs
+++ b/Content.IntegrationTests/Tests/Atmos/GasMixtureTest.cs
@@ -1,4 +1,4 @@
-using Content.IntegrationTests.Fixtures.Attributes;
+using Content.IntegrationTests.Fixtures.Attributes;
 using Content.Shared.Atmos;
 
 namespace Content.IntegrationTests.Tests.Atmos;
diff --git a/Content.IntegrationTests/Tests/Audio/Midi/MidiFileCollectionManagerTests.cs b/Content.IntegrationTests/Tests/Audio/Midi/MidiFileCollectionManagerTests.cs
index db9c063592..0f6c0d3bbc 100644
--- a/Content.IntegrationTests/Tests/Audio/Midi/MidiFileCollectionManagerTests.cs
+++ b/Content.IntegrationTests/Tests/Audio/Midi/MidiFileCollectionManagerTests.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 
 using System.IO;
 using System.Linq;
diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.Interact.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.Interact.cs
index 444bd159f3..be3824be84 100644
--- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.Interact.cs
+++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.Interact.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Buckle;
+using Content.Shared.Buckle;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Interaction;
 using Robust.Server.GameObjects;
diff --git a/Content.IntegrationTests/Tests/Chemistry/FixedPoint2SerializationTest.cs b/Content.IntegrationTests/Tests/Chemistry/FixedPoint2SerializationTest.cs
index 0e3f89c282..afa26d2e0e 100644
--- a/Content.IntegrationTests/Tests/Chemistry/FixedPoint2SerializationTest.cs
+++ b/Content.IntegrationTests/Tests/Chemistry/FixedPoint2SerializationTest.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Serialization.Markdown.Mapping;
diff --git a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
index 2b62926dc1..479f225a13 100644
--- a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
+++ b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
@@ -1,4 +1,4 @@
-using Content.IntegrationTests.Fixtures;
+using Content.IntegrationTests.Fixtures;
 using Content.Shared.Administration.Systems;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
diff --git a/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs b/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs
index bcacc8011b..da8d4adc7b 100644
--- a/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs
+++ b/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs
@@ -2,6 +2,7 @@ using Content.IntegrationTests.Fixtures;
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Commands;
 using Content.Shared.CCVar;
+using Content.Shared.GameTicking;
 using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -29,7 +30,7 @@ namespace Content.IntegrationTests.Tests.Commands
 
             var configManager = server.ResolveDependency<IConfigurationManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
-            var gameTicker = entityManager.System<GameTicker>();
+            var gameTicker = entityManager.System<ServerGameTicker>();
 
             await pair.RunUntilSynced();
 
diff --git a/Content.IntegrationTests/Tests/ConfigPresetTests.cs b/Content.IntegrationTests/Tests/ConfigPresetTests.cs
index 224a5677c0..a1135790f4 100644
--- a/Content.IntegrationTests/Tests/ConfigPresetTests.cs
+++ b/Content.IntegrationTests/Tests/ConfigPresetTests.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using Content.IntegrationTests.Fixtures;
 using Content.Server.Entry;
diff --git a/Content.IntegrationTests/Tests/DeviceLinking/DeviceLinkingTest.cs b/Content.IntegrationTests/Tests/DeviceLinking/DeviceLinkingTest.cs
index 695f16f65c..9b3c6efdeb 100644
--- a/Content.IntegrationTests/Tests/DeviceLinking/DeviceLinkingTest.cs
+++ b/Content.IntegrationTests/Tests/DeviceLinking/DeviceLinkingTest.cs
@@ -70,7 +70,7 @@ public sealed class DeviceLinkingTest : GameTest
                         sinkComp);
 
                     // Send a signal to the port
-                    Assert.DoesNotThrow(() => { deviceLinkSys.InvokePort(sourceEnt, "Output", null, sourceComp); },
+                    Assert.DoesNotThrow(() => { deviceLinkSys.InvokePort((sourceEnt, sourceComp), "Output"); },
                         $"Exception thrown while triggering port {port.Id} of the sink device.");
 
                     mapSys.DeleteMap(mapId);
diff --git a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs
index d3719a262b..c5712bd608 100644
--- a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs
+++ b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs
@@ -2,7 +2,6 @@ using System.Numerics;
 using Content.IntegrationTests.Fixtures;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
-using Content.Shared.DeviceNetwork;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Content.Shared.DeviceNetwork.Components;
@@ -58,22 +57,20 @@ namespace Content.IntegrationTests.Tests.DeviceNetwork
             var deviceNetSystem = entityManager.EntitySysManager.GetEntitySystem<DeviceNetworkSystem>();
             var deviceNetTestSystem = entityManager.EntitySysManager.GetEntitySystem<DeviceNetworkTestSystem>();
 
-
             EntityUid device1 = default;
             EntityUid device2 = default;
             DeviceNetworkComponent networkComponent1 = null;
             DeviceNetworkComponent networkComponent2 = null;
 
-            var testValue = "test";
-            var payload = new NetworkPayload
-            {
-                ["Test"] = testValue,
-                ["testnumber"] = 1,
-                ["testbool"] = true
-            };
-
             await server.WaitAssertion(() =>
             {
+                var payload = new TestPayload
+                {
+                    TestString = "test",
+                    TestNumber = 1,
+                    TestBool = true
+                };
+
                 device1 = entityManager.SpawnEntity("DummyNetworkDevice", MapCoordinates.Nullspace);
 
                 Assert.That(entityManager.TryGetComponent(device1, out networkComponent1), Is.True);
@@ -94,15 +91,8 @@ namespace Content.IntegrationTests.Tests.DeviceNetwork
                     Assert.That(networkComponent1.Address, Is.Not.EqualTo(networkComponent2.Address));
                 });
 
-                deviceNetSystem.QueuePacket(device1, networkComponent2.Address, payload, networkComponent2.ReceiveFrequency.Value);
-            });
-
-            await server.WaitRunTicks(2);
-            await server.WaitIdleAsync();
-
-            await server.WaitAssertion(() =>
-            {
-                Assert.That(payload, Is.EquivalentTo(deviceNetTestSystem.LastPayload));
+                deviceNetSystem.SendPacket(device1, networkComponent2.Address, ref payload, networkComponent2.ReceiveFrequency.Value);
+                Assert.That(payload, Is.EqualTo(deviceNetTestSystem.LastPayload));
             });
         }
 
@@ -124,14 +114,6 @@ namespace Content.IntegrationTests.Tests.DeviceNetwork
             DeviceNetworkComponent networkComponent2 = null;
             WirelessNetworkComponent wirelessNetworkComponent = null;
 
-            var testValue = "test";
-            var payload = new NetworkPayload
-            {
-                ["Test"] = testValue,
-                ["testnumber"] = 1,
-                ["testbool"] = true
-            };
-
             await server.WaitAssertion(() =>
             {
                 device1 = entityManager.SpawnEntity("WirelessNetworkDeviceDummy", coordinates);
@@ -158,33 +140,28 @@ namespace Content.IntegrationTests.Tests.DeviceNetwork
                     Assert.That(networkComponent1.Address, Is.Not.EqualTo(networkComponent2.Address));
                 });
 
-
-                deviceNetSystem.QueuePacket(device1, networkComponent2.Address, payload, networkComponent2.ReceiveFrequency.Value);
-            });
-
-            await server.WaitRunTicks(2);
-            await server.WaitIdleAsync();
-
-            await server.WaitAssertion(() =>
-            {
-                Assert.That(payload, Is.EqualTo(deviceNetTestSystem.LastPayload).AsCollection);
-
-                payload = new NetworkPayload
+                var payload = new TestPayload
                 {
-                    ["Wirelesstest"] = 5
+                    TestString = "test",
+                    TestNumber = 1,
+                    TestBool = true
                 };
 
+                deviceNetSystem.SendPacket(device1, networkComponent2.Address, ref payload, networkComponent2.ReceiveFrequency.Value);
+
+                Assert.That(payload, Is.EqualTo(deviceNetTestSystem.LastPayload));
+
                 wirelessNetworkComponent.Range = 0;
 
-                deviceNetSystem.QueuePacket(device1, networkComponent2.Address, payload, networkComponent2.ReceiveFrequency.Value);
-            });
+                var secondPayload = new SecondTestPayload
+                {
+                    TestString = "test",
+                    TestNumber = 1,
+                    TestBool = true
+                };
 
-            await server.WaitRunTicks(1);
-            await server.WaitIdleAsync();
-
-            await server.WaitAssertion(() =>
-            {
-                Assert.That(payload, Is.Not.EqualTo(deviceNetTestSystem.LastPayload).AsCollection);
+                deviceNetSystem.SendPacket(device1, networkComponent2.Address, ref secondPayload, networkComponent2.ReceiveFrequency.Value);
+                Assert.That(secondPayload, Is.Not.EqualTo(deviceNetTestSystem.LastPayloadSecond));
             });
         }
 
@@ -205,15 +182,6 @@ namespace Content.IntegrationTests.Tests.DeviceNetwork
             DeviceNetworkComponent networkComponent1 = null;
             DeviceNetworkComponent networkComponent2 = null;
             WiredNetworkComponent wiredNetworkComponent = null;
-            var grid = testMap.Grid.Comp;
-
-            var testValue = "test";
-            var payload = new NetworkPayload
-            {
-                ["Test"] = testValue,
-                ["testnumber"] = 1,
-                ["testbool"] = true
-            };
 
             await server.WaitRunTicks(2);
             await server.WaitIdleAsync();
@@ -244,27 +212,20 @@ namespace Content.IntegrationTests.Tests.DeviceNetwork
                     Assert.That(networkComponent1.Address, Is.Not.EqualTo(networkComponent2.Address));
                 });
 
-                deviceNetSystem.QueuePacket(device1, networkComponent2.Address, payload, networkComponent2.ReceiveFrequency.Value);
-            });
+                var payload = new TestPayload
+                {
+                    TestString = "test",
+                    TestNumber = 1,
+                    TestBool = true
+                };
 
-            await server.WaitRunTicks(1);
-            await server.WaitIdleAsync();
-
-            await server.WaitAssertion(() =>
-            {
-                //CollectionAssert.AreNotEqual(deviceNetTestSystem.LastPayload, payload);
+                deviceNetSystem.SendPacket(device1, networkComponent2.Address, ref payload, networkComponent2.ReceiveFrequency.Value);
 
                 entityManager.SpawnEntity("CableApcExtension", coordinates);
 
-                deviceNetSystem.QueuePacket(device1, networkComponent2.Address, payload, networkComponent2.ReceiveFrequency.Value);
-            });
+                deviceNetSystem.SendPacket(device1, networkComponent2.Address, ref payload, networkComponent2.ReceiveFrequency.Value);
 
-            await server.WaitRunTicks(1);
-            await server.WaitIdleAsync();
-
-            await server.WaitAssertion(() =>
-            {
-                Assert.That(payload, Is.EqualTo(deviceNetTestSystem.LastPayload).AsCollection);
+                Assert.That(payload, Is.EqualTo(deviceNetTestSystem.LastPayload));
             });
         }
     }
diff --git a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTestSystem.cs b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTestSystem.cs
index 2076cce9d6..891cf6dc9a 100644
--- a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTestSystem.cs
+++ b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTestSystem.cs
@@ -1,30 +1,71 @@
+#nullable enable
 using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Reflection;
 using Content.Shared.DeviceNetwork.Components;
+using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.IntegrationTests.Tests.DeviceNetwork;
 
 [Reflect(false)]
 public sealed partial class DeviceNetworkTestSystem : EntitySystem
 {
-    public NetworkPayload LastPayload = default;
-
     public override void Initialize()
     {
         base.Initialize();
-
-        SubscribeLocalEvent<DeviceNetworkComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
+        SubscribeLocalEvent<DeviceNetworkComponent, DeviceNetworkPacketData>(OnBaselinePacketReceived);
+        SubscribeLocalEvent<DeviceNetworkComponent, DeviceNetworkPacketEvent<TestPayload>>(OnTypedPacketReceived);
+        SubscribeLocalEvent<DeviceNetworkComponent, DeviceNetworkPacketEvent<SecondTestPayload>>(OnTypedPacketReceived);
     }
 
+    public TestPayload LastPayload = default;
+    public SecondTestPayload LastPayloadSecond = default;
+    public TestPayloadClass LastPayloadClass = default!;
+
     public void SendBaselineTestEvent(EntityUid uid)
     {
-        RaiseLocalEvent(uid, new DeviceNetworkPacketEvent(0, "", 0, "", uid, new NetworkPayload()));
+        var ev = new DeviceNetworkPacketData(0, "", 0, "", uid, new TestPayloadClass());
+        RaiseLocalEvent(uid, ref ev);
     }
 
-    private void OnPacketReceived(EntityUid uid, DeviceNetworkComponent component, DeviceNetworkPacketEvent args)
+    private void OnBaselinePacketReceived(Entity<DeviceNetworkComponent> ent, ref DeviceNetworkPacketData args)
+    {
+        LastPayloadClass = (TestPayloadClass) args.Data;
+    }
+
+    private void OnTypedPacketReceived(Entity<DeviceNetworkComponent> ent, ref DeviceNetworkPacketEvent<TestPayload> args)
     {
         LastPayload = args.Data;
     }
+
+    private void OnTypedPacketReceived(Entity<DeviceNetworkComponent> ent, ref DeviceNetworkPacketEvent<SecondTestPayload> args)
+    {
+        LastPayloadSecond = args.Data;
+    }
+}
+
+[ByRefEvent]
+public record struct DeviceNetworkPacketData(
+    int NetId,
+    string? Address,
+    uint Frequency,
+    string SenderAddress,
+    EntityUid Sender,
+    INetworkPayload Data);
+
+public readonly partial record struct TestPayload(string TestString, int TestNumber, bool TestBool) : INetworkPayload;
+
+public readonly partial record struct SecondTestPayload(string TestString, int TestNumber, bool TestBool) : INetworkPayload;
+
+public sealed partial class TestPayloadClass : INetworkPayload
+{
+    [DataField]
+    public string TestString;
+
+    [DataField]
+    public int TestNumber;
+
+    [DataField]
+    public bool TestBool;
 }
diff --git a/Content.IntegrationTests/Tests/Engineering/InflatablesDeflateTest.cs b/Content.IntegrationTests/Tests/Engineering/InflatablesDeflateTest.cs
index a7203d9259..45292b8a4b 100644
--- a/Content.IntegrationTests/Tests/Engineering/InflatablesDeflateTest.cs
+++ b/Content.IntegrationTests/Tests/Engineering/InflatablesDeflateTest.cs
@@ -1,4 +1,4 @@
-using Content.IntegrationTests.Tests.Interaction;
+using Content.IntegrationTests.Tests.Interaction;
 using Content.Shared.Engineering.Systems;
 
 namespace Content.IntegrationTests.Tests.Engineering;
diff --git a/Content.IntegrationTests/Tests/EntityTable/EntityTableTest.cs b/Content.IntegrationTests/Tests/EntityTable/EntityTableTest.cs
index 98c1811230..01c8ae0932 100644
--- a/Content.IntegrationTests/Tests/EntityTable/EntityTableTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTable/EntityTableTest.cs
@@ -1,10 +1,14 @@
-using System.Collections.Generic;
-using System.Linq;
 using Content.IntegrationTests.Fixtures;
 using Content.IntegrationTests.Fixtures.Attributes;
 using Content.Shared.EntityTable;
+using Content.Shared.EntityTable.Conditions;
+using Content.Shared.EntityTable.EntitySelectors;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using System.Collections.Generic;
+using System.Linq;
+using Robust.Shared.Containers;
 
 namespace Content.IntegrationTests.Tests.EntityTable;
 
@@ -14,6 +18,8 @@ public sealed class EntityTableTest : GameTest
 {
     [SidedDependency(Side.Server)]
     private readonly EntityTableSystem _sEntityTable = null!;
+    [SidedDependency(Side.Server)]
+    private readonly SharedContainerSystem _sContainer = null!;
 
     private const string EntProto1 = "EntityTableTestEnt1";
     private const string EntProto2 = "EntityTableTestEnt2";
@@ -105,6 +111,17 @@ public sealed class EntityTableTest : GameTest
              - !type:HasBudgetCondition
                costOverride: 0
          
+         - type: entityTable
+           id: EntityTableTestEntRequireAnyAllFail
+           table: !type:EntSelector
+             id: {EntProto1}
+             requireAll: false
+             conditions:
+             - !type:HasBudgetCondition
+               costOverride: 100
+             - !type:HasBudgetCondition
+               costOverride: 200
+         
          - type: entityTable
            id: EntityTableTestDeepComposition
            table: !type:AllSelector
@@ -124,9 +141,86 @@ public sealed class EntityTableTest : GameTest
            id: EntityTableTestChainTable
            table: !type:NestedSelector
              tableId: EntityTableTestNestedTable
+         
+         - type: entityTable
+           id: EntityTableTestNotRepeating
+           table: !type:EntSelector
+             id: {EntProto1}
+             conditions:
+             - !type:ExcludeEntitiesFromContextCondition
+         
+         - type: entityTable
+           id: EntityTableTestAllNotRepeating
+           table: !type:AllSelector
+             conditionsForChildren:
+             - !type:ExcludeEntitiesFromContextCondition
+             children:
+             - id: {EntProto1}
+             - id: {EntProto2}
+         
+         - type: entityTable
+           id: EntityTableTestChainNotRepeating
+           table: !type:NestedSelector
+             tableId: EntityTableTestNestedTable
+             conditionsForChildren:
+             - !type:ExcludeEntitiesFromContextCondition
+         
+         - type: entityTable
+           id: EntityTableTestNestedTableWithCost
+           table: !type:EntSelector
+             id: {EntProtoWithCost}
+             conditions:
+             - !type:HasBudgetCondition
+         
+         - type: entityTable
+           id: EntityTableTestChainTableWithCost
+           table: !type:NestedSelector
+             tableId: EntityTableTestNestedTableWithCost
+         
+         - type: entityTable
+           id: EntityTableTestGroupWithCostlyNested
+           table: !type:GroupSelector
+             children:
+             - !type:NestedSelector
+               tableId: EntityTableTestNestedTableWithCost
+               weight: 1
+             - id: {EntProto2}
+               weight: 1
+               
+         - type: entityTable
+           id: EntityTableTestLocalizedChildConditions
+           table: !type:AllSelector
+             children:
+             - !type:AllSelector
+               conditionsForChildren:
+               - !type:ExcludeEntitiesFromContextCondition
+               children:
+                - id: {EntProto1}
+                - id: {EntProto2}
+             - id: {EntProto2}
+
+         - type: entityTable
+           id: EntityTableTestSkipSelectorWithFailedChildren
+           table: !type:GroupSelector
+             children:
+             - !type:AllSelector
+               children:
+                - id: {EntProto1}
+                  conditions:
+                  - !type:AlwaysFailCondition
+             - id: {EntProto2}
+
+         - type: entityTable
+           id: EntityTableTestContainerCondition
+           table: !type:AllSelector
+             children:
+             - id: {EntProto1}
+               conditions:
+               - !type:EmptyContainerCondition
          """;
 
     [Test]
+    [RunOnSide(Side.Server)]
     public void EntSelector_BasicSingleSpawn()
     {
         var result = Run(Table("EntityTableTestEntSelector"));
@@ -134,6 +228,7 @@ public sealed class EntityTableTest : GameTest
     }
 
     [Test]
+    [RunOnSide(Side.Server)]
     public void EntSelector_AmountAndRollsCompose()
     {
         var result = Run(Table("EntityTableTestEntSelectorAmountRolls"));
@@ -142,6 +237,7 @@ public sealed class EntityTableTest : GameTest
     }
 
     [Test]
+    [RunOnSide(Side.Server)]
     public void AllSelector_CombinesChildrenInOrder()
     {
         var result = Run(Table("EntityTableTestAllSelector"));
@@ -150,6 +246,7 @@ public sealed class EntityTableTest : GameTest
     }
 
     [Test]
+    [RunOnSide(Side.Server)]
     public void NoneSelector_YieldsNothing()
     {
         var result = Run(Table("EntityTableTestNoneSelector"));
@@ -157,6 +254,7 @@ public sealed class EntityTableTest : GameTest
     }
 
     [Test]
+    [RunOnSide(Side.Server)]
     public void GroupSelector_WeightedPick_DeterministicWithSeed()
     {
         // EntityTableTestNestedTable is a GroupSelector: Ent1 weight 1, Ent2 weight 2.
@@ -177,6 +275,7 @@ public sealed class EntityTableTest : GameTest
     }
 
     [Test]
+    [RunOnSide(Side.Server)]
     public void GroupSelector_AllChildrenConditionsFail_ReturnsEmpty()
     {
         // No budget in context => condition fails => GroupSelector's child pool is empty.
@@ -185,6 +284,7 @@ public sealed class EntityTableTest : GameTest
     }
 
     [Test]
+    [RunOnSide(Side.Server)]
     public void NestedSelector_ResolvesTransitively()
     {
         // EntityTableTestChainTable is a NestedSelector pointing at EntityTableTestNestedTable.
@@ -194,6 +294,7 @@ public sealed class EntityTableTest : GameTest
     }
 
     [Test]
+    [RunOnSide(Side.Server)]
     public void HasBudgetCondition_GatesEntSelector()
     {
         // EntityTableTestEntSelectorWithCost reads cost 10 from the DynamicRuleCostComponent.
@@ -208,6 +309,7 @@ public sealed class EntityTableTest : GameTest
     }
 
     [Test]
+    [RunOnSide(Side.Server)]
     public void RequireAllConditionSemantics()
     {
         // RequireAll = true, one fails => no spawns.
@@ -219,6 +321,17 @@ public sealed class EntityTableTest : GameTest
         Assert.That(requireAnyResult, Is.EquivalentTo(new[] { new EntProtoId(EntProto1) }));
     }
 
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void RequireAny_AllConditionsFail_ReturnsEmpty()
+    {
+        // RequireAll = false but every condition fails => no spawns.
+        // Regression test: previously the OR-ing was seeded with `true`, so
+        // RequireAll = false always passed regardless of the actual results.
+        var result = Run(Table("EntityTableTestEntRequireAnyAllFail"), ctx: new EntityTableContext(new() { ["Budget"] = 50f }));
+        Assert.That(result, Is.Empty);
+    }
+
     [Test]
     [RunOnSide(Side.Server)]
     public void DeepComposition_ComplexTree()
@@ -228,6 +341,159 @@ public sealed class EntityTableTest : GameTest
         Assert.That(result, Is.EqualTo(new[] { new EntProtoId(EntProto2), new EntProtoId(EntProto1) }));
     }
 
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void ExcludeEntitiesFromContextCondition_GatesEntSelector()
+    {
+        // No UsedSpawns tracking in context => condition passes and the ent spawns.
+        var noTracking = Run(Table("EntityTableTestNotRepeating"), ctx: new EntityTableContext());
+        Assert.That(noTracking, Is.EquivalentTo(new[] { new EntProtoId(EntProto1) }));
+
+        // EntProto1 already recorded as spawned => blocked.
+        var used = new HashSet<EntProtoId> { new(EntProto1) };
+        var blocked = Run(Table("EntityTableTestNotRepeating"),
+            ctx: new EntityTableContext(new() { [ExcludeEntitiesFromContextCondition.EntitiesToExclude] = used }));
+        Assert.That(blocked, Is.Empty);
+
+        // Tracking enabled, but EntProto1 has not been spawned yet => allowed.
+        var allowed = Run(Table("EntityTableTestNotRepeating"),
+            ctx: new EntityTableContext(new() { [ExcludeEntitiesFromContextCondition.EntitiesToExclude] = new HashSet<EntProtoId>() }));
+        Assert.That(allowed, Is.EquivalentTo([new EntProtoId(EntProto1)]));
+    }
+
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void AllSelector_ConditionsForChildren_ApplyToChildren()
+    {
+        var used = new HashSet<EntProtoId> { new(EntProto1) };
+        var result = Run(Table("EntityTableTestAllNotRepeating"),
+            ctx: new EntityTableContext(new() { [ExcludeEntitiesFromContextCondition.EntitiesToExclude] = used }));
+        Assert.That(result, Is.EqualTo(new[] { new EntProtoId(EntProto2) }));
+    }
+
+    /// <summary>
+    /// EntityTableTestChainNotRepeating forwards the condition into EntityTableTestNestedTable.
+    /// EntProto1 already used => excluded from the GroupSelector pool, EntProto2 is picked.
+    /// </summary>
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void NestedSelector_ConditionsForChildren_ApplyToNestedChildren()
+    {
+        var used = new HashSet<EntProtoId> { new(EntProto1) };
+        var result = Run(Table("EntityTableTestChainNotRepeating"), SeededRand(1),
+            new EntityTableContext(new() { [ExcludeEntitiesFromContextCondition.EntitiesToExclude] = used }));
+        Assert.That(result, Is.EqualTo(new[] { new EntProtoId(EntProto2) }));
+    }
+
+    /// <summary>
+    /// EntityTableTestChainTableWithCost points at a nested table whose EntSelector is gated by
+    /// HasBudgetCondition (cost 10). The NestedSelector itself has no conditions, but the nested
+    /// table's conditions still gate it.
+    /// </summary>
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void NestedSelector_CheckConditions_IncludesNestedTable()
+    {
+        var poor = Run(Table("EntityTableTestChainTableWithCost"), ctx: new EntityTableContext(new() { ["Budget"] = 9f }));
+        Assert.That(poor, Is.Empty);
+
+        var rich = Run(Table("EntityTableTestChainTableWithCost"), ctx: new EntityTableContext(new() { ["Budget"] = 10f }));
+        Assert.That(rich, Is.EquivalentTo(new[] { new EntProtoId(EntProtoWithCost) }));
+    }
+
+    /// <summary>
+    /// The group contains a NestedSelector (cost 10) and EntProto2. With a budget of 9 the nested
+    /// selector fails CheckConditions and is excluded from the group's pool, so only EntProto2 can be picked.
+    /// </summary>
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void GroupSelector_ExcludesNestedSelectorWithFailingConditions()
+    {
+        var result = Run(Table("EntityTableTestGroupWithCostlyNested"), SeededRand(1), new EntityTableContext(new() { ["Budget"] = 9f }));
+        Assert.That(result, Is.EqualTo(new[] { new EntProtoId(EntProto2) }));
+    }
+
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void ChildrenSelector_SkipDeadSelectors()
+    {
+        // to not re-init test, just repeat a lot of times, because probability can come into play
+        for (var i = 0; i < 100; i++)
+        {
+            var result = Run(Table("EntityTableTestSkipSelectorWithFailedChildren"));
+            Assert.That(result, Is.EquivalentTo([EntProto2]));
+        }
+    }
+
+    /// <summary>
+    /// Demonstrates how injecting ExcludeEntitiesFromContextCondition through the context's
+    /// AdditionalConditionsKey can change the behavior of an otherwise unconstrained table.
+    /// </summary>
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void AdditionalConditions_FromContext_ChangeBehavior()
+    {
+        var used = new HashSet<EntProtoId> { new(EntProto1) };
+
+        // Without the injected condition, the UsedSpawns tracking alone has no effect.
+        var unconstrained = Run(Table("EntityTableTestEntSelector"),
+            ctx: new EntityTableContext(new() { [ExcludeEntitiesFromContextCondition.EntitiesToExclude] = used }));
+        Assert.That(unconstrained, Is.EquivalentTo([new EntProtoId(EntProto1)]));
+
+        // Injecting ExcludeEntitiesFromContextCondition gates the selector: EntProto1 is already used => blocked.
+        var ctx = new EntityTableContext(new() { [ExcludeEntitiesFromContextCondition.EntitiesToExclude] = used });
+        ctx.SetData(EntityTableSelector.AdditionalConditionsKey,
+            new List<EntityTableCondition> { new ExcludeEntitiesFromContextCondition() });
+        var blocked = Run(Table("EntityTableTestEntSelector"), ctx: ctx);
+        Assert.That(blocked, Is.Empty);
+
+        // With the condition injected but EntProto1 not yet used, the spawn is allowed.
+        var fresh = new EntityTableContext(new() { [ExcludeEntitiesFromContextCondition.EntitiesToExclude] = new HashSet<EntProtoId>() });
+        fresh.SetData(EntityTableSelector.AdditionalConditionsKey,
+            new List<EntityTableCondition> { new ExcludeEntitiesFromContextCondition() });
+        var allowed = Run(Table("EntityTableTestEntSelector"), ctx: fresh);
+        Assert.That(allowed, Is.EquivalentTo([new EntProtoId(EntProto1)]));
+    }
+
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void AdditionalConditions_RemainLocal()
+    {
+        var used = new HashSet<EntProtoId> { new(EntProto2) };
+        var ctx = new EntityTableContext(new() { [ExcludeEntitiesFromContextCondition.EntitiesToExclude] = used });
+
+        var result = Run(Table("EntityTableTestLocalizedChildConditions"), ctx: ctx);
+
+        ctx.TryGetData<object>(EntityTableSelector.AdditionalConditionsKey, out var empty);
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(empty, Is.Null);
+            Assert.That(result, Is.EquivalentTo([new EntProtoId(EntProto1), new EntProtoId(EntProto2)]));
+        }
+    }
+
+    [Test, Description("Tests each possibility for EntityTableContext EmptyContainerCondition.")]
+    [RunOnSide(Side.Server)]
+    public void TestEmptyContainerCondition()
+    {
+        // No context results in failure.
+        var result = Run(Table("EntityTableTestContainerCondition"));
+        Assert.That(result, Is.Empty);
+
+        // An empty container succeeds.
+        var container = _sContainer.MakeContainer<ContainerSlot>(SSpawn(EntProto1), "containerId");
+        var ctx = new EntityTableContext(new() { [EmptyContainerCondition.ContainerContextKey] = container });
+
+        result = Run(Table("EntityTableTestContainerCondition"), ctx: ctx);
+        Assert.That(result, Is.EquivalentTo(new [] { EntProto1 }));
+
+        // A non-empty container fails.
+        _sContainer.Insert(SSpawn(EntProto1), container, force: true);
+
+        result = Run(Table("EntityTableTestContainerCondition"), ctx: ctx);
+        Assert.That(result, Is.Empty);
+    }
+
     private static IRobustRandom SeededRand(int seed)
     {
         var rand = new RobustRandom();
@@ -241,3 +507,21 @@ public sealed class EntityTableTest : GameTest
         => _sEntityTable.GetSpawns(proto, rand, ctx)
                         .ToArray();
 }
+
+/// <summary>
+/// This condition always fails. Used mainly for integration tests.
+/// Can be used with <see cref="EntityTableCondition.Invert"/> to always succeed for extra pointlessness.
+/// </summary>
+public sealed partial class AlwaysFailCondition : EntityTableCondition
+{
+    /// <inheritdoc/>>
+    protected override bool EvaluateImplementation(
+        EntityTableSelector root,
+        IEntityManager entMan,
+        IPrototypeManager proto,
+        EntityTableContext ctx
+    )
+    {
+        return false;
+    }
+}
diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index 35298ce44e..387ad558aa 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -21,7 +21,7 @@ namespace Content.IntegrationTests.Tests
     [TestOf(typeof(EntityUid))]
     public sealed class EntityTest : GameTest
     {
-        private static readonly HashSet<ProtoId<EntityCategoryPrototype>> IgnoredCategories = ["Spawner", "Debug"];
+        private static readonly HashSet<ProtoId<EntityCategoryPrototype>> IgnoredCategories = ["Spawner", "Debug", "GameRules"];
 
         public override PoolSettings PoolSettings => new()
         {
@@ -413,6 +413,7 @@ namespace Content.IntegrationTests.Tests
                 "Broadphase",
                 "StationData", // errors when removed mid-round
                 "StationJobs",
+                "ActiveGameRule", // Requires GameRule :P
                 "Actor", // We aren't testing actor components, those need their player session set.
                 "BiomeSelection", // Whaddya know, requires config.
                 "ActivatableUI", // Requires enum key
diff --git a/Content.IntegrationTests/Tests/FollowerSystemTest.cs b/Content.IntegrationTests/Tests/FollowerSystemTest.cs
index 56153aa8c2..225a47340b 100644
--- a/Content.IntegrationTests/Tests/FollowerSystemTest.cs
+++ b/Content.IntegrationTests/Tests/FollowerSystemTest.cs
@@ -33,11 +33,11 @@ public sealed class FollowerSystemTest : GameTest
             mapSys.CreateMap(out var map);
 
             // Spawn an observer to be followed.
-            var followed = entMan.SpawnEntity(GameTicker.ObserverPrototypeName, new MapCoordinates(0, 0, map));
+            var followed = entMan.SpawnEntity(ServerGameTicker.ObserverPrototypeName, new MapCoordinates(0, 0, map));
             logger.Info($"Spawned followed observer: {entMan.ToPrettyString(followed)}");
 
             // Spawn an observer to follow another observer.
-            var follower = entMan.SpawnEntity(GameTicker.ObserverPrototypeName, new MapCoordinates(0, 0, map));
+            var follower = entMan.SpawnEntity(ServerGameTicker.ObserverPrototypeName, new MapCoordinates(0, 0, map));
             logger.Info($"Spawned follower observer: {entMan.ToPrettyString(follower)}");
 
             followerSystem.StartFollowingEntity(follower, followed);
diff --git a/Content.IntegrationTests/Tests/GameRules/AllGamePresetsStartTest.cs b/Content.IntegrationTests/Tests/GameRules/AllGamePresetsStartTest.cs
index bb61de4147..6f0647de7e 100644
--- a/Content.IntegrationTests/Tests/GameRules/AllGamePresetsStartTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/AllGamePresetsStartTest.cs
@@ -2,14 +2,13 @@ using System.Collections.Generic;
 using System.Linq;
 using Content.IntegrationTests.Fixtures.Attributes;
 using Content.IntegrationTests.Utility;
-using Content.Server.Antag;
-using Content.Server.Antag.Components;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Presets;
 using Content.Server.Shuttles.Components;
 using Content.Shared.Antag;
+using Content.Shared.Antag.Components;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Prototypes;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
 
@@ -28,7 +27,7 @@ public sealed class AllGamePresetsStartTest : AntagTest
 
     // Tests that all game modes can start given ideal circumstances.
     [Test]
-    [TestOf(typeof(GameTicker)), TestOf(typeof(AntagSelectionSystem)), TestOf(typeof(AntagSelectionComponent))]
+    [TestOf(typeof(ServerGameTicker)), TestOf(typeof(AntagSelectionSystem)), TestOf(typeof(AntagSelectionComponent))]
     [TestCaseSource(nameof(_gamePresets))]
     [Description("Ensures all Game Presets are able to start and assign all antags correctly without spawning anyone in nullspace.")]
     [EnsureCVar(Side.Server, typeof(CCVars), nameof(CCVars.GameTickerIgnoredPresets), GameTicker.DummyGameRule)]
diff --git a/Content.IntegrationTests/Tests/GameRules/AntagGhostRoleTest.cs b/Content.IntegrationTests/Tests/GameRules/AntagGhostRoleTest.cs
index c9a3ec0782..b0119c8ec7 100644
--- a/Content.IntegrationTests/Tests/GameRules/AntagGhostRoleTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/AntagGhostRoleTest.cs
@@ -1,13 +1,12 @@
-#nullable enable
+#nullable enable
 using System.Collections.Generic;
 using Content.IntegrationTests.Fixtures.Attributes;
 using Content.IntegrationTests.Utility;
-using Content.Server.Antag;
-using Content.Server.Antag.Components;
 using Content.Server.GameTicking;
 using Content.Server.Ghost.Roles;
 using Content.Server.Ghost.Roles.Components;
 using Content.Shared.Antag;
+using Content.Shared.Antag.Components;
 using Content.Shared.Players;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
@@ -33,7 +32,7 @@ public sealed partial class AntagGhostRoleTest : AntagTest
     private static readonly string[] AntagGameRules = GameDataScrounger.EntitiesWithComponent("AntagSelection");
 
     [Test]
-    [TestOf(typeof(GameTicker)), TestOf(typeof(AntagSelectionSystem)), TestOf(typeof(AntagSelectionComponent)), TestOf(typeof(GhostRoleSystem))]
+    [TestOf(typeof(ServerGameTicker)), TestOf(typeof(AntagSelectionSystem)), TestOf(typeof(AntagSelectionComponent)), TestOf(typeof(GhostRoleSystem))]
     [TestCaseSource(nameof(AntagGameRules))]
     [Description($"Ensures all GameRule entities with {nameof(AntagSelectionComponent)} can properly spawn those roles and they can be taken.")]
     [RunOnSide(Side.Server)]
@@ -64,7 +63,7 @@ public sealed partial class AntagGhostRoleTest : AntagTest
         while (roleEnumerator.MoveNext(out var spawner, out var role, out var xform))
         {
             // Ensure the ghost role spawner spawned correctly!
-            Assert.That(spawner.Rule, Is.EqualTo(gameRule));
+            Assert.That(spawner.Rule, Is.EqualTo(gameRule?.Owner));
             Assert.That(spawner.Definition, Is.Not.Null);
             AssertGhostRoleTaken(spawner, role, xform);
             var value = rules[spawner.Definition.Value];
@@ -80,7 +79,7 @@ public sealed partial class AntagGhostRoleTest : AntagTest
     }
 
     [Test]
-    [TestOf(typeof(GameTicker)), TestOf(typeof(AntagSelectionSystem)), TestOf(typeof(AntagSelectionComponent)), TestOf(typeof(GhostRoleSystem))]
+    [TestOf(typeof(ServerGameTicker)), TestOf(typeof(AntagSelectionSystem)), TestOf(typeof(AntagSelectionComponent)), TestOf(typeof(GhostRoleSystem))]
     [Description("Ensures a player can take all antag ghost roles sequentially without transferring unwanted mind data.")]
     [RunOnSide(Side.Server)]
     public void TestAntagGhostRolesSequential()
diff --git a/Content.IntegrationTests/Tests/GameRules/AntagTest.cs b/Content.IntegrationTests/Tests/GameRules/AntagTest.cs
index 9f89a9fbac..453e5e26ab 100644
--- a/Content.IntegrationTests/Tests/GameRules/AntagTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/AntagTest.cs
@@ -1,7 +1,5 @@
-using System.Linq;
 using Content.IntegrationTests.Fixtures;
 using Content.IntegrationTests.Fixtures.Attributes;
-using Content.Server.Antag;
 using Content.Server.GameTicking;
 using Content.Server.Mind;
 using Content.Shared.Antag;
@@ -25,7 +23,7 @@ public abstract partial class AntagTest : GameTest
     };
 
     [SidedDependency(Side.Server)] protected AntagSelectionSystem AntagSys = default!;
-    [SidedDependency(Side.Server)] protected GameTicker STicker = default!;
+    [SidedDependency(Side.Server)] protected ServerGameTicker STicker = default!;
     [SidedDependency(Side.Server)] protected MindSystem SMind = default!;
 
     /// <summary>
diff --git a/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs b/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs
index 13286c68a0..ad2d314edf 100644
--- a/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs
@@ -1,10 +1,10 @@
 #nullable enable
 using Content.IntegrationTests.Fixtures;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Presets;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Prototypes;
 using Robust.Shared.GameObjects;
 
 namespace Content.IntegrationTests.Tests.GameRules;
@@ -72,7 +72,7 @@ public sealed class FailAndStartPresetTest : GameTest
         var server = pair.Server;
         var client = pair.Client;
         var entMan = server.EntMan;
-        var ticker = server.System<GameTicker>();
+        var ticker = server.System<ServerGameTicker>();
         server.System<TestRuleSystem>().Run = true;
 
         Assert.That(server.CfgMan.GetCVar(CCVars.GridFill), Is.False);
diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
index f9074f7dc6..5202f4f786 100644
--- a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
@@ -4,17 +4,17 @@ using System.Linq;
 using Content.IntegrationTests.Fixtures;
 using Content.Server.Body.Components;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Presets;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Mind;
 using Content.Server.Roles;
 using Content.Server.RoundEnd;
 using Content.Server.Shuttles.Components;
 using Content.Shared.CCVar;
-using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.FixedPoint;
 using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Prototypes;
+using Content.Shared.GameTicking.Rules.Components;
 using Content.Shared.Hands.Components;
 using Content.Shared.Inventory;
 using Content.Shared.NPC.Prototypes;
@@ -57,7 +57,7 @@ public sealed class NukeOpsTest : GameTest
         var client = pair.Client;
         var entMan = server.EntMan;
         var mapSys = server.System<MapSystem>();
-        var ticker = server.System<GameTicker>();
+        var ticker = server.System<ServerGameTicker>();
         var mindSys = server.System<MindSystem>();
         var roleSys = server.System<RoleSystem>();
         var invSys = server.System<InventorySystem>();
diff --git a/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs b/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs
index 1a8fc6f6ee..638358c2a3 100644
--- a/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs
@@ -2,6 +2,7 @@ using Content.IntegrationTests.Fixtures;
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Rules;
 using Content.Server.GameTicking.Rules.Components;
+using Content.Shared.GameTicking;
 using Content.Shared.GameTicking.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
@@ -27,14 +28,14 @@ namespace Content.IntegrationTests.Tests.GameRules
             Assert.That(server.EntMan.Count<ActiveGameRuleComponent>(), Is.Zero);
 
             var entityManager = server.ResolveDependency<IEntityManager>();
-            var sGameTicker = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<GameTicker>();
+            var sGameTicker = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<ServerGameTicker>();
             var sGameTiming = server.ResolveDependency<IGameTiming>();
 
             MaxTimeRestartRuleComponent maxTime = null;
             await server.WaitPost(() =>
             {
                 sGameTicker.StartGameRule(MaxTimeRestartGameRule, out var ruleEntity);
-                Assert.That(entityManager.TryGetComponent<MaxTimeRestartRuleComponent>(ruleEntity, out maxTime));
+                Assert.That(entityManager.TryGetComponent(ruleEntity, out maxTime));
             });
 
             Assert.That(server.EntMan.Count<GameRuleComponent>(), Is.EqualTo(1));
diff --git a/Content.IntegrationTests/Tests/GameRules/SecretStartsTest.cs b/Content.IntegrationTests/Tests/GameRules/SecretStartsTest.cs
index efc5485e9b..07c0010185 100644
--- a/Content.IntegrationTests/Tests/GameRules/SecretStartsTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/SecretStartsTest.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.IntegrationTests.Fixtures;
 using Content.Server.GameTicking;
 using Robust.Shared.GameObjects;
@@ -23,8 +23,7 @@ public sealed class SecretStartsTest : GameTest
 
         var server = pair.Server;
         await server.WaitIdleAsync();
-        var entMan = server.ResolveDependency<IEntityManager>();
-        var gameTicker = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<GameTicker>();
+        var gameTicker = server.System<ServerGameTicker>();
 
         await server.WaitAssertion(() =>
         {
diff --git a/Content.IntegrationTests/Tests/GameRules/StartEndGameRulesTest.cs b/Content.IntegrationTests/Tests/GameRules/StartEndGameRulesTest.cs
index aef2fcf7cd..029704580e 100644
--- a/Content.IntegrationTests/Tests/GameRules/StartEndGameRulesTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/StartEndGameRulesTest.cs
@@ -26,7 +26,7 @@ public sealed class StartEndGameRulesTest : GameTest
         var pair = Pair;
         var server = pair.Server;
         await server.WaitIdleAsync();
-        var gameTicker = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<GameTicker>();
+        var gameTicker = server.System<ServerGameTicker>();
         var cfg = server.ResolveDependency<IConfigurationManager>();
         Assert.That(cfg.GetCVar(CCVars.GridFill), Is.False);
 
diff --git a/Content.IntegrationTests/Tests/GameRules/TraitorRuleTest.cs b/Content.IntegrationTests/Tests/GameRules/TraitorRuleTest.cs
index c76b349b64..84607cfcc0 100644
--- a/Content.IntegrationTests/Tests/GameRules/TraitorRuleTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/TraitorRuleTest.cs
@@ -8,6 +8,7 @@ using Content.Server.Mind;
 using Content.Server.Roles;
 using Content.Shared.GameTicking;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules.Components;
 using Content.Shared.Mind;
 using Content.Shared.NPC.Prototypes;
 using Content.Shared.NPC.Systems;
@@ -42,11 +43,10 @@ public sealed class TraitorRuleTest : GameTest
         var entMan = server.EntMan;
         var protoMan = server.ProtoMan;
         var compFact = server.ResolveDependency<IComponentFactory>();
-        var ticker = server.System<GameTicker>();
+        var ticker = server.System<ServerGameTicker>();
         var mindSys = server.System<MindSystem>();
         var roleSys = server.System<RoleSystem>();
         var factionSys = server.System<NpcFactionSystem>();
-        var traitorRuleSys = server.System<TraitorRuleSystem>();
 
         // Look up the minimum player count and max total objective difficulty for the game rule
         var minPlayers = 1;
@@ -96,7 +96,7 @@ public sealed class TraitorRuleTest : GameTest
             // Start the round
             ticker.StartRound();
             // Force traitor mode to start (skip the delay)
-            ticker.StartGameRule(gameRuleEnt);
+            ticker.StartGameRule(gameRuleEnt!.Value);
         });
         await pair.RunTicksSync(10);
 
diff --git a/Content.IntegrationTests/Tests/GameTestTests/DependencyTests.cs b/Content.IntegrationTests/Tests/GameTestTests/DependencyTests.cs
index 5ce2b486fd..a2cd082239 100644
--- a/Content.IntegrationTests/Tests/GameTestTests/DependencyTests.cs
+++ b/Content.IntegrationTests/Tests/GameTestTests/DependencyTests.cs
@@ -1,9 +1,8 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Client.GameTicking.Managers;
+using Content.Client.GameTicking;
 using Content.IntegrationTests.Fixtures;
 using Content.IntegrationTests.Fixtures.Attributes;
-using Content.IntegrationTests.NUnit.Constraints;
 using Content.Server.GameTicking;
 using Content.Shared.GameTicking;
 using Robust.Shared.GameObjects;
@@ -14,8 +13,8 @@ namespace Content.IntegrationTests.Tests.GameTestTests;
 [TestOf(typeof(SidedDependencyAttribute))]
 public sealed class DependencyTests : GameTest
 {
-    [SidedDependency(Side.Server)] private readonly SharedGameTicker _sGameTicker = null!;
-    [SidedDependency(Side.Client)] private readonly SharedGameTicker _cGameTicker = null!;
+    [SidedDependency(Side.Server)] private readonly GameTicker _sGameTicker = null!;
+    [SidedDependency(Side.Client)] private readonly GameTicker _cGameTicker = null!;
     [SidedDependency(Side.Server)] private readonly EntityQuery<TransformComponent> _sXformQuery = default!;
 
     [Test]
@@ -38,7 +37,7 @@ public sealed class DependencyTests : GameTest
         {
             Assert.That(!ReferenceEquals(_sGameTicker, _cGameTicker),
                 "Server and client gametickers should be distinct");
-            Assert.That(_sGameTicker, Is.TypeOf<GameTicker>());
+            Assert.That(_sGameTicker, Is.TypeOf<ServerGameTicker>());
             Assert.That(_cGameTicker, Is.TypeOf<ClientGameTicker>());
         }
     }
diff --git a/Content.IntegrationTests/Tests/Gibbing/GibTest.cs b/Content.IntegrationTests/Tests/Gibbing/GibTest.cs
index 23be8f028a..594e0a41c6 100644
--- a/Content.IntegrationTests/Tests/Gibbing/GibTest.cs
+++ b/Content.IntegrationTests/Tests/Gibbing/GibTest.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using Content.IntegrationTests.Fixtures;
 using Content.Shared.Gibbing;
 using Robust.Shared.GameObjects;
diff --git a/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs b/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs
index d2f67e9830..5ab785b05c 100644
--- a/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs
+++ b/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs
@@ -1,8 +1,8 @@
 using Content.IntegrationTests.Fixtures;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Systems;
-using Content.Server.Station.Systems;
 using Content.Shared.Preferences;
+using Content.Shared.Station.Systems;
 
 namespace Content.IntegrationTests.Tests.Internals;
 
diff --git a/Content.IntegrationTests/Tests/Kitchen/HandheldGrinderInteractionTest.cs b/Content.IntegrationTests/Tests/Kitchen/HandheldGrinderInteractionTest.cs
index 1b693d2802..304ee09d0f 100644
--- a/Content.IntegrationTests/Tests/Kitchen/HandheldGrinderInteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Kitchen/HandheldGrinderInteractionTest.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.IntegrationTests.Tests.Interaction;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Kitchen;
diff --git a/Content.IntegrationTests/Tests/MachineBoardTest.cs b/Content.IntegrationTests/Tests/MachineBoardTest.cs
index 5d3bc29b66..71cdcb7cc7 100644
--- a/Content.IntegrationTests/Tests/MachineBoardTest.cs
+++ b/Content.IntegrationTests/Tests/MachineBoardTest.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Content.IntegrationTests.Fixtures;
 using Content.Server.Construction.Components;
diff --git a/Content.IntegrationTests/Tests/MappingEditorTest.cs b/Content.IntegrationTests/Tests/MappingEditorTest.cs
index 987fe7ad73..09da993936 100644
--- a/Content.IntegrationTests/Tests/MappingEditorTest.cs
+++ b/Content.IntegrationTests/Tests/MappingEditorTest.cs
@@ -1,4 +1,4 @@
-using Content.Client.Gameplay;
+using Content.Client.Gameplay;
 using Content.Client.Mapping;
 using Content.IntegrationTests.Fixtures;
 using Robust.Client.State;
diff --git a/Content.IntegrationTests/Tests/Medical/DefibrillatorTest.cs b/Content.IntegrationTests/Tests/Medical/DefibrillatorTest.cs
index 18361a9d90..e6d2c208ce 100644
--- a/Content.IntegrationTests/Tests/Medical/DefibrillatorTest.cs
+++ b/Content.IntegrationTests/Tests/Medical/DefibrillatorTest.cs
@@ -1,5 +1,10 @@
 #nullable enable
+using System.Linq;
+using Content.IntegrationTests.Tests.Helpers;
 using Content.IntegrationTests.Tests.Interaction;
+using Content.Shared.Buckle;
+using Content.Shared.Buckle.Components;
+using Content.Shared.Chat;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Prototypes;
@@ -9,6 +14,7 @@ using Content.Shared.Medical;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
+using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 
 namespace Content.IntegrationTests.Tests.Medical;
@@ -19,11 +25,14 @@ namespace Content.IntegrationTests.Tests.Medical;
 [TestOf(typeof(DefibrillatorComponent))]
 public sealed class DefibrillatorTest : InteractionTest
 {
+    private sealed class SpeechListenerSystem : TestListenerSystem<EntitySpokeEvent>;
+
     // We need two hands to use a defbrillator.
     protected override string PlayerPrototype => "MobHuman";
 
     private static readonly EntProtoId DefibrillatorProtoId = "Defibrillator";
     private static readonly EntProtoId TargetProtoId = "MobHuman";
+    private static readonly EntProtoId BedProtoId = "Bed";
     private static readonly ProtoId<DamageTypePrototype> BluntDamageTypeId = "Blunt";
 
     /// <summary>
@@ -99,4 +108,60 @@ public sealed class DefibrillatorTest : InteractionTest
         // The target should be revived, but in crit.
         Assert.That(targetMobState.CurrentState, Is.EqualTo(MobState.Critical), "Target mob was not revived from being defibrillated.");
     }
+
+    /// <summary>
+    /// Revives a target mob that is strapped to a bed. The bed gets caught in the zap chain, but the defibrillator
+    /// should only report on the patient, not complain that the bed is an inanimate object.
+    /// </summary>
+    [Test]
+    public async Task ReviveBuckledTest()
+    {
+        var damageableSystem = SEntMan.System<DamageableSystem>();
+        var mobThresholdsSystem = SEntMan.System<MobThresholdSystem>();
+        var buckleSystem = SEntMan.System<SharedBuckleSystem>();
+        var loc = Server.ResolveDependency<ILocalizationManager>();
+
+        // Don't let the player and target suffocate.
+        await AddAtmosphere();
+
+        await SpawnTarget(TargetProtoId);
+        var bed = ToServer(await Spawn(BedProtoId));
+
+        var targetMobState = Comp<MobStateComponent>();
+        var targetDamageable = Comp<DamageableComponent>();
+        var targetBuckle = Comp<BuckleComponent>();
+
+        await Server.WaitPost(() => buckleSystem.TryBuckle(STarget.Value, null, bed));
+        await RunTicks(3);
+        Assert.That(targetBuckle.BuckledTo, Is.EqualTo(bed), "Target mob was not buckled to the bed.");
+
+        // Kill the target, then bring the damage back down to a revivable level.
+        var critThreshold = mobThresholdsSystem.GetThresholdForState(STarget.Value, MobState.Critical);
+        var deathThreshold = mobThresholdsSystem.GetThresholdForState(STarget.Value, MobState.Dead);
+        var critDamage = new DamageSpecifier(ProtoMan.Index(BluntDamageTypeId), (critThreshold + deathThreshold) / 2);
+        var deathDamage = new DamageSpecifier(ProtoMan.Index(BluntDamageTypeId), deathThreshold);
+
+        await Server.WaitPost(() => damageableSystem.SetDamage((STarget.Value, targetDamageable), deathDamage));
+        await RunTicks(3);
+        await Server.WaitPost(() => damageableSystem.SetDamage((STarget.Value, targetDamageable), critDamage));
+        await RunTicks(3);
+        Assert.That(targetMobState.CurrentState, Is.EqualTo(MobState.Dead), "Target mob was not dead before being defibrillated.");
+
+        // Spawn a defib, activate it and record everything it says.
+        var defib = await PlaceInHands(DefibrillatorProtoId, enableToggleable: true);
+        var sDefib = ToServer(defib);
+        await Server.WaitPost(() => SEntMan.EnsureComponent<TestListenerComponent>(sDefib));
+        var cooldown = Comp<DefibrillatorComponent>(defib).ZapDelay;
+        await RunSeconds((float)cooldown.TotalSeconds);
+
+        // ZAP!
+        await Interact();
+
+        Assert.That(targetMobState.CurrentState, Is.EqualTo(MobState.Critical), "Buckled target mob was not revived from being defibrillated.");
+
+        // The dummy has no mind, so the defib complains about that. It must not also complain about the bed.
+        var spoken = GetEvents<EntitySpokeEvent>(sDefib).Select(ev => ev.Message).ToList();
+        Assert.That(spoken, Is.Not.Empty, "Defibrillator did not report on the patient.");
+        Assert.That(spoken, Does.Not.Contain(loc.GetString("defibrillator-not-living")), "Defibrillator reported on the bed instead of the patient.");
+    }
 }
diff --git a/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs b/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs
deleted file mode 100644
index c207e7b489..0000000000
--- a/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-#nullable enable
-using Robust.Shared.Console;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-
-namespace Content.IntegrationTests.Tests.Minds;
-
-[TestFixture]
-public sealed partial class MindTests
-{
-    [Test]
-    public async Task DeleteAllThenGhost()
-    {
-        var pair = Pair;
-
-        // Client is connected with a valid entity & mind
-        Assert.That(pair.Client.EntMan.EntityExists(pair.Client.AttachedEntity));
-        Assert.That(pair.Server.EntMan.EntityExists(pair.PlayerData?.Mind));
-
-        // Delete **everything**
-        var conHost = pair.Server.ResolveDependency<IConsoleHost>();
-        await pair.Server.WaitPost(() => conHost.ExecuteCommand("entities delete"));
-        await pair.RunTicksSync(5);
-
-        Assert.That(pair.Server.EntMan.EntityCount, Is.EqualTo(0));
-
-        foreach (var ent in pair.Client.EntMan.GetEntities())
-        {
-            Console.WriteLine(pair.Client.EntMan.ToPrettyString(ent));
-        }
-
-        Assert.That(pair.Client.EntMan.EntityCount, Is.EqualTo(0));
-
-        // Create a new map.
-        MapId mapId = default;
-        await pair.Server.WaitPost(() => pair.Server.System<SharedMapSystem>().CreateMap(out mapId));
-        await pair.RunTicksSync(5);
-
-        // Client is not attached to anything
-        Assert.That(pair.Client.AttachedEntity, Is.Null);
-        Assert.That(pair.PlayerData?.Mind, Is.Null);
-
-        // Attempt to ghost
-        var cConHost = pair.Client.ResolveDependency<IConsoleHost>();
-        await pair.Client.WaitPost(() => cConHost.ExecuteCommand("ghost"));
-        await pair.RunTicksSync(10);
-
-        // Client should be attached to a ghost placed on the new map.
-        Assert.That(pair.Client.EntMan.EntityExists(pair.Client.AttachedEntity));
-        Assert.That(pair.Server.EntMan.EntityExists(pair.PlayerData?.Mind));
-        var xform = pair.Client.Transform(pair.Client.AttachedEntity!.Value);
-        Assert.That(xform.MapID, Is.EqualTo(mapId));
-    }
-}
diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs b/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs
index ce2cd643b2..e7b8037a0b 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs
@@ -174,7 +174,7 @@ public sealed partial class MindTests
         EntityUid ghost = default!;
         await server.WaitAssertion(() =>
         {
-            ghost = entMan.SpawnEntity(GameTicker.ObserverPrototypeName, MapCoordinates.Nullspace);
+            ghost = entMan.SpawnEntity(ServerGameTicker.ObserverPrototypeName, MapCoordinates.Nullspace);
             mindSystem.Visit(mind.Id, ghost);
         });
 
@@ -223,7 +223,7 @@ public sealed partial class MindTests
         var ghost = await BecomeGhost(pair);
 
         // Player is a normal ghost (not admin ghost).
-        Assert.That(entMan.GetComponent<MetaDataComponent>(player.AttachedEntity!.Value).EntityPrototype?.ID, Is.Not.EqualTo(GameTicker.AdminObserverPrototypeName));
+        Assert.That(entMan.GetComponent<MetaDataComponent>(player.AttachedEntity!.Value).EntityPrototype?.ID, Is.Not.EqualTo(ServerGameTicker.AdminObserverPrototypeName));
 
         // Try to become an admin ghost
         await server.WaitAssertion(() => serverConsole.ExecuteCommand(player, "aghost"));
@@ -234,7 +234,7 @@ public sealed partial class MindTests
         {
             Assert.That(player.AttachedEntity, Is.Not.EqualTo(ghost), "Player is still attached to the old ghost");
             Assert.That(entMan.HasComponent<GhostComponent>(player.AttachedEntity), "Player did not become a new ghost");
-            Assert.That(entMan.GetComponent<MetaDataComponent>(player.AttachedEntity!.Value).EntityPrototype?.ID, Is.EqualTo(GameTicker.AdminObserverPrototypeName));
+            Assert.That(entMan.GetComponent<MetaDataComponent>(player.AttachedEntity!.Value).EntityPrototype?.ID, Is.EqualTo(ServerGameTicker.AdminObserverPrototypeName));
         });
 
         var mindId = player.ContentData()?.Mind;
diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs b/Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs
index b3831a0cb1..5735987380 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs
@@ -80,7 +80,7 @@ public sealed partial class MindTests
         await pair.Server.WaitAssertion(() =>
         {
             var oldUid = player.AttachedEntity;
-            ghostUid = entMan.SpawnEntity(GameTicker.ObserverPrototypeName, MapCoordinates.Nullspace);
+            ghostUid = entMan.SpawnEntity(ServerGameTicker.ObserverPrototypeName, MapCoordinates.Nullspace);
             mindId = mindSys.GetMind(player.UserId)!.Value;
             Assert.That(mindId, Is.Not.EqualTo(default(EntityUid)));
             mind = entMan.GetComponent<MindComponent>(mindId);
diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.cs b/Content.IntegrationTests/Tests/Minds/MindTests.cs
index 7abc0ce9da..173408c105 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTests.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTests.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System.Linq;
 using Content.IntegrationTests.Fixtures;
 using Content.Server.Ghost.Roles;
diff --git a/Content.IntegrationTests/Tests/Minds/RoleTests.cs b/Content.IntegrationTests/Tests/Minds/RoleTests.cs
index 3204dc1c2f..b8f1599661 100644
--- a/Content.IntegrationTests/Tests/Minds/RoleTests.cs
+++ b/Content.IntegrationTests/Tests/Minds/RoleTests.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.IntegrationTests.Fixtures;
 using Content.Shared.Roles.Components;
 using Robust.Shared.GameObjects;
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index e6aafeb26d..dc47ef3796 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -10,11 +10,11 @@ using Content.Server.Administration.Systems;
 using Content.Server.GameTicking;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Systems;
-using Content.Server.Spawners.Components;
-using Content.Server.Station.Components;
 using Content.Shared.CCVar;
 using Content.Shared.Maps;
 using Content.Shared.Roles;
+using Content.Shared.Shuttles.Components;
+using Content.Shared.Spawners.Components;
 using Content.Shared.Station.Components;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
@@ -335,7 +335,7 @@ namespace Content.IntegrationTests.Tests
             var mapLoader = entManager.System<MapLoaderSystem>();
             var mapSystem = entManager.System<SharedMapSystem>();
             var protoManager = server.ResolveDependency<IPrototypeManager>();
-            var ticker = entManager.EntitySysManager.GetEntitySystem<GameTicker>();
+            var ticker = entManager.EntitySysManager.GetEntitySystem<ServerGameTicker>();
             var shuttleSystem = entManager.EntitySysManager.GetEntitySystem<ShuttleSystem>();
             var cfg = server.ResolveDependency<IConfigurationManager>();
 
diff --git a/Content.IntegrationTests/Tests/Power/StationPowerTests.cs b/Content.IntegrationTests/Tests/Power/StationPowerTests.cs
index 236ebea2ff..ba27e106b4 100644
--- a/Content.IntegrationTests/Tests/Power/StationPowerTests.cs
+++ b/Content.IntegrationTests/Tests/Power/StationPowerTests.cs
@@ -50,7 +50,7 @@ public sealed class StationPowerTests : GameTest
 
         var entMan = server.EntMan;
         var protoMan = server.ProtoMan;
-        var ticker = entMan.System<GameTicker>();
+        var ticker = entMan.System<ServerGameTicker>();
         var batterySys = entMan.System<BatterySystem>();
 
         // Load the map
@@ -108,7 +108,7 @@ public sealed class StationPowerTests : GameTest
 
         var entMan = server.EntMan;
         var protoMan = server.ProtoMan;
-        var ticker = entMan.System<GameTicker>();
+        var ticker = entMan.System<ServerGameTicker>();
         var xform = entMan.System<TransformSystem>();
 
         // Load the map
diff --git a/Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs b/Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs
index 62c9f1a460..7babf8f7f4 100644
--- a/Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs
+++ b/Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs
@@ -4,6 +4,7 @@ using Content.Server.Station.Systems;
 using Content.Shared.Inventory;
 using Content.Shared.Preferences;
 using Content.Shared.Preferences.Loadouts;
+using Content.Shared.Station.Systems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.IntegrationTests/Tests/Puller/InteractingEntitiesTest.cs b/Content.IntegrationTests/Tests/Puller/InteractingEntitiesTest.cs
index b53a9a1aad..623302dcbb 100644
--- a/Content.IntegrationTests/Tests/Puller/InteractingEntitiesTest.cs
+++ b/Content.IntegrationTests/Tests/Puller/InteractingEntitiesTest.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.IntegrationTests.Tests.Interaction;
 using Content.Shared.Interaction;
 using Content.Shared.Movement.Pulling.Systems;
diff --git a/Content.IntegrationTests/Tests/Replays/ReplayTests.cs b/Content.IntegrationTests/Tests/Replays/ReplayTests.cs
index 4bd5f62e78..774c93f070 100644
--- a/Content.IntegrationTests/Tests/Replays/ReplayTests.cs
+++ b/Content.IntegrationTests/Tests/Replays/ReplayTests.cs
@@ -38,7 +38,7 @@ public sealed class ReplayTests : GameTest
         server.CfgMan.SetCVar(CCVars.ReplayAutoRecordName, $"c/d/{autoRecName}");
 
         // Restart the round a few times
-        var ticker = server.System<GameTicker>();
+        var ticker = server.System<ServerGameTicker>();
         await server.WaitPost(() => ticker.RestartRound());
         await pair.RunTicksSync(25);
         Assert.That(recordMan.IsRecording, Is.True);
diff --git a/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs b/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs
index 17f178645a..2d38f2d354 100644
--- a/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs
+++ b/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs
@@ -1,4 +1,4 @@
-using Content.IntegrationTests.Fixtures;
+using Content.IntegrationTests.Fixtures;
 using Content.Server.GameTicking;
 using Content.Shared.GameTicking;
 using Robust.Shared.GameObjects;
@@ -41,7 +41,7 @@ namespace Content.IntegrationTests.Tests
             var server = pair.Server;
 
             var entitySystemManager = server.ResolveDependency<IEntitySystemManager>();
-            var gameTicker = entitySystemManager.GetEntitySystem<GameTicker>();
+            var gameTicker = entitySystemManager.GetEntitySystem<ServerGameTicker>();
 
             await server.WaitAssertion(() =>
             {
diff --git a/Content.IntegrationTests/Tests/RestartRoundTest.cs b/Content.IntegrationTests/Tests/RestartRoundTest.cs
index 1ed43b0951..b32fc22a36 100644
--- a/Content.IntegrationTests/Tests/RestartRoundTest.cs
+++ b/Content.IntegrationTests/Tests/RestartRoundTest.cs
@@ -23,7 +23,7 @@ namespace Content.IntegrationTests.Tests
 
             await server.WaitPost(() =>
             {
-                sysManager.GetEntitySystem<GameTicker>().RestartRound();
+                sysManager.GetEntitySystem<ServerGameTicker>().RestartRound();
             });
 
             await pair.RunUntilSynced();
diff --git a/Content.IntegrationTests/Tests/Round/JobTest.cs b/Content.IntegrationTests/Tests/Round/JobTest.cs
index 04e629c1ba..2abd28d6e2 100644
--- a/Content.IntegrationTests/Tests/Round/JobTest.cs
+++ b/Content.IntegrationTests/Tests/Round/JobTest.cs
@@ -85,7 +85,7 @@ public sealed class JobTest : GameTest
         var jobSys = pair.Server.System<SharedJobSystem>();
         var mindSys = pair.Server.System<MindSystem>();
         var roleSys = pair.Server.System<RoleSystem>();
-        var ticker = pair.Server.System<GameTicker>();
+        var ticker = pair.Server.System<ServerGameTicker>();
 
         user ??= pair.Client.User!.Value;
 
@@ -110,7 +110,7 @@ public sealed class JobTest : GameTest
         var pair = Pair;
 
         pair.Server.CfgMan.SetCVar(CCVars.GameMap, _map);
-        var ticker = pair.Server.System<GameTicker>();
+        var ticker = pair.Server.System<ServerGameTicker>();
 
         // Initially in the lobby
         Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby));
@@ -137,7 +137,7 @@ public sealed class JobTest : GameTest
         var pair = Pair;
 
         pair.Server.CfgMan.SetCVar(CCVars.GameMap, _map);
-        var ticker = pair.Server.System<GameTicker>();
+        var ticker = pair.Server.System<ServerGameTicker>();
         Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby));
         Assert.That(pair.Client.AttachedEntity, Is.Null);
 
@@ -170,11 +170,11 @@ public sealed class JobTest : GameTest
         var pair = Pair;
 
         pair.Server.CfgMan.SetCVar(CCVars.GameMap, _map);
-        var ticker = pair.Server.System<GameTicker>();
+        var ticker = pair.Server.System<ServerGameTicker>();
         Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby));
         Assert.That(pair.Client.AttachedEntity, Is.Null);
 
-        var stationJobs = pair.Server.System<StationJobsSystem>();
+        var stationJobs = pair.Server.System<ServerStationJobsSystem>();
         var captain = pair.Server.ProtoMan.Index(Captain);
         var engineer = pair.Server.ProtoMan.Index(Engineer);
         var passenger = pair.Server.ProtoMan.Index(Passenger);
@@ -202,9 +202,9 @@ public sealed class JobTest : GameTest
     {
         var pair = Pair;
         pair.Server.CfgMan.SetCVar(CCVars.GameMap, JobWeightOverrideMap);
-        var ticker = pair.Server.System<GameTicker>();
+        var ticker = pair.Server.System<ServerGameTicker>();
 
-        var stationJobs = pair.Server.System<StationJobsSystem>();
+        var stationJobs = pair.Server.System<ServerStationJobsSystem>();
         var passenger = pair.Server.ProtoMan.Index(Passenger);
         var engineer = pair.Server.ProtoMan.Index(Engineer);
         var captain = pair.Server.ProtoMan.Index(Captain);
@@ -256,7 +256,7 @@ public sealed class JobTest : GameTest
         var pair = Pair;
 
         pair.Server.CfgMan.SetCVar(CCVars.GameMap, _map);
-        var ticker = pair.Server.System<GameTicker>();
+        var ticker = pair.Server.System<ServerGameTicker>();
         Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby));
         Assert.That(pair.Client.AttachedEntity, Is.Null);
 
diff --git a/Content.IntegrationTests/Tests/RoundEndTest.cs b/Content.IntegrationTests/Tests/RoundEndTest.cs
index 4a02ede05e..72afdf480d 100644
--- a/Content.IntegrationTests/Tests/RoundEndTest.cs
+++ b/Content.IntegrationTests/Tests/RoundEndTest.cs
@@ -2,6 +2,7 @@ using Content.IntegrationTests.Fixtures;
 using Content.Server.GameTicking;
 using Content.Server.RoundEnd;
 using Content.Shared.CCVar;
+using Content.Shared.GameTicking;
 using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 
@@ -43,7 +44,7 @@ namespace Content.IntegrationTests.Tests
 
             var config = server.ResolveDependency<IConfigurationManager>();
             var sysManager = server.ResolveDependency<IEntitySystemManager>();
-            var ticker = sysManager.GetEntitySystem<GameTicker>();
+            var ticker = sysManager.GetEntitySystem<ServerGameTicker>();
             var roundEndSystem = sysManager.GetEntitySystem<RoundEndSystem>();
             var sys = server.System<RoundEndTestSystem>();
             sys.RoundCount = 0;
diff --git a/Content.IntegrationTests/Tests/SalvageTest.cs b/Content.IntegrationTests/Tests/SalvageTest.cs
index 68bdf4726c..705b4baf7f 100644
--- a/Content.IntegrationTests/Tests/SalvageTest.cs
+++ b/Content.IntegrationTests/Tests/SalvageTest.cs
@@ -1,4 +1,4 @@
-using Content.IntegrationTests.Fixtures;
+using Content.IntegrationTests.Fixtures;
 using Content.IntegrationTests.Fixtures.Attributes;
 using Content.Shared.CCVar;
 using Content.Shared.Salvage;
diff --git a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs
index 7dfc2ffc1e..2506a0e5ba 100644
--- a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs
+++ b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs
@@ -94,6 +94,10 @@ namespace Content.IntegrationTests.Tests
                 mapSystem.DeleteMap(mapId0);
                 mapSystem.DeleteMap(mapId1);
             });
+            foreach (var ent in SEntMan.GetEntities())
+            {
+                Console.WriteLine(SEntMan.ToPrettyString(ent));
+            }
             Assert.That(SEntMan.EntityCount.Equals(0), "Lingering entities at the end of CreateSaveLoadSaveGrid");
         }
 
@@ -177,6 +181,10 @@ namespace Content.IntegrationTests.Tests
 
             testSystem.Enabled = false;
             await server.WaitPost(() => mapSys.DeleteMap(mapId));
+            foreach (var ent in SEntMan.GetEntities())
+            {
+                Console.WriteLine(SEntMan.ToPrettyString(ent));
+            }
             Assert.That(SEntMan.EntityCount.Equals(0), "Lingering entities at the end of LoadSaveTicksSaveBagel");
         }
 
@@ -253,6 +261,10 @@ namespace Content.IntegrationTests.Tests
                 mapSys.DeleteMap(mapId1);
                 mapSys.DeleteMap(mapId2);
             });
+            foreach (var ent in SEntMan.GetEntities())
+            {
+                Console.WriteLine(SEntMan.ToPrettyString(ent));
+            }
             Assert.That(SEntMan.EntityCount.Equals(0), "Lingering entities at the end of LoadTickLoadBagel");
         }
 
diff --git a/Content.IntegrationTests/Tests/Security/StunBatonTest.cs b/Content.IntegrationTests/Tests/Security/StunBatonTest.cs
index 3f5d583854..eeb99c73d4 100644
--- a/Content.IntegrationTests/Tests/Security/StunBatonTest.cs
+++ b/Content.IntegrationTests/Tests/Security/StunBatonTest.cs
@@ -22,7 +22,7 @@ public sealed class StunBatonTests : InteractionTest
     private static readonly EntProtoId HumanProtoId = "MobHuman";
 
     // If you are rebalancing stun batons you will have to change this number.
-    private const int NumberOfHitsToStun = 3;
+    private const int NumberOfHitsToStun = 5;
 
     [SidedDependency(Side.Server)] private readonly SharedBatterySystem _battery = default!;
     [SidedDependency(Side.Server)] private readonly DamageableSystem _damageable = default!;
@@ -163,7 +163,7 @@ public sealed class StunBatonTests : InteractionTest
         var baton = await PlaceInHands(StunBatonProtoId, enableToggleable: true);
         var sBaton = ToServer(baton);
         var batteryComp = Comp<BatteryComponent>(baton);
-        var batonIntialCharge = _battery.GetCharge(sBaton);
+        var batonIntialCharge = _battery.GetCharge(sBaton).Charge;
 
         using (Assert.EnterMultipleScope())
         {
@@ -176,7 +176,7 @@ public sealed class StunBatonTests : InteractionTest
         await RunSeconds(2); // Weapon cooldown.
         await AttemptLightAttackMiss();
 
-        var batonNewCharge = _battery.GetCharge(sBaton);
+        var batonNewCharge = _battery.GetCharge(sBaton).Charge;
         Assert.That(batonNewCharge, Is.EqualTo(batonIntialCharge), "Stun baton lost charge when missing an attack.");
     }
 }
diff --git a/Content.IntegrationTests/Tests/ShuttleTest.cs b/Content.IntegrationTests/Tests/ShuttleTest.cs
index 2c77f6b8c7..8429dc7813 100644
--- a/Content.IntegrationTests/Tests/ShuttleTest.cs
+++ b/Content.IntegrationTests/Tests/ShuttleTest.cs
@@ -1,6 +1,7 @@
 using System.Numerics;
 using Content.IntegrationTests.Fixtures;
 using Content.Server.Shuttles.Components;
+using Content.Shared.Shuttles.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
diff --git a/Content.IntegrationTests/Tests/Station/EvacShuttleTest.cs b/Content.IntegrationTests/Tests/Station/EvacShuttleTest.cs
index e6a098a639..fc1d3741d4 100644
--- a/Content.IntegrationTests/Tests/Station/EvacShuttleTest.cs
+++ b/Content.IntegrationTests/Tests/Station/EvacShuttleTest.cs
@@ -4,6 +4,7 @@ using Content.Server.GameTicking;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Systems;
 using Content.Shared.CCVar;
+using Content.Shared.GameTicking;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Station.Components;
 using Robust.Shared.GameObjects;
@@ -30,7 +31,7 @@ public sealed class EvacShuttleTest : GameTest
         var pair = Pair;
         var server = pair.Server;
         var entMan = server.EntMan;
-        var ticker = server.System<GameTicker>();
+        var ticker = server.System<ServerGameTicker>();
 
         // Dummy ticker tests should not have centcomm
         Assert.That(entMan.Count<StationCentcommComponent>(), Is.Zero);
diff --git a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
index 7cdf0155ca..188fec54e8 100644
--- a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
+++ b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
@@ -6,6 +6,7 @@ using Content.Shared.CCVar;
 using Content.Shared.Maps;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
+using Content.Shared.Station.Components;
 using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Network;
@@ -14,7 +15,7 @@ using Robust.Shared.Prototypes;
 namespace Content.IntegrationTests.Tests.Station;
 
 [TestFixture]
-[TestOf(typeof(StationJobsSystem))]
+[TestOf(typeof(ServerStationJobsSystem))]
 public sealed class StationJobsTest : GameTest
 {
     private const string StationMapId = "FooStation";
@@ -137,8 +138,8 @@ public sealed class StationJobsTest : GameTest
         var prototypeManager = server.ResolveDependency<IPrototypeManager>();
         var barStationProto = prototypeManager.Index<GameMapPrototype>(SecondStationMapId);
         var entSysMan = server.ResolveDependency<IEntityManager>().EntitySysManager;
-        var stationJobs = entSysMan.GetEntitySystem<StationJobsSystem>();
-        var stationSystem = entSysMan.GetEntitySystem<StationSystem>();
+        var stationJobs = entSysMan.GetEntitySystem<ServerStationJobsSystem>();
+        var stationSystem = entSysMan.GetEntitySystem<ServerStationSystem>();
 
         var firstStation = EntityUid.Invalid;
         var secondStation = EntityUid.Invalid;
@@ -198,8 +199,8 @@ public sealed class StationJobsTest : GameTest
         var prototypeManager = server.ResolveDependency<IPrototypeManager>();
         var barStationProto = prototypeManager.Index<GameMapPrototype>(SecondStationMapId);
         var entSysMan = server.ResolveDependency<IEntityManager>().EntitySysManager;
-        var stationJobs = entSysMan.GetEntitySystem<StationJobsSystem>();
-        var stationSystem = entSysMan.GetEntitySystem<StationSystem>();
+        var stationJobs = entSysMan.GetEntitySystem<ServerStationJobsSystem>();
+        var stationSystem = entSysMan.GetEntitySystem<ServerStationSystem>();
         var station = EntityUid.Invalid;
 
         await server.WaitPost(() =>
@@ -264,8 +265,8 @@ public sealed class StationJobsTest : GameTest
         var prototypeManager = server.ResolveDependency<IPrototypeManager>();
         var fooStationProto = prototypeManager.Index<GameMapPrototype>(StationMapId);
         var entSysMan = server.ResolveDependency<IEntityManager>().EntitySysManager;
-        var stationJobs = entSysMan.GetEntitySystem<StationJobsSystem>();
-        var stationSystem = entSysMan.GetEntitySystem<StationSystem>();
+        var stationJobs = entSysMan.GetEntitySystem<ServerStationJobsSystem>();
+        var stationSystem = entSysMan.GetEntitySystem<ServerStationSystem>();
 
         var station = EntityUid.Invalid;
         await server.WaitPost(() =>
diff --git a/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs b/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs
index 60d9ddd7fc..9f795a16e7 100644
--- a/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs
@@ -4,7 +4,7 @@ using Content.IntegrationTests.Tests.Interaction;
 using Content.Shared.Input;
 using Content.Shared.PDA;
 using Content.Shared.Storage;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
 using Robust.Client.UserInterface;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
diff --git a/Content.IntegrationTests/Tests/Strip/StrippableTest.cs b/Content.IntegrationTests/Tests/Strip/StrippableTest.cs
index d2ae3bd7ec..4d8f7227af 100644
--- a/Content.IntegrationTests/Tests/Strip/StrippableTest.cs
+++ b/Content.IntegrationTests/Tests/Strip/StrippableTest.cs
@@ -1,4 +1,4 @@
-using Content.IntegrationTests.Tests.Interaction;
+using Content.IntegrationTests.Tests.Interaction;
 using Content.Shared.Strip.Components;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.IntegrationTests/Tests/Toolshed/AdminTest.cs b/Content.IntegrationTests/Tests/Toolshed/AdminTest.cs
index cc440d0ccb..e8e27518c2 100644
--- a/Content.IntegrationTests/Tests/Toolshed/AdminTest.cs
+++ b/Content.IntegrationTests/Tests/Toolshed/AdminTest.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Reflection;
 using Content.Server.Administration.Managers;
 using Robust.Shared.Toolshed;
diff --git a/Content.IntegrationTests/Tests/Toolshed/LocTest.cs b/Content.IntegrationTests/Tests/Toolshed/LocTest.cs
index 849f9e55d3..6d936878d6 100644
--- a/Content.IntegrationTests/Tests/Toolshed/LocTest.cs
+++ b/Content.IntegrationTests/Tests/Toolshed/LocTest.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Reflection;
 using Robust.Shared.Localization;
diff --git a/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs b/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs
index 6ab5ca1691..bfe8db778e 100644
--- a/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs
+++ b/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using Content.IntegrationTests.Fixtures;
 using Content.Shared.Physics;
 using Content.Shared.Spawning;
diff --git a/Content.IntegrationTests/Tests/Weapons/WeaponTests.cs b/Content.IntegrationTests/Tests/Weapons/WeaponTests.cs
index 8ddbe0ed08..2d3f5be2be 100644
--- a/Content.IntegrationTests/Tests/Weapons/WeaponTests.cs
+++ b/Content.IntegrationTests/Tests/Weapons/WeaponTests.cs
@@ -1,4 +1,4 @@
-using Content.IntegrationTests.Tests.Interaction;
+using Content.IntegrationTests.Tests.Interaction;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.FixedPoint;
diff --git a/Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs b/Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs
index d9801275b9..47801946a3 100644
--- a/Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs
+++ b/Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs
@@ -1,4 +1,4 @@
-using Content.IntegrationTests.Fixtures;
+using Content.IntegrationTests.Fixtures;
 using Content.Server.Doors;
 using Content.Server.Power;
 using Content.Server.Wires;
diff --git a/Content.MapRenderer/CommandLineArguments.cs b/Content.MapRenderer/CommandLineArguments.cs
index a4f3c83bf2..e028995dea 100644
--- a/Content.MapRenderer/CommandLineArguments.cs
+++ b/Content.MapRenderer/CommandLineArguments.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Content.MapRenderer.Extensions;
diff --git a/Content.MapRenderer/Extensions/DirectoryExtensions.cs b/Content.MapRenderer/Extensions/DirectoryExtensions.cs
index 55d4611a7e..216fda065a 100644
--- a/Content.MapRenderer/Extensions/DirectoryExtensions.cs
+++ b/Content.MapRenderer/Extensions/DirectoryExtensions.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Reflection;
 
 namespace Content.MapRenderer.Extensions
diff --git a/Content.MapRenderer/Extensions/EnvironmentExtensions.cs b/Content.MapRenderer/Extensions/EnvironmentExtensions.cs
index 34a379096f..58d0d49a52 100644
--- a/Content.MapRenderer/Extensions/EnvironmentExtensions.cs
+++ b/Content.MapRenderer/Extensions/EnvironmentExtensions.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System;
 using System.Diagnostics.CodeAnalysis;
 
diff --git a/Content.MapRenderer/MapViewerData.cs b/Content.MapRenderer/MapViewerData.cs
index b58d0c664b..9d3ce08d69 100644
--- a/Content.MapRenderer/MapViewerData.cs
+++ b/Content.MapRenderer/MapViewerData.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Numerics;
 using System.Text.Json.Serialization;
 using Robust.Shared.ContentPack;
diff --git a/Content.MapRenderer/Painters/DecalData.cs b/Content.MapRenderer/Painters/DecalData.cs
index c64d4ff6ff..b76113d670 100644
--- a/Content.MapRenderer/Painters/DecalData.cs
+++ b/Content.MapRenderer/Painters/DecalData.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Decals;
+using Content.Shared.Decals;
 
 namespace Content.MapRenderer.Painters;
 
diff --git a/Content.MapRenderer/Painters/DecalPainter.cs b/Content.MapRenderer/Painters/DecalPainter.cs
index acc9e5615a..9e68fe4548 100644
--- a/Content.MapRenderer/Painters/DecalPainter.cs
+++ b/Content.MapRenderer/Painters/DecalPainter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Numerics;
diff --git a/Content.MapRenderer/Painters/EntityData.cs b/Content.MapRenderer/Painters/EntityData.cs
index 8aad0c7e93..0219a97f8e 100644
--- a/Content.MapRenderer/Painters/EntityData.cs
+++ b/Content.MapRenderer/Painters/EntityData.cs
@@ -1,4 +1,4 @@
-using Robust.Client.GameObjects;
+using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
 namespace Content.MapRenderer.Painters;
diff --git a/Content.MapRenderer/Painters/EntityPainter.cs b/Content.MapRenderer/Painters/EntityPainter.cs
index 0c751b8583..a2abc2bbf3 100644
--- a/Content.MapRenderer/Painters/EntityPainter.cs
+++ b/Content.MapRenderer/Painters/EntityPainter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Numerics;
 using Robust.Client.GameObjects;
diff --git a/Content.MapRenderer/Painters/MapPainter.cs b/Content.MapRenderer/Painters/MapPainter.cs
index c6ae9c03bf..cbef2364e6 100644
--- a/Content.MapRenderer/Painters/MapPainter.cs
+++ b/Content.MapRenderer/Painters/MapPainter.cs
@@ -172,7 +172,7 @@ namespace Content.MapRenderer.Painters
 
                 if (_map is RenderMapPrototype)
                 {
-                    var mapId = sEntityManager.System<GameTicker>().DefaultMap;
+                    var mapId = sEntityManager.System<ServerGameTicker>().DefaultMap;
                     _grids = mapSys.GetAllGrids(mapId).ToArray();
                 }
 
diff --git a/Content.MapRenderer/ParallaxOutput.cs b/Content.MapRenderer/ParallaxOutput.cs
index bedbb1dc53..f8f656fca9 100644
--- a/Content.MapRenderer/ParallaxOutput.cs
+++ b/Content.MapRenderer/ParallaxOutput.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Utility;
diff --git a/Content.MapRenderer/Program.cs b/Content.MapRenderer/Program.cs
index 668e04f63d..dc2f07b6fa 100644
--- a/Content.MapRenderer/Program.cs
+++ b/Content.MapRenderer/Program.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Content.MapRenderer/RenderedGridImage.cs b/Content.MapRenderer/RenderedGridImage.cs
index c460853c37..9a3e232147 100644
--- a/Content.MapRenderer/RenderedGridImage.cs
+++ b/Content.MapRenderer/RenderedGridImage.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using SixLabors.ImageSharp;
diff --git a/Content.Packaging/DepsHandler.cs b/Content.Packaging/DepsHandler.cs
index 9907b97ba9..eddb0b8911 100644
--- a/Content.Packaging/DepsHandler.cs
+++ b/Content.Packaging/DepsHandler.cs
@@ -1,4 +1,4 @@
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Content.Packaging;
diff --git a/Content.Packaging/Program.cs b/Content.Packaging/Program.cs
index 25fc550a2f..19e6bc0466 100644
--- a/Content.Packaging/Program.cs
+++ b/Content.Packaging/Program.cs
@@ -1,4 +1,4 @@
-using Content.Packaging;
+using Content.Packaging;
 using Robust.Packaging;
 
 IPackageLogger logger = new PackageLoggerConsole();
diff --git a/Content.Packaging/SharedPackaging.cs b/Content.Packaging/SharedPackaging.cs
index 5888845588..dbc5ccab39 100644
--- a/Content.Packaging/SharedPackaging.cs
+++ b/Content.Packaging/SharedPackaging.cs
@@ -1,4 +1,4 @@
-namespace Content.Packaging;
+namespace Content.Packaging;
 
 public sealed class SharedPackaging
 {
diff --git a/Content.PatreonParser/Attributes.cs b/Content.PatreonParser/Attributes.cs
index d3ebeb5f7c..f9307a2450 100644
--- a/Content.PatreonParser/Attributes.cs
+++ b/Content.PatreonParser/Attributes.cs
@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Content.PatreonParser;
 
diff --git a/Content.PatreonParser/CurrentlyEntitledTiers.cs b/Content.PatreonParser/CurrentlyEntitledTiers.cs
index fd1747efda..a49f1efc71 100644
--- a/Content.PatreonParser/CurrentlyEntitledTiers.cs
+++ b/Content.PatreonParser/CurrentlyEntitledTiers.cs
@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Content.PatreonParser;
 
diff --git a/Content.PatreonParser/Data.cs b/Content.PatreonParser/Data.cs
index cdc7d79bff..f3315435c6 100644
--- a/Content.PatreonParser/Data.cs
+++ b/Content.PatreonParser/Data.cs
@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Content.PatreonParser;
 
diff --git a/Content.PatreonParser/Included.cs b/Content.PatreonParser/Included.cs
index ec3363579b..8c46ebe62a 100644
--- a/Content.PatreonParser/Included.cs
+++ b/Content.PatreonParser/Included.cs
@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Content.PatreonParser;
 
diff --git a/Content.PatreonParser/Patron.cs b/Content.PatreonParser/Patron.cs
index d9943a6a26..fe54b4663d 100644
--- a/Content.PatreonParser/Patron.cs
+++ b/Content.PatreonParser/Patron.cs
@@ -1,3 +1,3 @@
-namespace Content.PatreonParser;
+namespace Content.PatreonParser;
 
 public readonly record struct Patron(string FullName, string TierName, DateTime Start);
diff --git a/Content.PatreonParser/Program.cs b/Content.PatreonParser/Program.cs
index ff6646eda3..fd1108fb76 100644
--- a/Content.PatreonParser/Program.cs
+++ b/Content.PatreonParser/Program.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Content.PatreonParser;
diff --git a/Content.PatreonParser/Relationships.cs b/Content.PatreonParser/Relationships.cs
index f919f812f6..6b6da799e3 100644
--- a/Content.PatreonParser/Relationships.cs
+++ b/Content.PatreonParser/Relationships.cs
@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Content.PatreonParser;
 
diff --git a/Content.PatreonParser/Root.cs b/Content.PatreonParser/Root.cs
index 2a772a1214..b2cfffe714 100644
--- a/Content.PatreonParser/Root.cs
+++ b/Content.PatreonParser/Root.cs
@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Content.PatreonParser;
 
diff --git a/Content.PatreonParser/Row.cs b/Content.PatreonParser/Row.cs
index f4d2504616..62d700e5c5 100644
--- a/Content.PatreonParser/Row.cs
+++ b/Content.PatreonParser/Row.cs
@@ -1,4 +1,4 @@
-using CsvHelper.Configuration.Attributes;
+using CsvHelper.Configuration.Attributes;
 
 namespace Content.PatreonParser;
 
diff --git a/Content.PatreonParser/TierData.cs b/Content.PatreonParser/TierData.cs
index a840b21d35..a8b342a399 100644
--- a/Content.PatreonParser/TierData.cs
+++ b/Content.PatreonParser/TierData.cs
@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Content.PatreonParser;
 
diff --git a/Content.Replay/Menu/ReplayMainMenuControl.xaml b/Content.Replay/Menu/ReplayMainMenuControl.xaml
index ef2f97ce3d..4829addda1 100644
--- a/Content.Replay/Menu/ReplayMainMenuControl.xaml
+++ b/Content.Replay/Menu/ReplayMainMenuControl.xaml
@@ -1,7 +1,6 @@
 <Control xmlns="https://spacestation14.io"
          xmlns:pllax="clr-namespace:Content.Client.Parallax;assembly=Content.Client"
          xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls;assembly=Content.Client"
-         xmlns:style="clr-namespace:Content.Client.Stylesheets;assembly=Content.Client"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <pllax:ParallaxControl SpeedX="20"/>
     <LayoutContainer>
@@ -44,7 +43,7 @@
                         MinSize="300 150">
             <BoxContainer Orientation="Vertical" Align="Begin" Margin="8">
                 <Label Text="{Loc 'replay-info-title'}" Margin="4" HorizontalAlignment="Center"/>
-                <controls:HLine StyleClasses="highlight" Thickness="4"/>
+                <controls:Separator StyleClasses="highlight" Thickness="4"/>
                 <RichTextLabel Access="Public" Name="Info"/>
             </BoxContainer>
         </PanelContainer>
diff --git a/Content.Replay/Menu/SelectReplayWindow.xaml.cs b/Content.Replay/Menu/SelectReplayWindow.xaml.cs
index 5e765bb04c..c567860b2a 100644
--- a/Content.Replay/Menu/SelectReplayWindow.xaml.cs
+++ b/Content.Replay/Menu/SelectReplayWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Server.Database/DesignTimeContextFactories.cs b/Content.Server.Database/DesignTimeContextFactories.cs
index 8699b25824..aa9b78b437 100644
--- a/Content.Server.Database/DesignTimeContextFactories.cs
+++ b/Content.Server.Database/DesignTimeContextFactories.cs
@@ -1,4 +1,4 @@
-#if TOOLS
+#if TOOLS
 
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
diff --git a/Content.Server.Database/Migrations/Postgres/20200929113117_Init.Designer.cs b/Content.Server.Database/Migrations/Postgres/20200929113117_Init.Designer.cs
index 24f55b1f95..b98e9909a6 100644
--- a/Content.Server.Database/Migrations/Postgres/20200929113117_Init.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20200929113117_Init.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using Content.Server.Database;
diff --git a/Content.Server.Database/Migrations/Postgres/20200929113117_Init.cs b/Content.Server.Database/Migrations/Postgres/20200929113117_Init.cs
index eea30ffa1c..5c6e2e8bf9 100644
--- a/Content.Server.Database/Migrations/Postgres/20200929113117_Init.cs
+++ b/Content.Server.Database/Migrations/Postgres/20200929113117_Init.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
diff --git a/Content.Server.Database/Migrations/Postgres/20201006223000_SelectedCharacterSlotFk.cs b/Content.Server.Database/Migrations/Postgres/20201006223000_SelectedCharacterSlotFk.cs
index 0aecbee273..11e2bc1528 100644
--- a/Content.Server.Database/Migrations/Postgres/20201006223000_SelectedCharacterSlotFk.cs
+++ b/Content.Server.Database/Migrations/Postgres/20201006223000_SelectedCharacterSlotFk.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Content.Server.Database.Migrations.Postgres
diff --git a/Content.Server.Database/Migrations/Postgres/20201028210620_Admins.Designer.cs b/Content.Server.Database/Migrations/Postgres/20201028210620_Admins.Designer.cs
index ae0daea2ad..62bb943b87 100644
--- a/Content.Server.Database/Migrations/Postgres/20201028210620_Admins.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20201028210620_Admins.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using Content.Server.Database;
diff --git a/Content.Server.Database/Migrations/Postgres/20201028210620_Admins.cs b/Content.Server.Database/Migrations/Postgres/20201028210620_Admins.cs
index 02514652da..c29338c1dd 100644
--- a/Content.Server.Database/Migrations/Postgres/20201028210620_Admins.cs
+++ b/Content.Server.Database/Migrations/Postgres/20201028210620_Admins.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
diff --git a/Content.Server.Database/Migrations/Postgres/20201109092921_ExtraIndices.Designer.cs b/Content.Server.Database/Migrations/Postgres/20201109092921_ExtraIndices.Designer.cs
index ce41855793..056d4db9f6 100644
--- a/Content.Server.Database/Migrations/Postgres/20201109092921_ExtraIndices.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20201109092921_ExtraIndices.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using Content.Server.Database;
diff --git a/Content.Server.Database/Migrations/Postgres/20201109092921_ExtraIndices.cs b/Content.Server.Database/Migrations/Postgres/20201109092921_ExtraIndices.cs
index 5521f82d27..3e41c998e4 100644
--- a/Content.Server.Database/Migrations/Postgres/20201109092921_ExtraIndices.cs
+++ b/Content.Server.Database/Migrations/Postgres/20201109092921_ExtraIndices.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Content.Server.Database.Migrations.Postgres
 {
diff --git a/Content.Server.Database/Migrations/Postgres/20201203093409_ClothingAndPronouns.Designer.cs b/Content.Server.Database/Migrations/Postgres/20201203093409_ClothingAndPronouns.Designer.cs
index 9fd3c7c83d..3565b41f6a 100644
--- a/Content.Server.Database/Migrations/Postgres/20201203093409_ClothingAndPronouns.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20201203093409_ClothingAndPronouns.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using Content.Server.Database;
diff --git a/Content.Server.Database/Migrations/Postgres/20201203093409_ClothingAndPronouns.cs b/Content.Server.Database/Migrations/Postgres/20201203093409_ClothingAndPronouns.cs
index ec7318fc4b..b9ae827785 100644
--- a/Content.Server.Database/Migrations/Postgres/20201203093409_ClothingAndPronouns.cs
+++ b/Content.Server.Database/Migrations/Postgres/20201203093409_ClothingAndPronouns.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Content.Server.Database.Migrations.Postgres
 {
diff --git a/Content.Server.Database/Migrations/Postgres/20210103151756_BackpackPreference.Designer.cs b/Content.Server.Database/Migrations/Postgres/20210103151756_BackpackPreference.Designer.cs
index 1a66e59863..1491a10574 100644
--- a/Content.Server.Database/Migrations/Postgres/20210103151756_BackpackPreference.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20210103151756_BackpackPreference.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using Content.Server.Database;
diff --git a/Content.Server.Database/Migrations/Postgres/20210103151756_BackpackPreference.cs b/Content.Server.Database/Migrations/Postgres/20210103151756_BackpackPreference.cs
index 0c5a7356bb..2fd3dc33bb 100644
--- a/Content.Server.Database/Migrations/Postgres/20210103151756_BackpackPreference.cs
+++ b/Content.Server.Database/Migrations/Postgres/20210103151756_BackpackPreference.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Content.Server.Database.Migrations.Postgres
 {
diff --git a/Content.Server.Database/Migrations/Postgres/20210211211033_AdminOOCColor.Designer.cs b/Content.Server.Database/Migrations/Postgres/20210211211033_AdminOOCColor.Designer.cs
index e5341a532d..a9cc5c4d34 100644
--- a/Content.Server.Database/Migrations/Postgres/20210211211033_AdminOOCColor.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20210211211033_AdminOOCColor.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using Content.Server.Database;
diff --git a/Content.Server.Database/Migrations/Postgres/20210211211033_AdminOOCColor.cs b/Content.Server.Database/Migrations/Postgres/20210211211033_AdminOOCColor.cs
index 5c3235d354..55f7ca115b 100644
--- a/Content.Server.Database/Migrations/Postgres/20210211211033_AdminOOCColor.cs
+++ b/Content.Server.Database/Migrations/Postgres/20210211211033_AdminOOCColor.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Content.Server.Database.Migrations.Postgres
 {
diff --git a/Content.Server.Database/Migrations/Postgres/20210321230012_HWID.Designer.cs b/Content.Server.Database/Migrations/Postgres/20210321230012_HWID.Designer.cs
index ce4962fb34..879536733c 100644
--- a/Content.Server.Database/Migrations/Postgres/20210321230012_HWID.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20210321230012_HWID.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using Content.Server.Database;
diff --git a/Content.Server.Database/Migrations/Postgres/20210321230012_HWID.cs b/Content.Server.Database/Migrations/Postgres/20210321230012_HWID.cs
index e44d741394..24835ba436 100644
--- a/Content.Server.Database/Migrations/Postgres/20210321230012_HWID.cs
+++ b/Content.Server.Database/Migrations/Postgres/20210321230012_HWID.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Content.Server.Database.Migrations.Postgres
 {
diff --git a/Content.Server.Database/Migrations/Postgres/20210915093340_UniqueHighPriorityJob.Designer.cs b/Content.Server.Database/Migrations/Postgres/20210915093340_UniqueHighPriorityJob.Designer.cs
index 633c92b6a2..6822ebcfbc 100644
--- a/Content.Server.Database/Migrations/Postgres/20210915093340_UniqueHighPriorityJob.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20210915093340_UniqueHighPriorityJob.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using Content.Server.Database;
diff --git a/Content.Server.Database/Migrations/Postgres/20210915093340_UniqueHighPriorityJob.cs b/Content.Server.Database/Migrations/Postgres/20210915093340_UniqueHighPriorityJob.cs
index ae09e9a9a5..a21cc42124 100644
--- a/Content.Server.Database/Migrations/Postgres/20210915093340_UniqueHighPriorityJob.cs
+++ b/Content.Server.Database/Migrations/Postgres/20210915093340_UniqueHighPriorityJob.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Content.Server.Database.Migrations.Postgres
 {
diff --git a/Content.Server.Database/Migrations/Postgres/20211120202701_AdminLogs.Designer.cs b/Content.Server.Database/Migrations/Postgres/20211120202701_AdminLogs.Designer.cs
index 9a55ce493c..391b208d09 100644
--- a/Content.Server.Database/Migrations/Postgres/20211120202701_AdminLogs.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20211120202701_AdminLogs.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20211120202701_AdminLogs.cs b/Content.Server.Database/Migrations/Postgres/20211120202701_AdminLogs.cs
index f024165d0a..888cc367a3 100644
--- a/Content.Server.Database/Migrations/Postgres/20211120202701_AdminLogs.cs
+++ b/Content.Server.Database/Migrations/Postgres/20211120202701_AdminLogs.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text.Json;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
diff --git a/Content.Server.Database/Migrations/Postgres/20211121123543_AdminLogsImpact.Designer.cs b/Content.Server.Database/Migrations/Postgres/20211121123543_AdminLogsImpact.Designer.cs
index fc54389ec2..8a1deff05b 100644
--- a/Content.Server.Database/Migrations/Postgres/20211121123543_AdminLogsImpact.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20211121123543_AdminLogsImpact.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20211121123543_AdminLogsImpact.cs b/Content.Server.Database/Migrations/Postgres/20211121123543_AdminLogsImpact.cs
index 736a63a187..6d16de98d2 100644
--- a/Content.Server.Database/Migrations/Postgres/20211121123543_AdminLogsImpact.cs
+++ b/Content.Server.Database/Migrations/Postgres/20211121123543_AdminLogsImpact.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20220103235647_whitelist.Designer.cs b/Content.Server.Database/Migrations/Postgres/20220103235647_whitelist.Designer.cs
index d0b203f14e..27e5df8476 100644
--- a/Content.Server.Database/Migrations/Postgres/20220103235647_whitelist.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220103235647_whitelist.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20220103235647_whitelist.cs b/Content.Server.Database/Migrations/Postgres/20220103235647_whitelist.cs
index 5a0632feb1..a4e92b0779 100644
--- a/Content.Server.Database/Migrations/Postgres/20220103235647_whitelist.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220103235647_whitelist.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Postgres/20220108185749_add-species.Designer.cs b/Content.Server.Database/Migrations/Postgres/20220108185749_add-species.Designer.cs
index 0d3ad481aa..c7d3d8befd 100644
--- a/Content.Server.Database/Migrations/Postgres/20220108185749_add-species.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220108185749_add-species.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20220108185749_add-species.cs b/Content.Server.Database/Migrations/Postgres/20220108185749_add-species.cs
index a5abc2d4dd..69bff2ffa8 100644
--- a/Content.Server.Database/Migrations/Postgres/20220108185749_add-species.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220108185749_add-species.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20220127170845_UnifyMore.Designer.cs b/Content.Server.Database/Migrations/Postgres/20220127170845_UnifyMore.Designer.cs
index 4f3669b3a0..2382ee0c25 100644
--- a/Content.Server.Database/Migrations/Postgres/20220127170845_UnifyMore.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220127170845_UnifyMore.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20220127170845_UnifyMore.cs b/Content.Server.Database/Migrations/Postgres/20220127170845_UnifyMore.cs
index 0f8f07dba7..a65ed0c895 100644
--- a/Content.Server.Database/Migrations/Postgres/20220127170845_UnifyMore.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220127170845_UnifyMore.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20220129005644_ServerBanHit.Designer.cs b/Content.Server.Database/Migrations/Postgres/20220129005644_ServerBanHit.Designer.cs
index deebafcc26..43ecd35deb 100644
--- a/Content.Server.Database/Migrations/Postgres/20220129005644_ServerBanHit.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220129005644_ServerBanHit.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20220129005644_ServerBanHit.cs b/Content.Server.Database/Migrations/Postgres/20220129005644_ServerBanHit.cs
index 4c830eccde..c45fc5893c 100644
--- a/Content.Server.Database/Migrations/Postgres/20220129005644_ServerBanHit.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220129005644_ServerBanHit.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Postgres/20220214061058_RoleBans.Designer.cs b/Content.Server.Database/Migrations/Postgres/20220214061058_RoleBans.Designer.cs
index 14621dd08a..877b12f42f 100644
--- a/Content.Server.Database/Migrations/Postgres/20220214061058_RoleBans.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220214061058_RoleBans.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20220214061058_RoleBans.cs b/Content.Server.Database/Migrations/Postgres/20220214061058_RoleBans.cs
index 477356abe1..3825ebc637 100644
--- a/Content.Server.Database/Migrations/Postgres/20220214061058_RoleBans.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220214061058_RoleBans.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
diff --git a/Content.Server.Database/Migrations/Postgres/20220308222742_Cleanup.Designer.cs b/Content.Server.Database/Migrations/Postgres/20220308222742_Cleanup.Designer.cs
index f0fa212cbf..71dfb9b86f 100644
--- a/Content.Server.Database/Migrations/Postgres/20220308222742_Cleanup.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220308222742_Cleanup.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20220308222742_Cleanup.cs b/Content.Server.Database/Migrations/Postgres/20220308222742_Cleanup.cs
index 54e9eb9b9b..8fb0e2b500 100644
--- a/Content.Server.Database/Migrations/Postgres/20220308222742_Cleanup.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220308222742_Cleanup.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20220310173734_SpeciesMarkings.Designer.cs b/Content.Server.Database/Migrations/Postgres/20220310173734_SpeciesMarkings.Designer.cs
index 98c555da7a..a14624442e 100644
--- a/Content.Server.Database/Migrations/Postgres/20220310173734_SpeciesMarkings.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220310173734_SpeciesMarkings.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20220310173734_SpeciesMarkings.cs b/Content.Server.Database/Migrations/Postgres/20220310173734_SpeciesMarkings.cs
index ce5dcc6156..1214c59a72 100644
--- a/Content.Server.Database/Migrations/Postgres/20220310173734_SpeciesMarkings.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220310173734_SpeciesMarkings.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20220313151800_ServerNameFts.Designer.cs b/Content.Server.Database/Migrations/Postgres/20220313151800_ServerNameFts.Designer.cs
index 2406a71c75..98cec35ec3 100644
--- a/Content.Server.Database/Migrations/Postgres/20220313151800_ServerNameFts.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220313151800_ServerNameFts.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20220313151800_ServerNameFts.cs b/Content.Server.Database/Migrations/Postgres/20220313151800_ServerNameFts.cs
index 35eb96ad8f..90ac35c9a0 100644
--- a/Content.Server.Database/Migrations/Postgres/20220313151800_ServerNameFts.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220313151800_ServerNameFts.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Postgres/20220324144654_AdminNotes.Designer.cs b/Content.Server.Database/Migrations/Postgres/20220324144654_AdminNotes.Designer.cs
index f18d160011..98ebf17568 100644
--- a/Content.Server.Database/Migrations/Postgres/20220324144654_AdminNotes.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220324144654_AdminNotes.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20220324144654_AdminNotes.cs b/Content.Server.Database/Migrations/Postgres/20220324144654_AdminNotes.cs
index 41d2408f50..e4ef0d86a6 100644
--- a/Content.Server.Database/Migrations/Postgres/20220324144654_AdminNotes.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220324144654_AdminNotes.cs
@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/Content.Server.Database/Migrations/Postgres/20220325170225_PlayerReadRules.Designer.cs b/Content.Server.Database/Migrations/Postgres/20220325170225_PlayerReadRules.Designer.cs
index a31dddd26f..cf1835ab34 100644
--- a/Content.Server.Database/Migrations/Postgres/20220325170225_PlayerReadRules.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220325170225_PlayerReadRules.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20220325170225_PlayerReadRules.cs b/Content.Server.Database/Migrations/Postgres/20220325170225_PlayerReadRules.cs
index f58b2ec842..c43ef00a82 100644
--- a/Content.Server.Database/Migrations/Postgres/20220325170225_PlayerReadRules.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220325170225_PlayerReadRules.cs
@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/Content.Server.Database/Migrations/Postgres/20220326104916_UploadedResourcesLog.Designer.cs b/Content.Server.Database/Migrations/Postgres/20220326104916_UploadedResourcesLog.Designer.cs
index b2d90fcae3..a5c1ffbd6f 100644
--- a/Content.Server.Database/Migrations/Postgres/20220326104916_UploadedResourcesLog.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220326104916_UploadedResourcesLog.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20220326104916_UploadedResourcesLog.cs b/Content.Server.Database/Migrations/Postgres/20220326104916_UploadedResourcesLog.cs
index 3ad9c7cc4d..62be2f0843 100644
--- a/Content.Server.Database/Migrations/Postgres/20220326104916_UploadedResourcesLog.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220326104916_UploadedResourcesLog.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
diff --git a/Content.Server.Database/Migrations/Postgres/20220503222955_FixIndices.Designer.cs b/Content.Server.Database/Migrations/Postgres/20220503222955_FixIndices.Designer.cs
index 7ef408fb47..fdc7e91f17 100644
--- a/Content.Server.Database/Migrations/Postgres/20220503222955_FixIndices.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220503222955_FixIndices.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20220503222955_FixIndices.cs b/Content.Server.Database/Migrations/Postgres/20220503222955_FixIndices.cs
index 3420a0ebc1..ad79cc49b5 100644
--- a/Content.Server.Database/Migrations/Postgres/20220503222955_FixIndices.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220503222955_FixIndices.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20220505084828_MarkingsJsonb.Designer.cs b/Content.Server.Database/Migrations/Postgres/20220505084828_MarkingsJsonb.Designer.cs
index 5290735212..aec2c627a8 100644
--- a/Content.Server.Database/Migrations/Postgres/20220505084828_MarkingsJsonb.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220505084828_MarkingsJsonb.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20220505084828_MarkingsJsonb.cs b/Content.Server.Database/Migrations/Postgres/20220505084828_MarkingsJsonb.cs
index 0f6cb09159..d15a63038b 100644
--- a/Content.Server.Database/Migrations/Postgres/20220505084828_MarkingsJsonb.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220505084828_MarkingsJsonb.cs
@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 
 using System.Text.Json;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/Content.Server.Database/Migrations/Postgres/20220509060724_FlavorText.Designer.cs b/Content.Server.Database/Migrations/Postgres/20220509060724_FlavorText.Designer.cs
index 03ccbc04a7..a52aa4bab2 100644
--- a/Content.Server.Database/Migrations/Postgres/20220509060724_FlavorText.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220509060724_FlavorText.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20220509060724_FlavorText.cs b/Content.Server.Database/Migrations/Postgres/20220509060724_FlavorText.cs
index 64bfc8a84b..34f29cfea0 100644
--- a/Content.Server.Database/Migrations/Postgres/20220509060724_FlavorText.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220509060724_FlavorText.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20220724000132_PlayTime.Designer.cs b/Content.Server.Database/Migrations/Postgres/20220724000132_PlayTime.Designer.cs
index 9fe51c0af6..68068157f6 100644
--- a/Content.Server.Database/Migrations/Postgres/20220724000132_PlayTime.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220724000132_PlayTime.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20220724000132_PlayTime.cs b/Content.Server.Database/Migrations/Postgres/20220724000132_PlayTime.cs
index 811bee45cc..0d3338062b 100644
--- a/Content.Server.Database/Migrations/Postgres/20220724000132_PlayTime.cs
+++ b/Content.Server.Database/Migrations/Postgres/20220724000132_PlayTime.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
diff --git a/Content.Server.Database/Migrations/Postgres/20230319110655_ProfileTraitIndexUnique.Designer.cs b/Content.Server.Database/Migrations/Postgres/20230319110655_ProfileTraitIndexUnique.Designer.cs
index ed13602d03..c316e5de9d 100644
--- a/Content.Server.Database/Migrations/Postgres/20230319110655_ProfileTraitIndexUnique.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20230319110655_ProfileTraitIndexUnique.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20230319110655_ProfileTraitIndexUnique.cs b/Content.Server.Database/Migrations/Postgres/20230319110655_ProfileTraitIndexUnique.cs
index 4453b6070e..efdf7365dc 100644
--- a/Content.Server.Database/Migrations/Postgres/20230319110655_ProfileTraitIndexUnique.cs
+++ b/Content.Server.Database/Migrations/Postgres/20230319110655_ProfileTraitIndexUnique.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20230402214647_BanAutoDelete.Designer.cs b/Content.Server.Database/Migrations/Postgres/20230402214647_BanAutoDelete.Designer.cs
index 507b2ae410..658d389ca7 100644
--- a/Content.Server.Database/Migrations/Postgres/20230402214647_BanAutoDelete.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20230402214647_BanAutoDelete.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20230402214647_BanAutoDelete.cs b/Content.Server.Database/Migrations/Postgres/20230402214647_BanAutoDelete.cs
index 65960b93b1..d1a78a5e10 100644
--- a/Content.Server.Database/Migrations/Postgres/20230402214647_BanAutoDelete.cs
+++ b/Content.Server.Database/Migrations/Postgres/20230402214647_BanAutoDelete.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20230725193102_AdminNotesImprovementsForeignKeys.Designer.cs b/Content.Server.Database/Migrations/Postgres/20230725193102_AdminNotesImprovementsForeignKeys.Designer.cs
index 80a5ce7e33..b5715664c0 100644
--- a/Content.Server.Database/Migrations/Postgres/20230725193102_AdminNotesImprovementsForeignKeys.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20230725193102_AdminNotesImprovementsForeignKeys.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20230725193102_AdminNotesImprovementsForeignKeys.cs b/Content.Server.Database/Migrations/Postgres/20230725193102_AdminNotesImprovementsForeignKeys.cs
index e3e407ac10..fbd266b382 100644
--- a/Content.Server.Database/Migrations/Postgres/20230725193102_AdminNotesImprovementsForeignKeys.cs
+++ b/Content.Server.Database/Migrations/Postgres/20230725193102_AdminNotesImprovementsForeignKeys.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20230727190902_AdminLogCompoundKey.Designer.cs b/Content.Server.Database/Migrations/Postgres/20230727190902_AdminLogCompoundKey.Designer.cs
index 1120faa7f4..c7a8aaaf69 100644
--- a/Content.Server.Database/Migrations/Postgres/20230727190902_AdminLogCompoundKey.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20230727190902_AdminLogCompoundKey.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20230727190902_AdminLogCompoundKey.cs b/Content.Server.Database/Migrations/Postgres/20230727190902_AdminLogCompoundKey.cs
index 048c6195de..12d2679017 100644
--- a/Content.Server.Database/Migrations/Postgres/20230727190902_AdminLogCompoundKey.cs
+++ b/Content.Server.Database/Migrations/Postgres/20230727190902_AdminLogCompoundKey.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Postgres/20231021071411_RoundStartDate.Designer.cs b/Content.Server.Database/Migrations/Postgres/20231021071411_RoundStartDate.Designer.cs
index 434a34918b..62e117e9ee 100644
--- a/Content.Server.Database/Migrations/Postgres/20231021071411_RoundStartDate.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20231021071411_RoundStartDate.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20231021071411_RoundStartDate.cs b/Content.Server.Database/Migrations/Postgres/20231021071411_RoundStartDate.cs
index d98b4e45a8..8d9c5dd5e4 100644
--- a/Content.Server.Database/Migrations/Postgres/20231021071411_RoundStartDate.cs
+++ b/Content.Server.Database/Migrations/Postgres/20231021071411_RoundStartDate.cs
@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/Content.Server.Database/Migrations/Postgres/20231024041204_DropAdminLogEntity.Designer.cs b/Content.Server.Database/Migrations/Postgres/20231024041204_DropAdminLogEntity.Designer.cs
index 551bf922b0..1721a4941e 100644
--- a/Content.Server.Database/Migrations/Postgres/20231024041204_DropAdminLogEntity.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20231024041204_DropAdminLogEntity.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20231024041204_DropAdminLogEntity.cs b/Content.Server.Database/Migrations/Postgres/20231024041204_DropAdminLogEntity.cs
index ec9c2e9a6c..e8cb832ffa 100644
--- a/Content.Server.Database/Migrations/Postgres/20231024041204_DropAdminLogEntity.cs
+++ b/Content.Server.Database/Migrations/Postgres/20231024041204_DropAdminLogEntity.cs
@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 
 using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
diff --git a/Content.Server.Database/Migrations/Postgres/20231126234054_ConnectionLogServer.Designer.cs b/Content.Server.Database/Migrations/Postgres/20231126234054_ConnectionLogServer.Designer.cs
index 36de4bb0a7..8c3ef8a8c1 100644
--- a/Content.Server.Database/Migrations/Postgres/20231126234054_ConnectionLogServer.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20231126234054_ConnectionLogServer.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20231126234054_ConnectionLogServer.cs b/Content.Server.Database/Migrations/Postgres/20231126234054_ConnectionLogServer.cs
index 1102ae3eb7..b2fa51f449 100644
--- a/Content.Server.Database/Migrations/Postgres/20231126234054_ConnectionLogServer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20231126234054_ConnectionLogServer.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20231226154937_AdminLogPk.Designer.cs b/Content.Server.Database/Migrations/Postgres/20231226154937_AdminLogPk.Designer.cs
index fd09365aa9..b3614fbef2 100644
--- a/Content.Server.Database/Migrations/Postgres/20231226154937_AdminLogPk.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20231226154937_AdminLogPk.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20231226154937_AdminLogPk.cs b/Content.Server.Database/Migrations/Postgres/20231226154937_AdminLogPk.cs
index b8ad5e3394..7d85c0feea 100644
--- a/Content.Server.Database/Migrations/Postgres/20231226154937_AdminLogPk.cs
+++ b/Content.Server.Database/Migrations/Postgres/20231226154937_AdminLogPk.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.Designer.cs
index 61aa1a8c73..cf289c94a7 100644
--- a/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.cs b/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.cs
index a6a34626ed..cd03c31073 100644
--- a/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Postgres/20240201091301_SpawnPriorityPreference.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240201091301_SpawnPriorityPreference.Designer.cs
index 8f62c31284..2649d74ae2 100644
--- a/Content.Server.Database/Migrations/Postgres/20240201091301_SpawnPriorityPreference.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240201091301_SpawnPriorityPreference.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20240201091301_SpawnPriorityPreference.cs b/Content.Server.Database/Migrations/Postgres/20240201091301_SpawnPriorityPreference.cs
index 6fa95717a0..f041b3e8de 100644
--- a/Content.Server.Database/Migrations/Postgres/20240201091301_SpawnPriorityPreference.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240201091301_SpawnPriorityPreference.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20240301130641_ClothingRemoval.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240301130641_ClothingRemoval.Designer.cs
index 0867022d36..1219b592f5 100644
--- a/Content.Server.Database/Migrations/Postgres/20240301130641_ClothingRemoval.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240301130641_ClothingRemoval.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20240301130641_ClothingRemoval.cs b/Content.Server.Database/Migrations/Postgres/20240301130641_ClothingRemoval.cs
index 1ac30e4407..c279c17ca0 100644
--- a/Content.Server.Database/Migrations/Postgres/20240301130641_ClothingRemoval.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240301130641_ClothingRemoval.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.Designer.cs
index 3930a7c7cb..eefbffcc2a 100644
--- a/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.cs b/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.cs
index 372eecc585..9081050b8d 100644
--- a/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20240403072242_Loadouts.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240403072242_Loadouts.Designer.cs
index 4ad933731c..f0e4c57776 100644
--- a/Content.Server.Database/Migrations/Postgres/20240403072242_Loadouts.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240403072242_Loadouts.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20240403072242_Loadouts.cs b/Content.Server.Database/Migrations/Postgres/20240403072242_Loadouts.cs
index bc512b6e81..4ee0f8da03 100644
--- a/Content.Server.Database/Migrations/Postgres/20240403072242_Loadouts.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240403072242_Loadouts.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Postgres/20240409013837_FixRoundStartDateNullability.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240409013837_FixRoundStartDateNullability.Designer.cs
index c04e53b1c5..a600500f6d 100644
--- a/Content.Server.Database/Migrations/Postgres/20240409013837_FixRoundStartDateNullability.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240409013837_FixRoundStartDateNullability.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20240409013837_FixRoundStartDateNullability.cs b/Content.Server.Database/Migrations/Postgres/20240409013837_FixRoundStartDateNullability.cs
index 84b296d4fe..303b530033 100644
--- a/Content.Server.Database/Migrations/Postgres/20240409013837_FixRoundStartDateNullability.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240409013837_FixRoundStartDateNullability.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.Designer.cs
index 5032281dfe..e9cdb45940 100644
--- a/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.cs b/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.cs
index 1cd0d8df17..9bc0c144ec 100644
--- a/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.cs
@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/Content.Server.Database/Migrations/Postgres/20240606065731_RemoveLastReadRules.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240606065731_RemoveLastReadRules.Designer.cs
index 222fe126d9..db295008c5 100644
--- a/Content.Server.Database/Migrations/Postgres/20240606065731_RemoveLastReadRules.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240606065731_RemoveLastReadRules.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20240606065731_RemoveLastReadRules.cs b/Content.Server.Database/Migrations/Postgres/20240606065731_RemoveLastReadRules.cs
index 1982197f62..31d1328636 100644
--- a/Content.Server.Database/Migrations/Postgres/20240606065731_RemoveLastReadRules.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240606065731_RemoveLastReadRules.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Postgres/20240606121555_ban_notify_trigger.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240606121555_ban_notify_trigger.Designer.cs
index 2f06e5ff98..8a460e7be0 100644
--- a/Content.Server.Database/Migrations/Postgres/20240606121555_ban_notify_trigger.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240606121555_ban_notify_trigger.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20240606121555_ban_notify_trigger.cs b/Content.Server.Database/Migrations/Postgres/20240606121555_ban_notify_trigger.cs
index b84d230b45..e449840e79 100644
--- a/Content.Server.Database/Migrations/Postgres/20240606121555_ban_notify_trigger.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240606121555_ban_notify_trigger.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20240606175154_ReturnLastReadRules.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240606175154_ReturnLastReadRules.Designer.cs
index e82e58bf5c..48463ff1fd 100644
--- a/Content.Server.Database/Migrations/Postgres/20240606175154_ReturnLastReadRules.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240606175154_ReturnLastReadRules.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20240606175154_ReturnLastReadRules.cs b/Content.Server.Database/Migrations/Postgres/20240606175154_ReturnLastReadRules.cs
index af4e5ad4c4..a5b5b9ba84 100644
--- a/Content.Server.Database/Migrations/Postgres/20240606175154_ReturnLastReadRules.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240606175154_ReturnLastReadRules.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.Designer.cs
index 8bd837236a..f9a6895f58 100644
--- a/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.cs b/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.cs
index 736e9e37a2..41683f9e9c 100644
--- a/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240621120713_ConnectionLogTimeIndex.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.Designer.cs
index 5d89f3dd29..662b845147 100644
--- a/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.cs b/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.cs
index 192e87ac96..0e2c9bbfe2 100644
--- a/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240623005121_BanTemplate.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
diff --git a/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.Designer.cs b/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.Designer.cs
index 155d6a163f..2c25d69157 100644
--- a/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.cs b/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.cs
index c70a5ffaa5..1a9b4da7b6 100644
--- a/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.cs
+++ b/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.Designer.cs b/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.Designer.cs
index dc1b4a0eeb..d1ae2bed37 100644
--- a/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.cs b/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.cs
index debb36aacc..bbbf0ed143 100644
--- a/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.cs
+++ b/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20241122174243_IPIntel.Designer.cs b/Content.Server.Database/Migrations/Postgres/20241122174243_IPIntel.Designer.cs
index 2e284f0810..2ca26ef3c7 100644
--- a/Content.Server.Database/Migrations/Postgres/20241122174243_IPIntel.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20241122174243_IPIntel.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20241122174243_IPIntel.cs b/Content.Server.Database/Migrations/Postgres/20241122174243_IPIntel.cs
index 138690949e..b22baf727a 100644
--- a/Content.Server.Database/Migrations/Postgres/20241122174243_IPIntel.cs
+++ b/Content.Server.Database/Migrations/Postgres/20241122174243_IPIntel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
diff --git a/Content.Server.Database/Migrations/Postgres/20241223235939_AdminStatus.Designer.cs b/Content.Server.Database/Migrations/Postgres/20241223235939_AdminStatus.Designer.cs
index 364ded06d0..d618859c16 100644
--- a/Content.Server.Database/Migrations/Postgres/20241223235939_AdminStatus.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20241223235939_AdminStatus.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20241223235939_AdminStatus.cs b/Content.Server.Database/Migrations/Postgres/20241223235939_AdminStatus.cs
index 8444cead4e..bbc0587e20 100644
--- a/Content.Server.Database/Migrations/Postgres/20241223235939_AdminStatus.cs
+++ b/Content.Server.Database/Migrations/Postgres/20241223235939_AdminStatus.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20250211131539_LoadoutNames.Designer.cs b/Content.Server.Database/Migrations/Postgres/20250211131539_LoadoutNames.Designer.cs
index b6bd8e24ed..ab127a6c04 100644
--- a/Content.Server.Database/Migrations/Postgres/20250211131539_LoadoutNames.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20250211131539_LoadoutNames.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20250211131539_LoadoutNames.cs b/Content.Server.Database/Migrations/Postgres/20250211131539_LoadoutNames.cs
index 3b331f33df..8c0ebd8b99 100644
--- a/Content.Server.Database/Migrations/Postgres/20250211131539_LoadoutNames.cs
+++ b/Content.Server.Database/Migrations/Postgres/20250211131539_LoadoutNames.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20250314222016_ConstructionFavorites.Designer.cs b/Content.Server.Database/Migrations/Postgres/20250314222016_ConstructionFavorites.Designer.cs
index 736a84d93a..a48311da47 100644
--- a/Content.Server.Database/Migrations/Postgres/20250314222016_ConstructionFavorites.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20250314222016_ConstructionFavorites.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Net;
 using System.Text.Json;
diff --git a/Content.Server.Database/Migrations/Postgres/20250314222016_ConstructionFavorites.cs b/Content.Server.Database/Migrations/Postgres/20250314222016_ConstructionFavorites.cs
index e64914dced..4ef531835d 100644
--- a/Content.Server.Database/Migrations/Postgres/20250314222016_ConstructionFavorites.cs
+++ b/Content.Server.Database/Migrations/Postgres/20250314222016_ConstructionFavorites.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/20260118084629_OrganMarkings.Designer.cs b/Content.Server.Database/Migrations/Postgres/20260118084629_OrganMarkings.Designer.cs
index a8d031faa0..6c1f7ce183 100644
--- a/Content.Server.Database/Migrations/Postgres/20260118084629_OrganMarkings.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20260118084629_OrganMarkings.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Collections.Generic;
 using System.Net;
diff --git a/Content.Server.Database/Migrations/Postgres/20260118084629_OrganMarkings.cs b/Content.Server.Database/Migrations/Postgres/20260118084629_OrganMarkings.cs
index ec2b926f16..e6a4950dc4 100644
--- a/Content.Server.Database/Migrations/Postgres/20260118084629_OrganMarkings.cs
+++ b/Content.Server.Database/Migrations/Postgres/20260118084629_OrganMarkings.cs
@@ -1,4 +1,4 @@
-using System.Text.Json;
+using System.Text.Json;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Postgres/20260120200503_BanRefactor.Designer.cs b/Content.Server.Database/Migrations/Postgres/20260120200503_BanRefactor.Designer.cs
index 62dde10b99..91b6cb5cc2 100644
--- a/Content.Server.Database/Migrations/Postgres/20260120200503_BanRefactor.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20260120200503_BanRefactor.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Collections.Generic;
 using System.Net;
diff --git a/Content.Server.Database/Migrations/Postgres/20260120200503_BanRefactor.cs b/Content.Server.Database/Migrations/Postgres/20260120200503_BanRefactor.cs
index 6e6a9dfbe5..5247ef59d8 100644
--- a/Content.Server.Database/Migrations/Postgres/20260120200503_BanRefactor.cs
+++ b/Content.Server.Database/Migrations/Postgres/20260120200503_BanRefactor.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Content.Shared.Database;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
diff --git a/Content.Server.Database/Migrations/Postgres/20260126003838_CustomVoteLog.Designer.cs b/Content.Server.Database/Migrations/Postgres/20260126003838_CustomVoteLog.Designer.cs
index 9bcfcafad0..5e178b2ff5 100644
--- a/Content.Server.Database/Migrations/Postgres/20260126003838_CustomVoteLog.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20260126003838_CustomVoteLog.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Collections.Generic;
 using System.Net;
diff --git a/Content.Server.Database/Migrations/Postgres/20260126003838_CustomVoteLog.cs b/Content.Server.Database/Migrations/Postgres/20260126003838_CustomVoteLog.cs
index 0545c55a05..1ac041a0d5 100644
--- a/Content.Server.Database/Migrations/Postgres/20260126003838_CustomVoteLog.cs
+++ b/Content.Server.Database/Migrations/Postgres/20260126003838_CustomVoteLog.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
diff --git a/Content.Server.Database/Migrations/Postgres/20260701024227_VoiceSelector.Designer.cs b/Content.Server.Database/Migrations/Postgres/20260701024227_VoiceSelector.Designer.cs
index ad5edf096b..96a97cf5e5 100644
--- a/Content.Server.Database/Migrations/Postgres/20260701024227_VoiceSelector.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20260701024227_VoiceSelector.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Collections.Generic;
 using System.Net;
diff --git a/Content.Server.Database/Migrations/Postgres/20260701024227_VoiceSelector.cs b/Content.Server.Database/Migrations/Postgres/20260701024227_VoiceSelector.cs
index 352180edd6..5607d0e2ea 100644
--- a/Content.Server.Database/Migrations/Postgres/20260701024227_VoiceSelector.cs
+++ b/Content.Server.Database/Migrations/Postgres/20260701024227_VoiceSelector.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index 6b3ae71bc1..ba3668fd88 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Collections.Generic;
 using System.Net;
diff --git a/Content.Server.Database/Migrations/Sqlite/20200929113112_Init.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20200929113112_Init.Designer.cs
index e1b403291b..127ed13914 100644
--- a/Content.Server.Database/Migrations/Sqlite/20200929113112_Init.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20200929113112_Init.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20200929113112_Init.cs b/Content.Server.Database/Migrations/Sqlite/20200929113112_Init.cs
index 2c9dc8ebd1..c600aeeca3 100644
--- a/Content.Server.Database/Migrations/Sqlite/20200929113112_Init.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20200929113112_Init.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Content.Server.Database.Migrations.Sqlite
diff --git a/Content.Server.Database/Migrations/Sqlite/20201028210616_Admins.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20201028210616_Admins.Designer.cs
index 23ebe0d41b..79bb8f1350 100644
--- a/Content.Server.Database/Migrations/Sqlite/20201028210616_Admins.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20201028210616_Admins.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20201028210616_Admins.cs b/Content.Server.Database/Migrations/Sqlite/20201028210616_Admins.cs
index c9c65034d4..d017f0830e 100644
--- a/Content.Server.Database/Migrations/Sqlite/20201028210616_Admins.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20201028210616_Admins.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Content.Server.Database.Migrations.Sqlite
diff --git a/Content.Server.Database/Migrations/Sqlite/20201109092917_ExtraIndices.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20201109092917_ExtraIndices.Designer.cs
index ca7d412b93..c4223452b0 100644
--- a/Content.Server.Database/Migrations/Sqlite/20201109092917_ExtraIndices.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20201109092917_ExtraIndices.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20201109092917_ExtraIndices.cs b/Content.Server.Database/Migrations/Sqlite/20201109092917_ExtraIndices.cs
index 0c7368a51a..57f7d6e051 100644
--- a/Content.Server.Database/Migrations/Sqlite/20201109092917_ExtraIndices.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20201109092917_ExtraIndices.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Content.Server.Database.Migrations.Sqlite
 {
diff --git a/Content.Server.Database/Migrations/Sqlite/20201203093351_ClothingAndPronouns.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20201203093351_ClothingAndPronouns.Designer.cs
index 01243e826a..379b752ce0 100644
--- a/Content.Server.Database/Migrations/Sqlite/20201203093351_ClothingAndPronouns.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20201203093351_ClothingAndPronouns.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20201203093351_ClothingAndPronouns.cs b/Content.Server.Database/Migrations/Sqlite/20201203093351_ClothingAndPronouns.cs
index 763b9623a8..58c22d470f 100644
--- a/Content.Server.Database/Migrations/Sqlite/20201203093351_ClothingAndPronouns.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20201203093351_ClothingAndPronouns.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Content.Server.Database.Migrations.Sqlite
 {
diff --git a/Content.Server.Database/Migrations/Sqlite/20210103151752_BackpackPreference.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20210103151752_BackpackPreference.Designer.cs
index 661cfbc318..8f8d7acb3a 100644
--- a/Content.Server.Database/Migrations/Sqlite/20210103151752_BackpackPreference.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20210103151752_BackpackPreference.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20210103151752_BackpackPreference.cs b/Content.Server.Database/Migrations/Sqlite/20210103151752_BackpackPreference.cs
index ff907ca1f2..31d0f40baf 100644
--- a/Content.Server.Database/Migrations/Sqlite/20210103151752_BackpackPreference.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20210103151752_BackpackPreference.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Content.Server.Database.Migrations.Sqlite
 {
diff --git a/Content.Server.Database/Migrations/Sqlite/20210211211028_AdminOOCColor.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20210211211028_AdminOOCColor.Designer.cs
index f11e1c7ab5..0aba8e4989 100644
--- a/Content.Server.Database/Migrations/Sqlite/20210211211028_AdminOOCColor.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20210211211028_AdminOOCColor.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20210211211028_AdminOOCColor.cs b/Content.Server.Database/Migrations/Sqlite/20210211211028_AdminOOCColor.cs
index cf9015f796..117398449e 100644
--- a/Content.Server.Database/Migrations/Sqlite/20210211211028_AdminOOCColor.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20210211211028_AdminOOCColor.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Content.Server.Database.Migrations.Sqlite
 {
diff --git a/Content.Server.Database/Migrations/Sqlite/20210321225959_HWID.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20210321225959_HWID.Designer.cs
index 6c18ec1405..ce940623f5 100644
--- a/Content.Server.Database/Migrations/Sqlite/20210321225959_HWID.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20210321225959_HWID.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20210321225959_HWID.cs b/Content.Server.Database/Migrations/Sqlite/20210321225959_HWID.cs
index ea1a653aad..7d9f7206f2 100644
--- a/Content.Server.Database/Migrations/Sqlite/20210321225959_HWID.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20210321225959_HWID.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Content.Server.Database.Migrations.Sqlite
 {
diff --git a/Content.Server.Database/Migrations/Sqlite/20210915093336_UniqueHighPriorityJob.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20210915093336_UniqueHighPriorityJob.Designer.cs
index b8b69e3c4f..b91bf9a358 100644
--- a/Content.Server.Database/Migrations/Sqlite/20210915093336_UniqueHighPriorityJob.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20210915093336_UniqueHighPriorityJob.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20210915093336_UniqueHighPriorityJob.cs b/Content.Server.Database/Migrations/Sqlite/20210915093336_UniqueHighPriorityJob.cs
index db20f46571..c7bd58f9bb 100644
--- a/Content.Server.Database/Migrations/Sqlite/20210915093336_UniqueHighPriorityJob.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20210915093336_UniqueHighPriorityJob.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Content.Server.Database.Migrations.Sqlite
 {
diff --git a/Content.Server.Database/Migrations/Sqlite/20211120202654_AdminLogs.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20211120202654_AdminLogs.Designer.cs
index 3d286369de..86ae3c824c 100644
--- a/Content.Server.Database/Migrations/Sqlite/20211120202654_AdminLogs.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20211120202654_AdminLogs.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20211120202654_AdminLogs.cs b/Content.Server.Database/Migrations/Sqlite/20211120202654_AdminLogs.cs
index 5750509d5c..e790c7f016 100644
--- a/Content.Server.Database/Migrations/Sqlite/20211120202654_AdminLogs.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20211120202654_AdminLogs.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Sqlite/20211121123536_AdminLogsImpact.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20211121123536_AdminLogsImpact.Designer.cs
index 8db35773f4..9f5d34cc5e 100644
--- a/Content.Server.Database/Migrations/Sqlite/20211121123536_AdminLogsImpact.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20211121123536_AdminLogsImpact.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20211121123536_AdminLogsImpact.cs b/Content.Server.Database/Migrations/Sqlite/20211121123536_AdminLogsImpact.cs
index 4072e60e95..bef1d6a927 100644
--- a/Content.Server.Database/Migrations/Sqlite/20211121123536_AdminLogsImpact.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20211121123536_AdminLogsImpact.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20220103235637_whitelist.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20220103235637_whitelist.Designer.cs
index a1fb607c45..b85365bff2 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220103235637_whitelist.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220103235637_whitelist.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20220103235637_whitelist.cs b/Content.Server.Database/Migrations/Sqlite/20220103235637_whitelist.cs
index 77eb7b79c6..c76fc9104b 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220103235637_whitelist.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220103235637_whitelist.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Sqlite/20220108185734_add-species.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20220108185734_add-species.Designer.cs
index a5655aa531..e40f1b28ee 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220108185734_add-species.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220108185734_add-species.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20220108185734_add-species.cs b/Content.Server.Database/Migrations/Sqlite/20220108185734_add-species.cs
index 9e4bd56fa9..b7760df305 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220108185734_add-species.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220108185734_add-species.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20220127165122_UnifyMore.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20220127165122_UnifyMore.Designer.cs
index e76f7f4471..77949ec20e 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220127165122_UnifyMore.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220127165122_UnifyMore.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20220127165122_UnifyMore.cs b/Content.Server.Database/Migrations/Sqlite/20220127165122_UnifyMore.cs
index f1558e0cd2..73827eb33c 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220127165122_UnifyMore.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220127165122_UnifyMore.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Sqlite/20220129005638_ServerBanHit.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20220129005638_ServerBanHit.Designer.cs
index cd1eaaf16c..2f7af2451f 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220129005638_ServerBanHit.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220129005638_ServerBanHit.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20220129005638_ServerBanHit.cs b/Content.Server.Database/Migrations/Sqlite/20220129005638_ServerBanHit.cs
index 3c7ad8e75c..0946f07790 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220129005638_ServerBanHit.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220129005638_ServerBanHit.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20220214060745_RoleBans.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20220214060745_RoleBans.Designer.cs
index 1c810a3fb7..52db654346 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220214060745_RoleBans.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220214060745_RoleBans.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20220214060745_RoleBans.cs b/Content.Server.Database/Migrations/Sqlite/20220214060745_RoleBans.cs
index ab32fa7145..fc280e1fb0 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220214060745_RoleBans.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220214060745_RoleBans.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Sqlite/20220308222736_Cleanup.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20220308222736_Cleanup.Designer.cs
index 2245e1ad0a..493dcfac4f 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220308222736_Cleanup.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220308222736_Cleanup.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20220308222736_Cleanup.cs b/Content.Server.Database/Migrations/Sqlite/20220308222736_Cleanup.cs
index 38aea02b40..e49b1a6665 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220308222736_Cleanup.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220308222736_Cleanup.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20220310173728_SpeciesMarkings.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20220310173728_SpeciesMarkings.Designer.cs
index 85d6918eaf..41e49b0717 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220310173728_SpeciesMarkings.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220310173728_SpeciesMarkings.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20220310173728_SpeciesMarkings.cs b/Content.Server.Database/Migrations/Sqlite/20220310173728_SpeciesMarkings.cs
index e65290a535..d70d39eb85 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220310173728_SpeciesMarkings.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220310173728_SpeciesMarkings.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20220313151753_ServerNameFts.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20220313151753_ServerNameFts.Designer.cs
index ea9fc43f64..16698d917e 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220313151753_ServerNameFts.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220313151753_ServerNameFts.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20220313151753_ServerNameFts.cs b/Content.Server.Database/Migrations/Sqlite/20220313151753_ServerNameFts.cs
index df0461bfab..766847888e 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220313151753_ServerNameFts.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220313151753_ServerNameFts.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20220324144649_AdminNotes.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20220324144649_AdminNotes.Designer.cs
index 657eef99f3..878b13cca4 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220324144649_AdminNotes.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220324144649_AdminNotes.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20220324144649_AdminNotes.cs b/Content.Server.Database/Migrations/Sqlite/20220324144649_AdminNotes.cs
index ba8f9057af..d71492ad94 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220324144649_AdminNotes.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220324144649_AdminNotes.cs
@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/Content.Server.Database/Migrations/Sqlite/20220325170220_PlayerReadRules.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20220325170220_PlayerReadRules.Designer.cs
index 74616d57b5..3125219c71 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220325170220_PlayerReadRules.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220325170220_PlayerReadRules.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20220325170220_PlayerReadRules.cs b/Content.Server.Database/Migrations/Sqlite/20220325170220_PlayerReadRules.cs
index 0b93e1a181..fb6d3ac1bb 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220325170220_PlayerReadRules.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220325170220_PlayerReadRules.cs
@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/Content.Server.Database/Migrations/Sqlite/20220326104908_UploadedResourcesLog.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20220326104908_UploadedResourcesLog.Designer.cs
index e70ff62d12..e42abf02a0 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220326104908_UploadedResourcesLog.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220326104908_UploadedResourcesLog.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20220326104908_UploadedResourcesLog.cs b/Content.Server.Database/Migrations/Sqlite/20220326104908_UploadedResourcesLog.cs
index 94006bd21b..6ea88f3caf 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220326104908_UploadedResourcesLog.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220326104908_UploadedResourcesLog.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Sqlite/20220503222949_FixIndices.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20220503222949_FixIndices.Designer.cs
index c01801588a..511c97bb04 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220503222949_FixIndices.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220503222949_FixIndices.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20220503222949_FixIndices.cs b/Content.Server.Database/Migrations/Sqlite/20220503222949_FixIndices.cs
index dcfe31ff83..cde8d3d0e8 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220503222949_FixIndices.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220503222949_FixIndices.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20220505084819_MarkingsJsonb.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20220505084819_MarkingsJsonb.Designer.cs
index 2f724139a9..d90652ff95 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220505084819_MarkingsJsonb.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220505084819_MarkingsJsonb.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Text.Json;
 using Content.Server.Database;
diff --git a/Content.Server.Database/Migrations/Sqlite/20220505084819_MarkingsJsonb.cs b/Content.Server.Database/Migrations/Sqlite/20220505084819_MarkingsJsonb.cs
index fa5f82e129..d44bbccb39 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220505084819_MarkingsJsonb.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220505084819_MarkingsJsonb.cs
@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 
 using Microsoft.EntityFrameworkCore.Migrations;
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20220509060717_FlavorText.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20220509060717_FlavorText.Designer.cs
index 6a4a9106a5..01ba771b1c 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220509060717_FlavorText.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220509060717_FlavorText.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20220509060717_FlavorText.cs b/Content.Server.Database/Migrations/Sqlite/20220509060717_FlavorText.cs
index 7fce7bc7cf..378c895703 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220509060717_FlavorText.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220509060717_FlavorText.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20220724000127_PlayTime.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20220724000127_PlayTime.Designer.cs
index 0278a01762..d49bbe0c17 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220724000127_PlayTime.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220724000127_PlayTime.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20220724000127_PlayTime.cs b/Content.Server.Database/Migrations/Sqlite/20220724000127_PlayTime.cs
index 1005ce866f..b8337b3632 100644
--- a/Content.Server.Database/Migrations/Sqlite/20220724000127_PlayTime.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20220724000127_PlayTime.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Sqlite/20230319110651_ProfileTraitIndexUnique.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20230319110651_ProfileTraitIndexUnique.Designer.cs
index 48dd94c8ed..f41dd91292 100644
--- a/Content.Server.Database/Migrations/Sqlite/20230319110651_ProfileTraitIndexUnique.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20230319110651_ProfileTraitIndexUnique.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20230319110651_ProfileTraitIndexUnique.cs b/Content.Server.Database/Migrations/Sqlite/20230319110651_ProfileTraitIndexUnique.cs
index 67ad85fc34..6938fdc107 100644
--- a/Content.Server.Database/Migrations/Sqlite/20230319110651_ProfileTraitIndexUnique.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20230319110651_ProfileTraitIndexUnique.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20230402214642_BanAutoDelete.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20230402214642_BanAutoDelete.Designer.cs
index 05088e73bc..e95f3e3362 100644
--- a/Content.Server.Database/Migrations/Sqlite/20230402214642_BanAutoDelete.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20230402214642_BanAutoDelete.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20230402214642_BanAutoDelete.cs b/Content.Server.Database/Migrations/Sqlite/20230402214642_BanAutoDelete.cs
index ab50c89f94..f06a0904a6 100644
--- a/Content.Server.Database/Migrations/Sqlite/20230402214642_BanAutoDelete.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20230402214642_BanAutoDelete.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20230725193058_AdminNotesImprovementsForeignKeys.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20230725193058_AdminNotesImprovementsForeignKeys.Designer.cs
index 33df58f60c..8508dff482 100644
--- a/Content.Server.Database/Migrations/Sqlite/20230725193058_AdminNotesImprovementsForeignKeys.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20230725193058_AdminNotesImprovementsForeignKeys.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20230725193058_AdminNotesImprovementsForeignKeys.cs b/Content.Server.Database/Migrations/Sqlite/20230725193058_AdminNotesImprovementsForeignKeys.cs
index 4169a728c0..04189da743 100644
--- a/Content.Server.Database/Migrations/Sqlite/20230725193058_AdminNotesImprovementsForeignKeys.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20230725193058_AdminNotesImprovementsForeignKeys.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20230727190858_AdminLogCompoundKey.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20230727190858_AdminLogCompoundKey.Designer.cs
index 0c4a33c24a..451499aec3 100644
--- a/Content.Server.Database/Migrations/Sqlite/20230727190858_AdminLogCompoundKey.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20230727190858_AdminLogCompoundKey.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20230727190858_AdminLogCompoundKey.cs b/Content.Server.Database/Migrations/Sqlite/20230727190858_AdminLogCompoundKey.cs
index 529766f712..2d9b6fcca6 100644
--- a/Content.Server.Database/Migrations/Sqlite/20230727190858_AdminLogCompoundKey.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20230727190858_AdminLogCompoundKey.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20231021071407_RoundStartDate.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20231021071407_RoundStartDate.Designer.cs
index 33a6089b4e..a0673e564b 100644
--- a/Content.Server.Database/Migrations/Sqlite/20231021071407_RoundStartDate.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20231021071407_RoundStartDate.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20231021071407_RoundStartDate.cs b/Content.Server.Database/Migrations/Sqlite/20231021071407_RoundStartDate.cs
index 0948bd99f1..572f898fd0 100644
--- a/Content.Server.Database/Migrations/Sqlite/20231021071407_RoundStartDate.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20231021071407_RoundStartDate.cs
@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/Content.Server.Database/Migrations/Sqlite/20231024041159_DropAdminLogEntity.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20231024041159_DropAdminLogEntity.Designer.cs
index b8d3b27f11..b07c7fb79b 100644
--- a/Content.Server.Database/Migrations/Sqlite/20231024041159_DropAdminLogEntity.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20231024041159_DropAdminLogEntity.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20231024041159_DropAdminLogEntity.cs b/Content.Server.Database/Migrations/Sqlite/20231024041159_DropAdminLogEntity.cs
index 59e9efce4e..0ec6e80009 100644
--- a/Content.Server.Database/Migrations/Sqlite/20231024041159_DropAdminLogEntity.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20231024041159_DropAdminLogEntity.cs
@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 
 using Microsoft.EntityFrameworkCore.Migrations;
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20231126234049_ConnectionLogServer.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20231126234049_ConnectionLogServer.Designer.cs
index 4490c53d35..c438c9564a 100644
--- a/Content.Server.Database/Migrations/Sqlite/20231126234049_ConnectionLogServer.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20231126234049_ConnectionLogServer.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20231126234049_ConnectionLogServer.cs b/Content.Server.Database/Migrations/Sqlite/20231126234049_ConnectionLogServer.cs
index e9378e4465..b06e2977c1 100644
--- a/Content.Server.Database/Migrations/Sqlite/20231126234049_ConnectionLogServer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20231126234049_ConnectionLogServer.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20231226154929_AdminLogPk.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20231226154929_AdminLogPk.Designer.cs
index fe3d01289d..06ea6f1b0a 100644
--- a/Content.Server.Database/Migrations/Sqlite/20231226154929_AdminLogPk.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20231226154929_AdminLogPk.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20231226154929_AdminLogPk.cs b/Content.Server.Database/Migrations/Sqlite/20231226154929_AdminLogPk.cs
index 4028ad10d5..505b077bef 100644
--- a/Content.Server.Database/Migrations/Sqlite/20231226154929_AdminLogPk.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20231226154929_AdminLogPk.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.Designer.cs
index 049901bc7d..0997af8a37 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.cs b/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.cs
index 4988a3c336..7913a42b7c 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Sqlite/20240201091254_SpawnPriorityPreference.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240201091254_SpawnPriorityPreference.Designer.cs
index f4ec4be23f..3c42d927bf 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240201091254_SpawnPriorityPreference.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240201091254_SpawnPriorityPreference.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20240201091254_SpawnPriorityPreference.cs b/Content.Server.Database/Migrations/Sqlite/20240201091254_SpawnPriorityPreference.cs
index cf2528f290..7eb152273a 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240201091254_SpawnPriorityPreference.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240201091254_SpawnPriorityPreference.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20240301130602_ClothingRemoval.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240301130602_ClothingRemoval.Designer.cs
index f9fcfdfaff..d6ba865305 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240301130602_ClothingRemoval.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240301130602_ClothingRemoval.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20240301130602_ClothingRemoval.cs b/Content.Server.Database/Migrations/Sqlite/20240301130602_ClothingRemoval.cs
index dd69ef2c3a..d9a66cba3b 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240301130602_ClothingRemoval.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240301130602_ClothingRemoval.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.Designer.cs
index e6d7e62b4e..e53a4f1da4 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.cs b/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.cs
index e0f7d0e0c7..6c40a16b4d 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20240403072258_Loadouts.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240403072258_Loadouts.Designer.cs
index 80241693cf..94af5bc906 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240403072258_Loadouts.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240403072258_Loadouts.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20240403072258_Loadouts.cs b/Content.Server.Database/Migrations/Sqlite/20240403072258_Loadouts.cs
index c262ed1b6b..0e481a3f3e 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240403072258_Loadouts.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240403072258_Loadouts.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20240409013832_FixRoundStartDateNullability.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240409013832_FixRoundStartDateNullability.Designer.cs
index 339b2e8243..d82abc48fc 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240409013832_FixRoundStartDateNullability.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240409013832_FixRoundStartDateNullability.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20240409013832_FixRoundStartDateNullability.cs b/Content.Server.Database/Migrations/Sqlite/20240409013832_FixRoundStartDateNullability.cs
index dbfd7776ba..529bb55967 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240409013832_FixRoundStartDateNullability.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240409013832_FixRoundStartDateNullability.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Sqlite/20240409014937_FixRoundStartDateNullability2.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240409014937_FixRoundStartDateNullability2.Designer.cs
index 6eac47da95..7a85b99df8 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240409014937_FixRoundStartDateNullability2.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240409014937_FixRoundStartDateNullability2.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20240409014937_FixRoundStartDateNullability2.cs b/Content.Server.Database/Migrations/Sqlite/20240409014937_FixRoundStartDateNullability2.cs
index 01b90f8333..7c25a8daae 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240409014937_FixRoundStartDateNullability2.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240409014937_FixRoundStartDateNullability2.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.Designer.cs
index 531f013604..225025a94f 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.cs b/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.cs
index 9d192fc685..69c7ac6c2e 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.cs
@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/Content.Server.Database/Migrations/Sqlite/20240606065717_RemoveLastReadRules.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240606065717_RemoveLastReadRules.Designer.cs
index fceb831f00..cca7424713 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240606065717_RemoveLastReadRules.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240606065717_RemoveLastReadRules.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20240606065717_RemoveLastReadRules.cs b/Content.Server.Database/Migrations/Sqlite/20240606065717_RemoveLastReadRules.cs
index 7f98fc2410..c9d55eb00c 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240606065717_RemoveLastReadRules.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240606065717_RemoveLastReadRules.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Sqlite/20240606175141_ReturnLastReadRules.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240606175141_ReturnLastReadRules.Designer.cs
index 043230b02b..a58388ce97 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240606175141_ReturnLastReadRules.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240606175141_ReturnLastReadRules.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20240606175141_ReturnLastReadRules.cs b/Content.Server.Database/Migrations/Sqlite/20240606175141_ReturnLastReadRules.cs
index 0b0fd8725c..758696cc8e 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240606175141_ReturnLastReadRules.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240606175141_ReturnLastReadRules.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.Designer.cs
index b3e512548a..cf4a425088 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.cs b/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.cs
index f97c62f6cc..4f5ae17e05 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240621120705_ConnectionLogTimeIndex.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.Designer.cs
index acce21c2bd..48a4901019 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.cs b/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.cs
index ffe5a47550..f7c87caa04 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240623005113_BanTemplate.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.Designer.cs
index 56a9fe0a05..a431a0126d 100644
--- a/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.cs b/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.cs
index 97b5dafd03..c255fbe84d 100644
--- a/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.Designer.cs
index bd4e20a464..eae61a02f0 100644
--- a/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.cs b/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.cs
index 3a7fd784e1..b3b18b0bfd 100644
--- a/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20241122174236_IPIntel.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20241122174236_IPIntel.Designer.cs
index 35bee6ecba..c777a13d1a 100644
--- a/Content.Server.Database/Migrations/Sqlite/20241122174236_IPIntel.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20241122174236_IPIntel.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20241122174236_IPIntel.cs b/Content.Server.Database/Migrations/Sqlite/20241122174236_IPIntel.cs
index 559b69d26f..50d7981af0 100644
--- a/Content.Server.Database/Migrations/Sqlite/20241122174236_IPIntel.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20241122174236_IPIntel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Sqlite/20241223235932_AdminStatus.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20241223235932_AdminStatus.Designer.cs
index 3f5f556ca1..4935d3ccc3 100644
--- a/Content.Server.Database/Migrations/Sqlite/20241223235932_AdminStatus.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20241223235932_AdminStatus.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20241223235932_AdminStatus.cs b/Content.Server.Database/Migrations/Sqlite/20241223235932_AdminStatus.cs
index ac08aa246e..e3c20b30bd 100644
--- a/Content.Server.Database/Migrations/Sqlite/20241223235932_AdminStatus.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20241223235932_AdminStatus.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20250211131517_LoadoutNames.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20250211131517_LoadoutNames.Designer.cs
index 5e54eec94b..1c6b873660 100644
--- a/Content.Server.Database/Migrations/Sqlite/20250211131517_LoadoutNames.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20250211131517_LoadoutNames.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20250211131517_LoadoutNames.cs b/Content.Server.Database/Migrations/Sqlite/20250211131517_LoadoutNames.cs
index bc13e9e59f..fbcde814b6 100644
--- a/Content.Server.Database/Migrations/Sqlite/20250211131517_LoadoutNames.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20250211131517_LoadoutNames.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20250314222717_ConstructionFavorites.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20250314222717_ConstructionFavorites.Designer.cs
index e05cd32edd..4b15b36255 100644
--- a/Content.Server.Database/Migrations/Sqlite/20250314222717_ConstructionFavorites.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20250314222717_ConstructionFavorites.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20250314222717_ConstructionFavorites.cs b/Content.Server.Database/Migrations/Sqlite/20250314222717_ConstructionFavorites.cs
index 055e0b7ae4..3eb046b793 100644
--- a/Content.Server.Database/Migrations/Sqlite/20250314222717_ConstructionFavorites.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20250314222717_ConstructionFavorites.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20260118084622_OrganMarkings.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20260118084622_OrganMarkings.Designer.cs
index 7536236a96..f32886f5f0 100644
--- a/Content.Server.Database/Migrations/Sqlite/20260118084622_OrganMarkings.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20260118084622_OrganMarkings.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20260118084622_OrganMarkings.cs b/Content.Server.Database/Migrations/Sqlite/20260118084622_OrganMarkings.cs
index 8b1f79f72f..d5a2197407 100644
--- a/Content.Server.Database/Migrations/Sqlite/20260118084622_OrganMarkings.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20260118084622_OrganMarkings.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20260120200455_BanRefactor.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20260120200455_BanRefactor.Designer.cs
index 804e3aae27..0fdae77f9f 100644
--- a/Content.Server.Database/Migrations/Sqlite/20260120200455_BanRefactor.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20260120200455_BanRefactor.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20260120200455_BanRefactor.cs b/Content.Server.Database/Migrations/Sqlite/20260120200455_BanRefactor.cs
index f813d10945..54760ff445 100644
--- a/Content.Server.Database/Migrations/Sqlite/20260120200455_BanRefactor.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20260120200455_BanRefactor.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Sqlite/20260126003831_CustomVoteLog.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20260126003831_CustomVoteLog.Designer.cs
index d5ea038894..0230775896 100644
--- a/Content.Server.Database/Migrations/Sqlite/20260126003831_CustomVoteLog.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20260126003831_CustomVoteLog.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20260126003831_CustomVoteLog.cs b/Content.Server.Database/Migrations/Sqlite/20260126003831_CustomVoteLog.cs
index 2d34b3017f..e2ecf7f3b3 100644
--- a/Content.Server.Database/Migrations/Sqlite/20260126003831_CustomVoteLog.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20260126003831_CustomVoteLog.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/Content.Server.Database/Migrations/Sqlite/20260701024222_VoiceSelector.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20260701024222_VoiceSelector.Designer.cs
index 779717fafc..bcb994a3d4 100644
--- a/Content.Server.Database/Migrations/Sqlite/20260701024222_VoiceSelector.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20260701024222_VoiceSelector.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Migrations/Sqlite/20260701024222_VoiceSelector.cs b/Content.Server.Database/Migrations/Sqlite/20260701024222_VoiceSelector.cs
index b9328e32c4..5eee6aede5 100644
--- a/Content.Server.Database/Migrations/Sqlite/20260701024222_VoiceSelector.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20260701024222_VoiceSelector.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index 8b523fb4d6..b1c77c6b7e 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Content.Server.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/Content.Server.Database/Model.Ban.cs b/Content.Server.Database/Model.Ban.cs
index 7d1ee2ab1a..b2669a7cf2 100644
--- a/Content.Server.Database/Model.Ban.cs
+++ b/Content.Server.Database/Model.Ban.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using Content.Shared.Database;
diff --git a/Content.Server.Database/Model.CustomVoteLog.cs b/Content.Server.Database/Model.CustomVoteLog.cs
index 69fe14b590..291524b43f 100644
--- a/Content.Server.Database/Model.CustomVoteLog.cs
+++ b/Content.Server.Database/Model.CustomVoteLog.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore;
 
diff --git a/Content.Server.Database/ModelPostgres.cs b/Content.Server.Database/ModelPostgres.cs
index c3f41b7058..754dd8b1f4 100644
--- a/Content.Server.Database/ModelPostgres.cs
+++ b/Content.Server.Database/ModelPostgres.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
diff --git a/Content.Server.Database/ModelSqlite.cs b/Content.Server.Database/ModelSqlite.cs
index a64a2af8d9..cc9ea13b14 100644
--- a/Content.Server.Database/ModelSqlite.cs
+++ b/Content.Server.Database/ModelSqlite.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.IO;
 using System.Linq;
diff --git a/Content.Server/Access/Systems/JobStatusSystem.cs b/Content.Server/Access/Systems/JobStatusSystem.cs
index d78528bd2f..3b46a2f3c2 100644
--- a/Content.Server/Access/Systems/JobStatusSystem.cs
+++ b/Content.Server/Access/Systems/JobStatusSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Access.Systems;
+using Content.Shared.Access.Systems;
 
 namespace Content.Server.Access.Systems;
 
diff --git a/Content.Server/Access/Systems/PresetIdCardSystem.cs b/Content.Server/Access/Systems/PresetIdCardSystem.cs
index 63a355546e..ee224bad09 100644
--- a/Content.Server/Access/Systems/PresetIdCardSystem.cs
+++ b/Content.Server/Access/Systems/PresetIdCardSystem.cs
@@ -1,9 +1,9 @@
 using Content.Server.Access.Components;
-using Content.Server.GameTicking;
-using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Access.Systems;
+using Content.Shared.GameTicking;
 using Content.Shared.Roles;
+using Content.Shared.Station.Components;
 
 namespace Content.Server.Access.Systems;
 
@@ -11,7 +11,7 @@ public sealed partial class PresetIdCardSystem : EntitySystem
 {
     [Dependency] private IdCardSystem _cardSystem = default!;
     [Dependency] private SharedAccessSystem _accessSystem = default!;
-    [Dependency] private StationSystem _stationSystem = default!;
+    [Dependency] private ServerStationSystem _stationSystem = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Server/Actions/Commands/AddActionCommand.cs b/Content.Server/Actions/Commands/AddActionCommand.cs
index 747bf2ee80..f5fa7c8e1f 100644
--- a/Content.Server/Actions/Commands/AddActionCommand.cs
+++ b/Content.Server/Actions/Commands/AddActionCommand.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Administration;
 using Content.Shared.Actions;
 using Content.Shared.Actions.Components;
diff --git a/Content.Server/Actions/Commands/RemoveActionCommand.cs b/Content.Server/Actions/Commands/RemoveActionCommand.cs
index 3e7a4d6804..4745655de0 100644
--- a/Content.Server/Actions/Commands/RemoveActionCommand.cs
+++ b/Content.Server/Actions/Commands/RemoveActionCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Shared.Actions;
 using Content.Shared.Actions.Components;
 using Content.Shared.Administration;
diff --git a/Content.Server/Acz/ContentMagicAczProvider.cs b/Content.Server/Acz/ContentMagicAczProvider.cs
index 57b5c1ec56..12720eb11d 100644
--- a/Content.Server/Acz/ContentMagicAczProvider.cs
+++ b/Content.Server/Acz/ContentMagicAczProvider.cs
@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using Content.Packaging;
 using Robust.Packaging;
diff --git a/Content.Server/Administration/AdminCommandAttribute.cs b/Content.Server/Administration/AdminCommandAttribute.cs
index 409d9fe984..98b34bb3b2 100644
--- a/Content.Server/Administration/AdminCommandAttribute.cs
+++ b/Content.Server/Administration/AdminCommandAttribute.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using JetBrains.Annotations;
 using Robust.Shared.Console;
 
diff --git a/Content.Server/Administration/AdminEventLog/AdminEventLogEui.cs b/Content.Server/Administration/AdminEventLog/AdminEventLogEui.cs
index 5f9cea5316..9a03a84a41 100644
--- a/Content.Server/Administration/AdminEventLog/AdminEventLogEui.cs
+++ b/Content.Server/Administration/AdminEventLog/AdminEventLogEui.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration.Managers;
+using Content.Server.Administration.Managers;
 using Content.Server.Discord.WebhookMessages;
 using Content.Server.EUI;
 using Content.Server.GameTicking;
@@ -20,7 +20,7 @@ public sealed partial class AdminEventLogEui : BaseEui
     [Dependency] private EventWebhook _eventWebhook = default!;
     [Dependency] private IEntityManager _e = default!;
 
-    private int CurrentRoundId => _e.System<GameTicker>().RoundId;
+    private int CurrentRoundId => _e.System<ServerGameTicker>().RoundId;
 
     public AdminEventLogEui()
     {
diff --git a/Content.Server/Administration/AdminPermsChangedEventArgs.cs b/Content.Server/Administration/AdminPermsChangedEventArgs.cs
index 07eb416be6..17d0041e7a 100644
--- a/Content.Server/Administration/AdminPermsChangedEventArgs.cs
+++ b/Content.Server/Administration/AdminPermsChangedEventArgs.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using Robust.Shared.Player;
 
 namespace Content.Server.Administration
diff --git a/Content.Server/Administration/AdminRank.cs b/Content.Server/Administration/AdminRank.cs
index 2f27891ea7..53153e05ff 100644
--- a/Content.Server/Administration/AdminRank.cs
+++ b/Content.Server/Administration/AdminRank.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 
 
 namespace Content.Server.Administration
diff --git a/Content.Server/Administration/BanList/BanListEui.cs b/Content.Server/Administration/BanList/BanListEui.cs
index fa130976db..f186ef3a80 100644
--- a/Content.Server/Administration/BanList/BanListEui.cs
+++ b/Content.Server/Administration/BanList/BanListEui.cs
@@ -1,4 +1,4 @@
-using System.Collections.Immutable;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Administration.Managers;
diff --git a/Content.Server/Administration/Commands/AGhostCommand.cs b/Content.Server/Administration/Commands/AGhostCommand.cs
index 5b450a2c4e..ae23427e45 100644
--- a/Content.Server/Administration/Commands/AGhostCommand.cs
+++ b/Content.Server/Administration/Commands/AGhostCommand.cs
@@ -75,7 +75,7 @@ public sealed partial class AGhostCommand : LocalizedCommands
         var metaDataSystem = _entities.System<MetaDataSystem>();
         var ghostSystem = _entities.System<SharedGhostSystem>();
         var transformSystem = _entities.System<TransformSystem>();
-        var gameTicker = _entities.System<GameTicker>();
+        var gameTicker = _entities.System<ServerGameTicker>();
 
         if (!mindSystem.TryGetMind(player, out var mindId, out var mind))
         {
@@ -102,7 +102,7 @@ public sealed partial class AGhostCommand : LocalizedCommands
             coordinates = gameTicker.GetObserverSpawnPoint();
         }
 
-        var ghost = _entities.SpawnEntity(GameTicker.AdminObserverPrototypeName, coordinates.Value);
+        var ghost = _entities.SpawnEntity(ServerGameTicker.AdminObserverPrototypeName, coordinates.Value);
 
         if (canReturn)
         {
diff --git a/Content.Server/Administration/Commands/AdminLogBulk.cs b/Content.Server/Administration/Commands/AdminLogBulk.cs
index 78aad21a4e..c4f3e95dd4 100644
--- a/Content.Server/Administration/Commands/AdminLogBulk.cs
+++ b/Content.Server/Administration/Commands/AdminLogBulk.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Server.Administration.Logs;
 using Content.Shared.Administration;
 using Content.Shared.Database;
diff --git a/Content.Server/Administration/Commands/BanExemptionCommands.cs b/Content.Server/Administration/Commands/BanExemptionCommands.cs
index a0389d080f..718f26db4c 100644
--- a/Content.Server/Administration/Commands/BanExemptionCommands.cs
+++ b/Content.Server/Administration/Commands/BanExemptionCommands.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Text;
 using Content.Server.Database;
 using Content.Shared.Administration;
diff --git a/Content.Server/Administration/Commands/BanListCommand.cs b/Content.Server/Administration/Commands/BanListCommand.cs
index 92c187db18..564b6fd4d3 100644
--- a/Content.Server/Administration/Commands/BanListCommand.cs
+++ b/Content.Server/Administration/Commands/BanListCommand.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Administration.BanList;
 using Content.Server.Database;
 using Content.Server.EUI;
diff --git a/Content.Server/Administration/Commands/CameraCommand.cs b/Content.Server/Administration/Commands/CameraCommand.cs
index 6dd5903a2e..52d4777566 100644
--- a/Content.Server/Administration/Commands/CameraCommand.cs
+++ b/Content.Server/Administration/Commands/CameraCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration.UI;
+using Content.Server.Administration.UI;
 using Content.Server.EUI;
 using Content.Shared.Administration;
 using Robust.Server.Player;
diff --git a/Content.Server/Administration/Commands/ChangeCvarCommand.cs b/Content.Server/Administration/Commands/ChangeCvarCommand.cs
index 119a1b8241..a4312b18ee 100644
--- a/Content.Server/Administration/Commands/ChangeCvarCommand.cs
+++ b/Content.Server/Administration/Commands/ChangeCvarCommand.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
 using Content.Shared.Administration;
diff --git a/Content.Server/Administration/Commands/ClearBluespaceLockerLinks.cs b/Content.Server/Administration/Commands/ClearBluespaceLockerLinks.cs
index 3db43b72e2..e99832bf60 100644
--- a/Content.Server/Administration/Commands/ClearBluespaceLockerLinks.cs
+++ b/Content.Server/Administration/Commands/ClearBluespaceLockerLinks.cs
@@ -1,4 +1,4 @@
-using Content.Server.Storage.Components;
+using Content.Server.Storage.Components;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 
diff --git a/Content.Server/Administration/Commands/DeleteComponentCommand.cs b/Content.Server/Administration/Commands/DeleteComponentCommand.cs
index 5cec3768e0..b5609c8e90 100644
--- a/Content.Server/Administration/Commands/DeleteComponentCommand.cs
+++ b/Content.Server/Administration/Commands/DeleteComponentCommand.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands;
diff --git a/Content.Server/Administration/Commands/ForceGhostCommand.cs b/Content.Server/Administration/Commands/ForceGhostCommand.cs
index 8a11a93917..b5f869ce4d 100644
--- a/Content.Server/Administration/Commands/ForceGhostCommand.cs
+++ b/Content.Server/Administration/Commands/ForceGhostCommand.cs
@@ -12,7 +12,7 @@ namespace Content.Server.Administration.Commands;
 public sealed partial class ForceGhostCommand : LocalizedEntityCommands
 {
     [Dependency] private IPlayerManager _playerManager = default!;
-    [Dependency] private GameTicker _gameTicker = default!;
+    [Dependency] private ServerGameTicker _gameTicker = default!;
     [Dependency] private SharedMindSystem _mind = default!;
     [Dependency] private GhostSystem _ghost = default!;
 
diff --git a/Content.Server/Administration/Commands/JobWhitelistCommands.cs b/Content.Server/Administration/Commands/JobWhitelistCommands.cs
index e266c19ecf..2753dd2508 100644
--- a/Content.Server/Administration/Commands/JobWhitelistCommands.cs
+++ b/Content.Server/Administration/Commands/JobWhitelistCommands.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Database;
 using Content.Server.Players.JobWhitelist;
 using Content.Shared.Administration;
diff --git a/Content.Server/Administration/Commands/LinkBluespaceLocker.cs b/Content.Server/Administration/Commands/LinkBluespaceLocker.cs
index 36dcb41206..fe57a36f43 100644
--- a/Content.Server/Administration/Commands/LinkBluespaceLocker.cs
+++ b/Content.Server/Administration/Commands/LinkBluespaceLocker.cs
@@ -1,4 +1,4 @@
-using Content.Server.Storage.Components;
+using Content.Server.Storage.Components;
 using Content.Shared.Administration;
 using Content.Shared.Storage.Components;
 using Robust.Shared.Console;
diff --git a/Content.Server/Administration/Commands/LoadGameMapCommand.cs b/Content.Server/Administration/Commands/LoadGameMapCommand.cs
index a3da721f82..019b1f0550 100644
--- a/Content.Server/Administration/Commands/LoadGameMapCommand.cs
+++ b/Content.Server/Administration/Commands/LoadGameMapCommand.cs
@@ -12,7 +12,7 @@ namespace Content.Server.Administration.Commands
     public sealed partial class LoadGameMapCommand : LocalizedEntityCommands
     {
         [Dependency] private IPrototypeManager _prototypeManager = default!;
-        [Dependency] private GameTicker _gameTicker = default!;
+        [Dependency] private ServerGameTicker _gameTicker = default!;
         [Dependency] private SharedMapSystem _mapSystem = default!;
 
         public override string Command => "loadgamemap";
diff --git a/Content.Server/Administration/Commands/OpenAdminEventLogCommand.cs b/Content.Server/Administration/Commands/OpenAdminEventLogCommand.cs
index ec5e353ce1..1d610af57f 100644
--- a/Content.Server/Administration/Commands/OpenAdminEventLogCommand.cs
+++ b/Content.Server/Administration/Commands/OpenAdminEventLogCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration.AdminEventLog;
+using Content.Server.Administration.AdminEventLog;
 using Content.Server.EUI;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
diff --git a/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs b/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs
index 98d6e510ad..e842e1e9f9 100644
--- a/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs
+++ b/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Shared.Administration;
 using Robust.Server.Player;
diff --git a/Content.Server/Administration/Commands/OpenAdminNotesCommand.cs b/Content.Server/Administration/Commands/OpenAdminNotesCommand.cs
index 60158dd03a..897cc35707 100644
--- a/Content.Server/Administration/Commands/OpenAdminNotesCommand.cs
+++ b/Content.Server/Administration/Commands/OpenAdminNotesCommand.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Administration.Notes;
 using Content.Shared.Administration;
 using Robust.Server.Player;
diff --git a/Content.Server/Administration/Commands/PanicBunkerCommand.cs b/Content.Server/Administration/Commands/PanicBunkerCommand.cs
index 7e675a6f22..c2198832e7 100644
--- a/Content.Server/Administration/Commands/PanicBunkerCommand.cs
+++ b/Content.Server/Administration/Commands/PanicBunkerCommand.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
diff --git a/Content.Server/Administration/Commands/PardonCommand.cs b/Content.Server/Administration/Commands/PardonCommand.cs
index 47f1831e6a..b1c3cfdd83 100644
--- a/Content.Server/Administration/Commands/PardonCommand.cs
+++ b/Content.Server/Administration/Commands/PardonCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Database;
+using Content.Server.Database;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 
diff --git a/Content.Server/Administration/Commands/PromoteHostCommand.cs b/Content.Server/Administration/Commands/PromoteHostCommand.cs
index 054d9191b4..c724b7652a 100644
--- a/Content.Server/Administration/Commands/PromoteHostCommand.cs
+++ b/Content.Server/Administration/Commands/PromoteHostCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration.Managers;
+using Content.Server.Administration.Managers;
 using JetBrains.Annotations;
 using Robust.Server.Player;
 using Robust.Shared.Console;
diff --git a/Content.Server/Administration/Commands/ReadyAllCommand.cs b/Content.Server/Administration/Commands/ReadyAllCommand.cs
index aa25830c4e..f98353883b 100644
--- a/Content.Server/Administration/Commands/ReadyAllCommand.cs
+++ b/Content.Server/Administration/Commands/ReadyAllCommand.cs
@@ -1,5 +1,6 @@
-using Content.Server.GameTicking;
+using Content.Server.GameTicking;
 using Content.Shared.Administration;
+using Content.Shared.GameTicking;
 using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands;
@@ -7,7 +8,7 @@ namespace Content.Server.Administration.Commands;
 [AdminCommand(AdminFlags.Round)]
 public sealed partial class ReadyAllCommand : LocalizedEntityCommands
 {
-    [Dependency] private GameTicker _gameTicker = default!;
+    [Dependency] private ServerGameTicker _gameTicker = default!;
 
     public override string Command => "readyall";
 
diff --git a/Content.Server/Administration/Commands/RemoveExtraComponents.cs b/Content.Server/Administration/Commands/RemoveExtraComponents.cs
index 5f0ef3a225..97b03a5223 100644
--- a/Content.Server/Administration/Commands/RemoveExtraComponents.cs
+++ b/Content.Server/Administration/Commands/RemoveExtraComponents.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/Administration/Commands/RoleBanCommand.cs b/Content.Server/Administration/Commands/RoleBanCommand.cs
index 266e941e32..b59f2f8714 100644
--- a/Content.Server/Administration/Commands/RoleBanCommand.cs
+++ b/Content.Server/Administration/Commands/RoleBanCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration.Managers;
+using Content.Server.Administration.Managers;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
diff --git a/Content.Server/Administration/Commands/RoleBanListCommand.cs b/Content.Server/Administration/Commands/RoleBanListCommand.cs
index 387ed4c92d..ac428d52ca 100644
--- a/Content.Server/Administration/Commands/RoleBanListCommand.cs
+++ b/Content.Server/Administration/Commands/RoleBanListCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration.BanList;
+using Content.Server.Administration.BanList;
 using Content.Server.EUI;
 using Content.Server.Database;
 using Content.Shared.Administration;
diff --git a/Content.Server/Administration/Commands/ShowGhostsCommand.cs b/Content.Server/Administration/Commands/ShowGhostsCommand.cs
index 2180e11c78..a20e7bc469 100644
--- a/Content.Server/Administration/Commands/ShowGhostsCommand.cs
+++ b/Content.Server/Administration/Commands/ShowGhostsCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Ghost;
+using Content.Server.Ghost;
 using Content.Server.Revenant.EntitySystems;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
diff --git a/Content.Server/Administration/Commands/ThrowScoreboardCommand.cs b/Content.Server/Administration/Commands/ThrowScoreboardCommand.cs
index cacd043f39..d48bdbaedd 100644
--- a/Content.Server/Administration/Commands/ThrowScoreboardCommand.cs
+++ b/Content.Server/Administration/Commands/ThrowScoreboardCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameTicking;
+using Content.Server.GameTicking;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 
@@ -22,6 +22,6 @@ public sealed partial class ThrowScoreboardCommand : IConsoleCommand
             shell.WriteLine(Help);
             return;
         }
-        _e.System<GameTicker>().ShowRoundEndScoreboard();
+        _e.System<ServerGameTicker>().ShowRoundEndScoreboard();
     }
 }
diff --git a/Content.Server/Administration/Components/SuperBonkComponent.cs b/Content.Server/Administration/Components/SuperBonkComponent.cs
index 2034c22136..861ee9b19c 100644
--- a/Content.Server/Administration/Components/SuperBonkComponent.cs
+++ b/Content.Server/Administration/Components/SuperBonkComponent.cs
@@ -13,7 +13,7 @@ public sealed partial class SuperBonkComponent : Component
     /// <summary>
     /// All of the tables the target will be bonked on.
     /// </summary>
-    [DataField]
+    // TODO: Probably needs to be split into two fields
     public List<EntityUid>.Enumerator Tables;
 
     /// <summary>
diff --git a/Content.Server/Administration/Logs/AdminLogManager.Cache.cs b/Content.Server/Administration/Logs/AdminLogManager.Cache.cs
index 250d0f7aa3..4bb555e5f3 100644
--- a/Content.Server/Administration/Logs/AdminLogManager.Cache.cs
+++ b/Content.Server/Administration/Logs/AdminLogManager.Cache.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Database;
 using Content.Shared.Administration.Logs;
diff --git a/Content.Server/Administration/Logs/AdminLogManager.Json.cs b/Content.Server/Administration/Logs/AdminLogManager.Json.cs
index a0a3b920bd..12b56a14a5 100644
--- a/Content.Server/Administration/Logs/AdminLogManager.Json.cs
+++ b/Content.Server/Administration/Logs/AdminLogManager.Json.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Content.Server.Administration.Logs.Converters;
diff --git a/Content.Server/Administration/Logs/AdminLogManager.cs b/Content.Server/Administration/Logs/AdminLogManager.cs
index 02884a8703..4514568062 100644
--- a/Content.Server/Administration/Logs/AdminLogManager.cs
+++ b/Content.Server/Administration/Logs/AdminLogManager.cs
@@ -1,15 +1,15 @@
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Content.Server.Administration.Systems;
 using Content.Server.Database;
 using Content.Server.EUI;
-using Content.Server.GameTicking;
 using Content.Shared.Administration.Logs;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Database;
+using Content.Shared.GameTicking;
 using Content.Shared.Mind;
 using Content.Shared.Players.PlayTimeTracking;
 using Prometheus;
diff --git a/Content.Server/Administration/Logs/AdminLogSystem.cs b/Content.Server/Administration/Logs/AdminLogSystem.cs
index aa3209bc39..a507ec5f6f 100644
--- a/Content.Server/Administration/Logs/AdminLogSystem.cs
+++ b/Content.Server/Administration/Logs/AdminLogSystem.cs
@@ -1,5 +1,5 @@
-using Content.Server.GameTicking;
-using Content.Server.GameTicking.Events;
+using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Events;
 
 namespace Content.Server.Administration.Logs;
 
diff --git a/Content.Server/Administration/Logs/AdminLogsEui.cs b/Content.Server/Administration/Logs/AdminLogsEui.cs
index 184d0cf273..2165ea903d 100644
--- a/Content.Server/Administration/Logs/AdminLogsEui.cs
+++ b/Content.Server/Administration/Logs/AdminLogsEui.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Content.Server.Administration.Managers;
@@ -52,7 +52,7 @@ public sealed partial class AdminLogsEui : BaseEui
         };
     }
 
-    private int CurrentRoundId => _e.System<GameTicker>().RoundId;
+    private int CurrentRoundId => _e.System<ServerGameTicker>().RoundId;
 
     public override async void Opened()
     {
diff --git a/Content.Server/Administration/Logs/Converters/AdminLogConverter.cs b/Content.Server/Administration/Logs/Converters/AdminLogConverter.cs
index 778f84c1ac..2f129ff2bc 100644
--- a/Content.Server/Administration/Logs/Converters/AdminLogConverter.cs
+++ b/Content.Server/Administration/Logs/Converters/AdminLogConverter.cs
@@ -1,4 +1,4 @@
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Content.Server.Administration.Logs.Converters;
diff --git a/Content.Server/Administration/Logs/Converters/AdminLogConverterAttribute.cs b/Content.Server/Administration/Logs/Converters/AdminLogConverterAttribute.cs
index ac1be307a5..a28dc30235 100644
--- a/Content.Server/Administration/Logs/Converters/AdminLogConverterAttribute.cs
+++ b/Content.Server/Administration/Logs/Converters/AdminLogConverterAttribute.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace Content.Server.Administration.Logs.Converters;
 
diff --git a/Content.Server/Administration/Logs/Converters/FixedPoint2Converter.cs b/Content.Server/Administration/Logs/Converters/FixedPoint2Converter.cs
index 9f6dcfa2e5..2d79ca4450 100644
--- a/Content.Server/Administration/Logs/Converters/FixedPoint2Converter.cs
+++ b/Content.Server/Administration/Logs/Converters/FixedPoint2Converter.cs
@@ -1,4 +1,4 @@
-using System.Text.Json;
+using System.Text.Json;
 using Content.Shared.FixedPoint;
 
 namespace Content.Server.Administration.Logs.Converters;
diff --git a/Content.Server/Administration/Logs/Converters/GasMixtureStringRepresentationConverter.cs b/Content.Server/Administration/Logs/Converters/GasMixtureStringRepresentationConverter.cs
index 7fe05022be..91954bcab5 100644
--- a/Content.Server/Administration/Logs/Converters/GasMixtureStringRepresentationConverter.cs
+++ b/Content.Server/Administration/Logs/Converters/GasMixtureStringRepresentationConverter.cs
@@ -1,4 +1,4 @@
-using System.Text.Json;
+using System.Text.Json;
 using Content.Server.Atmos;
 
 namespace Content.Server.Administration.Logs.Converters;
diff --git a/Content.Server/Administration/Logs/Converters/MindStringRepresentationConverter.cs b/Content.Server/Administration/Logs/Converters/MindStringRepresentationConverter.cs
index b43d2a90e7..3161d8a20c 100644
--- a/Content.Server/Administration/Logs/Converters/MindStringRepresentationConverter.cs
+++ b/Content.Server/Administration/Logs/Converters/MindStringRepresentationConverter.cs
@@ -1,4 +1,4 @@
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using Content.Shared.Mind;
 
diff --git a/Content.Server/Administration/Logs/Converters/PlayerSessionConverter.cs b/Content.Server/Administration/Logs/Converters/PlayerSessionConverter.cs
index d1a009b8cd..b74d9502bb 100644
--- a/Content.Server/Administration/Logs/Converters/PlayerSessionConverter.cs
+++ b/Content.Server/Administration/Logs/Converters/PlayerSessionConverter.cs
@@ -1,4 +1,4 @@
-using System.Text.Json;
+using System.Text.Json;
 using Content.Shared.Administration.Logs;
 
 namespace Content.Server.Administration.Logs.Converters;
diff --git a/Content.Server/Administration/Logs/IAdminLogManager.cs b/Content.Server/Administration/Logs/IAdminLogManager.cs
index 0793095ebf..dc4adc92e0 100644
--- a/Content.Server/Administration/Logs/IAdminLogManager.cs
+++ b/Content.Server/Administration/Logs/IAdminLogManager.cs
@@ -1,9 +1,8 @@
-using System.Text.Json;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Content.Server.Database;
-using Content.Server.GameTicking;
 using Content.Shared.Administration.Logs;
-using Robust.Shared.Network;
+using Content.Shared.GameTicking;
 using Robust.Shared.Player;
 
 namespace Content.Server.Administration.Logs;
diff --git a/Content.Server/Administration/Logs/LogFilter.cs b/Content.Server/Administration/Logs/LogFilter.cs
index a1ab74c315..68f2fea8e1 100644
--- a/Content.Server/Administration/Logs/LogFilter.cs
+++ b/Content.Server/Administration/Logs/LogFilter.cs
@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 
diff --git a/Content.Server/Administration/Managers/AdminManager.Metrics.cs b/Content.Server/Administration/Managers/AdminManager.Metrics.cs
index bb838762ba..c6dc3b8334 100644
--- a/Content.Server/Administration/Managers/AdminManager.Metrics.cs
+++ b/Content.Server/Administration/Managers/AdminManager.Metrics.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.Metrics;
+using System.Diagnostics.Metrics;
 using System.Runtime.InteropServices;
 using Content.Server.Afk;
 using Robust.Server.DataMetrics;
diff --git a/Content.Server/Administration/Managers/BanManager.cs b/Content.Server/Administration/Managers/BanManager.cs
index 093ff092ee..dec725374d 100644
--- a/Content.Server/Administration/Managers/BanManager.cs
+++ b/Content.Server/Administration/Managers/BanManager.cs
@@ -276,7 +276,7 @@ public sealed partial class BanManager : IBanManager, IPostInjectInit
         {
             roundIds = [..banInfo.RoundIds];
         }
-        else if (_systems.TryGetEntitySystem<GameTicker>(out var ticker) && ticker.RoundId != 0)
+        else if (_systems.TryGetEntitySystem<ServerGameTicker>(out var ticker) && ticker.RoundId != 0)
         {
             roundIds = [ticker.RoundId];
         }
diff --git a/Content.Server/Administration/Managers/CVarControlManager.cs b/Content.Server/Administration/Managers/CVarControlManager.cs
index ac4e7f9a84..5a6c63944f 100644
--- a/Content.Server/Administration/Managers/CVarControlManager.cs
+++ b/Content.Server/Administration/Managers/CVarControlManager.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Reflection;
 using Content.Shared.CCVar.CVarAccess;
 using Robust.Shared.Configuration;
diff --git a/Content.Server/Administration/Managers/MultiServerKickManager.cs b/Content.Server/Administration/Managers/MultiServerKickManager.cs
index b7ed0a9946..c842e02149 100644
--- a/Content.Server/Administration/Managers/MultiServerKickManager.cs
+++ b/Content.Server/Administration/Managers/MultiServerKickManager.cs
@@ -1,4 +1,4 @@
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using Content.Server.Database;
 using Content.Shared.CCVar;
diff --git a/Content.Server/Administration/Notes/AdminNotesManager.cs b/Content.Server/Administration/Notes/AdminNotesManager.cs
index 90a04c6164..2dd4b2cf34 100644
--- a/Content.Server/Administration/Notes/AdminNotesManager.cs
+++ b/Content.Server/Administration/Notes/AdminNotesManager.cs
@@ -122,7 +122,7 @@ public sealed partial class AdminNotesManager : IAdminNotesManager, IPostInjectI
 
         _sawmill.Info(sb.ToString());
 
-        _systems.TryGetEntitySystem(out GameTicker? ticker);
+        _systems.TryGetEntitySystem(out ServerGameTicker? ticker);
         int? roundId = ticker == null || ticker.RoundId == 0 ? null : ticker.RoundId;
         var serverName = _config.GetCVar(CCVars.AdminLogsServerName); // This could probably be done another way, but this is fine. For displaying only.
         var createdAt = DateTime.UtcNow;
diff --git a/Content.Server/Administration/ServerApi.Utility.cs b/Content.Server/Administration/ServerApi.Utility.cs
index 951e0039d6..96489a4881 100644
--- a/Content.Server/Administration/ServerApi.Utility.cs
+++ b/Content.Server/Administration/ServerApi.Utility.cs
@@ -1,4 +1,4 @@
-using System.Net;
+using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Robust.Server.ServerStatus;
diff --git a/Content.Server/Administration/ServerApi.cs b/Content.Server/Administration/ServerApi.cs
index b643193403..00c14a1828 100644
--- a/Content.Server/Administration/ServerApi.cs
+++ b/Content.Server/Administration/ServerApi.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Security.Cryptography;
@@ -11,14 +11,14 @@ using Content.Server.Administration.Systems;
 using Content.Server.Corvax.Api.AHelp; // Corvax-API
 using Content.Server.Database;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Presets;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Maps;
 using Content.Server.RoundEnd;
 using Content.Shared.Administration.Managers;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
+using Content.Shared.GameTicking;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Prototypes;
 using Content.Shared.Prototypes;
 using Robust.Server.ServerStatus;
 using Robust.Shared.Asynchronous;
@@ -220,7 +220,7 @@ public sealed partial class ServerApi : IPostInjectInit
 
         await RunOnMainThread(async () =>
         {
-            var ticker = _entitySystemManager.GetEntitySystem<GameTicker>();
+            var ticker = _entitySystemManager.GetEntitySystem<ServerGameTicker>();
             if (ticker.RunLevel != GameRunLevel.PreRoundLobby)
             {
                 await RespondError(
@@ -260,7 +260,7 @@ public sealed partial class ServerApi : IPostInjectInit
 
         await RunOnMainThread(async () =>
         {
-            var ticker = _entitySystemManager.GetEntitySystem<GameTicker>();
+            var ticker = _entitySystemManager.GetEntitySystem<ServerGameTicker>();
             var gameRule = ticker
                 .GetActiveGameRules()
                 .FirstOrNull(rule =>
@@ -294,7 +294,7 @@ public sealed partial class ServerApi : IPostInjectInit
 
         await RunOnMainThread(async () =>
         {
-            var ticker = _entitySystemManager.GetEntitySystem<GameTicker>();
+            var ticker = _entitySystemManager.GetEntitySystem<ServerGameTicker>();
             if (!_prototypeManager.HasIndex<EntityPrototype>(body.GameRuleId))
             {
                 await RespondError(context,
@@ -304,11 +304,13 @@ public sealed partial class ServerApi : IPostInjectInit
                 return;
             }
 
-            var ruleEntity = ticker.AddGameRule(body.GameRuleId);
+            if (ticker.AddGameRule(body.GameRuleId) is not { } ruleEntity)
+                return;
+
             _sawmill.Info($"Added game rule {body.GameRuleId} by {FormatLogActor(actor)}.");
             if (ticker.RunLevel == GameRunLevel.InRound)
             {
-                ticker.StartGameRule(ruleEntity);
+                ticker.StartGameRule(ruleEntity.AsNullable());
                 _sawmill.Info($"Started game rule {body.GameRuleId} by {FormatLogActor(actor)}.");
             }
 
@@ -420,7 +422,7 @@ public sealed partial class ServerApi : IPostInjectInit
     {
         await RunOnMainThread(async () =>
         {
-            var ticker = _entitySystemManager.GetEntitySystem<GameTicker>();
+            var ticker = _entitySystemManager.GetEntitySystem<ServerGameTicker>();
 
             if (ticker.RunLevel != GameRunLevel.PreRoundLobby)
             {
@@ -443,7 +445,7 @@ public sealed partial class ServerApi : IPostInjectInit
         await RunOnMainThread(async () =>
         {
             var roundEndSystem = _entitySystemManager.GetEntitySystem<RoundEndSystem>();
-            var ticker = _entitySystemManager.GetEntitySystem<GameTicker>();
+            var ticker = _entitySystemManager.GetEntitySystem<ServerGameTicker>();
 
             if (ticker.RunLevel != GameRunLevel.InRound)
             {
@@ -465,7 +467,7 @@ public sealed partial class ServerApi : IPostInjectInit
     {
         await RunOnMainThread(async () =>
         {
-            var ticker = _entitySystemManager.GetEntitySystem<GameTicker>();
+            var ticker = _entitySystemManager.GetEntitySystem<ServerGameTicker>();
 
             ticker.RestartRound();
             _sawmill.Info($"Forced instant round restart by {FormatLogActor(actor)}");
@@ -546,7 +548,7 @@ public sealed partial class ServerApi : IPostInjectInit
 
         var info = await RunOnMainThread<InfoResponse>(() =>
         {
-            var ticker = _entitySystemManager.GetEntitySystem<GameTicker>();
+            var ticker = _entitySystemManager.GetEntitySystem<ServerGameTicker>();
             var adminSystem = _entitySystemManager.GetEntitySystem<AdminSystem>();
 
             var players = new List<InfoResponse.Player>();
diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index 2842b9a53e..719f93e218 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -50,7 +50,7 @@ public sealed partial class AdminSystem : EntitySystem
     [Dependency] private PhysicsSystem _physics = default!;
     [Dependency] private PlayTimeTrackingManager _playTime = default!;
     [Dependency] private SharedRoleSystem _role = default!;
-    [Dependency] private GameTicker _gameTicker = default!;
+    [Dependency] private ServerGameTicker _gameTicker = default!;
     [Dependency] private SharedAudioSystem _audio = default!;
     [Dependency] private StationRecordsSystem _stationRecords = default!;
     [Dependency] private TransformSystem _transform = default!;
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
index 078daa0b04..9a94d3ff46 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
@@ -1,10 +1,10 @@
-using Content.Server.Antag;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Zombies;
 using Content.Shared.Administration;
 using Content.Server.Clothing.Systems;
+using Content.Shared.Antag;
 using Content.Shared.Database;
+using Content.Shared.GameTicking.Rules.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.Mind.Components;
 using Content.Shared.Roles;
@@ -20,7 +20,7 @@ public sealed partial class AdminVerbSystem
 {
     [Dependency] private AntagSelectionSystem _antag = default!;
     [Dependency] private ZombieSystem _zombie = default!;
-    [Dependency] private GameTicker _gameTicker = default!;
+    [Dependency] private ServerGameTicker _gameTicker = default!;
     [Dependency] private OutfitSystem _outfit = default!;
 
     private static readonly EntProtoId DefaultTraitorRule = "Traitor";
@@ -179,14 +179,15 @@ public sealed partial class AdminVerbSystem
             Icon = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/job_icons.rsi"), "ParadoxClone"),
             Act = () =>
             {
-                var ruleEnt = _gameTicker.AddGameRule(ParadoxCloneRuleId);
+                if (_gameTicker.AddGameRule(ParadoxCloneRuleId) is not { } ruleEnt)
+                    return;
 
                 if (!TryComp<ParadoxCloneRuleComponent>(ruleEnt, out var paradoxCloneRuleComp))
                     return;
 
                 paradoxCloneRuleComp.OriginalBody = args.Target; // override the target player
 
-                _gameTicker.StartGameRule(ruleEnt);
+                _gameTicker.StartGameRule(ruleEnt.AsNullable());
             },
             Impact = LogImpact.High,
             Message = string.Join(": ", paradoxCloneName, Loc.GetString("admin-verb-make-paradox-clone")),
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Prototypes.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Prototypes.cs
new file mode 100644
index 0000000000..5c905d5c7a
--- /dev/null
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Prototypes.cs
@@ -0,0 +1,51 @@
+using Content.Shared.Administration.Verbs.Prototypes;
+using Content.Shared.EntityEffects;
+using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
+using Robust.Shared.Player;
+
+namespace Content.Server.Administration.Systems;
+
+public sealed partial class AdminVerbSystem
+{
+    [Dependency] private SharedEntityEffectsSystem _entityEffects = default!;
+    [Dependency] private EntityWhitelistSystem _whitelistSystem = default!;
+
+    // All prototype verbs have names so invokeverb works.
+    private void AddPrototypeVerbs(GetVerbsEvent<Verb> args)
+    {
+        if (!TryComp(args.User, out ActorComponent? actor))
+            return;
+
+        var player = actor.PlayerSession;
+
+        foreach (var prototype in ProtoMan.EnumeratePrototypes<AdminVerbPrototype>())
+        {
+            var category = ProtoMan.Index(prototype.CategoryPrototype);
+            if (!_adminManager.HasAdminFlag(player, category.RequiredFlags))
+                continue;
+
+            if (!_whitelistSystem.CheckBoth(args.Target, category.Blacklist, category.Whitelist) ||
+                !_whitelistSystem.CheckBoth(args.Target, prototype.Blacklist, prototype.Whitelist))
+                continue;
+
+            var name = Loc.GetString(prototype.Name).ToLowerInvariant();
+            var verb = new Verb
+            {
+                Text = name,
+                Category = new VerbCategory(category.Name, category.Icon, category.IconsOnly)
+                {
+                    Columns = category.Columns
+                },
+                Icon = prototype.Icon,
+                Act = () => _entityEffects.ApplyEffects(args.Target, prototype.Effects, user: args.User),
+                Impact = category.Impact,
+                Message = prototype.Description is { } description
+                    ? string.Join(": ", name, Loc.GetString(description))
+                    : null
+            };
+
+            args.Verbs.Add(verb);
+        }
+    }
+}
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
deleted file mode 100644
index ad3b9d11a4..0000000000
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ /dev/null
@@ -1,1131 +0,0 @@
-using System.Linq;
-using System.Numerics;
-using System.Threading;
-using Content.Server.Atmos.EntitySystems;
-using Content.Server.Atmos.Piping.EntitySystems;
-using Content.Server.Body.Systems;
-using Content.Server.Electrocution;
-using Content.Server.Explosion.EntitySystems;
-using Content.Server.GhostKick;
-using Content.Server.Nutrition.EntitySystems;
-using Content.Server.Physics.Components;
-using Content.Server.Pointing.Components;
-using Content.Server.Polymorph.Systems;
-using Content.Server.Popups;
-using Content.Server.Roles;
-using Content.Shared.Speech.Components;
-using Content.Server.Storage.EntitySystems;
-using Content.Server.Tabletop;
-using Content.Shared.Actions;
-using Content.Shared.Administration;
-using Content.Shared.Administration.Components;
-using Content.Shared.Atmos;
-using Content.Shared.Atmos.Components;
-using Content.Shared.Body;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
-using Content.Shared.Clothing.Components;
-using Content.Shared.Cluwne;
-using Content.Shared.Damage.Components;
-using Content.Shared.Damage.Systems;
-using Content.Shared.Database;
-using Content.Shared.Electrocution;
-using Content.Shared.Gibbing;
-using Content.Shared.Gravity;
-using Content.Shared.Interaction.Components;
-using Content.Shared.Inventory;
-using Content.Shared.Medical;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Movement.Components;
-using Content.Shared.Movement.Systems;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Polymorph;
-using Content.Shared.Popups;
-using Content.Shared.Silicons.Laws;
-using Content.Shared.Silicons.Laws.Components;
-using Content.Shared.Slippery;
-using Content.Shared.StatusEffectNew;
-using Content.Shared.StatusEffectNew.Components;
-using Content.Shared.Storage.Components;
-using Content.Shared.Tabletop.Components;
-using Content.Shared.Tools.Systems;
-using Content.Shared.Verbs;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Systems;
-using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Robust.Shared.Spawners;
-using Robust.Shared.Utility;
-using Timer = Robust.Shared.Timing.Timer;
-
-namespace Content.Server.Administration.Systems;
-
-public sealed partial class AdminVerbSystem
-{
-    private static readonly EntProtoId<StatusEffectComponent> MaidStatus = "StatusEffectClumsyMaid";
-
-    private readonly ProtoId<PolymorphPrototype> LizardSmite = "AdminLizardSmite";
-    private readonly ProtoId<PolymorphPrototype> VulpkaninSmite = "AdminVulpSmite";
-
-    [Dependency] private SharedActionsSystem _actions = default!;
-    [Dependency] private IRobustRandom _random = default!;
-    [Dependency] private BloodstreamSystem _bloodstreamSystem = default!;
-    [Dependency] private BodySystem _bodySystem = default!;
-    [Dependency] private CreamPieSystem _creamPieSystem = default!;
-    [Dependency] private ElectrocutionSystem _electrocutionSystem = default!;
-    [Dependency] private EntityStorageSystem _entityStorageSystem = default!;
-    [Dependency] private ExplosionSystem _explosionSystem = default!;
-    [Dependency] private FixtureSystem _fixtures = default!;
-    [Dependency] private FlammableSystem _flammableSystem = default!;
-    [Dependency] private GhostKickManager _ghostKickManager = default!;
-    [Dependency] private SharedGodmodeSystem _sharedGodmodeSystem = default!;
-    [Dependency] private InventorySystem _inventorySystem = default!;
-    [Dependency] private MovementSpeedModifierSystem _movementSpeedModifierSystem = default!;
-    [Dependency] private PolymorphSystem _polymorphSystem = default!;
-    [Dependency] private MobThresholdSystem _mobThresholdSystem = default!;
-    [Dependency] private PopupSystem _popupSystem = default!;
-    [Dependency] private SharedPhysicsSystem _physics = default!;
-    [Dependency] private RoleSystem _role = default!;
-    [Dependency] private TabletopSystem _tabletopSystem = default!;
-    [Dependency] private VomitSystem _vomitSystem = default!;
-    [Dependency] private WeldableSystem _weldableSystem = default!;
-    [Dependency] private SharedContentEyeSystem _eyeSystem = default!;
-    [Dependency] private SharedTransformSystem _transformSystem = default!;
-    [Dependency] private SuperBonkSystem _superBonkSystem = default!;
-    [Dependency] private SlipperySystem _slipperySystem = default!;
-    [Dependency] private GibbingSystem _gibbing = default!;
-    [Dependency] private DamageableSystem _damageable = default!;
-    [Dependency] private AtmosDeviceSystem _atmosDevice = default!;
-    [Dependency] private StatusEffectsSystem _statusEffects = default!;
-
-    private readonly EntProtoId _actionViewLawsProtoId = "ActionViewLaws";
-    private readonly ProtoId<SiliconLawsetPrototype> _crewsimovLawset = "Crewsimov";
-
-    private readonly EntProtoId _siliconMindRole = "MindRoleSiliconBrain";
-    private const string SiliconLawBoundUserInterface = "SiliconLawBoundUserInterface";
-
-    // All smite verbs have names so invokeverb works.
-    private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
-    {
-        if (!TryComp(args.User, out ActorComponent? actor))
-            return;
-
-        var player = actor.PlayerSession;
-
-        if (!_adminManager.HasAdminFlag(player, AdminFlags.Fun))
-            return;
-
-        // 1984.
-        if (HasComp<MapComponent>(args.Target) || HasComp<MapGridComponent>(args.Target))
-            return;
-
-        var explodeName = Loc.GetString("admin-smite-explode-name").ToLowerInvariant();
-        Verb explode = new()
-        {
-            Text = explodeName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/smite.svg.192dpi.png")),
-            Act = () =>
-            {
-                var coords = _transformSystem.GetMapCoordinates(args.Target);
-                Timer.Spawn(_gameTiming.TickPeriod,
-                    () => _explosionSystem.QueueExplosion(coords, ExplosionSystem.DefaultExplosionPrototypeId,
-                        4, 1, 2, args.Target, maxTileBreak: 0), // it gibs, damage doesn't need to be high.
-                    CancellationToken.None);
-
-                _gibbing.Gib(args.Target);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", explodeName, Loc.GetString("admin-smite-explode-description")) // we do this so the description tells admins the Text to run it via console.
-        };
-        args.Verbs.Add(explode);
-
-        var chessName = Loc.GetString("admin-smite-chess-dimension-name").ToLowerInvariant();
-        Verb chess = new()
-        {
-            Text = chessName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Fun/Tabletop/chessboard.rsi"), "chessboard"),
-            Act = () =>
-            {
-                _sharedGodmodeSystem.EnableGodmode(args.Target); // So they don't suffocate.
-                EnsureComp<TabletopDraggableComponent>(args.Target);
-                var xform = Transform(args.Target);
-                _popupSystem.PopupEntity(Loc.GetString("admin-smite-chess-self"), args.Target,
-                    args.Target, PopupType.LargeCaution);
-                _popupSystem.PopupCoordinates(
-                    Loc.GetString("admin-smite-chess-others", ("name", args.Target)), xform.Coordinates,
-                    Filter.PvsExcept(args.Target), true, PopupType.MediumCaution);
-                var board = Spawn("ChessBoard", xform.Coordinates);
-                var session = _tabletopSystem.EnsureSession(Comp<TabletopGameComponent>(board));
-                _transformSystem.SetMapCoordinates(args.Target, session.Position);
-                _transformSystem.SetWorldRotationNoLerp((args.Target, xform), Angle.Zero);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", chessName, Loc.GetString("admin-smite-chess-dimension-description"))
-        };
-        args.Verbs.Add(chess);
-
-        if (TryComp<FlammableComponent>(args.Target, out var flammable))
-        {
-            var flamesName = Loc.GetString("admin-smite-set-alight-name").ToLowerInvariant();
-            Verb flames = new()
-            {
-                Text = flamesName,
-                Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/Alerts/Fire/fire.png")),
-                Act = () =>
-                {
-                    // Fuck you. Burn Forever.
-                    flammable.FireStacks = flammable.MaximumFireStacks;
-                    _flammableSystem.Ignite(args.Target, args.User);
-                    var xform = Transform(args.Target);
-                    _popupSystem.PopupEntity(Loc.GetString("admin-smite-set-alight-self"), args.Target,
-                        args.Target, PopupType.LargeCaution);
-                    _popupSystem.PopupCoordinates(Loc.GetString("admin-smite-set-alight-others", ("name", args.Target)), xform.Coordinates,
-                        Filter.PvsExcept(args.Target), true, PopupType.MediumCaution);
-                },
-                Impact = LogImpact.Extreme,
-                Message = string.Join(": ", flamesName, Loc.GetString("admin-smite-set-alight-description"))
-            };
-            args.Verbs.Add(flames);
-        }
-
-        var monkeyName = Loc.GetString("admin-smite-monkeyify-name").ToLowerInvariant();
-        Verb monkey = new()
-        {
-            Text = monkeyName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Mobs/Animals/monkey.rsi"), "monkey"),
-            Act = () =>
-            {
-                _polymorphSystem.PolymorphEntity(args.Target, "AdminMonkeySmite");
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", monkeyName, Loc.GetString("admin-smite-monkeyify-description"))
-        };
-        args.Verbs.Add(monkey);
-
-        var disposalBinName = Loc.GetString("admin-smite-garbage-can-name").ToLowerInvariant();
-        Verb disposalBin = new()
-        {
-            Text = disposalBinName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Structures/Piping/disposal.rsi"), "disposal"),
-            Act = () =>
-            {
-                _polymorphSystem.PolymorphEntity(args.Target, "AdminDisposalsSmite");
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", disposalBinName, Loc.GetString("admin-smite-garbage-can-description"))
-        };
-        args.Verbs.Add(disposalBin);
-
-        if (TryComp<DamageableComponent>(args.Target, out var damageable) &&
-            HasComp<MobStateComponent>(args.Target))
-        {
-            var hardElectrocuteName = Loc.GetString("admin-smite-electrocute-name").ToLowerInvariant();
-            Verb hardElectrocute = new()
-            {
-                Text = hardElectrocuteName,
-                Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Rsi(new("/Textures/Clothing/Hands/Gloves/Color/yellow.rsi"), "icon"),
-                Act = () =>
-                {
-                    var totalDamage = _damageable.GetTotalDamage((args.Target, damageable));
-                    int damageToDeal;
-                    if (!_mobThresholdSystem.TryGetThresholdForState(args.Target, MobState.Critical, out var criticalThreshold))
-                    {
-                        // We can't crit them so try killing them.
-                        if (!_mobThresholdSystem.TryGetThresholdForState(args.Target, MobState.Dead,
-                                out var deadThreshold))
-                            return;// whelp.
-                        damageToDeal = deadThreshold.Value.Int() - (int)totalDamage;
-                    }
-                    else
-                    {
-                        damageToDeal = criticalThreshold.Value.Int() - (int)totalDamage;
-                    }
-
-                    if (damageToDeal <= 0)
-                        damageToDeal = 100; // murder time.
-
-                    if (_inventorySystem.TryGetSlots(args.Target, out var slotDefinitions))
-                    {
-                        foreach (var slot in slotDefinitions)
-                        {
-                            if (!_inventorySystem.TryGetSlotEntity(args.Target, slot.Name, out var slotEnt))
-                                continue;
-
-                            RemComp<InsulatedComponent>(slotEnt.Value); // Fry the gloves.
-                        }
-                    }
-
-                    _electrocutionSystem.TryDoElectrocution(args.Target, null, damageToDeal,
-                        TimeSpan.FromSeconds(30), refresh: true, ignoreInsulation: true);
-                },
-                Impact = LogImpact.Extreme,
-                Message = string.Join(": ", hardElectrocuteName, Loc.GetString("admin-smite-electrocute-description"))
-            };
-            args.Verbs.Add(hardElectrocute);
-        }
-
-        if (TryComp<CreamPiedComponent>(args.Target, out var creamPied))
-        {
-            var creamPieName = Loc.GetString("admin-smite-creampie-name").ToLowerInvariant();
-            Verb creamPie = new()
-            {
-                Text = creamPieName,
-                Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Consumable/Food/Baked/pie.rsi"), "plain-slice"),
-                Act = () =>
-                {
-                    _creamPieSystem.SetCreamPied((args.Target, creamPied), true);
-                },
-                Impact = LogImpact.Extreme,
-                Message = string.Join(": ", creamPieName, Loc.GetString("admin-smite-creampie-description"))
-            };
-            args.Verbs.Add(creamPie);
-        }
-
-        if (TryComp<BloodstreamComponent>(args.Target, out var bloodstream))
-        {
-            var bloodRemovalName = Loc.GetString("admin-smite-remove-blood-name").ToLowerInvariant();
-            Verb bloodRemoval = new()
-            {
-                Text = bloodRemovalName,
-                Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Rsi(new("/Textures/Fluids/tomato_splat.rsi"), "puddle-1"),
-                Act = () =>
-                {
-                    _bloodstreamSystem.SpillAllSolutions((args.Target, bloodstream));
-                    var xform = Transform(args.Target);
-                    _popupSystem.PopupEntity(Loc.GetString("admin-smite-remove-blood-self"), args.Target,
-                        args.Target, PopupType.LargeCaution);
-                    _popupSystem.PopupCoordinates(Loc.GetString("admin-smite-remove-blood-others", ("name", args.Target)), xform.Coordinates,
-                        Filter.PvsExcept(args.Target), true, PopupType.MediumCaution);
-                },
-                Impact = LogImpact.Extreme,
-                Message = string.Join(": ", bloodRemovalName, Loc.GetString("admin-smite-remove-blood-description"))
-            };
-            args.Verbs.Add(bloodRemoval);
-        }
-
-        if (TryComp<BodyComponent>(args.Target, out var body))
-        {
-            var vomitOrgansName = Loc.GetString("admin-smite-vomit-organs-name").ToLowerInvariant();
-            Verb vomitOrgans = new()
-            {
-                Text = vomitOrgansName,
-                Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Rsi(new("/Textures/Fluids/vomit_toxin.rsi"), "vomit_toxin-1"),
-                Act = () =>
-                {
-                    _vomitSystem.Vomit(args.Target, -1000, -1000); // You feel hollow!
-                    _bodySystem.TryGetOrgansWithComponent<TransformComponent>((args.Target, body), out var organs);
-                    var baseXform = Transform(args.Target);
-                    foreach (var organ in organs)
-                    {
-                        if (HasComp<BrainComponent>(organ.Owner) || HasComp<EyeComponent>(organ.Owner))
-                            continue;
-
-                        _transformSystem.PlaceNextTo((organ.Owner, organ.Comp), (args.Target, baseXform));
-                    }
-
-                    _popupSystem.PopupEntity(Loc.GetString("admin-smite-vomit-organs-self"), args.Target,
-                        args.Target, PopupType.LargeCaution);
-                    _popupSystem.PopupCoordinates(Loc.GetString("admin-smite-vomit-organs-others", ("name", args.Target)), baseXform.Coordinates,
-                        Filter.PvsExcept(args.Target), true, PopupType.MediumCaution);
-                },
-                Impact = LogImpact.Extreme,
-                Message = string.Join(": ", vomitOrgansName, Loc.GetString("admin-smite-vomit-organs-description"))
-            };
-            args.Verbs.Add(vomitOrgans);
-
-            var handsRemovalName = Loc.GetString("admin-smite-remove-hands-name").ToLowerInvariant();
-            Verb handsRemoval = new()
-            {
-                Text = handsRemovalName,
-                Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/remove-hands.png")),
-                Act = () =>
-                {
-                    var baseXform = Transform(args.Target);
-                    var parts = new HashSet<ProtoId<OrganCategoryPrototype>>() { "HandRight", "HandLeft" };
-                    _bodySystem.TryGetOrgansWithComponent<OrganComponent>((args.Target, body), out var organs);
-                    foreach (var organ in organs.Where(it => it.Comp.Category is { } category && parts.Contains(category)))
-                    {
-                        _transformSystem.AttachToGridOrMap(organ);
-                    }
-                    _popupSystem.PopupEntity(Loc.GetString("admin-smite-remove-hands-self"), args.Target,
-                        args.Target, PopupType.LargeCaution);
-                    _popupSystem.PopupCoordinates(Loc.GetString("admin-smite-remove-hands-other", ("name", args.Target)), baseXform.Coordinates,
-                        Filter.PvsExcept(args.Target), true, PopupType.Medium);
-                },
-                Impact = LogImpact.Extreme,
-                Message = string.Join(": ", handsRemovalName, Loc.GetString("admin-smite-remove-hands-description"))
-            };
-            args.Verbs.Add(handsRemoval);
-
-            var handRemovalName = Loc.GetString("admin-smite-remove-hand-name").ToLowerInvariant();
-            Verb handRemoval = new()
-            {
-                Text = handRemovalName,
-                Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/remove-hand.png")),
-                Act = () =>
-                {
-                    var baseXform = Transform(args.Target);
-                    var parts = new HashSet<ProtoId<OrganCategoryPrototype>>() { "HandRight", "HandLeft" };
-                    _bodySystem.TryGetOrgansWithComponent<OrganComponent>((args.Target, body), out var organs);
-                    foreach (var organ in organs.Where(it => it.Comp.Category is { } category && parts.Contains(category)))
-                    {
-                        _transformSystem.AttachToGridOrMap(organ);
-                        break;
-                    }
-                    _popupSystem.PopupEntity(Loc.GetString("admin-smite-remove-hands-self"), args.Target,
-                        args.Target, PopupType.LargeCaution);
-                    _popupSystem.PopupCoordinates(Loc.GetString("admin-smite-remove-hands-other", ("name", args.Target)), baseXform.Coordinates,
-                        Filter.PvsExcept(args.Target), true, PopupType.Medium);
-                },
-                Impact = LogImpact.Extreme,
-                Message = string.Join(": ", handRemovalName, Loc.GetString("admin-smite-remove-hand-description"))
-            };
-            args.Verbs.Add(handRemoval);
-
-            var stomachRemovalName = Loc.GetString("admin-smite-stomach-removal-name").ToLowerInvariant();
-            Verb stomachRemoval = new()
-            {
-                Text = stomachRemovalName,
-                Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Rsi(new("/Textures/Mobs/Species/Human/organs.rsi"), "stomach"),
-                Act = () =>
-                {
-                    _bodySystem.TryGetOrgansWithComponent<StomachComponent>((args.Target, body), out var organs);
-                    foreach (var entity in organs)
-                    {
-                        QueueDel(entity.Owner);
-                    }
-
-                    _popupSystem.PopupEntity(Loc.GetString("admin-smite-stomach-removal-self"), args.Target,
-                        args.Target, PopupType.LargeCaution);
-                },
-                Impact = LogImpact.Extreme,
-                Message = string.Join(": ", stomachRemovalName, Loc.GetString("admin-smite-stomach-removal-description"))
-            };
-            args.Verbs.Add(stomachRemoval);
-
-            var lungRemovalName = Loc.GetString("admin-smite-lung-removal-name").ToLowerInvariant();
-            Verb lungRemoval = new()
-            {
-                Text = lungRemovalName,
-                Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Rsi(new("/Textures/Mobs/Species/Human/organs.rsi"), "lung-r"),
-                Act = () =>
-                {
-                    _bodySystem.TryGetOrgansWithComponent<LungComponent>((args.Target, body), out var organs);
-                    foreach (var entity in organs)
-                    {
-                        QueueDel(entity.Owner);
-                    }
-
-                    _popupSystem.PopupEntity(Loc.GetString("admin-smite-lung-removal-self"), args.Target,
-                        args.Target, PopupType.LargeCaution);
-                },
-                Impact = LogImpact.Extreme,
-                Message = string.Join(": ", lungRemovalName, Loc.GetString("admin-smite-lung-removal-description"))
-            };
-            args.Verbs.Add(lungRemoval);
-        }
-
-        if (TryComp<PhysicsComponent>(args.Target, out var physics))
-        {
-            var pinballName = Loc.GetString("admin-smite-pinball-name").ToLowerInvariant();
-            Verb pinball = new()
-            {
-                Text = pinballName,
-                Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Fun/Balls/basketball.rsi"), "icon"),
-                Act = () =>
-                {
-                    var xform = Transform(args.Target);
-                    var fixtures = Comp<FixturesComponent>(args.Target);
-                    _transformSystem.Unanchor(args.Target, xform); // Just in case.
-                    _physics.SetBodyType(args.Target, BodyType.Dynamic, manager: fixtures, body: physics);
-                    _physics.SetBodyStatus(args.Target, physics, BodyStatus.InAir);
-                    _physics.WakeBody(args.Target, manager: fixtures, body: physics);
-
-                    foreach (var fixture in fixtures.Fixtures.Values)
-                    {
-                        if (!fixture.Hard)
-                            continue;
-
-                        _physics.SetRestitution(args.Target, fixture, 1.1f, false, fixtures);
-                    }
-
-                    _fixtures.FixtureUpdate(args.Target, manager: fixtures, body: physics);
-
-                    _physics.SetLinearVelocity(args.Target, _random.NextVector2(1.5f, 1.5f), manager: fixtures, body: physics);
-                    _physics.SetAngularVelocity(args.Target, MathF.PI * 12, manager: fixtures, body: physics);
-                    _physics.SetLinearDamping(args.Target, physics, 0f);
-                    _physics.SetAngularDamping(args.Target, physics, 0f);
-                },
-                Impact = LogImpact.Extreme,
-                Message = string.Join(": ", pinballName, Loc.GetString("admin-smite-pinball-description"))
-            };
-            args.Verbs.Add(pinball);
-
-            var yeetName = Loc.GetString("admin-smite-yeet-name").ToLowerInvariant();
-            Verb yeet = new()
-            {
-                Text = yeetName,
-                Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/eject.svg.192dpi.png")),
-                Act = () =>
-                {
-                    var xform = Transform(args.Target);
-                    var fixtures = Comp<FixturesComponent>(args.Target);
-                    _transformSystem.Unanchor(args.Target); // Just in case.
-
-                    _physics.SetBodyType(args.Target, BodyType.Dynamic, body: physics);
-                    _physics.SetBodyStatus(args.Target, physics, BodyStatus.InAir);
-                    _physics.WakeBody(args.Target, manager: fixtures, body: physics);
-
-                    foreach (var fixture in fixtures.Fixtures.Values)
-                    {
-                        _physics.SetHard(args.Target, fixture, false, manager: fixtures);
-                    }
-
-                    _physics.SetLinearVelocity(args.Target, _random.NextVector2(8.0f, 8.0f), manager: fixtures, body: physics);
-                    _physics.SetAngularVelocity(args.Target, MathF.PI * 12, manager: fixtures, body: physics);
-                    _physics.SetLinearDamping(args.Target, physics, 0f);
-                    _physics.SetAngularDamping(args.Target, physics, 0f);
-                },
-                Impact = LogImpact.Extreme,
-                Message = string.Join(": ", yeetName, Loc.GetString("admin-smite-yeet-description"))
-            };
-            args.Verbs.Add(yeet);
-        }
-
-        var breadName = Loc.GetString("admin-smite-become-bread-name").ToLowerInvariant(); // Will I get cancelled for breadName-ing you?
-        Verb bread = new()
-        {
-            Text = breadName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Consumable/Food/Baked/bread.rsi"), "plain"),
-            Act = () =>
-            {
-                _polymorphSystem.PolymorphEntity(args.Target, "AdminBreadSmite");
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", breadName, Loc.GetString("admin-smite-become-bread-description"))
-        };
-        args.Verbs.Add(bread);
-
-        var mouseName = Loc.GetString("admin-smite-become-mouse-name").ToLowerInvariant();
-        Verb mouse = new()
-        {
-            Text = mouseName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Mobs/Animals/mouse.rsi"), "icon-0"),
-            Act = () =>
-            {
-                _polymorphSystem.PolymorphEntity(args.Target, "AdminMouseSmite");
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", mouseName, Loc.GetString("admin-smite-become-mouse-description"))
-        };
-        args.Verbs.Add(mouse);
-
-        if (TryComp<ActorComponent>(args.Target, out var actorComponent))
-        {
-            var ghostKickName = Loc.GetString("admin-smite-ghostkick-name").ToLowerInvariant();
-            Verb ghostKick = new()
-            {
-                Text = ghostKickName,
-                Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/gavel.svg.192dpi.png")),
-                Act = () =>
-                {
-                    _ghostKickManager.DoDisconnect(actorComponent.PlayerSession.Channel, "Smitten.");
-                },
-                Impact = LogImpact.Extreme,
-                Message = string.Join(": ", ghostKickName, Loc.GetString("admin-smite-ghostkick-description"))
-
-            };
-            args.Verbs.Add(ghostKick);
-        }
-
-        if (TryComp<InventoryComponent>(args.Target, out var inventory))
-        {
-            var nyanifyName = Loc.GetString("admin-smite-nyanify-name").ToLowerInvariant();
-            Verb nyanify = new()
-            {
-                Text = nyanifyName,
-                Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Rsi(new("/Textures/Clothing/Head/Hats/catears.rsi"), "icon"),
-                Act = () =>
-                {
-                    var ears = Spawn("ClothingHeadHatCatEars", Transform(args.Target).Coordinates);
-                    EnsureComp<UnremoveableComponent>(ears);
-                    _inventorySystem.TryUnequip(args.Target, "head", true, true, false, inventory);
-                    _inventorySystem.TryEquip(args.Target, ears, "head", true, true, false, inventory);
-                },
-                Impact = LogImpact.Extreme,
-                Message = string.Join(": ", nyanifyName, Loc.GetString("admin-smite-nyanify-description"))
-            };
-            args.Verbs.Add(nyanify);
-
-            var killSignName = Loc.GetString("admin-smite-kill-sign-name").ToLowerInvariant();
-            Verb killSign = new()
-            {
-                Text = killSignName,
-                Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/killsign.rsi"), "icon"),
-                Act = () =>
-                {
-                    EnsureComp<KillSignComponent>(args.Target, out var comp);
-                    comp.HideFromOwner = false; // We set it to false anyway, in case the hidden smite was used beforehand.
-                    Dirty(args.Target, comp);
-                },
-                Impact = LogImpact.Extreme,
-                Message = string.Join(": ", killSignName, Loc.GetString("admin-smite-kill-sign-description"))
-            };
-            args.Verbs.Add(killSign);
-
-            var hiddenKillSignName = Loc.GetString("admin-smite-kill-sign-hidden-name").ToLowerInvariant();
-            Verb hiddenKillSign = new()
-            {
-                Text = hiddenKillSignName,
-                Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/killsign.rsi"), "icon-hidden"),
-                Act = () =>
-                {
-                    EnsureComp<KillSignComponent>(args.Target, out var comp);
-                    comp.HideFromOwner = true;
-                    Dirty(args.Target, comp);
-                },
-                Impact = LogImpact.Extreme,
-                Message = string.Join(": ", hiddenKillSignName, Loc.GetString("admin-smite-kill-sign-hidden-description"))
-            };
-            args.Verbs.Add(hiddenKillSign);
-
-            var cluwneName = Loc.GetString("admin-smite-cluwne-name").ToLowerInvariant();
-            Verb cluwne = new()
-            {
-                Text = cluwneName,
-                Category = VerbCategory.Smite,
-
-                Icon = new SpriteSpecifier.Rsi(new("/Textures/Clothing/Mask/cluwne.rsi"), "icon"),
-
-                Act = () =>
-                {
-                    EnsureComp<CluwneComponent>(args.Target);
-                },
-                Impact = LogImpact.Extreme,
-                Message = string.Join(": ", cluwneName, Loc.GetString("admin-smite-cluwne-description"))
-            };
-            args.Verbs.Add(cluwne);
-
-            var maidenName = Loc.GetString("admin-smite-maid-name").ToLowerInvariant();
-            Verb maiden = new()
-            {
-                Text = maidenName,
-                Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Rsi(new("/Textures/Clothing/Uniforms/Jumpskirts/Service/janimaid.rsi"), "icon"),
-                Act = () =>
-                {
-                    _outfit.SetOutfit(args.Target, "JanitorMaidGear", (_, clothing) =>
-                    {
-                        if (HasComp<ClothingComponent>(clothing))
-                            EnsureComp<UnremoveableComponent>(clothing);
-                        _statusEffects.TrySetStatusEffectDuration(args.Target, MaidStatus);
-                    });
-                },
-                Impact = LogImpact.Extreme,
-                Message = string.Join(": ", maidenName, Loc.GetString("admin-smite-maid-description"))
-            };
-            args.Verbs.Add(maiden);
-        }
-
-        var angerPointingArrowsName = Loc.GetString("admin-smite-anger-pointing-arrows-name").ToLowerInvariant();
-        Verb angerPointingArrows = new()
-        {
-            Text = angerPointingArrowsName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/pointing.rsi"), "pointing"),
-            Act = () =>
-            {
-                EnsureComp<PointingArrowAngeringComponent>(args.Target);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", angerPointingArrowsName, Loc.GetString("admin-smite-anger-pointing-arrows-description"))
-        };
-        args.Verbs.Add(angerPointingArrows);
-
-        var dustName = Loc.GetString("admin-smite-dust-name").ToLowerInvariant();
-        Verb dust = new()
-        {
-            Text = dustName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Materials/materials.rsi"), "ash"),
-            Act = () =>
-            {
-                QueueDel(args.Target);
-                Spawn("Ash", Transform(args.Target).Coordinates);
-                _popupSystem.PopupEntity(Loc.GetString("admin-smite-turned-ash-other", ("name", args.Target)), args.Target, PopupType.LargeCaution);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", dustName, Loc.GetString("admin-smite-dust-description"))
-        };
-        args.Verbs.Add(dust);
-
-        var youtubeVideoSimulationName = Loc.GetString("admin-smite-buffering-name").ToLowerInvariant();
-        Verb youtubeVideoSimulation = new()
-        {
-            Text = youtubeVideoSimulationName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/Misc/buffering_smite_icon.png")),
-            Act = () =>
-            {
-                EnsureComp<BufferingComponent>(args.Target);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", youtubeVideoSimulationName, Loc.GetString("admin-smite-buffering-description"))
-        };
-        args.Verbs.Add(youtubeVideoSimulation);
-
-        var instrumentationName = Loc.GetString("admin-smite-become-instrument-name").ToLowerInvariant();
-        Verb instrumentation = new()
-        {
-            Text = instrumentationName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Fun/Instruments/h_synthesizer.rsi"), "supersynth"),
-            Act = () =>
-            {
-                _polymorphSystem.PolymorphEntity(args.Target, "AdminInstrumentSmite");
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", instrumentationName, Loc.GetString("admin-smite-become-instrument-description"))
-        };
-        args.Verbs.Add(instrumentation);
-
-        var noGravityName = Loc.GetString("admin-smite-remove-gravity-name").ToLowerInvariant();
-        Verb noGravity = new()
-        {
-            Text = noGravityName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Structures/Machines/gravity_generator.rsi"), "off"),
-            Act = () =>
-            {
-                var grav = EnsureComp<MovementIgnoreGravityComponent>(args.Target);
-                grav.Weightless = true;
-
-                Dirty(args.Target, grav);
-
-                EnsureComp<GravityAffectedComponent>(args.Target, out var weightless);
-                weightless.Weightless = true;
-
-                Dirty(args.Target, weightless);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", noGravityName, Loc.GetString("admin-smite-remove-gravity-description"))
-        };
-        args.Verbs.Add(noGravity);
-
-        var reptilianName = Loc.GetString("admin-smite-reptilian-species-swap-name").ToLowerInvariant();
-        Verb reptilian = new()
-        {
-            Text = reptilianName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Fun/Plushies/lizard.rsi"), "icon"),
-            Act = () =>
-            {
-                _polymorphSystem.PolymorphEntity(args.Target, LizardSmite);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", reptilianName, Loc.GetString("admin-smite-reptilian-species-swap-description"))
-        };
-        args.Verbs.Add(reptilian);
-
-        var vulpName = Loc.GetString("admin-smite-vulpkanin-species-swap-name").ToLowerInvariant();
-        Verb vulp = new()
-        {
-            Text = vulpName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/Balls/tennisball.rsi"), "icon"),
-            Act = () =>
-            {
-                _polymorphSystem.PolymorphEntity(args.Target, VulpkaninSmite);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", vulpName, Loc.GetString("admin-smite-vulpkanin-species-swap-description"))
-        };
-        args.Verbs.Add(vulp);
-
-        var lockerName = Loc.GetString("admin-smite-locker-stuff-name").ToLowerInvariant();
-        Verb locker = new()
-        {
-            Text = lockerName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Structures/Storage/closet.rsi"), "generic"),
-            Act = () =>
-            {
-                var xform = Transform(args.Target);
-                var locker = Spawn("ClosetMaintenance", xform.Coordinates);
-                if (TryComp<EntityStorageComponent>(locker, out var storage))
-                {
-                    _entityStorageSystem.ToggleOpen(args.Target, locker, storage);
-                    _entityStorageSystem.Insert(args.Target, locker, storage);
-                    _entityStorageSystem.ToggleOpen(args.Target, locker, storage);
-                }
-                _weldableSystem.SetWeldedState(locker, true);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", lockerName, Loc.GetString("admin-smite-locker-stuff-description"))
-        };
-        args.Verbs.Add(locker);
-
-        var headstandName = Loc.GetString("admin-smite-headstand-name").ToLowerInvariant();
-        Verb headstand = new()
-        {
-            Text = headstandName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/refresh.svg.192dpi.png")),
-            Act = () =>
-            {
-                EnsureComp<HeadstandComponent>(args.Target);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", headstandName, Loc.GetString("admin-smite-headstand-description"))
-        };
-        args.Verbs.Add(headstand);
-
-        var zoomInName = Loc.GetString("admin-smite-zoom-in-name").ToLowerInvariant();
-        Verb zoomIn = new()
-        {
-            Text = zoomInName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/zoom.png")),
-            Act = () =>
-            {
-                var eye = EnsureComp<ContentEyeComponent>(args.Target);
-                _eyeSystem.SetZoom(args.Target, eye.TargetZoom * 0.2f, ignoreLimits: true);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", zoomInName, Loc.GetString("admin-smite-zoom-in-description"))
-        };
-        args.Verbs.Add(zoomIn);
-
-        var flipEyeName = Loc.GetString("admin-smite-flip-eye-name").ToLowerInvariant();
-        Verb flipEye = new()
-        {
-            Text = flipEyeName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/flip.png")),
-            Act = () =>
-            {
-                var eye = EnsureComp<ContentEyeComponent>(args.Target);
-                _eyeSystem.SetZoom(args.Target, eye.TargetZoom * -1, ignoreLimits: true);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", flipEyeName, Loc.GetString("admin-smite-flip-eye-description"))
-        };
-        args.Verbs.Add(flipEye);
-
-        var runWalkSwapName = Loc.GetString("admin-smite-run-walk-swap-name").ToLowerInvariant();
-        Verb runWalkSwap = new()
-        {
-            Text = runWalkSwapName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/run-walk-swap.png")),
-            Act = () =>
-            {
-                var movementSpeed = EnsureComp<MovementSpeedModifierComponent>(args.Target);
-                (movementSpeed.BaseSprintSpeed, movementSpeed.BaseWalkSpeed) = (movementSpeed.BaseWalkSpeed, movementSpeed.BaseSprintSpeed);
-
-                Dirty(args.Target, movementSpeed);
-
-                _popupSystem.PopupEntity(Loc.GetString("admin-smite-run-walk-swap-prompt"), args.Target,
-                    args.Target, PopupType.LargeCaution);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", runWalkSwapName, Loc.GetString("admin-smite-run-walk-swap-description"))
-        };
-        args.Verbs.Add(runWalkSwap);
-
-        var backwardsAccentName = Loc.GetString("admin-smite-speak-backwards-name").ToLowerInvariant();
-        Verb backwardsAccent = new()
-        {
-            Text = backwardsAccentName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/help-backwards.png")),
-            Act = () =>
-            {
-                EnsureComp<BackwardsAccentComponent>(args.Target);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", backwardsAccentName, Loc.GetString("admin-smite-speak-backwards-description"))
-        };
-        args.Verbs.Add(backwardsAccent);
-
-        var disarmProneName = Loc.GetString("admin-smite-disarm-prone-name").ToLowerInvariant();
-        Verb disarmProne = new()
-        {
-            Text = disarmProneName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/Actions/disarm.png")),
-            Act = () =>
-            {
-                EnsureComp<DisarmProneComponent>(args.Target);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", disarmProneName, Loc.GetString("admin-smite-disarm-prone-description"))
-        };
-        args.Verbs.Add(disarmProne);
-
-        var superSpeedName = Loc.GetString("admin-smite-super-speed-name").ToLowerInvariant();
-        Verb superSpeed = new()
-        {
-            Text = superSpeedName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/super_speed.png")),
-            Act = () =>
-            {
-                var movementSpeed = EnsureComp<MovementSpeedModifierComponent>(args.Target);
-                _movementSpeedModifierSystem?.ChangeBaseSpeed(args.Target, 400, 8000, 40, movementSpeed);
-
-                _popupSystem.PopupEntity(Loc.GetString("admin-smite-super-speed-prompt"), args.Target,
-                    args.Target, PopupType.LargeCaution);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", superSpeedName, Loc.GetString("admin-smite-super-speed-description"))
-        };
-        args.Verbs.Add(superSpeed);
-
-        //Bonk
-        var superBonkLiteName = Loc.GetString("admin-smite-super-bonk-lite-name").ToLowerInvariant();
-        Verb superBonkLite = new()
-        {
-            Text = superBonkLiteName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("Structures/Furniture/Tables/glass.rsi"), "full"),
-            Act = () =>
-            {
-                _superBonkSystem.StartSuperBonk(args.Target, stopWhenDead: true);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", superBonkLiteName, Loc.GetString("admin-smite-super-bonk-lite-description"))
-        };
-        args.Verbs.Add(superBonkLite);
-
-        var superBonkName = Loc.GetString("admin-smite-super-bonk-name").ToLowerInvariant();
-        Verb superBonk = new()
-        {
-            Text = superBonkName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("Structures/Furniture/Tables/generic.rsi"), "full"),
-            Act = () =>
-            {
-                _superBonkSystem.StartSuperBonk(args.Target);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", superBonkName, Loc.GetString("admin-smite-super-bonk-description"))
-        };
-        args.Verbs.Add(superBonk);
-
-        var superslipName = Loc.GetString("admin-smite-super-slip-name").ToLowerInvariant();
-        Verb superslip = new()
-        {
-            Text = superslipName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("Objects/Specific/Janitorial/soap.rsi"), "omega-4"),
-            Act = () =>
-            {
-                var hadSlipComponent = EnsureComp(args.Target, out SlipperyComponent slipComponent);
-                if (!hadSlipComponent)
-                {
-                    slipComponent.SlipData.SuperSlippery = true;
-                    slipComponent.SlipData.StunTime = TimeSpan.FromSeconds(5);
-                    slipComponent.SlipData.LaunchForwardsMultiplier = 20;
-                }
-
-                _slipperySystem.TrySlip(args.Target, slipComponent, args.Target, requiresContact: false);
-                if (!hadSlipComponent)
-                {
-                    RemComp(args.Target, slipComponent);
-                }
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", superslipName, Loc.GetString("admin-smite-super-slip-description"))
-        };
-        args.Verbs.Add(superslip);
-
-        var omniaccentName = Loc.GetString("admin-smite-omni-accent-name").ToLowerInvariant();
-        Verb omniaccent = new()
-        {
-            Text = omniaccentName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("Interface/Actions/voice-mask.rsi"), "icon"),
-            Act = () =>
-            {
-                EnsureComp<BarkAccentComponent>(args.Target);
-                EnsureComp<BleatingAccentComponent>(args.Target);
-                EnsureComp<FrenchAccentComponent>(args.Target);
-                EnsureComp<GermanAccentComponent>(args.Target);
-                EnsureComp<LizardAccentComponent>(args.Target);
-                EnsureComp<MobsterAccentComponent>(args.Target);
-                EnsureComp<MothAccentComponent>(args.Target);
-                EnsureComp<OwOAccentComponent>(args.Target);
-                EnsureComp<SkeletonAccentComponent>(args.Target);
-                EnsureComp<SouthernAccentComponent>(args.Target);
-                EnsureComp<SpanishAccentComponent>(args.Target);
-                EnsureComp<StutteringAccentComponent>(args.Target);
-
-                if (_random.Next(0, 8) == 0)
-                {
-                    EnsureComp<BackwardsAccentComponent>(args.Target); // was asked to make this at a low chance idk
-                }
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", omniaccentName, Loc.GetString("admin-smite-omni-accent-description"))
-        };
-        args.Verbs.Add(omniaccent);
-
-        var crawlerName = Loc.GetString("admin-smite-crawler-name").ToLowerInvariant();
-        Verb crawler = new()
-        {
-            Text = crawlerName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("Mobs/Animals/snake.rsi"), "icon"),
-            Act = () =>
-            {
-                EnsureComp<WormComponent>(args.Target);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", crawlerName, Loc.GetString("admin-smite-crawler-description"))
-        };
-        args.Verbs.Add(crawler);
-
-        var siliconName = Loc.GetString("admin-smite-silicon-laws-bound-name").ToLowerInvariant();
-        Verb silicon = new()
-        {
-            Text = siliconName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("Interface/Actions/actions_borg.rsi"), "state-laws"),
-            Act = () =>
-            {
-                var userInterfaceComp = EnsureComp<UserInterfaceComponent>(args.Target);
-                _uiSystem.SetUi((args.Target, userInterfaceComp), SiliconLawsUiKey.Key, new InterfaceData(SiliconLawBoundUserInterface));
-
-                if (!HasComp<SiliconLawBoundComponent>(args.Target))
-                {
-                    EnsureComp<SiliconLawBoundComponent>(args.Target);
-                    _actions.AddAction(args.Target, _actionViewLawsProtoId);
-                }
-
-                EnsureComp<SiliconLawProviderComponent>(args.Target);
-                _siliconLawSystem.SetLaws(_siliconLawSystem.GetLawset(_crewsimovLawset).Laws, args.Target);
-
-                if (_mindSystem.TryGetMind(args.Target, out var mindId, out _))
-                    _role.MindAddRole(mindId, _siliconMindRole);
-
-                _popupSystem.PopupEntity(Loc.GetString("admin-smite-silicon-laws-bound-self"), args.Target,
-                    args.Target, PopupType.LargeCaution);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", siliconName, Loc.GetString("admin-smite-silicon-laws-bound-description"))
-        };
-        args.Verbs.Add(silicon);
-
-        var homingRodName = Loc.GetString("admin-smite-homing-rod-name").ToLowerInvariant();
-        Verb homingRod = new()
-        {
-            Text = homingRodName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("Objects/Specific/Security/target.rsi"), "target_s"),
-            Act = () =>
-            {
-                var speed = 25f; // It don't miss brother.
-                var distance = 350f;
-                HomingLaunchSequence(args.Target, "ImmovableRodKeepTiles", distance, speed); // todo: swap the proto for an EntityTable GetSpawns once rod rule rework
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", homingRodName, Loc.GetString("admin-smite-homing-rod-description"))
-        };
-        args.Verbs.Add(homingRod);
-
-        var homingRodSlowName = Loc.GetString("admin-smite-homing-rod-slow-name").ToLowerInvariant();
-        Verb homingRodSlow = new()
-        {
-            Text = homingRodSlowName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("Objects/Specific/Security/target.rsi"), "target_c"),
-            Act = () =>
-            {
-                var speed = 5f; // slightly faster than default sprint speed 4.5
-                if (TryComp<MovementSpeedModifierComponent>(args.Target, out var movement))
-                    speed = movement.CurrentSprintSpeed + 0.001f;// run
-                var distance = 200f; // its kinda slow so were just gonna cheat a bit.
-                HomingLaunchSequence(args.Target, "ImmovableRodKeepTiles", distance, speed);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", homingRodSlowName, Loc.GetString("admin-smite-homing-rod-slow-description"))
-        };
-        args.Verbs.Add(homingRodSlow);
-
-        var makeStinkyName = Loc.GetString("admin-smite-make-stinky-name").ToLowerInvariant();
-        Verb makeStinky = new()
-        {
-            Text = makeStinkyName,
-            Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new("Clothing/Mask/gas.rsi"), "icon"),
-            Act = () =>
-            {
-                var gasMiner = EnsureComp<GasMinerComponent>(args.Target);
-                gasMiner.SpawnGas = Gas.Ammonia;
-                gasMiner.SpawnAmount = 20;
-                gasMiner.ShowExamineText = false;
-
-                // Atmos device is not networked, no dirty.
-                var atmosDevice = EnsureComp<AtmosDeviceComponent>(args.Target);
-                atmosDevice.RequireAnchored = false;
-
-                _atmosDevice.JoinAtmosphere((args.Target, atmosDevice));
-                Dirty(args.Target, gasMiner);
-            },
-            Impact = LogImpact.Extreme,
-            Message = string.Join(": ", makeStinkyName, Loc.GetString("admin-smite-make-stinky-description"))
-        };
-        args.Verbs.Add(makeStinky);
-    }
-
-    public void HomingLaunchSequence(EntityUid target, EntProtoId proto, float distance, float speed)
-    {
-        // ToDo: Reuse some spawning code from whereever the rod rule ends up.
-        // I would do it now but theres a massive rod rewrite, and I don't wanna poke it for this.
-        // find reasonable spawn location (use gamerule and find rod?) but respect map not on grid etc etc
-
-        var random = new RobustRandom() as IRobustRandom;
-        random.SetSeed(target.Id);
-        var offset = random.NextAngle().RotateVec(new Vector2(distance, 0));
-        var spawnCoords = _transformSystem.GetMapCoordinates(target).Offset(offset);
-        var rod = Spawn(proto, spawnCoords);
-        // Here we abuse the ChasingWalkComp by making it skip targetting logic and dialling its frequency up
-        EnsureComp<ChasingWalkComponent>(rod, out var chasingComp);
-        chasingComp.NextChangeVectorTime = TimeSpan.MaxValue; // we just want it to never change
-        chasingComp.ChasingEntity = target;
-        chasingComp.ImpulseInterval = .1f; // skrrt skrrrrrrt skrrrt
-        chasingComp.RotateWithImpulse = true;
-        chasingComp.MaxSpeed = speed;
-        chasingComp.Speed = speed; // tell me lies, tell me sweet little lies.
-
-        if (TryComp<TimedDespawnComponent>(rod, out var despawn))
-            despawn.Lifetime = offset.Length() / speed * 3; // exists thrice as long as it takes to get to you.
-    }
-}
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index da4b442382..fa51f5b87c 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -16,6 +16,7 @@ using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Construction.Components;
 using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.Doors.Components;
 using Content.Shared.Hands.Components;
@@ -32,6 +33,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
@@ -42,12 +44,15 @@ public sealed partial class AdminVerbSystem
 {
     [Dependency] private DoorSystem _door = default!;
     [Dependency] private AirlockSystem _airlockSystem = default!;
+    [Dependency] private SharedGodmodeSystem _sharedGodmodeSystem = default!;
     [Dependency] private StackSystem _stackSystem = default!;
     [Dependency] private SharedAccessSystem _accessSystem = default!;
     [Dependency] private HandsSystem _handsSystem = default!;
+    [Dependency] private InventorySystem _inventorySystem = default!;
+    [Dependency] private SharedPhysicsSystem _physics = default!;
     [Dependency] private QuickDialogSystem _quickDialog = default!;
     [Dependency] private AdminTestArenaSystem _adminTestArenaSystem = default!;
-    [Dependency] private StationJobsSystem _stationJobsSystem = default!;
+    [Dependency] private ServerStationJobsSystem _stationJobsSystem = default!;
     [Dependency] private JointSystem _jointSystem = default!;
     [Dependency] private SharedBatterySystem _batterySystem = default!;
     [Dependency] private MetaDataSystem _metaSystem = default!;
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs
index e2f0f152f1..ed8e15f9ee 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs
@@ -7,7 +7,6 @@ using Content.Server.Ghost.Roles;
 using Content.Server.Mind;
 using Content.Server.Prayer;
 using Content.Server.Silicons.Laws;
-using Content.Server.Station.Systems;
 using Content.Shared.Administration;
 using Content.Shared.Administration.Systems;
 using Content.Shared.Chemistry.Components.SolutionManager;
@@ -31,12 +30,11 @@ using Robust.Shared.Console;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
-using Robust.Shared.Timing;
 using Robust.Shared.Toolshed;
 using Robust.Shared.Utility;
 using System.Linq;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Mind;
+using Content.Shared.Station.Systems;
 using static Content.Shared.Configurable.ConfigurationComponent;
 
 namespace Content.Server.Administration.Systems
@@ -50,7 +48,6 @@ namespace Content.Server.Administration.Systems
         [Dependency] private IConsoleHost _console = default!;
         [Dependency] private IAdminLogManager _adminLogs = default!;
         [Dependency] private IAdminManager _adminManager = default!;
-        [Dependency] private IGameTiming _gameTiming = default!;
         [Dependency] private SharedMapSystem _map = default!;
         [Dependency] private AdminSystem _adminSystem = default!;
         [Dependency] private DisposalTubeSystem _disposalTubes = default!;
@@ -69,6 +66,7 @@ namespace Content.Server.Administration.Systems
         [Dependency] private IPlayerManager _playerManager = default!;
         [Dependency] private SiliconLawSystem _siliconLawSystem = default!;
         [Dependency] private AfkConfirmSystem _afkConfirm = default!;
+        [Dependency] private SharedTransformSystem _transformSystem = default!;
 
         private readonly Dictionary<ICommonSession, List<EditSolutionsEui>> _openSolutionUis = new();
 
@@ -86,7 +84,7 @@ namespace Content.Server.Administration.Systems
         {
             AddAdminVerbs(ev);
             AddDebugVerbs(ev);
-            AddSmiteVerbs(ev);
+            AddPrototypeVerbs(ev);
             AddTricksVerbs(ev);
             AddAntagVerbs(ev);
         }
diff --git a/Content.Server/Administration/Systems/BufferingSystem.cs b/Content.Server/Administration/Systems/BufferingSystem.cs
index b840823f27..180a7eca04 100644
--- a/Content.Server/Administration/Systems/BufferingSystem.cs
+++ b/Content.Server/Administration/Systems/BufferingSystem.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Shared.Administration;
 using Content.Shared.Administration.Components;
 using Content.Shared.Administration.Systems;
diff --git a/Content.Server/Administration/Systems/BwoinkSystem.cs b/Content.Server/Administration/Systems/BwoinkSystem.cs
index d3b5bb3ac7..96ae928f75 100644
--- a/Content.Server/Administration/Systems/BwoinkSystem.cs
+++ b/Content.Server/Administration/Systems/BwoinkSystem.cs
@@ -40,7 +40,7 @@ namespace Content.Server.Administration.Systems
         [Dependency] private IConfigurationManager _config = default!;
         [Dependency] private IGameTiming _timing = default!;
         [Dependency] private IPlayerLocator _playerLocator = default!;
-        [Dependency] private GameTicker _gameTicker = default!;
+        [Dependency] private ServerGameTicker _gameTicker = default!;
         [Dependency] private SharedMindSystem _minds = default!;
         [Dependency] private IAfkManager _afkManager = default!;
         [Dependency] private IServerDbManager _dbManager = default!;
diff --git a/Content.Server/Administration/Systems/SuperBonkSystem.cs b/Content.Server/Administration/Systems/SuperBonkSystem.cs
index a8deeaaae2..1daf55d65b 100644
--- a/Content.Server/Administration/Systems/SuperBonkSystem.cs
+++ b/Content.Server/Administration/Systems/SuperBonkSystem.cs
@@ -2,8 +2,7 @@ using Content.Server.Administration.Components;
 using Content.Shared.Climbing.Components;
 using Content.Shared.Climbing.Systems;
 using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using JetBrains.Annotations;
+using Content.Shared.Mobs.Systems;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Administration.Systems;
@@ -12,16 +11,34 @@ public sealed partial class SuperBonkSystem : EntitySystem
 {
     [Dependency] private SharedTransformSystem _transformSystem = default!;
     [Dependency] private ClimbSystem _climbSystem = default!;
+    [Dependency] private MobStateSystem _mobState = default!;
     [Dependency] private IGameTiming _timing = default!;
 
     [Dependency] private EntityQuery<TransformComponent> _transformQuery;
 
     [SubscribeLocalEvent]
-    private void OnInit(Entity<SuperBonkComponent> ent, ref ComponentInit args)
+    private void OnStartup(Entity<SuperBonkComponent> ent, ref ComponentStartup args)
     {
-        var (_, component) = ent;
+        var (uid, component) = ent;
+
+        if (component.StopWhenDead && _mobState.IsDead(uid))
+        {
+            RemCompDeferred<SuperBonkComponent>(uid);
+            return;
+        }
 
         component.NextBonk = _timing.CurTime + component.BonkCooldown;
+
+        var tables = EntityQueryEnumerator<BonkableComponent>();
+        var bonks = new List<EntityUid>();
+        while (tables.MoveNext(out var table, out _))
+        {
+            bonks.Add(table);
+        }
+
+        component.Tables = bonks.GetEnumerator();
+        if (!component.Tables.MoveNext())
+            RemCompDeferred<SuperBonkComponent>(uid);
     }
 
     [SubscribeLocalEvent]
@@ -53,32 +70,6 @@ public sealed partial class SuperBonkSystem : EntitySystem
         }
     }
 
-    /// <summary>
-    /// Begin a grand journey to bonk every table.
-    /// </summary>
-    [PublicAPI]
-    public void StartSuperBonk(EntityUid target, bool stopWhenDead = false)
-    {
-        //The other check in the code to stop when the target dies does not work if the target is already dead.
-        if (stopWhenDead && TryComp<MobStateComponent>(target, out var mobState) && mobState.CurrentState == MobState.Dead)
-            return;
-
-        if (EnsureComp<SuperBonkComponent>(target, out var component))
-            return;
-
-        var tables = EntityQueryEnumerator<BonkableComponent>();
-        var bonks = new List<EntityUid>();
-        // This is done so we don't crash if something like a new table is spawned.
-        while (tables.MoveNext(out var uid, out var comp))
-        {
-            bonks.Add(uid);
-        }
-
-        component.Tables = bonks.GetEnumerator();
-        component.Tables.MoveNext(); // Move off the current selection (which is nothing)
-        component.StopWhenDead = stopWhenDead;
-    }
-
     private bool TryBonk(EntityUid uid, EntityUid tableUid)
     {
         // It would be very weird for something without a transform component to have a bonk component
diff --git a/Content.Server/Administration/Toolshed/AdminsCommand.cs b/Content.Server/Administration/Toolshed/AdminsCommand.cs
index 4dfab6373d..740b022ab4 100644
--- a/Content.Server/Administration/Toolshed/AdminsCommand.cs
+++ b/Content.Server/Administration/Toolshed/AdminsCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration.Managers;
+using Content.Server.Administration.Managers;
 using Content.Shared.Administration;
 using Robust.Shared.Player;
 using Robust.Shared.Toolshed;
diff --git a/Content.Server/Administration/Toolshed/MarkedCommand.cs b/Content.Server/Administration/Toolshed/MarkedCommand.cs
index c2b9ecf79a..1227233a23 100644
--- a/Content.Server/Administration/Toolshed/MarkedCommand.cs
+++ b/Content.Server/Administration/Toolshed/MarkedCommand.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using Robust.Shared.Toolshed;
 
 namespace Content.Server.Administration.Toolshed;
diff --git a/Content.Server/Administration/Toolshed/RejuvenateCommand.cs b/Content.Server/Administration/Toolshed/RejuvenateCommand.cs
index b503e9cb96..9ac9079bc4 100644
--- a/Content.Server/Administration/Toolshed/RejuvenateCommand.cs
+++ b/Content.Server/Administration/Toolshed/RejuvenateCommand.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using Content.Shared.Administration.Systems;
 using Robust.Shared.Toolshed;
 using Robust.Shared.Toolshed.Errors;
diff --git a/Content.Server/Administration/Toolshed/SolutionCommand.cs b/Content.Server/Administration/Toolshed/SolutionCommand.cs
index 079deb62c5..60fe9a553d 100644
--- a/Content.Server/Administration/Toolshed/SolutionCommand.cs
+++ b/Content.Server/Administration/Toolshed/SolutionCommand.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
diff --git a/Content.Server/Administration/UI/PermissionsEui.cs b/Content.Server/Administration/UI/PermissionsEui.cs
index 028662902d..82ce538a8d 100644
--- a/Content.Server/Administration/UI/PermissionsEui.cs
+++ b/Content.Server/Administration/UI/PermissionsEui.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Administration.Managers;
 using Content.Server.Database;
diff --git a/Content.Server/Afk/AfkManager.cs b/Content.Server/Afk/AfkManager.cs
index 54bc4d7fd5..c30b61f62f 100644
--- a/Content.Server/Afk/AfkManager.cs
+++ b/Content.Server/Afk/AfkManager.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration.Managers;
+using Content.Server.Administration.Managers;
 using Content.Shared.CCVar;
 using JetBrains.Annotations;
 using Robust.Server.Player;
diff --git a/Content.Server/Afk/AfkSystem.cs b/Content.Server/Afk/AfkSystem.cs
index 36e61f07ab..28ee238fc3 100644
--- a/Content.Server/Afk/AfkSystem.cs
+++ b/Content.Server/Afk/AfkSystem.cs
@@ -2,6 +2,7 @@ using Content.Server.Administration.Managers;
 using Content.Server.GameTicking;
 using Content.Shared.Afk.Events;
 using Content.Shared.CCVar;
+using Content.Shared.GameTicking;
 using Content.Shared.Instruments;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
@@ -21,7 +22,7 @@ public sealed partial class AfkSystem : EntitySystem
     [Dependency] private IAfkManager _afkManager = default!;
     [Dependency] private IPlayerManager _playerManager = default!;
     [Dependency] private IGameTiming _timing = default!;
-    [Dependency] private GameTicker _ticker = default!;
+    [Dependency] private ServerGameTicker _ticker = default!;
     [Dependency] private IConfigurationManager _cfg = default!;
 
     /// <summary>
diff --git a/Content.Server/Afk/IsAfkCommand.cs b/Content.Server/Afk/IsAfkCommand.cs
index a6968ec210..2359e9fdf8 100644
--- a/Content.Server/Afk/IsAfkCommand.cs
+++ b/Content.Server/Afk/IsAfkCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
diff --git a/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs b/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs
index bc524c565f..39dc7b0667 100644
--- a/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs
+++ b/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs
@@ -7,7 +7,7 @@ namespace Content.Server.AlertLevel;
 
 public sealed partial class AlertLevelDisplaySystem : EntitySystem
 {
-    [Dependency] private StationSystem _stationSystem = default!;
+    [Dependency] private ServerStationSystem _stationSystem = default!;
     [Dependency] private SharedAppearanceSystem _appearance = default!;
 
     public override void Initialize()
diff --git a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
index f781b7a7da..6807c34d58 100644
--- a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
+++ b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
@@ -1,7 +1,8 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.AlertLevel;
 using Content.Shared.Station;
+using Content.Shared.Station.Systems;
 using Robust.Shared.Console;
 using Robust.Shared.Prototypes;
 
@@ -11,7 +12,7 @@ namespace Content.Server.AlertLevel.Commands;
 public sealed partial class SetAlertLevelCommand : LocalizedEntityCommands
 {
     [Dependency] private AlertLevelSystem _alertLevelSystem = default!;
-    [Dependency] private SharedStationSystem _stationSystem = default!;
+    [Dependency] private StationSystem _stationSystem = default!;
     [Dependency] private IPrototypeManager _prototype = default!;
 
     public override string Command => "setalertlevel";
diff --git a/Content.Server/Anomaly/AnomalySystem.Commands.cs b/Content.Server/Anomaly/AnomalySystem.Commands.cs
index 177f4c7b4a..4e9d8863d6 100644
--- a/Content.Server/Anomaly/AnomalySystem.Commands.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Commands.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.Anomaly.Components;
 using Robust.Shared.Console;
diff --git a/Content.Server/Anomaly/AnomalySystem.Vessel.cs b/Content.Server/Anomaly/AnomalySystem.Vessel.cs
index 0900f3e96f..5a9917d22e 100644
--- a/Content.Server/Anomaly/AnomalySystem.Vessel.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Vessel.cs
@@ -1,4 +1,4 @@
-using Content.Server.Anomaly.Components;
+using Content.Server.Anomaly.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Anomaly;
 using Content.Shared.Anomaly.Components;
diff --git a/Content.Server/Anomaly/AnomalySystem.cs b/Content.Server/Anomaly/AnomalySystem.cs
index e1514bfeaf..2693aa108b 100644
--- a/Content.Server/Anomaly/AnomalySystem.cs
+++ b/Content.Server/Anomaly/AnomalySystem.cs
@@ -5,12 +5,12 @@ using Content.Server.Explosion.EntitySystems;
 using Content.Server.Materials;
 using Content.Server.Radiation.Systems;
 using Content.Server.Radio.EntitySystems;
-using Content.Server.Station.Systems;
 using Content.Shared.Anomaly;
 using Content.Shared.Anomaly.Components;
 using Content.Shared.Anomaly.Prototypes;
 using Content.Shared.Random;
 using Content.Shared.Random.Helpers;
+using Content.Shared.Station.Systems;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
diff --git a/Content.Server/Anomaly/Components/AnomalyVesselComponent.cs b/Content.Server/Anomaly/Components/AnomalyVesselComponent.cs
index 1225cbf116..47c1d57f0c 100644
--- a/Content.Server/Anomaly/Components/AnomalyVesselComponent.cs
+++ b/Content.Server/Anomaly/Components/AnomalyVesselComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Anomaly;
+using Content.Shared.Anomaly;
 using Robust.Shared.Audio;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
diff --git a/Content.Server/Anomaly/Components/BluespaceAnomalyComponent.cs b/Content.Server/Anomaly/Components/BluespaceAnomalyComponent.cs
index 6c6692cfff..ede774eaef 100644
--- a/Content.Server/Anomaly/Components/BluespaceAnomalyComponent.cs
+++ b/Content.Server/Anomaly/Components/BluespaceAnomalyComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Anomaly.Effects;
+using Content.Server.Anomaly.Effects;
 using Robust.Shared.Audio;
 
 namespace Content.Server.Anomaly.Components;
diff --git a/Content.Server/Anomaly/Components/GeneratingAnomalyGeneratorComponent.cs b/Content.Server/Anomaly/Components/GeneratingAnomalyGeneratorComponent.cs
index ef93e8c699..b22bebeaea 100644
--- a/Content.Server/Anomaly/Components/GeneratingAnomalyGeneratorComponent.cs
+++ b/Content.Server/Anomaly/Components/GeneratingAnomalyGeneratorComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Anomaly;
+using Content.Shared.Anomaly;
 using Robust.Shared.Audio;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
diff --git a/Content.Server/Anomaly/Components/TechAnomalyComponent.cs b/Content.Server/Anomaly/Components/TechAnomalyComponent.cs
index c15fa4fcf4..0600fd3963 100644
--- a/Content.Server/Anomaly/Components/TechAnomalyComponent.cs
+++ b/Content.Server/Anomaly/Components/TechAnomalyComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Anomaly.Effects;
+using Content.Server.Anomaly.Effects;
 using Content.Shared.Destructible.Thresholds;
 using Content.Shared.DeviceLinking;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/Anomaly/Effects/TechAnomalySystem.cs b/Content.Server/Anomaly/Effects/TechAnomalySystem.cs
index 512879c0db..d7eb940c9e 100644
--- a/Content.Server/Anomaly/Effects/TechAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/TechAnomalySystem.cs
@@ -128,6 +128,6 @@ public sealed partial class TechAnomalySystem : EntitySystem
 
     private void OnPulse(Entity<TechAnomalyComponent> tech, ref AnomalyPulseEvent args)
     {
-        _signal.InvokePort(tech, tech.Comp.PulsePort);
+        _signal.InvokePort(tech.Owner, tech.Comp.PulsePort);
     }
 }
diff --git a/Content.Server/Antag/AntagMultipleRoleSpawnerSystem.cs b/Content.Server/Antag/AntagMultipleRoleSpawnerSystem.cs
index 485c5d46ad..ad5eba21c9 100644
--- a/Content.Server/Antag/AntagMultipleRoleSpawnerSystem.cs
+++ b/Content.Server/Antag/AntagMultipleRoleSpawnerSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Antag.Components;
+using Content.Shared.Antag;
 using Robust.Shared.Random;
 
 namespace Content.Server.Antag;
diff --git a/Content.Server/Antag/AntagObjectivesSystem.cs b/Content.Server/Antag/AntagObjectivesSystem.cs
index 6fffe18926..560b90f08d 100644
--- a/Content.Server/Antag/AntagObjectivesSystem.cs
+++ b/Content.Server/Antag/AntagObjectivesSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Antag.Components;
-using Content.Server.Objectives;
+using Content.Shared.Antag;
 using Content.Shared.Mind;
-using Content.Shared.Objectives.Systems;
 
 namespace Content.Server.Antag;
 
diff --git a/Content.Server/Antag/AntagRandomObjectivesSystem.cs b/Content.Server/Antag/AntagRandomObjectivesSystem.cs
index 3be62e20c9..8832f3d227 100644
--- a/Content.Server/Antag/AntagRandomObjectivesSystem.cs
+++ b/Content.Server/Antag/AntagRandomObjectivesSystem.cs
@@ -1,8 +1,8 @@
 using Content.Server.Antag.Components;
 using Content.Server.Objectives;
+using Content.Shared.Antag;
 using Content.Shared.Mind;
 using Content.Shared.Objectives.Components;
-using Content.Shared.Objectives.Systems;
 using Robust.Shared.Random;
 
 namespace Content.Server.Antag;
diff --git a/Content.Server/Antag/AntagRandomSpawnRule.cs b/Content.Server/Antag/AntagRandomSpawnRule.cs
index 696c224287..7f2dc4c0ef 100644
--- a/Content.Server/Antag/AntagRandomSpawnRule.cs
+++ b/Content.Server/Antag/AntagRandomSpawnRule.cs
@@ -1,11 +1,14 @@
 using Content.Server.Antag.Components;
+using Content.Server.Station.Systems;
+using Content.Shared.Antag;
 using Content.Shared.GameTicking.Components;
-using Content.Server.GameTicking.Rules;
+using Content.Shared.GameTicking.Rules;
 
 namespace Content.Server.Antag;
 
 public sealed partial class AntagRandomSpawnSystem : GameRuleSystem<AntagRandomSpawnComponent>
 {
+    [Dependency] private ServerStationSystem _station = default!;
     [Dependency] private SharedTransformSystem _transform = default!;
 
     public override void Initialize()
@@ -15,15 +18,15 @@ public sealed partial class AntagRandomSpawnSystem : GameRuleSystem<AntagRandomS
         SubscribeLocalEvent<AntagRandomSpawnComponent, AntagSelectLocationEvent>(OnSelectLocation);
     }
 
-    protected override void Added(EntityUid uid, AntagRandomSpawnComponent comp, GameRuleComponent gameRule, GameRuleAddedEvent args)
+    protected override void Added(Entity<AntagRandomSpawnComponent, GameRuleComponent> rule, ref GameRuleAddedEvent args)
     {
-        base.Added(uid, comp, gameRule, args);
+        base.Added(rule, ref args);
 
         // we have to select this here because AntagSelectLocationEvent is raised twice because MakeAntag is called twice
         // once when a ghost role spawner is created and once when someone takes the ghost role
 
-        if (TryFindRandomTile(out _, out _, out _, out var coords))
-            comp.Coords = coords;
+        if (_station.TryFindRandomTile(out _, out _, out _, out var coords))
+            rule.Comp1.Coords = coords;
     }
 
     private void OnSelectLocation(Entity<AntagRandomSpawnComponent> ent, ref AntagSelectLocationEvent args)
diff --git a/Content.Server/Antag/AntagSpawnerSystem.cs b/Content.Server/Antag/AntagSpawnerSystem.cs
index 9bbe784265..6f2089e7dd 100644
--- a/Content.Server/Antag/AntagSpawnerSystem.cs
+++ b/Content.Server/Antag/AntagSpawnerSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Antag.Components;
+using Content.Shared.Antag;
 
 namespace Content.Server.Antag;
 
diff --git a/Content.Server/Antag/Components/AntagImmuneComponent.cs b/Content.Server/Antag/Components/AntagImmuneComponent.cs
index beec7960f0..4de6c93286 100644
--- a/Content.Server/Antag/Components/AntagImmuneComponent.cs
+++ b/Content.Server/Antag/Components/AntagImmuneComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Antag.Components;
+namespace Content.Server.Antag.Components;
 
 [RegisterComponent]
 public sealed partial class AntagImmuneComponent : Component
diff --git a/Content.Server/Antag/Components/AntagMultipleRoleSpawnerComponent.cs b/Content.Server/Antag/Components/AntagMultipleRoleSpawnerComponent.cs
index f375dd6dc3..84415f4d8f 100644
--- a/Content.Server/Antag/Components/AntagMultipleRoleSpawnerComponent.cs
+++ b/Content.Server/Antag/Components/AntagMultipleRoleSpawnerComponent.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Antag;
-using Content.Shared.Roles;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Antag.Components;
diff --git a/Content.Server/Antag/Components/AntagRandomSpawnComponent.cs b/Content.Server/Antag/Components/AntagRandomSpawnComponent.cs
index b73d5cdb68..c3df203e7d 100644
--- a/Content.Server/Antag/Components/AntagRandomSpawnComponent.cs
+++ b/Content.Server/Antag/Components/AntagRandomSpawnComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Antag.Components;
 using Robust.Shared.Map;
 
 namespace Content.Server.Antag.Components;
diff --git a/Content.Server/Antag/MobReplacementRuleSystem.cs b/Content.Server/Antag/MobReplacementRuleSystem.cs
index aaaf83868a..3f66d1e0f2 100644
--- a/Content.Server/Antag/MobReplacementRuleSystem.cs
+++ b/Content.Server/Antag/MobReplacementRuleSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Antag.Mimic;
 using Content.Server.GameTicking.Rules;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules;
 using Content.Shared.VendingMachines.Components;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
diff --git a/Content.Server/Antag/ServerAntagSelectionSystem.cs b/Content.Server/Antag/ServerAntagSelectionSystem.cs
new file mode 100644
index 0000000000..dddb3dc9e9
--- /dev/null
+++ b/Content.Server/Antag/ServerAntagSelectionSystem.cs
@@ -0,0 +1,167 @@
+using System.Diagnostics;
+using System.Linq;
+using Content.Server.Administration.Managers;
+using Content.Server.Chat.Managers;
+using Content.Server.GameTicking.Events;
+using Content.Server.GameTicking.Rules.Components;
+using Content.Server.Ghost.Roles;
+using Content.Server.Ghost.Roles.Components;
+using Content.Server.Objectives;
+using Content.Server.Players.PlayTimeTracking;
+using Content.Server.Preferences.Managers;
+using Content.Shared.Antag;
+using Content.Shared.Antag.Components;
+using Content.Shared.Chat;
+using Content.Shared.Roles;
+using Robust.Shared.Audio;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Antag;
+
+/// <inheritdoc/>
+public sealed partial class ServerAntagSelectionSystem : AntagSelectionSystem
+{
+    [Dependency] private IBanManager _ban = default!;
+    [Dependency] private IChatManager _chat = default!;
+    [Dependency] private IServerPreferencesManager _pref = default!;
+    [Dependency] private GhostRoleSystem _ghostRole = default!;
+    [Dependency] private PlayTimeTrackingSystem _playTime = default!;
+
+    [SubscribeLocalEvent]
+    private void OnTakeGhostRole(Entity<GhostRoleAntagSpawnerComponent> ent, ref TakeGhostRoleEvent args)
+    {
+        if (args.TookRole)
+            return;
+
+        if (ent.Comp.Rule is not { } rule || ent.Comp.Definition is not { } proto)
+            return;
+
+        if (!ProtoMan.Resolve(proto, out var def))
+            return;
+
+        if (!Exists(rule) || !RuleQuery.TryComp(rule, out var select))
+            return;
+
+        // Ensure the player is allowed to play this antagonist!
+        if (IsAntagBanned(args.Player, def) || !_playTime.IsAllowed(args.Player, def.PrefRoles))
+            return;
+
+        if (!TrySpawnAntagonist((rule, select), def, args.Player, XForm.GetMapCoordinates(ent), out var uid))
+        {
+            Log.Error($"Tried to make {args.Player.UserId} into an antagonist but was unable to spawn an entity for them. Game rule {ToPrettyString(ent)}");
+            return;
+        }
+
+        // We do this after TrySpawnAntagonist so we don't have to worry about a failed spawn adding permanent pre selections to a game rule.
+        PreSelectSession((rule, select), def, args.Player);
+        InitializeAntag((rule, select), def, uid.Value, args.Player);
+        args.TookRole = true;
+
+        // Move ghosts that were watching the raffle on the spawner over to the freshly spawned antag.
+        Follower.TransferFollowers(ent.Owner, uid.Value);
+
+        _ghostRole.UnregisterGhostRole((ent, Comp<GhostRoleComponent>(ent)));
+    }
+
+    [SubscribeLocalEvent]
+    private void OnObjectivesTextGetInfo(Entity<AntagSelectionComponent> ent, ref ObjectivesTextGetInfoEvent args)
+    {
+        if (ent.Comp.AgentName is not { } name)
+            return;
+
+        args.Minds = GetAntagIdentities(ent.AsNullable()).ToList();
+        args.AgentName = Loc.GetString(name);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnJobNotAssigned(NoJobsAvailableSpawningEvent args)
+    {
+        // If someone fails to spawn in due to there being no jobs, they should be removed from any preselected antags.
+        // We only care about delayed rules, since if they're active the player should have already been removed via MakeAntag.
+        var query = QueryDelayedRules();
+        while (query.MoveNext(out var uid, out var comp, out _, out _))
+        {
+            if (comp.SelectionTime == AntagSelectionTime.RuleStarted)
+                continue;
+
+            Debug.Assert(comp.SelectionTime != AntagSelectionTime.Never, $"Player: {args.Player.Name}, was pre selected for an game rule {ToPrettyString(uid)} which does not do pre-selections");
+
+            if (!comp.RemoveUponFailedSpawn)
+                continue;
+
+            foreach (var antag in comp.Antags)
+            {
+                if (!comp.PreSelectedSessions.TryGetValue(antag, out var session))
+                    break;
+                session.Remove(args.Player);
+            }
+        }
+    }
+
+    public override IEnumerable<ProtoId<AntagPrototype>> GetValidAntagPreferences(ICommonSession session, List<ProtoId<AntagPrototype>>? filter = null)
+    {
+        if (!_pref.TryGetCachedPreferences(session.UserId, out var prefs))
+            yield break;
+
+        foreach (var antag in prefs.SelectedCharacter.AntagPreferences)
+        {
+            // We also check this in IsSessionValid, but we also check it here since this is public API.
+            if (_ban.IsRoleBanned(session, antag) || !_playTime.IsAllowed(session, antag))
+                continue;
+
+            if (filter != null && !filter.Contains(antag))
+                continue;
+
+            yield return antag;
+        }
+    }
+
+    public override void SendBriefing(ICommonSession? session, string briefing, Color? briefingColor, SoundSpecifier? briefingSound)
+    {
+        if (session == null)
+            return;
+
+        Audio.PlayGlobal(briefingSound, session);
+        if (!string.IsNullOrEmpty(briefing))
+        {
+            var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", briefing));
+            _chat.ChatMessageToOne(ChatChannel.Server, briefing, wrappedMessage, default, false, session.Channel, briefingColor);
+        }
+    }
+
+    public override bool IsAntagBanned(ICommonSession session, AntagSpecifierPrototype definition)
+    {
+        if (_ban.GetAntagBans(session.UserId) is not { } bans)
+            return false;
+
+        foreach (var role in definition.PrefRoles)
+        {
+            // banned!
+            if (bans.Contains(role))
+                return true;
+        }
+
+        return false;
+    }
+
+    protected override Entity<AntagSelectionComponent>? ForceGetGameRuleEnt<T>(string id)
+    {
+        var query = EntityQueryEnumerator<T, AntagSelectionComponent>();
+        while (query.MoveNext(out var uid, out _, out var comp))
+        {
+            if (MetaData(uid).EntityPrototype?.ID == id)
+                return (uid, comp);
+        }
+
+        // Game Rule is invalid. You *really* fucked up.
+        if (GameTicker.AddGameRule(id) is not { } ruleEnt)
+            return null;
+
+        RemComp<LoadMapRuleComponent>(ruleEnt);
+        var antag = RuleQuery.Comp(ruleEnt);
+        antag.AssignmentHandled = true; // don't do normal selection.
+        GameTicker.StartGameRule(ruleEnt.AsNullable());
+        return (ruleEnt, antag);
+    }
+}
diff --git a/Content.Server/Atmos/Commands/ListGasesCommand.cs b/Content.Server/Atmos/Commands/ListGasesCommand.cs
index f794f33011..33429e7b70 100644
--- a/Content.Server/Atmos/Commands/ListGasesCommand.cs
+++ b/Content.Server/Atmos/Commands/ListGasesCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
diff --git a/Content.Server/Atmos/Components/AirFilterComponent.cs b/Content.Server/Atmos/Components/AirFilterComponent.cs
index 6b65a646f2..4e26ef1f52 100644
--- a/Content.Server/Atmos/Components/AirFilterComponent.cs
+++ b/Content.Server/Atmos/Components/AirFilterComponent.cs
@@ -1,5 +1,5 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Atmos;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Atmos;
 
 namespace Content.Server.Atmos.Components;
 
diff --git a/Content.Server/Atmos/Components/AirIntakeComponent.cs b/Content.Server/Atmos/Components/AirIntakeComponent.cs
index dafaed93a5..453153ba87 100644
--- a/Content.Server/Atmos/Components/AirIntakeComponent.cs
+++ b/Content.Server/Atmos/Components/AirIntakeComponent.cs
@@ -1,5 +1,5 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Atmos;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Atmos;
 
 namespace Content.Server.Atmos.Components;
 
diff --git a/Content.Server/Atmos/Components/AtmosExposedComponent.cs b/Content.Server/Atmos/Components/AtmosExposedComponent.cs
index 0f40e998ea..ee4c8d93d3 100644
--- a/Content.Server/Atmos/Components/AtmosExposedComponent.cs
+++ b/Content.Server/Atmos/Components/AtmosExposedComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Temperature.Components;
+using Content.Shared.Temperature.Components;
 
 namespace Content.Server.Atmos.Components;
 
diff --git a/Content.Server/Atmos/Components/GasMixtureHolderComponent.cs b/Content.Server/Atmos/Components/GasMixtureHolderComponent.cs
index 98feb43346..1b25ab771d 100644
--- a/Content.Server/Atmos/Components/GasMixtureHolderComponent.cs
+++ b/Content.Server/Atmos/Components/GasMixtureHolderComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos;
+using Content.Shared.Atmos;
 
 namespace Content.Server.Atmos.Components
 {
diff --git a/Content.Server/Atmos/Components/PressureProtectionComponent.cs b/Content.Server/Atmos/Components/PressureProtectionComponent.cs
index e1f13bca79..839bfd3e15 100644
--- a/Content.Server/Atmos/Components/PressureProtectionComponent.cs
+++ b/Content.Server/Atmos/Components/PressureProtectionComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.EntitySystems;
 
 namespace Content.Server.Atmos.Components;
 
diff --git a/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs b/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs
index bebc50dd68..a8cf63cb5a 100644
--- a/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs
+++ b/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs
@@ -253,8 +253,8 @@ public sealed partial class AtmosAlertsComputerSystem : SharedAtmosAlertsCompute
             // Create entry
             var netEnt = GetNetEntity(ent);
 
-            var entry = new AtmosAlertsComputerEntry
-                (netEnt,
+            var entry = new AtmosAlertsComputerEntry(
+                netEnt,
                 GetNetCoordinates(entXform.Coordinates),
                 entDevice.Group,
                 alarmState,
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index 1ef881eec5..546642e65a 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -18,10 +18,10 @@ using Content.Shared.Projectiles;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Temperature;
 using Content.Shared.Throwing;
-using Content.Shared.Timing;
 using Content.Shared.Toggleable;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.FixedPoint;
+using Content.Shared.Timing.Systems;
 using JetBrains.Annotations;
 using Robust.Server.Audio;
 using Robust.Shared.Physics.Components;
@@ -176,7 +176,7 @@ namespace Content.Server.Atmos.EntitySystems
 
             args.Handled = true;
 
-            if (!TryComp(uid, out UseDelayComponent? useDelay) || !_useDelay.TryResetDelay((uid, useDelay), true))
+            if (!_useDelay.TryResetDelay(uid, true))
                 return;
 
             _audio.PlayPvs(component.ExtinguishAttemptSound, uid);
diff --git a/Content.Server/Atmos/GasMixtureStringRepresentation.cs b/Content.Server/Atmos/GasMixtureStringRepresentation.cs
index de87e6e295..50c526e27c 100644
--- a/Content.Server/Atmos/GasMixtureStringRepresentation.cs
+++ b/Content.Server/Atmos/GasMixtureStringRepresentation.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 
 namespace Content.Server.Atmos;
 
diff --git a/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs b/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs
index 8c02218a95..8b6a1a427b 100644
--- a/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs
+++ b/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs
@@ -20,7 +20,7 @@ public sealed partial class AirAlarmComponent : Component
     public readonly HashSet<string> KnownDevices = new();
     public readonly Dictionary<string, GasVentPumpData> VentData = new();
     public readonly Dictionary<string, GasVentScrubberData> ScrubberData = new();
-    public readonly Dictionary<string, AtmosSensorData> SensorData = new();
+    public readonly Dictionary<string, AtmosMonitorData> SensorData = new();
 
     public bool CanSync = true;
 
diff --git a/Content.Server/Atmos/Monitor/Payloads/AirAlarmPayloads.cs b/Content.Server/Atmos/Monitor/Payloads/AirAlarmPayloads.cs
new file mode 100644
index 0000000000..963c3af009
--- /dev/null
+++ b/Content.Server/Atmos/Monitor/Payloads/AirAlarmPayloads.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Atmos.Monitor;
+using Content.Shared.Atmos.Monitor.Components;
+using Content.Shared.DeviceNetwork;
+
+namespace Content.Server.Atmos.Monitor.Payloads;
+
+/// <summary>
+/// A network payload sent to an air alarm to set its mode.
+/// </summary>
+public partial record struct AirAlarmSetModePayload : INetworkPayload
+{
+    [DataField]
+    public AirAlarmMode Mode;
+}
+
+/// <summary>
+/// A network payload sent from an atmos device to an air alarm to update its UI.
+/// </summary>
+public partial record struct AirAlarmSetDataPayload : INetworkPayload
+{
+    [DataField]
+    public IAtmosDeviceData Payload;
+}
diff --git a/Content.Server/Atmos/Monitor/Payloads/AtmosAlarmablePayloads.cs b/Content.Server/Atmos/Monitor/Payloads/AtmosAlarmablePayloads.cs
new file mode 100644
index 0000000000..9a9e1d8726
--- /dev/null
+++ b/Content.Server/Atmos/Monitor/Payloads/AtmosAlarmablePayloads.cs
@@ -0,0 +1,48 @@
+using Content.Shared.Atmos.Monitor;
+using Content.Shared.DeviceNetwork;
+using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Atmos.Monitor.Payloads;
+
+[ImplicitDataDefinitionForInheritors]
+public partial interface IAtmosAlarmableSourcePayload : INetworkPayload
+{
+    HashSet<ProtoId<TagPrototype>> Source { get; set; }
+}
+
+/// <summary>
+/// Broadcasts an atmos alarm.
+/// </summary>
+public partial record struct AtmosAlarmPayload : IAtmosAlarmableSourcePayload
+{
+    [DataField]
+    public AtmosAlarmType Type;
+
+    [DataField]
+    public AtmosMonitorThresholdTypeFlags? TrippedThresholds;
+
+    [DataField]
+    public HashSet<ProtoId<TagPrototype>> Source { get; set; } = new();
+}
+
+/// <summary>
+/// Synchronizes the data of an atmos alarmable to all other alarmable devices.
+/// </summary>
+public partial record struct AtmosAlarmableSyncAlertsPayload : IAtmosAlarmableSourcePayload
+{
+    [DataField]
+    public Dictionary<string, AtmosAlarmType> AlarmStates = new();
+
+    [DataField]
+    public HashSet<ProtoId<TagPrototype>> Source { get; set; } = new();
+}
+
+/// <summary>
+/// Resets the state of an atmos alarmable to Normal.
+/// </summary>
+public partial record struct AtmosAlarmableResetAllPayload : IAtmosAlarmableSourcePayload
+{
+    [DataField]
+    public HashSet<ProtoId<TagPrototype>> Source { get; set; } = new();
+}
diff --git a/Content.Server/Atmos/Monitor/Payloads/AtmosMonitorPayloads.cs b/Content.Server/Atmos/Monitor/Payloads/AtmosMonitorPayloads.cs
new file mode 100644
index 0000000000..804873932d
--- /dev/null
+++ b/Content.Server/Atmos/Monitor/Payloads/AtmosMonitorPayloads.cs
@@ -0,0 +1,46 @@
+using Content.Server.Atmos.Monitor.Components;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Monitor;
+using Content.Shared.DeviceNetwork;
+
+namespace Content.Server.Atmos.Monitor.Payloads;
+
+/// <summary>
+/// Used for synchronizing the sender device and adding its address to all listeners.
+/// </summary>
+public partial record struct AtmosMonitorRegisterDevicePayload : INetworkPayload;
+
+/// <summary>
+/// Removes the sender device from all listeners of this payload.
+/// </summary>
+public partial record struct AtmosMonitorDeregisterDevicePayload : INetworkPayload;
+
+/// <summary>
+/// Sets specific threshold on the target atmos device.
+/// </summary>
+public partial record struct AtmosMonitorSetThresholdPayload : INetworkPayload
+{
+    [DataField]
+    public AtmosMonitorThresholdType Type;
+
+    [DataField]
+    public AtmosAlarmThreshold Threshold;
+
+    [DataField]
+    public Gas? Gas;
+}
+
+/// <summary>
+/// Sets thresholds on all connected devices.
+/// </summary>
+public partial record struct AtmosMonitorSetAllThresholdsPayload : INetworkPayload
+{
+    [DataField]
+    public AtmosMonitorData Data;
+}
+
+/// <summary>
+/// Sets the alarm state of a <see cref="AtmosMonitorComponent"/> to Normal
+/// and broadcasts it to all listening <see cref="AtmosAlarmableComponent"/>.
+/// </summary>
+public partial record struct AtmosMonitorResetPayload : INetworkPayload;
diff --git a/Content.Server/Atmos/Monitor/Payloads/AtmosSyncPayload.cs b/Content.Server/Atmos/Monitor/Payloads/AtmosSyncPayload.cs
new file mode 100644
index 0000000000..d6cd2d3e16
--- /dev/null
+++ b/Content.Server/Atmos/Monitor/Payloads/AtmosSyncPayload.cs
@@ -0,0 +1,8 @@
+using Content.Shared.DeviceNetwork;
+
+namespace Content.Server.Atmos.Monitor.Payloads;
+
+/// <summary>
+/// A general payload that when sent to an atmos device forces it to respond with its data payload.
+/// </summary>
+public partial record struct AtmosSyncPayload : INetworkPayload;
diff --git a/Content.Server/Atmos/Monitor/Systems/AirAlarmModes.cs b/Content.Server/Atmos/Monitor/Systems/AirAlarmModes.cs
index fd702c209a..f192b04113 100644
--- a/Content.Server/Atmos/Monitor/Systems/AirAlarmModes.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AirAlarmModes.cs
@@ -1,7 +1,6 @@
 using Content.Server.Atmos.Monitor.Components;
 using Content.Server.Atmos.Monitor.Systems;
 using Content.Server.DeviceNetwork.Systems;
-using Content.Shared.Atmos;
 using Content.Shared.Atmos.Monitor.Components;
 using Content.Shared.Atmos.Piping.Unary.Components;
 
diff --git a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
index 830f6a6262..4a259c6031 100644
--- a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
@@ -12,28 +12,22 @@ using Content.Shared.Atmos.Monitor.Components;
 using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.Database;
 using Content.Shared.DeviceLinking;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Systems;
 using Content.Shared.Interaction;
 using Content.Shared.Power;
 using Content.Shared.Wires;
 using Robust.Server.GameObjects;
 using System.Linq;
+using Content.Server.Atmos.Monitor.Payloads;
 using Content.Shared.Atmos.Components;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.DeviceNetwork.Components;
+using Content.Shared.UserInterface;
 
 namespace Content.Server.Atmos.Monitor.Systems;
 
 // AirAlarm system - specific for atmos devices, rather than
 // atmos monitors.
-//
-// oh boy, message passing!
-//
-// Commands should always be sent into packet's Command
-// data key. In response, a packet will be transmitted
-// with the response type as its command, and the
-// response data in its data key.
 public sealed partial class AirAlarmSystem : EntitySystem
 {
     [Dependency] private AccessReaderSystem _access = default!;
@@ -45,26 +39,31 @@ public sealed partial class AirAlarmSystem : EntitySystem
     [Dependency] private DeviceListSystem _deviceList = default!;
     [Dependency] private PopupSystem _popup = default!;
     [Dependency] private UserInterfaceSystem _ui = default!;
+
     [Dependency] private EntityQuery<DeviceNetworkComponent> _deviceNetworkQuery = default!;
 
     #region Device Network API
 
-    /// <summary>
-    ///     Command to set an air alarm's mode.
-    /// </summary>
-    public const string AirAlarmSetMode = "air_alarm_set_mode";
-
     // -- API --
 
-    /// <summary>
-    ///     Set the data for an air alarm managed device.
-    /// </summary>
-    /// <param name="address">The address of the device.</param>
-    /// <param name="data">The data to send to the device.</param>
-    public void SetData(EntityUid uid, string address, IAtmosDeviceData data)
+    public void SetData(EntityUid uid, string address, GasVentPumpData payload)
     {
-        _atmosDevNet.SetDeviceState(uid, address, data);
-        _atmosDevNet.Sync(uid, address);
+        var sendPayload = new GasVentPumpSetDataPayload { Data = payload };
+        _deviceNet.SendPacket(uid, address, ref sendPayload);
+        SetDeviceDataInternal(uid, address, payload);
+    }
+
+    public void SetData(EntityUid uid, string address, GasVentScrubberData payload)
+    {
+        var sendPayload = new GasVentScrubberSetDataPayload { Data = payload };
+        _deviceNet.SendPacket(uid, address, ref sendPayload);
+        SetDeviceDataInternal(uid, address, payload);
+    }
+
+    private void SetDeviceDataInternal(EntityUid uid, string address, IAtmosDeviceData payload)
+    {
+        var setPayload = new AirAlarmSetDataPayload { Payload = payload };
+        _deviceNet.SendPacket(uid, address, ref setPayload);
     }
 
     /// <summary>
@@ -116,32 +115,26 @@ public sealed partial class AirAlarmSystem : EntitySystem
     private void SetThreshold(EntityUid uid, string address, AtmosMonitorThresholdType type,
         AtmosAlarmThreshold threshold, Gas? gas = null)
     {
-        var payload = new NetworkPayload
+        var payload = new AtmosMonitorSetThresholdPayload
         {
-            [DeviceNetworkConstants.Command] = AtmosMonitorSystem.AtmosMonitorSetThresholdCmd,
-            [AtmosMonitorSystem.AtmosMonitorThresholdDataType] = type,
-            [AtmosMonitorSystem.AtmosMonitorThresholdData] = threshold,
+            Type = type,
+            Threshold = threshold,
+            Gas = gas,
         };
 
-        if (gas != null)
-        {
-            payload.Add(AtmosMonitorSystem.AtmosMonitorThresholdGasType, gas);
-        }
-
-        _deviceNet.QueuePacket(uid, address, payload);
+        _deviceNet.SendPacket(uid, address, ref payload);
 
         SyncDevice(uid, address);
     }
 
-    private void SetAllThresholds(EntityUid uid, string address, AtmosSensorData data)
+    private void SetAllThresholds(EntityUid uid, string address, AtmosMonitorData dataPayload)
     {
-        var payload = new NetworkPayload
+        var payload = new AtmosMonitorSetAllThresholdsPayload
         {
-            [DeviceNetworkConstants.Command] = AtmosMonitorSystem.AtmosMonitorSetAllThresholdsCmd,
-            [AtmosMonitorSystem.AtmosMonitorAllThresholdData] = data
+            Data = dataPayload
         };
 
-        _deviceNet.QueuePacket(uid, address, payload);
+        _deviceNet.SendPacket(uid, address, ref payload);
 
         SyncDevice(uid, address);
     }
@@ -155,13 +148,12 @@ public sealed partial class AirAlarmSystem : EntitySystem
         if (TryComp<AtmosMonitorComponent>(uid, out var monitor) && !monitor.NetEnabled)
             return;
 
-        var payload = new NetworkPayload
+        var payload = new AirAlarmSetModePayload
         {
-            [DeviceNetworkConstants.Command] = AirAlarmSetMode,
-            [AirAlarmSetMode] = mode
+            Mode = mode,
         };
 
-        _deviceNet.QueuePacket(uid, null, payload);
+        _deviceNet.SendPacket(uid, null, ref payload);
     }
 
     #endregion
@@ -170,7 +162,7 @@ public sealed partial class AirAlarmSystem : EntitySystem
 
     public override void Initialize()
     {
-        SubscribeLocalEvent<AirAlarmComponent, DeviceNetworkPacketEvent>(OnPacketRecv);
+        base.Initialize();
         SubscribeLocalEvent<AirAlarmComponent, AtmosDeviceUpdateEvent>(OnAtmosUpdate);
         SubscribeLocalEvent<AirAlarmComponent, AtmosAlarmEvent>(OnAtmosAlarm);
         SubscribeLocalEvent<AirAlarmComponent, PowerChangedEvent>(OnPowerChanged);
@@ -178,7 +170,7 @@ public sealed partial class AirAlarmSystem : EntitySystem
         SubscribeLocalEvent<AirAlarmComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<AirAlarmComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<AirAlarmComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<AirAlarmComponent, ActivateInWorldEvent>(OnActivate);
+        SubscribeLocalEvent<AirAlarmComponent, AfterActivatableUIOpenEvent>(OnActivate);
 
         Subs.BuiEvents<AirAlarmComponent>(SharedAirAlarmInterfaceKey.Key, subs =>
         {
@@ -252,21 +244,8 @@ public sealed partial class AirAlarmSystem : EntitySystem
         _activeUserInterfaces.Remove(uid);
     }
 
-    private void OnActivate(EntityUid uid, AirAlarmComponent component, ActivateInWorldEvent args)
+    private void OnActivate(EntityUid uid, AirAlarmComponent component, AfterActivatableUIOpenEvent args)
     {
-        if (!args.Complex)
-            return;
-
-        if (TryComp<WiresPanelComponent>(uid, out var panel) && panel.Open)
-        {
-            args.Handled = false;
-            return;
-        }
-
-        if (!this.IsPowered(uid, EntityManager))
-            return;
-
-        _ui.OpenUi(uid, SharedAirAlarmInterfaceKey.Key, args.User);
         AddActiveInterface(uid);
         SyncAllDevices(uid);
         UpdateUI(uid, component);
@@ -360,7 +339,7 @@ public sealed partial class AirAlarmSystem : EntitySystem
                 foreach (string addr in component.VentData.Keys)
                 {
                     _adminLogger.Add(LogType.AtmosDeviceSetting, LogImpact.Medium, $"{ToPrettyString(args.Actor)} copied settings to vent {addr}");
-                    SetData(uid, addr, args.Data);
+                    SetData(uid, addr, ventData);
                 }
                 break;
 
@@ -368,11 +347,11 @@ public sealed partial class AirAlarmSystem : EntitySystem
                 foreach (string addr in component.ScrubberData.Keys)
                 {
                     _adminLogger.Add(LogType.AtmosDeviceSetting, LogImpact.Medium, $"{ToPrettyString(args.Actor)} copied settings to scrubber {addr}");
-                    SetData(uid, addr, args.Data);
+                    SetData(uid, addr, scrubberData);
                 }
                 break;
 
-            case AtmosSensorData sensorData:
+            case AtmosMonitorData sensorData:
                 foreach (string addr in component.SensorData.Keys)
                 {
                     SetAllThresholds(uid, addr, sensorData);
@@ -430,14 +409,12 @@ public sealed partial class AirAlarmSystem : EntitySystem
 
         if (component.State != args.AlarmType)
         {
-            TryComp<DeviceLinkSourceComponent>(uid, out var source);
-
             // send low to old state's port
-            _deviceLink.SendSignal(uid, GetPort(component), false, source);
+            _deviceLink.SendSignal(uid, GetPort(component), false);
 
             // send high to new state's port, along with updating the cached state
             component.State = args.AlarmType;
-            _deviceLink.SendSignal(uid, GetPort(component), true, source);
+            _deviceLink.SendSignal(uid, GetPort(component), true);
         }
 
         UpdateUI(uid, component);
@@ -517,7 +494,7 @@ public sealed partial class AirAlarmSystem : EntitySystem
     }
 
     /// <summary>
-    ///     Sets device data. Practically a wrapper around the packet sending function, SetData.
+    ///     Sets device data.
     /// </summary>
     /// <param name="address">The address to send the new data to.</param>
     /// <param name="devData">The device data to be sent.</param>
@@ -529,52 +506,44 @@ public sealed partial class AirAlarmSystem : EntitySystem
         }
 
         devData.Dirty = true;
-        SetData(uid, address, devData);
+
+        devData.RaisePayload(uid, address, _deviceNet);
+        SetDeviceDataInternal(uid, address, devData);
     }
 
-    private void OnPacketRecv(EntityUid uid, AirAlarmComponent controller, DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnSetData(Entity<AirAlarmComponent> ent, ref DeviceNetworkPacketEvent<AirAlarmSetDataPayload> args)
     {
-        if (!args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? cmd))
+        var (uid, controller) = ent;
+        if (!controller.CanSync)
             return;
 
-        switch (cmd)
+        // Save into component.
+        // Sync data to interface.
+        switch (args.Data.Payload)
         {
-            case AtmosDeviceNetworkSystem.SyncData:
-                if (!args.Data.TryGetValue(AtmosDeviceNetworkSystem.SyncData, out IAtmosDeviceData? data)
-                    || !controller.CanSync)
-                    break;
-
-                // Save into component.
-                // Sync data to interface.
-                switch (data)
-                {
-                    case GasVentPumpData ventData:
-                        if (!controller.VentData.TryAdd(args.SenderAddress, ventData))
-                            controller.VentData[args.SenderAddress] = ventData;
-                        break;
-                    case GasVentScrubberData scrubberData:
-                        if (!controller.ScrubberData.TryAdd(args.SenderAddress, scrubberData))
-                            controller.ScrubberData[args.SenderAddress] = scrubberData;
-                        break;
-                    case AtmosSensorData sensorData:
-                        if (!controller.SensorData.TryAdd(args.SenderAddress, sensorData))
-                            controller.SensorData[args.SenderAddress] = sensorData;
-                        break;
-                }
-
-                controller.KnownDevices.Add(args.SenderAddress);
-
-                UpdateUI(uid, controller);
-
-                return;
-            case AirAlarmSetMode:
-                if (!args.Data.TryGetValue(AirAlarmSetMode, out AirAlarmMode alarmMode))
-                    break;
-
-                SetMode(uid, args.SenderAddress, alarmMode, uiOnly: false);
-
-                return;
+            case GasVentPumpData ventData:
+                if (!controller.VentData.TryAdd(args.SenderAddress, ventData))
+                    controller.VentData[args.SenderAddress] = ventData;
+                break;
+            case GasVentScrubberData scrubberData:
+                if (!controller.ScrubberData.TryAdd(args.SenderAddress, scrubberData))
+                    controller.ScrubberData[args.SenderAddress] = scrubberData;
+                break;
+            case AtmosMonitorData sensorData:
+                if (!controller.SensorData.TryAdd(args.SenderAddress, sensorData))
+                    controller.SensorData[args.SenderAddress] = sensorData;
+                break;
         }
+
+        controller.KnownDevices.Add(args.SenderAddress);
+        UpdateUI(uid, controller);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnSetMode(Entity<AirAlarmComponent> ent, ref DeviceNetworkPacketEvent<AirAlarmSetModePayload> args)
+    {
+        SetMode(ent, args.SenderAddress, args.Data.Mode, uiOnly: false);
     }
 
     #endregion
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
index f5dfe1486d..5ffd226153 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
@@ -1,16 +1,15 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Atmos.Monitor.Components;
+using Content.Server.Atmos.Monitor.Payloads;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Shared.Atmos.Monitor;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.Power;
 using Content.Shared.Tag;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
 using Content.Shared.DeviceNetwork.Components;
 
 namespace Content.Server.Atmos.Monitor.Systems;
@@ -22,30 +21,10 @@ public sealed partial class AtmosAlarmableSystem : EntitySystem
     [Dependency] private DeviceNetworkSystem _deviceNet = default!;
     [Dependency] private AtmosDeviceNetworkSystem _atmosDevNetSystem = default!;
 
-    /// <summary>
-    ///     An alarm. Has three valid states: Normal, Warning, Danger.
-    ///     Will attempt to fetch the tags from the alarming entity
-    ///     to send over.
-    /// </summary>
-    public const string AlertCmd = "atmos_alarm";
-
-    public const string AlertSource = "atmos_alarm_source";
-
-    public const string AlertTypes = "atmos_alarm_types";
-
-    /// <summary>
-    ///     Syncs alerts from this alarm receiver to other alarm receivers.
-    ///     Creates a network effect as a result. Note: if the alert receiver
-    ///     is not aware of the device beforehand, it will not sync.
-    /// </summary>
-    public const string SyncAlerts = "atmos_alarmable_sync_alerts";
-
-    public const string ResetAll = "atmos_alarmable_reset_all";
-
     public override void Initialize()
     {
+        base.Initialize();
         SubscribeLocalEvent<AtmosAlarmableComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<AtmosAlarmableComponent, DeviceNetworkPacketEvent>(OnPacketRecv);
         SubscribeLocalEvent<AtmosAlarmableComponent, PowerChangedEvent>(OnPowerChange);
     }
 
@@ -78,92 +57,73 @@ public sealed partial class AtmosAlarmableSystem : EntitySystem
         }
     }
 
-    private void OnPacketRecv(EntityUid uid, AtmosAlarmableComponent component, DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnAlarmPayload(Entity<AtmosAlarmableComponent> ent, ref DeviceNetworkPacketEvent<AtmosAlarmPayload> args)
     {
-        if (component.IgnoreAlarms) return;
-
-        if (!TryComp(uid, out DeviceNetworkComponent? netConn))
+        var payload = args.Data;
+        if (!CheckTags(ent, payload))
             return;
 
-        if (!args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? cmd)
-            || !args.Data.TryGetValue(AlertSource, out HashSet<ProtoId<TagPrototype>>? sourceTags))
+        var (uid, component) = ent;
+
+        var isValid = payload.TrippedThresholds == null
+                      || component.MonitorAlertTypes == AtmosMonitorThresholdTypeFlags.None
+                      || (payload.TrippedThresholds & component.MonitorAlertTypes) != 0;
+
+        if (!component.NetworkAlarmStates.ContainsKey(args.SenderAddress))
         {
+            if (!isValid)
+                return;
+
+            component.NetworkAlarmStates.Add(args.SenderAddress, payload.Type);
+        }
+        else
+        {
+            // This is because if the alert is no longer valid,
+            // it may mean that the threshold we need to look at has
+            // been removed from the threshold types passed:
+            // basically, we need to reset this state to normal here.
+            component.NetworkAlarmStates[args.SenderAddress] = isValid ? payload.Type : AtmosAlarmType.Normal;
+        }
+
+        if (!TryGetHighestAlert(uid, out var netMax, component))
+        {
+            netMax = AtmosAlarmType.Normal;
+        }
+
+        TryUpdateAlert(uid, netMax.Value, component);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnResetAllPayload(Entity<AtmosAlarmableComponent> ent, ref DeviceNetworkPacketEvent<AtmosAlarmableResetAllPayload> args)
+    {
+        if (!CheckTags(ent, args.Data))
             return;
-        }
 
-        var isValid = sourceTags.Any(source => component.SyncWithTags.Contains(source));
+        Reset(ent.Owner, ent.Comp);
+    }
 
-        if (!isValid)
-        {
+    [SubscribeLocalEvent]
+    private void OnSyncAlertsPayload(Entity<AtmosAlarmableComponent> ent, ref DeviceNetworkPacketEvent<AtmosAlarmableSyncAlertsPayload> args)
+    {
+        if (!CheckTags(ent, args.Data))
             return;
-        }
 
-        switch (cmd)
+        foreach (var (key, alarm) in args.Data.AlarmStates)
         {
-            case AlertCmd:
-                // Set the alert state, and then cache it so we can calculate
-                // the maximum alarm state at all times.
-                if (!args.Data.TryGetValue(DeviceNetworkConstants.CmdSetState, out AtmosAlarmType state))
-                {
-                    break;
-                }
-
-                if (args.Data.TryGetValue(AlertTypes, out AtmosMonitorThresholdTypeFlags types) && component.MonitorAlertTypes != AtmosMonitorThresholdTypeFlags.None)
-                {
-                    isValid = (types & component.MonitorAlertTypes) != 0;
-                }
-
-                if (!component.NetworkAlarmStates.ContainsKey(args.SenderAddress))
-                {
-                    if (!isValid)
-                    {
-                        break;
-                    }
-
-                    component.NetworkAlarmStates.Add(args.SenderAddress, state);
-                }
-                else
-                {
-                    // This is because if the alert is no longer valid,
-                    // it may mean that the threshold we need to look at has
-                    // been removed from the threshold types passed:
-                    // basically, we need to reset this state to normal here.
-                    component.NetworkAlarmStates[args.SenderAddress] = isValid ? state : AtmosAlarmType.Normal;
-                }
-
-                if (!TryGetHighestAlert(uid, out var netMax, component))
-                {
-                    netMax = AtmosAlarmType.Normal;
-                }
-
-                TryUpdateAlert(uid, netMax.Value, component);
-
-                break;
-            case ResetAll:
-                Reset(uid, component);
-                break;
-            case SyncAlerts:
-                if (!args.Data.TryGetValue(SyncAlerts,
-                        out IReadOnlyDictionary<string, AtmosAlarmType>? alarms))
-                {
-                    break;
-                }
-
-                foreach (var (key, alarm) in alarms)
-                {
-                    if (!component.NetworkAlarmStates.TryAdd(key, alarm))
-                    {
-                        component.NetworkAlarmStates[key] = alarm;
-                    }
-                }
-
-                if (TryGetHighestAlert(uid, out var maxAlert, component))
-                {
-                    TryUpdateAlert(uid, maxAlert.Value, component);
-                }
-
-                break;
+            ent.Comp.NetworkAlarmStates.TryAdd(key, alarm);
+            ent.Comp.NetworkAlarmStates[key] = alarm;
         }
+
+        if (TryGetHighestAlert(ent, out var maxAlert, ent.Comp))
+        {
+            TryUpdateAlert(ent, maxAlert.Value, ent.Comp);
+        }
+    }
+
+    private static bool CheckTags<T>(Entity<AtmosAlarmableComponent> ent, T payload) where T : IAtmosAlarmableSourcePayload
+    {
+        return !ent.Comp.IgnoreAlarms && payload.Source.Any(source => ent.Comp.SyncWithTags.Contains(source));
     }
 
     private void TryUpdateAlert(EntityUid uid, AtmosAlarmType type, AtmosAlarmableComponent alarmable, bool sync = true)
@@ -191,14 +151,13 @@ public sealed partial class AtmosAlarmableSystem : EntitySystem
             return;
         }
 
-        var payload = new NetworkPayload
+        var payload = new AtmosAlarmableSyncAlertsPayload
         {
-            [DeviceNetworkConstants.Command] = SyncAlerts,
-            [SyncAlerts] = alarmable.NetworkAlarmStates,
-            [AlertSource] = tags.Tags
+            AlarmStates = alarmable.NetworkAlarmStates,
+            Source = tags.Tags,
         };
 
-        _deviceNet.QueuePacket(uid, address, payload);
+        _deviceNet.SendPacket(uid, address, ref payload);
     }
 
     /// <summary>
@@ -228,41 +187,36 @@ public sealed partial class AtmosAlarmableSystem : EntitySystem
             alarmable.NetworkAlarmStates[devNet.Address] = alarmType;
         }
 
-        var payload = new NetworkPayload
+        var payload = new AtmosAlarmPayload
         {
-            [DeviceNetworkConstants.Command] = AlertCmd,
-            [DeviceNetworkConstants.CmdSetState] = alarmType,
-            [AlertSource] = tags.Tags
+            Type = alarmType,
+            Source = tags.Tags,
         };
 
-        _deviceNet.QueuePacket(uid, null, payload);
+        _deviceNet.SendPacket(uid, null, ref payload);
     }
 
     /// <summary>
     ///     Resets the state of this alarmable to normal.
     /// </summary>
-    /// <param name="uid"></param>
-    /// <param name="alarmable"></param>
-    public void Reset(EntityUid uid, AtmosAlarmableComponent? alarmable = null, TagComponent? tags = null)
+    public void Reset(EntityUid uid, AtmosAlarmableComponent? alarmable = null, TagComponent? tags = null, DeviceNetworkComponent? device = null)
     {
-        if (!Resolve(uid, ref alarmable, ref tags, false) || alarmable.LastAlarmState == AtmosAlarmType.Normal)
+        if (!Resolve(uid, ref alarmable, ref tags, ref device, false) || alarmable.LastAlarmState == AtmosAlarmType.Normal)
         {
             return;
         }
 
-        alarmable.NetworkAlarmStates.Clear();
-        TryUpdateAlert(uid, AtmosAlarmType.Normal, alarmable);
+        if (alarmable.NetworkAlarmStates.ContainsKey(device.Address))
+            alarmable.NetworkAlarmStates[device.Address] = AtmosAlarmType.Normal;
 
         if (!alarmable.ReceiveOnly)
         {
-            var payload = new NetworkPayload
-            {
-                [DeviceNetworkConstants.Command] = ResetAll,
-                [AlertSource] = tags.Tags
-            };
-
-            _deviceNet.QueuePacket(uid, null, payload);
+            var payload = new AtmosMonitorResetPayload();
+            _deviceNet.SendPacket(uid, null, ref payload);
         }
+
+        TryUpdateAlert(uid, AtmosAlarmType.Normal, alarmable);
+        alarmable.NetworkAlarmStates.Clear();
     }
 
     public void ResetAllOnNetwork(EntityUid uid, AtmosAlarmableComponent? alarmable = null)
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosDeviceNetwork.cs b/Content.Server/Atmos/Monitor/Systems/AtmosDeviceNetwork.cs
index 55978b2303..30154d8233 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosDeviceNetwork.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosDeviceNetwork.cs
@@ -1,6 +1,10 @@
+using Content.Server.Atmos.Monitor.Payloads;
 using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Systems;
+using Content.Shared.Atmos.Monitor;
 using Content.Shared.Atmos.Monitor.Components;
+using Content.Shared.Atmos.Piping.Binary.Components;
+using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.DeviceNetwork;
 
 namespace Content.Server.Atmos.Monitor.Systems;
@@ -11,61 +15,23 @@ namespace Content.Server.Atmos.Monitor.Systems;
 /// </summary>
 public sealed partial class AtmosDeviceNetworkSystem : EntitySystem
 {
-    /// <summary>
-    ///     Register a device's address on this device.
-    /// </summary>
-    public const string RegisterDevice = "atmos_register_device";
-
-    /// <summary>
-    ///     Deregister a device's address on this device.
-    /// </summary>
-    public const string DeregisterDevice = "atmos_deregister_device";
-
-    /// <summary>
-    ///     Synchronize the data this device has with the sender.
-    /// </summary>
-    public const string SyncData = "atmos_sync_data";
-
     [Dependency] private DeviceNetworkSystem _deviceNet = default!;
 
     public void Register(EntityUid uid, string? address)
     {
-        var registerPayload = new NetworkPayload
-        {
-            [DeviceNetworkConstants.Command] = RegisterDevice
-        };
-
-        _deviceNet.QueuePacket(uid, address, registerPayload);
+        var registerPayload = new AtmosMonitorRegisterDevicePayload();
+        _deviceNet.SendPacket(uid, address, ref registerPayload);
     }
 
     public void Deregister(EntityUid uid, string? address)
     {
-        var deregisterPayload = new NetworkPayload
-        {
-            [DeviceNetworkConstants.Command] = DeregisterDevice
-        };
-
-        _deviceNet.QueuePacket(uid, address, deregisterPayload);
+        var deregisterPayload = new AtmosMonitorDeregisterDevicePayload();
+        _deviceNet.SendPacket(uid, address, ref deregisterPayload);
     }
 
     public void Sync(EntityUid uid, string? address)
     {
-        var syncPayload = new NetworkPayload
-        {
-            [DeviceNetworkConstants.Command] = SyncData
-        };
-
-        _deviceNet.QueuePacket(uid, address, syncPayload);
-    }
-
-    public void SetDeviceState(EntityUid uid, string address, IAtmosDeviceData data)
-    {
-        var payload = new NetworkPayload()
-        {
-            [DeviceNetworkConstants.Command] = DeviceNetworkConstants.CmdSetState,
-            [DeviceNetworkConstants.CmdSetState] = data
-        };
-
-        _deviceNet.QueuePacket(uid, address, payload);
+        var payload = new AtmosSyncPayload();
+        _deviceNet.SendPacket(uid, address, ref payload);
     }
 }
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
index ff34828877..52d22899d0 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Monitor.Components;
+using Content.Server.Atmos.Monitor.Payloads;
 using Content.Server.Atmos.Piping.EntitySystems;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.NodeContainer.EntitySystems;
@@ -12,7 +13,6 @@ using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.Monitor;
 using Content.Shared.Atmos.Piping.Components;
 using Content.Shared.Database;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.Power;
 using Content.Shared.Tag;
@@ -31,26 +31,15 @@ public sealed partial class AtmosMonitorSystem : EntitySystem
     [Dependency] private DeviceNetworkSystem _deviceNetSystem = default!;
     [Dependency] private NodeContainerSystem _nodeContainerSystem = default!;
 
-    // Commands
-    public const string AtmosMonitorSetThresholdCmd = "atmos_monitor_set_threshold";
-    public const string AtmosMonitorSetAllThresholdsCmd = "atmos_monitor_set_all_thresholds";
-
-    // Packet data
-    public const string AtmosMonitorThresholdData = "atmos_monitor_threshold_data";
-    public const string AtmosMonitorAllThresholdData = "atmos_monitor_all_threshold_data";
-    public const string AtmosMonitorThresholdDataType = "atmos_monitor_threshold_type";
-
-    public const string AtmosMonitorThresholdGasType = "atmos_monitor_threshold_gas";
-
     public override void Initialize()
     {
+        base.Initialize();
         SubscribeLocalEvent<AtmosMonitorComponent, ComponentStartup>(OnAtmosMonitorStartup);
         SubscribeLocalEvent<AtmosMonitorComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<AtmosMonitorComponent, AtmosDeviceUpdateEvent>(OnAtmosUpdate);
         SubscribeLocalEvent<AtmosMonitorComponent, TileFireEvent>(OnFireEvent);
         SubscribeLocalEvent<AtmosMonitorComponent, PowerChangedEvent>(OnPowerChangedEvent);
         SubscribeLocalEvent<AtmosMonitorComponent, BeforePacketSentEvent>(BeforePacketRecv);
-        SubscribeLocalEvent<AtmosMonitorComponent, DeviceNetworkPacketEvent>(OnPacketRecv);
         SubscribeLocalEvent<AtmosMonitorComponent, AtmosDeviceDisabledEvent>(OnAtmosDeviceLeaveAtmosphere);
         SubscribeLocalEvent<AtmosMonitorComponent, AtmosDeviceEnabledEvent>(OnAtmosDeviceEnterAtmosphere);
         SubscribeLocalEvent<AtmosMonitorComponent, AtmosDeviceTileChangedEvent>(OnAtmosDeviceTileChangedEvent);
@@ -112,74 +101,73 @@ public sealed partial class AtmosMonitorSystem : EntitySystem
         }
     }
 
-    private void BeforePacketRecv(EntityUid uid, AtmosMonitorComponent component, BeforePacketSentEvent args)
+    private void BeforePacketRecv(Entity<AtmosMonitorComponent> ent, ref BeforePacketSentEvent args)
     {
-        if (!component.NetEnabled) args.Cancel();
+        if (!ent.Comp.NetEnabled)
+            args.Cancelled = true;
     }
 
-    private void OnPacketRecv(EntityUid uid, AtmosMonitorComponent component, DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnRegisterDevice(Entity<AtmosMonitorComponent> ent, ref DeviceNetworkPacketEvent<AtmosMonitorRegisterDevicePayload> args)
     {
-        // sync the internal 'last alarm state' from
-        // the other alarms, so that we can calculate
-        // the highest network alarm state at any time
-        if (!args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? cmd))
+        ent.Comp.RegisteredDevices.Add(args.SenderAddress);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnDeregisterDevice(Entity<AtmosMonitorComponent> ent, ref DeviceNetworkPacketEvent<AtmosMonitorDeregisterDevicePayload> args)
+    {
+        ent.Comp.RegisteredDevices.Remove(args.SenderAddress);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnReset(Entity<AtmosMonitorComponent> ent, ref DeviceNetworkPacketEvent<AtmosMonitorResetPayload> args)
+    {
+        Reset(ent);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnSetThreshold(Entity<AtmosMonitorComponent> ent, ref DeviceNetworkPacketEvent<AtmosMonitorSetThresholdPayload> args)
+    {
+        SetThreshold(ent, args.Data.Type, args.Data.Threshold, args.Data.Gas);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnSetAllThresholds(Entity<AtmosMonitorComponent> ent, ref DeviceNetworkPacketEvent<AtmosMonitorSetAllThresholdsPayload> args)
+    {
+        SetAllThresholds(ent, args.Data.Data);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnSyncPayload(Entity<AtmosMonitorComponent> ent, ref DeviceNetworkPacketEvent<AtmosSyncPayload> args)
+    {
+        var dataPayload = new AtmosMonitorData();
+        if (ent.Comp.TileGas != null)
         {
-            return;
+            var gases = new Dictionary<Gas, float>();
+            foreach (var gas in Enum.GetValues<Gas>())
+            {
+                gases.Add(gas, ent.Comp.TileGas.GetMoles(gas));
+            }
+
+            dataPayload = new AtmosMonitorData(
+                ent.Comp.TileGas.Pressure,
+                ent.Comp.TileGas.Temperature,
+                ent.Comp.TileGas.TotalMoles,
+                ent.Comp.LastAlarmState,
+                gases,
+                ent.Comp.PressureThreshold ?? new(),
+                ent.Comp.TemperatureThreshold ?? new(),
+                ent.Comp.GasThresholds ?? new());
         }
 
-        switch (cmd)
+        var airAlarm = new AirAlarmSetDataPayload
         {
-            case AtmosDeviceNetworkSystem.RegisterDevice:
-                component.RegisteredDevices.Add(args.SenderAddress);
-                break;
-            case AtmosDeviceNetworkSystem.DeregisterDevice:
-                component.RegisteredDevices.Remove(args.SenderAddress);
-                break;
-            case AtmosAlarmableSystem.ResetAll:
-                Reset(uid);
-                // Don't clear alarm states here.
-                break;
-            case AtmosMonitorSetThresholdCmd:
-                if (args.Data.TryGetValue(AtmosMonitorThresholdData, out AtmosAlarmThreshold? thresholdData)
-                    && args.Data.TryGetValue(AtmosMonitorThresholdDataType, out AtmosMonitorThresholdType? thresholdType))
-                {
-                    args.Data.TryGetValue(AtmosMonitorThresholdGasType, out Gas? gas);
-                    SetThreshold(uid, thresholdType.Value, thresholdData, gas);
-                }
-                break;
-            case AtmosMonitorSetAllThresholdsCmd:
-                if (args.Data.TryGetValue(AtmosMonitorAllThresholdData, out AtmosSensorData? allThresholdData))
-                {
-                    SetAllThresholds(uid, allThresholdData);
-                }
-                break;
-            case AtmosDeviceNetworkSystem.SyncData:
-                var payload = new NetworkPayload();
-                payload.Add(DeviceNetworkConstants.Command, AtmosDeviceNetworkSystem.SyncData);
-                if (component.TileGas != null)
-                {
-                    var gases = new Dictionary<Gas, float>();
-                    foreach (var gas in Enum.GetValues<Gas>())
-                    {
-                        gases.Add(gas, component.TileGas.GetMoles(gas));
-                    }
+            Payload = dataPayload,
+        };
 
-                    payload.Add(AtmosDeviceNetworkSystem.SyncData, new AtmosSensorData(
-                        component.TileGas.Pressure,
-                        component.TileGas.Temperature,
-                        component.TileGas.TotalMoles,
-                        component.LastAlarmState,
-                        gases,
-                        component.PressureThreshold ?? new(),
-                        component.TemperatureThreshold ?? new(),
-                        component.GasThresholds ?? new()
-                    ));
-                }
-
-                _deviceNetSystem.QueuePacket(uid, args.SenderAddress, payload);
-                Alert(uid, component.LastAlarmState);
-                break;
-        }
+        dataPayload.RaisePayload(ent.Owner, args.SenderAddress, _deviceNetSystem);
+        _deviceNetSystem.SendPacket(ent.Owner, args.SenderAddress, ref airAlarm);
+        Alert(ent, ent.Comp.LastAlarmState);
     }
 
     private void OnPowerChangedEvent(Entity<AtmosMonitorComponent> ent, ref PowerChangedEvent args)
@@ -375,17 +363,16 @@ public sealed partial class AtmosMonitorSystem : EntitySystem
             return;
         }
 
-        var payload = new NetworkPayload
+        var payload = new AtmosAlarmPayload
         {
-            [DeviceNetworkConstants.Command] = AtmosAlarmableSystem.AlertCmd,
-            [DeviceNetworkConstants.CmdSetState] = monitor.LastAlarmState,
-            [AtmosAlarmableSystem.AlertSource] = tags.Tags,
-            [AtmosAlarmableSystem.AlertTypes] = monitor.TrippedThresholds
+            Type = monitor.LastAlarmState,
+            Source = tags.Tags,
+            TrippedThresholds = monitor.TrippedThresholds,
         };
 
         foreach (var addr in monitor.RegisteredDevices)
         {
-            _deviceNetSystem.QueuePacket(owner, addr, payload);
+            _deviceNetSystem.SendPacket(owner, addr, ref payload);
         }
     }
 
@@ -475,14 +462,14 @@ public sealed partial class AtmosMonitorSystem : EntitySystem
     ///     AtmosSensorData object's thresholds.
     /// </summary>
     /// <param name="uid">The entity's uid</param>
-    /// <param name="allThresholdData">An AtmosSensorData object from which the thresholds will be loaded.</param>
-    public void SetAllThresholds(EntityUid uid, AtmosSensorData allThresholdData)
+    /// <param name="allThresholdDataPayload">An AtmosSensorData object from which the thresholds will be loaded.</param>
+    public void SetAllThresholds(EntityUid uid, AtmosMonitorData allThresholdDataPayload)
     {
-        SetThreshold(uid, AtmosMonitorThresholdType.Temperature, allThresholdData.TemperatureThreshold);
-        SetThreshold(uid, AtmosMonitorThresholdType.Pressure, allThresholdData.PressureThreshold);
+        SetThreshold(uid, AtmosMonitorThresholdType.Temperature, allThresholdDataPayload.TemperatureThreshold);
+        SetThreshold(uid, AtmosMonitorThresholdType.Pressure, allThresholdDataPayload.PressureThreshold);
         foreach (var gas in Enum.GetValues<Gas>())
         {
-            SetThreshold(uid, AtmosMonitorThresholdType.Gas, allThresholdData.GasThresholds[gas], gas);
+            SetThreshold(uid, AtmosMonitorThresholdType.Gas, allThresholdDataPayload.GasThresholds[gas], gas);
         }
     }
 }
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
index 8729bd18fa..977ee1d611 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
@@ -1,5 +1,5 @@
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Atmos.Monitor.Systems;
+using Content.Server.Atmos.Monitor.Payloads;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.Nodes;
@@ -9,11 +9,9 @@ using Content.Shared.Atmos.Piping.Binary.Components;
 using Content.Shared.Atmos.Piping.Binary.Systems;
 using Content.Shared.Atmos.Piping.Components;
 using Content.Shared.Audio;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
-using Content.Shared.DeviceNetwork.Components;
 
 namespace Content.Server.Atmos.Piping.Binary.EntitySystems
 {
@@ -32,8 +30,6 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
 
             SubscribeLocalEvent<GasVolumePumpComponent, AtmosDeviceUpdateEvent>(OnVolumePumpUpdated);
             SubscribeLocalEvent<GasVolumePumpComponent, AtmosDeviceDisabledEvent>(OnVolumePumpLeaveAtmosphere);
-
-            SubscribeLocalEvent<GasVolumePumpComponent, DeviceNetworkPacketEvent>(OnPacketRecv);
         }
 
         private void OnVolumePumpUpdated(EntityUid uid, GasVolumePumpComponent pump, ref AtmosDeviceUpdateEvent args)
@@ -107,25 +103,15 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
             _userInterfaceSystem.CloseUi(uid, GasVolumePumpUiKey.Key);
         }
 
-        private void OnPacketRecv(EntityUid uid, GasVolumePumpComponent component, DeviceNetworkPacketEvent args)
+        [SubscribeLocalEvent]
+        private void OnSyncPayload(Entity<GasVolumePumpComponent> ent, ref DeviceNetworkPacketEvent<AtmosSyncPayload> args)
         {
-            if (!TryComp(uid, out DeviceNetworkComponent? netConn)
-                || !args.Data.TryGetValue(DeviceNetworkConstants.Command, out var cmd))
+            var data = new GasVolumePumpDataPayload
             {
-                return;
-            }
+                LastMolesTransferred = ent.Comp.LastMolesTransferred,
+            };
 
-            var payload = new NetworkPayload();
-
-            switch (cmd)
-            {
-                case AtmosDeviceNetworkSystem.SyncData:
-                    payload.Add(DeviceNetworkConstants.Command, AtmosDeviceNetworkSystem.SyncData);
-                    payload.Add(AtmosDeviceNetworkSystem.SyncData, new GasVolumePumpData(component.LastMolesTransferred));
-
-                    _deviceNetwork.QueuePacket(uid, args.SenderAddress, payload, device: netConn);
-                    return;
-            }
+            _deviceNetwork.SendPacket(ent.Owner, args.SenderAddress, ref data);
         }
     }
 }
diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
index 175629076a..2bbe6ab70e 100644
--- a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
+++ b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
@@ -169,15 +169,15 @@ namespace Content.Server.Atmos.Piping.Unary.Components
             };
         }
 
-        public void FromAirAlarmData(GasVentPumpData data)
+        public void FromAirAlarmData(GasVentPumpData dataPayload)
         {
-            Enabled = data.Enabled;
-            IsDirty = data.Dirty;
-            PumpDirection = data.PumpDirection;
-            PressureChecks = data.PressureChecks;
-            ExternalPressureBound = data.ExternalPressureBound;
-            InternalPressureBound = data.InternalPressureBound;
-            PressureLockoutOverride = data.PressureLockoutOverride;
+            Enabled = dataPayload.Enabled;
+            IsDirty = dataPayload.Dirty;
+            PumpDirection = dataPayload.PumpDirection;
+            PressureChecks = dataPayload.PressureChecks;
+            ExternalPressureBound = dataPayload.ExternalPressureBound;
+            InternalPressureBound = dataPayload.InternalPressureBound;
+            PressureLockoutOverride = dataPayload.PressureLockoutOverride;
         }
 
         #region GuidebookData
diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs
index 4a9437bc1f..21b4fbb87a 100644
--- a/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs
+++ b/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs
@@ -66,18 +66,18 @@ namespace Content.Server.Atmos.Piping.Unary.Components
             };
         }
 
-        public void FromAirAlarmData(GasVentScrubberData data)
+        public void FromAirAlarmData(GasVentScrubberData dataPayload)
         {
-            Enabled = data.Enabled;
-            IsDirty = data.Dirty;
-            PumpDirection = data.PumpDirection;
-            TransferRate = data.VolumeRate;
-            WideNet = data.WideNet;
+            Enabled = dataPayload.Enabled;
+            IsDirty = dataPayload.Dirty;
+            PumpDirection = dataPayload.PumpDirection;
+            TransferRate = dataPayload.VolumeRate;
+            WideNet = dataPayload.WideNet;
 
-            if (!data.FilterGases.SequenceEqual(FilterGases))
+            if (!dataPayload.FilterGases.SequenceEqual(FilterGases))
             {
                 FilterGases.Clear();
-                foreach (var gas in data.FilterGases)
+                foreach (var gas in dataPayload.FilterGases)
                     FilterGases.Add(gas);
             }
         }
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
index f4af8e6f9b..950aeb7491 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
@@ -1,5 +1,5 @@
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Atmos.Monitor.Systems;
+using Content.Server.Atmos.Monitor.Payloads;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.Nodes;
@@ -10,9 +10,7 @@ using JetBrains.Annotations;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.Piping.Unary.Systems;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
-using Content.Shared.DeviceNetwork.Components;
 
 namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 {
@@ -27,11 +25,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
         public override void Initialize()
         {
             base.Initialize();
-
             SubscribeLocalEvent<GasThermoMachineComponent, AtmosDeviceUpdateEvent>(OnThermoMachineUpdated);
-
-            // Device network
-            SubscribeLocalEvent<GasThermoMachineComponent, DeviceNetworkPacketEvent>(OnPacketRecv);
         }
 
         private void OnThermoMachineUpdated(EntityUid uid, GasThermoMachineComponent thermoMachine, ref AtmosDeviceUpdateEvent args)
@@ -117,24 +111,15 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             }
         }
 
-        private void OnPacketRecv(EntityUid uid, GasThermoMachineComponent component, DeviceNetworkPacketEvent args)
+        [SubscribeLocalEvent]
+        private void OnSyncPayload(Entity<GasThermoMachineComponent> ent, ref DeviceNetworkPacketEvent<AtmosSyncPayload> args)
         {
-            if (!TryComp(uid, out DeviceNetworkComponent? netConn)
-                || !args.Data.TryGetValue(DeviceNetworkConstants.Command, out var cmd))
-                return;
-
-            var payload = new NetworkPayload();
-
-            switch (cmd)
+            var data = new GasThermoMachineDataPayload
             {
-                case AtmosDeviceNetworkSystem.SyncData:
-                    payload.Add(DeviceNetworkConstants.Command, AtmosDeviceNetworkSystem.SyncData);
-                    payload.Add(AtmosDeviceNetworkSystem.SyncData, new GasThermoMachineData(component.LastEnergyDelta));
+                EnergyDelta = ent.Comp.LastEnergyDelta,
+            };
 
-                    _deviceNetwork.QueuePacket(uid, args.SenderAddress, payload, device: netConn);
-
-                    return;
-            }
+            _deviceNetwork.SendPacket(ent.Owner, args.SenderAddress, ref data);
         }
     }
 }
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
index e9d1c36a16..4b93c3cc84 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.Monitor.Payloads;
 using Content.Server.Atmos.Monitor.Systems;
 using Content.Server.Atmos.Piping.Unary.Components;
 using Content.Server.DeviceLinking.Systems;
@@ -17,8 +18,6 @@ using Content.Shared.Atmos.Visuals;
 using Content.Shared.Audio;
 using Content.Shared.Database;
 using Content.Shared.DeviceLinking.Events;
-using Content.Shared.DeviceNetwork;
-using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.Examine;
@@ -45,6 +44,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
         [Dependency] private SharedDoAfterSystem _doAfterSystem = default!;
         [Dependency] private IGameTiming _timing = default!;
         [Dependency] private PowerReceiverSystem _powerReceiverSystem = default!;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -54,7 +54,6 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             SubscribeLocalEvent<GasVentPumpComponent, AtmosDeviceEnabledEvent>(OnGasVentPumpEnterAtmosphere);
             SubscribeLocalEvent<GasVentPumpComponent, AtmosAlarmEvent>(OnAtmosAlarm);
             SubscribeLocalEvent<GasVentPumpComponent, PowerChangedEvent>(OnPowerChanged);
-            SubscribeLocalEvent<GasVentPumpComponent, DeviceNetworkPacketEvent>(OnPacketRecv);
             SubscribeLocalEvent<GasVentPumpComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<GasVentPumpComponent, ExaminedEvent>(OnExamine);
             SubscribeLocalEvent<GasVentPumpComponent, SignalReceivedEvent>(OnSignalReceived);
@@ -216,70 +215,67 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             UpdateState(uid, component);
         }
 
-        private void OnPacketRecv(EntityUid uid, GasVentPumpComponent component, DeviceNetworkPacketEvent args)
+        [SubscribeLocalEvent]
+        private void OnSyncPayload(Entity<GasVentPumpComponent> ent, ref DeviceNetworkPacketEvent<AtmosSyncPayload> args)
         {
-            if (!TryComp(uid, out DeviceNetworkComponent? netConn)
-                || !args.Data.TryGetValue(DeviceNetworkConstants.Command, out var cmd))
-                return;
-
-            var payload = new NetworkPayload();
-
-            switch (cmd)
+            var data = ent.Comp.ToAirAlarmData();
+            var airAlarm = new AirAlarmSetDataPayload
             {
-                case AtmosDeviceNetworkSystem.SyncData:
-                    payload.Add(DeviceNetworkConstants.Command, AtmosDeviceNetworkSystem.SyncData);
-                    payload.Add(AtmosDeviceNetworkSystem.SyncData, component.ToAirAlarmData());
+                Payload = data,
+            };
+            _deviceNetSystem.SendPacket(ent.Owner, args.SenderAddress, ref airAlarm);
+        }
 
-                    _deviceNetSystem.QueuePacket(uid, args.SenderAddress, payload, device: netConn);
+        [SubscribeLocalEvent]
+        private void OnSetPayload(Entity<GasVentPumpComponent> ent, ref DeviceNetworkPacketEvent<GasVentPumpSetDataPayload> args)
+        {
+            var setData = args.Data.Data;
+            var previous = ent.Comp.ToAirAlarmData();
 
-                    return;
-                case DeviceNetworkConstants.CmdSetState:
-                    if (!args.Data.TryGetValue(DeviceNetworkConstants.CmdSetState, out GasVentPumpData? setData))
-                        break;
-
-                    var previous = component.ToAirAlarmData();
-
-                    if (previous.Enabled != setData.Enabled)
-                    {
-                        string enabled = setData.Enabled ? "enabled" : "disabled" ;
-                        _adminLogger.Add(LogType.AtmosDeviceSetting, LogImpact.Medium, $"{ToPrettyString(uid)} {enabled}");
-                    }
-
-                    if (previous.PumpDirection != setData.PumpDirection)
-                        _adminLogger.Add(LogType.AtmosDeviceSetting, LogImpact.Medium, $"{ToPrettyString(uid)} direction changed to {setData.PumpDirection}");
-
-                    if (previous.PressureChecks != setData.PressureChecks)
-                        _adminLogger.Add(LogType.AtmosDeviceSetting, LogImpact.Medium, $"{ToPrettyString(uid)} pressure check changed to {setData.PressureChecks}");
-
-                    if (previous.ExternalPressureBound != setData.ExternalPressureBound)
-                    {
-                        _adminLogger.Add(
-                            LogType.AtmosDeviceSetting,
-                            LogImpact.Medium,
-                            $"{ToPrettyString(uid)} external pressure bound changed from {previous.ExternalPressureBound} kPa to {setData.ExternalPressureBound} kPa"
-                        );
-                    }
-
-                    if (previous.InternalPressureBound != setData.InternalPressureBound)
-                    {
-                        _adminLogger.Add(
-                            LogType.AtmosDeviceSetting,
-                            LogImpact.Medium,
-                            $"{ToPrettyString(uid)} internal pressure bound changed from {previous.InternalPressureBound} kPa to {setData.InternalPressureBound} kPa"
-                        );
-                    }
-
-                    if (previous.PressureLockoutOverride != setData.PressureLockoutOverride)
-                    {
-                        string enabled = setData.PressureLockoutOverride ? "enabled" : "disabled" ;
-                        _adminLogger.Add(LogType.AtmosDeviceSetting, LogImpact.Medium, $"{ToPrettyString(uid)} pressure lockout override {enabled}");
-                    }
-
-                    component.FromAirAlarmData(setData);
-                    UpdateState(uid, component);
-
-                    return;
+            if (previous.Enabled != setData.Enabled)
+            {
+                string enabled = setData.Enabled ? "enabled" : "disabled";
+                _adminLogger.Add(LogType.AtmosDeviceSetting, LogImpact.Medium, $"{ToPrettyString(ent)} {enabled}");
             }
+
+            if (previous.PumpDirection != setData.PumpDirection)
+                _adminLogger.Add(LogType.AtmosDeviceSetting,
+                    LogImpact.Medium,
+                    $"{ToPrettyString(ent)} direction changed to {setData.PumpDirection}");
+
+            if (previous.PressureChecks != setData.PressureChecks)
+                _adminLogger.Add(LogType.AtmosDeviceSetting,
+                    LogImpact.Medium,
+                    $"{ToPrettyString(ent)} pressure check changed to {setData.PressureChecks}");
+
+            if (previous.ExternalPressureBound != setData.ExternalPressureBound)
+            {
+                _adminLogger.Add(
+                    LogType.AtmosDeviceSetting,
+                    LogImpact.Medium,
+                    $"{ToPrettyString(ent)} external pressure bound changed from {previous.ExternalPressureBound} kPa to {setData.ExternalPressureBound} kPa"
+                );
+            }
+
+            if (previous.InternalPressureBound != setData.InternalPressureBound)
+            {
+                _adminLogger.Add(
+                    LogType.AtmosDeviceSetting,
+                    LogImpact.Medium,
+                    $"{ToPrettyString(ent)} internal pressure bound changed from {previous.InternalPressureBound} kPa to {setData.InternalPressureBound} kPa"
+                );
+            }
+
+            if (previous.PressureLockoutOverride != setData.PressureLockoutOverride)
+            {
+                string enabled = setData.PressureLockoutOverride ? "enabled" : "disabled";
+                _adminLogger.Add(LogType.AtmosDeviceSetting,
+                    LogImpact.Medium,
+                    $"{ToPrettyString(ent)} pressure lockout override {enabled}");
+            }
+
+            ent.Comp.FromAirAlarmData(setData);
+            UpdateState(ent, ent.Comp);
         }
 
         private void OnInit(EntityUid uid, GasVentPumpComponent component, ComponentInit args)
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
index 81e94e6ab7..94fea1758b 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.Monitor.Payloads;
 using Content.Server.Atmos.Monitor.Systems;
 using Content.Server.Atmos.Piping.Unary.Components;
 using Content.Server.DeviceNetwork.Systems;
@@ -14,8 +15,6 @@ using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.Atmos.Piping.Unary.Visuals;
 using Content.Shared.Audio;
 using Content.Shared.Database;
-using Content.Shared.DeviceNetwork;
-using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.Power;
 using Content.Shared.Tools.Systems;
@@ -46,7 +45,6 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             SubscribeLocalEvent<GasVentScrubberComponent, AtmosDeviceDisabledEvent>(OnVentScrubberLeaveAtmosphere);
             SubscribeLocalEvent<GasVentScrubberComponent, AtmosAlarmEvent>(OnAtmosAlarm);
             SubscribeLocalEvent<GasVentScrubberComponent, PowerChangedEvent>(OnPowerChanged);
-            SubscribeLocalEvent<GasVentScrubberComponent, DeviceNetworkPacketEvent>(OnPacketRecv);
             SubscribeLocalEvent<GasVentScrubberComponent, WeldableChangedEvent>(OnWeldChanged);
         }
 
@@ -146,69 +144,68 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             UpdateState(uid, component);
         }
 
-        private void OnPacketRecv(EntityUid uid, GasVentScrubberComponent component, DeviceNetworkPacketEvent args)
+        [SubscribeLocalEvent]
+        private void OnSyncPayload(Entity<GasVentScrubberComponent> ent, ref DeviceNetworkPacketEvent<AtmosSyncPayload> args)
         {
-            if (!TryComp(uid, out DeviceNetworkComponent? netConn)
-                || !args.Data.TryGetValue(DeviceNetworkConstants.Command, out var cmd))
-                return;
-
-            var payload = new NetworkPayload();
-
-            switch (cmd)
+            var data = ent.Comp.ToAirAlarmData();
+            var airAlarm = new AirAlarmSetDataPayload
             {
-                case AtmosDeviceNetworkSystem.SyncData:
-                    payload.Add(DeviceNetworkConstants.Command, AtmosDeviceNetworkSystem.SyncData);
-                    payload.Add(AtmosDeviceNetworkSystem.SyncData, component.ToAirAlarmData());
+                Payload = data,
+            };
+            _deviceNetSystem.SendPacket(ent.Owner, args.SenderAddress, ref airAlarm);
+        }
 
-                    _deviceNetSystem.QueuePacket(uid, args.SenderAddress, payload, device: netConn);
+        [SubscribeLocalEvent]
+        private void OnSetPayload(Entity<GasVentScrubberComponent> ent, ref DeviceNetworkPacketEvent<GasVentScrubberSetDataPayload> args)
+        {
+            var setData = args.Data.Data;
+            var previous = ent.Comp.ToAirAlarmData();
 
-                    return;
-                case DeviceNetworkConstants.CmdSetState:
-                    if (!args.Data.TryGetValue(DeviceNetworkConstants.CmdSetState, out GasVentScrubberData? setData))
-                        break;
-
-                    var previous = component.ToAirAlarmData();
-
-                    if (previous.Enabled != setData.Enabled)
-                    {
-                        string enabled = setData.Enabled ? "enabled" : "disabled" ;
-                        _adminLogger.Add(LogType.AtmosDeviceSetting, LogImpact.Medium, $"{ToPrettyString(uid)} {enabled}");
-                    }
-
-                    // TODO: IgnoreAlarms?
-
-                    if (previous.PumpDirection != setData.PumpDirection)
-                        _adminLogger.Add(LogType.AtmosDeviceSetting, LogImpact.Medium, $"{ToPrettyString(uid)} direction changed to {setData.PumpDirection}");
-
-                    // TODO: This is iterating through both sets, it could probably be faster but they're both really small sets anyways
-                    foreach (Gas gas in previous.FilterGases)
-                        if (!setData.FilterGases.Contains(gas))
-                            _adminLogger.Add(LogType.AtmosDeviceSetting, LogImpact.Medium, $"{ToPrettyString(uid)} {gas} filtering disabled");
-
-                    foreach (Gas gas in setData.FilterGases)
-                        if (!previous.FilterGases.Contains(gas))
-                            _adminLogger.Add(LogType.AtmosDeviceSetting, LogImpact.Medium, $"{ToPrettyString(uid)} {gas} filtering enabled");
-
-                    if (previous.VolumeRate != setData.VolumeRate)
-                    {
-                        _adminLogger.Add(
-                            LogType.AtmosDeviceSetting,
-                            LogImpact.Medium,
-                            $"{ToPrettyString(uid)} volume rate changed from {previous.VolumeRate} L to {setData.VolumeRate} L"
-                        );
-                    }
-
-                    if (previous.WideNet != setData.WideNet)
-                    {
-                        string enabled = setData.WideNet ? "enabled" : "disabled" ;
-                        _adminLogger.Add(LogType.AtmosDeviceSetting, LogImpact.Medium, $"{ToPrettyString(uid)} WideNet {enabled}");
-                    }
-
-                    component.FromAirAlarmData(setData);
-                    UpdateState(uid, component);
-
-                    return;
+            if (previous.Enabled != setData.Enabled)
+            {
+                string enabled = setData.Enabled ? "enabled" : "disabled";
+                _adminLogger.Add(LogType.AtmosDeviceSetting, LogImpact.Medium, $"{ToPrettyString(ent)} {enabled}");
             }
+
+            // TODO: IgnoreAlarms?
+
+            if (previous.PumpDirection != setData.PumpDirection)
+                _adminLogger.Add(LogType.AtmosDeviceSetting,
+                    LogImpact.Medium,
+                    $"{ToPrettyString(ent)} direction changed to {setData.PumpDirection}");
+
+            // TODO: This is iterating through both sets, it could probably be faster but they're both really small sets anyways
+            foreach (Gas gas in previous.FilterGases)
+                if (!setData.FilterGases.Contains(gas))
+                    _adminLogger.Add(LogType.AtmosDeviceSetting,
+                        LogImpact.Medium,
+                        $"{ToPrettyString(ent)} {gas} filtering disabled");
+
+            foreach (Gas gas in setData.FilterGases)
+                if (!previous.FilterGases.Contains(gas))
+                    _adminLogger.Add(LogType.AtmosDeviceSetting,
+                        LogImpact.Medium,
+                        $"{ToPrettyString(ent)} {gas} filtering enabled");
+
+            if (previous.VolumeRate != setData.VolumeRate)
+            {
+                _adminLogger.Add(
+                    LogType.AtmosDeviceSetting,
+                    LogImpact.Medium,
+                    $"{ToPrettyString(ent)} volume rate changed from {previous.VolumeRate} L to {setData.VolumeRate} L"
+                );
+            }
+
+            if (previous.WideNet != setData.WideNet)
+            {
+                string enabled = setData.WideNet ? "enabled" : "disabled";
+                _adminLogger.Add(LogType.AtmosDeviceSetting,
+                    LogImpact.Medium,
+                    $"{ToPrettyString(ent)} WideNet {enabled}");
+            }
+
+            ent.Comp.FromAirAlarmData(setData);
+            UpdateState(ent, ent.Comp);
         }
 
         /// <summary>
diff --git a/Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs b/Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs
index 475c149cf3..db768667f9 100644
--- a/Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs
+++ b/Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs
@@ -1,4 +1,4 @@
-using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Reactions;
 using JetBrains.Annotations;
diff --git a/Content.Server/Atmos/Reactions/FrezonProductionReaction.cs b/Content.Server/Atmos/Reactions/FrezonProductionReaction.cs
index e3d3ece6b6..604a5112bc 100644
--- a/Content.Server/Atmos/Reactions/FrezonProductionReaction.cs
+++ b/Content.Server/Atmos/Reactions/FrezonProductionReaction.cs
@@ -1,4 +1,4 @@
-using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Reactions;
 using JetBrains.Annotations;
diff --git a/Content.Server/Atmos/Reactions/GasReactionPrototype.cs b/Content.Server/Atmos/Reactions/GasReactionPrototype.cs
index dc7ba85dcc..9e00d38ede 100644
--- a/Content.Server/Atmos/Reactions/GasReactionPrototype.cs
+++ b/Content.Server/Atmos/Reactions/GasReactionPrototype.cs
@@ -1,4 +1,4 @@
-using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Reactions;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/Audio/AmbientSoundSystem.cs b/Content.Server/Audio/AmbientSoundSystem.cs
index ea0409c725..9b2287f01f 100644
--- a/Content.Server/Audio/AmbientSoundSystem.cs
+++ b/Content.Server/Audio/AmbientSoundSystem.cs
@@ -8,13 +8,21 @@ namespace Content.Server.Audio;
 
 public sealed partial class AmbientSoundSystem : SharedAmbientSoundSystem
 {
+    [Dependency] private PowerReceiverSystem _powerReceiver = default!;
+
     public override void Initialize()
     {
         base.Initialize();
+        SubscribeLocalEvent<AmbientOnPoweredComponent, MapInitEvent>(HandleMapInit);
         SubscribeLocalEvent<AmbientOnPoweredComponent, PowerChangedEvent>(HandlePowerChange);
         SubscribeLocalEvent<AmbientOnPoweredComponent, PowerNetBatterySupplyEvent>(HandlePowerSupply);
     }
 
+    private void HandleMapInit(EntityUid uid, AmbientOnPoweredComponent component, MapInitEvent args)
+    {
+        SetAmbience(uid, _powerReceiver.IsPowered(uid));
+    }
+
     private void HandlePowerSupply(EntityUid uid, AmbientOnPoweredComponent component, ref PowerNetBatterySupplyEvent args)
     {
         SetAmbience(uid, args.Supply);
diff --git a/Content.Server/Audio/ContentAudioSystem.cs b/Content.Server/Audio/ContentAudioSystem.cs
index 90451fde77..9f4b31ea2e 100644
--- a/Content.Server/Audio/ContentAudioSystem.cs
+++ b/Content.Server/Audio/ContentAudioSystem.cs
@@ -5,6 +5,7 @@ using Content.Shared.Audio;
 using Content.Shared.Audio.Events;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Events;
 using Robust.Server.Audio;
 using Robust.Shared.Audio;
 using Robust.Shared.Configuration;
diff --git a/Content.Server/Audio/ServerGlobalSoundSystem.cs b/Content.Server/Audio/ServerGlobalSoundSystem.cs
index 06a05834c1..a96509711e 100644
--- a/Content.Server/Audio/ServerGlobalSoundSystem.cs
+++ b/Content.Server/Audio/ServerGlobalSoundSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Station.Systems;
+using Content.Server.Station.Systems;
 using Content.Shared.Audio;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -10,7 +10,7 @@ namespace Content.Server.Audio;
 public sealed partial class ServerGlobalSoundSystem : SharedGlobalSoundSystem
 {
     [Dependency] private IConsoleHost _conHost = default!;
-    [Dependency] private StationSystem _stationSystem = default!;
+    [Dependency] private ServerStationSystem _stationSystem = default!;
     [Dependency] private SharedAudioSystem _audio = default!;
 
     public override void Shutdown()
diff --git a/Content.Server/Beam/BeamSystem.cs b/Content.Server/Beam/BeamSystem.cs
index 81e31f9ae1..0235cbdd92 100644
--- a/Content.Server/Beam/BeamSystem.cs
+++ b/Content.Server/Beam/BeamSystem.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Shared.Beam;
 using Content.Shared.Beam.Components;
 using Content.Shared.Physics;
diff --git a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
index f3888f0553..0c199ec0b6 100644
--- a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
+++ b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
@@ -1,6 +1,6 @@
+using System.Globalization;
 using Content.Server.Chat.Managers;
 using Content.Server.Ghost;
-using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Access.Systems;
 using Content.Shared.Bed.Cryostorage;
@@ -10,22 +10,22 @@ using Content.Shared.Clothing.Components;
 using Content.Shared.Database;
 using Content.Shared.GameTicking;
 using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Inventory;
 using Content.Shared.Mind.Components;
+using Content.Shared.Popups;
+using Content.Shared.Station.Components;
+using Content.Shared.Station.Systems;
 using Content.Shared.StationRecords;
+using Content.Shared.StationRecords.Components;
+using Content.Shared.StationRecords.Systems;
 using Content.Shared.UserInterface;
 using Robust.Server.Player;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Enums;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
-using System.Globalization;
-using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Inventory;
-using Content.Shared.Popups;
-using Content.Shared.Station;
-using Content.Shared.StationRecords.Components;
-using Content.Shared.StationRecords.Systems;
-using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.Bed.Cryostorage;
 
@@ -43,8 +43,8 @@ public sealed partial class CryostorageSystem : SharedCryostorageSystem
     [Dependency] private SharedHandsSystem _hands = default!;
     [Dependency] private InventorySystem _inventory = default!;
     [Dependency] private SharedPopupSystem _popup = default!;
-    [Dependency] private SharedStationSystem _station = default!;
-    [Dependency] private StationJobsSystem _stationJobs = default!;
+    [Dependency] private StationSystem _station = default!;
+    [Dependency] private ServerStationJobsSystem _stationJobs = default!;
     [Dependency] private StationRecordsSystem _stationRecords = default!;
     [Dependency] private SharedTransformSystem _transform = default!;
     [Dependency] private SharedUserInterfaceSystem _ui = default!;
diff --git a/Content.Server/Body/Systems/ThermalRegulatorSystem.cs b/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
index e0b8899a17..179099da8d 100644
--- a/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
+++ b/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
@@ -2,6 +2,7 @@ using Content.Server.Body.Components;
 using Content.Server.Temperature.Systems;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Temperature.Components;
+using Content.Shared.Mobs.Systems;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Body.Systems;
@@ -11,6 +12,7 @@ public sealed partial class ThermalRegulatorSystem : EntitySystem
     [Dependency] private IGameTiming _gameTiming = default!;
     [Dependency] private TemperatureSystem _tempSys = default!;
     [Dependency] private ActionBlockerSystem _actionBlockerSys = default!;
+    [Dependency] private MobStateSystem _mobState = default!;
 
     public override void Initialize()
     {
@@ -39,6 +41,11 @@ public sealed partial class ThermalRegulatorSystem : EntitySystem
                 continue;
 
             regulator.NextUpdate += regulator.UpdateInterval;
+
+            // The dead shouldn't be able to regulate their own body temperature.
+            if (_mobState.IsDead(uid))
+                continue;
+
             ProcessThermalRegulation((uid, regulator));
         }
     }
diff --git a/Content.Server/Botany/Systems/PlantAtmosphericSystem.cs b/Content.Server/Botany/Systems/PlantAtmosphericSystem.cs
index 96efa20ff7..6ec902ee0c 100644
--- a/Content.Server/Botany/Systems/PlantAtmosphericSystem.cs
+++ b/Content.Server/Botany/Systems/PlantAtmosphericSystem.cs
@@ -11,7 +11,7 @@ public sealed partial class PlantAtmosphericSystem : SharedPlantAtmosphericSyste
     [Dependency] private AtmosphereSystem _atmosphere = default!;
     [Dependency] private PlantHolderSystem _plantHolder = default!;
 
-    [Dependency] private EntityQuery<PlantHolderComponent> _holderQuery = default!;
+    [Dependency] private EntityQuery<PlantHolderComponent> _holderQuery;
 
     [SubscribeLocalEvent]
     private void OnPlantGrow(Entity<PlantAtmosphericComponent> ent, ref PlantGrowEvent args)
diff --git a/Content.Server/CPUJob/JobQueues/Queues/PathfindingJobQueue.cs b/Content.Server/CPUJob/JobQueues/Queues/PathfindingJobQueue.cs
index a3c1084e40..c54a39fda4 100644
--- a/Content.Server/CPUJob/JobQueues/Queues/PathfindingJobQueue.cs
+++ b/Content.Server/CPUJob/JobQueues/Queues/PathfindingJobQueue.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.CPUJob.JobQueues.Queues;
+using Robust.Shared.CPUJob.JobQueues.Queues;
 
 namespace Content.Server.CPUJob.JobQueues.Queues
 {
diff --git a/Content.Server/Cargo/Components/CargoSellBlacklistComponent.cs b/Content.Server/Cargo/Components/CargoSellBlacklistComponent.cs
index 9cbaa4a15b..652644d2ac 100644
--- a/Content.Server/Cargo/Components/CargoSellBlacklistComponent.cs
+++ b/Content.Server/Cargo/Components/CargoSellBlacklistComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Cargo.Components;
+namespace Content.Server.Cargo.Components;
 
 /// <summary>
 ///     Marks an entity as unable to be sold through the cargo shuttle.
diff --git a/Content.Server/Cargo/Components/MobPriceComponent.cs b/Content.Server/Cargo/Components/MobPriceComponent.cs
index ec4bb51487..6db5f3188e 100644
--- a/Content.Server/Cargo/Components/MobPriceComponent.cs
+++ b/Content.Server/Cargo/Components/MobPriceComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Cargo.Components;
+namespace Content.Server.Cargo.Components;
 
 /// <summary>
 /// This is used for calculating the price of mobs.
diff --git a/Content.Server/Cargo/Components/RandomPriceComponent.cs b/Content.Server/Cargo/Components/RandomPriceComponent.cs
index 3ece8334e6..dc0d9aa891 100644
--- a/Content.Server/Cargo/Components/RandomPriceComponent.cs
+++ b/Content.Server/Cargo/Components/RandomPriceComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Cargo.Systems;
+using Content.Server.Cargo.Systems;
 
 namespace Content.Server.Cargo.Components;
 
diff --git a/Content.Server/Cargo/Components/StackPriceComponent.cs b/Content.Server/Cargo/Components/StackPriceComponent.cs
index 52675792f1..64efcf7c66 100644
--- a/Content.Server/Cargo/Components/StackPriceComponent.cs
+++ b/Content.Server/Cargo/Components/StackPriceComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Cargo.Components;
+namespace Content.Server.Cargo.Components;
 
 /// <summary>
 /// This is used for pricing stacks of items.
diff --git a/Content.Server/Cargo/Components/StaticPriceComponent.cs b/Content.Server/Cargo/Components/StaticPriceComponent.cs
index 5fa50b00a3..5e9dd2c9ea 100644
--- a/Content.Server/Cargo/Components/StaticPriceComponent.cs
+++ b/Content.Server/Cargo/Components/StaticPriceComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Cargo.Components;
+namespace Content.Server.Cargo.Components;
 
 /// <summary>
 /// This is used for setting a static, unchanging price for an object.
diff --git a/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs b/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs
index 56401602b3..b9344c35f4 100644
--- a/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs
+++ b/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs
@@ -1,6 +1,5 @@
 using System.Linq;
 using Content.Shared.Cargo;
-using Content.Shared.Cargo.Components;
 using Content.Shared.Cargo.Prototypes;
 using Content.Shared.Station.Components;
 using Robust.Shared.Prototypes;
@@ -19,14 +18,20 @@ public sealed partial class StationCargoOrderDatabaseComponent : Component
     [DataField]
     public int Capacity = 20;
 
+    /// <summary>
+    /// Every outstanding order across every account.
+    /// </summary>
     [ViewVariables]
     public IEnumerable<CargoOrderData> AllOrders => Orders.SelectMany(p => p.Value);
 
+    /// <summary>
+    /// A dictionary containing every outstanding order on the system, indexed by account.
+    /// </summary>
     [DataField]
     public Dictionary<ProtoId<CargoAccountPrototype>, List<CargoOrderData>> Orders = new();
 
     /// <summary>
-    /// Used to determine unique order IDs
+    /// Used to determine unique order IDs.
     /// </summary>
     [ViewVariables]
     public int NumOrdersCreated;
@@ -49,7 +54,7 @@ public sealed partial class StationCargoOrderDatabaseComponent : Component
     public EntityUid? Shuttle;
 
     /// <summary>
-    ///     The paper-type prototype to spawn with the order information.
+    /// The paper-type prototype to spawn with the order information.
     /// </summary>
     [DataField]
     public EntProtoId PrinterOutput = "PaperCargoInvoice";
@@ -59,12 +64,25 @@ public sealed partial class StationCargoOrderDatabaseComponent : Component
 /// Event broadcast before a cargo order is fulfilled, allowing alternate systems to fulfill the order.
 /// </summary>
 [ByRefEvent]
-public record struct FulfillCargoOrderEvent(Entity<StationDataComponent> Station, CargoOrderData Order, Entity<CargoOrderConsoleComponent> OrderConsole)
+public record struct FulfillCargoOrderEvent(Entity<StationDataComponent> Station, CargoOrderData Order)
 {
-    public Entity<CargoOrderConsoleComponent> OrderConsole = OrderConsole;
-    public Entity<StationDataComponent> Station = Station;
-    public CargoOrderData Order = Order;
+    /// <summary>
+    /// The station that placed the order.
+    /// </summary>
+    public readonly Entity<StationDataComponent> Station = Station;
 
+    /// <summary>
+    /// The <see cref="CargoOrderData"/> representing the order.
+    /// </summary>
+    public readonly CargoOrderData Order = Order;
+
+    /// <summary>
+    /// The entity that is fulfilling the order, e.g. the telepad where an order will arrive.
+    /// </summary>
     public EntityUid? FulfillmentEntity;
+
+    /// <summary>
+    /// If this event has already been handled.
+    /// </summary>
     public bool Handled = false;
 }
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index c69ff8aacd..da60070370 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -218,7 +218,10 @@ namespace Content.Server.Cargo.Systems
                 order.SetApproverData(_identity.GetIdentityShortInfo(player, uid));
             }
 
-            var ev = new FulfillCargoOrderEvent((station.Value, stationData), order, (uid, component));
+            order.ApprovingConsole = GetNetEntity(uid);
+            order.Approved = true;
+
+            var ev = new FulfillCargoOrderEvent((station.Value, stationData), order);
             RaiseLocalEvent(ref ev);
             ev.FulfillmentEntity ??= station.Value;
 
@@ -231,11 +234,12 @@ namespace Content.Server.Cargo.Systems
                     _popup.PopupCursor(Loc.GetString("cargo-console-unfulfilled"), args.Actor);
                     PlayDenySound(uid, component);
                     order.Approver = null;
+                    order.ApprovingConsole = null;
+                    order.Approved = false;
                     return;
                 }
             }
 
-            order.Approved = true;
             _audio.PlayPvs(ApproveSound, uid);
 
             if (!emagged)
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
index c3c5dcdf47..7930391439 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
@@ -10,7 +10,6 @@ using Content.Shared.Power;
 using Content.Shared.Station.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Random;
-using Robust.Shared.Utility;
 
 namespace Content.Server.Cargo.Systems;
 
@@ -40,9 +39,7 @@ public sealed partial class CargoSystem
             if (_station.GetOwningStation(uid, xform) != args.Station)
                 continue;
 
-            // todo cannot be fucking asked to figure out device linking rn but this shouldn't just default to the first port.
-            if (!TryGetLinkedConsole((uid, tele), out var console) ||
-                console.Value.Owner != args.OrderConsole.Owner)
+            if (!IsLinkedToConsole(uid, GetEntity(args.Order.ApprovingConsole)))
                 continue;
 
             tele.CurrentOrders.Add(args.Order);
@@ -54,22 +51,20 @@ public sealed partial class CargoSystem
         }
     }
 
-    private bool TryGetLinkedConsole(Entity<CargoTelepadComponent> ent,
-        [NotNullWhen(true)] out Entity<CargoOrderConsoleComponent>? console)
+    private bool IsLinkedToConsole(
+        EntityUid uid,
+        EntityUid? approvingConsole
+    )
     {
-        console = null;
-        if (!TryComp<DeviceLinkSinkComponent>(ent, out var sinkComponent) ||
-            sinkComponent.LinkedSources.FirstOrNull() is not { } linked)
+        if (approvingConsole is null)
             return false;
 
-        if (!TryComp<CargoOrderConsoleComponent>(linked, out var consoleComp))
+        if (!TryComp<DeviceLinkSinkComponent>(uid, out var sinkComponent))
             return false;
 
-        console = (linked, consoleComp);
-        return true;
+        return sinkComponent.LinkedSources.Any(ent => ent == approvingConsole.Value);
     }
 
-
     private void UpdateTelepad(float frameTime)
     {
         var query = EntityQueryEnumerator<CargoTelepadComponent, TransformComponent>();
@@ -94,7 +89,7 @@ public sealed partial class CargoSystem
                 continue;
             }
 
-            if (comp.CurrentOrders.Count == 0 || !TryGetLinkedConsole((uid, comp), out var console))
+            if (comp.CurrentOrders.Count == 0)
             {
                 comp.Accumulator += comp.Delay;
                 continue;
@@ -142,19 +137,16 @@ public sealed partial class CargoSystem
 
         if (_station.GetOwningStation(ent) is not { } station)
         {
-            station = _random.Pick(_station.GetStations().Where(HasComp<StationCargoOrderDatabaseComponent>).ToList());
+            station = _random.Pick(_station.GetStations().Where(x => HasComp<StationCargoOrderDatabaseComponent>(x.Owner)).ToList());
         }
 
         if (!TryComp<StationCargoOrderDatabaseComponent>(station, out var db) ||
             !TryComp<StationDataComponent>(station, out var data))
             return;
 
-        if (!TryGetLinkedConsole(ent, out var console))
-            return;
-
         foreach (var order in ent.Comp.CurrentOrders)
         {
-            TryFulfillOrder((station, data), console.Value.Comp.Account, order, db);
+            TryFulfillOrder((station, data), order.Account, order, db);
         }
     }
 
diff --git a/Content.Server/Cargo/Systems/CargoSystem.cs b/Content.Server/Cargo/Systems/CargoSystem.cs
index a753f785cf..6b2dbf103c 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.cs
@@ -34,7 +34,7 @@ public sealed partial class CargoSystem : SharedCargoSystem
     [Dependency] private SharedAppearanceSystem _appearance = default!;
     [Dependency] private SharedAudioSystem _audio = default!;
     [Dependency] private StackSystem _stack = default!;
-    [Dependency] private StationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
     [Dependency] private UserInterfaceSystem _uiSystem = default!;
     [Dependency] private MetaDataSystem _metaSystem = default!;
     [Dependency] private RadioSystem _radio = default!;
diff --git a/Content.Server/Cargo/Systems/PriceGunSystem.cs b/Content.Server/Cargo/Systems/PriceGunSystem.cs
index 4b4ce9576e..c82efdbf57 100644
--- a/Content.Server/Cargo/Systems/PriceGunSystem.cs
+++ b/Content.Server/Cargo/Systems/PriceGunSystem.cs
@@ -2,8 +2,9 @@ using Content.Server.Popups;
 using Content.Server.Salvage.JobBoard;
 using Content.Shared.Cargo.Components;
 using Content.Shared.IdentityManagement;
-using Content.Shared.Timing;
 using Content.Shared.Cargo.Systems;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.Cargo.Systems;
diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs
index 4ee27bb546..367de77ca8 100644
--- a/Content.Server/Cargo/Systems/PricingSystem.cs
+++ b/Content.Server/Cargo/Systems/PricingSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.Cargo.Components;
 using Content.Shared.Administration;
 using Content.Shared.Cargo;
diff --git a/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs
index add42c4953..ba3ae0dbcf 100644
--- a/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs
+++ b/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs
@@ -14,7 +14,7 @@ public sealed partial class CrewManifestCartridgeSystem : EntitySystem
     [Dependency] private CartridgeLoaderSystem _cartridgeLoader = default!;
     [Dependency] private IConfigurationManager _configManager = default!;
     [Dependency] private CrewManifestSystem _crewManifest = default!;
-    [Dependency] private StationSystem _stationSystem = default!;
+    [Dependency] private ServerStationSystem _stationSystem = default!;
 
     private static readonly EntProtoId CartridgePrototypeName = "CrewManifestCartridge";
 
diff --git a/Content.Server/Changeling/Systems/ChangelingLastResortSystem.cs b/Content.Server/Changeling/Systems/ServerChangelingLastResortSystem.cs
similarity index 93%
rename from Content.Server/Changeling/Systems/ChangelingLastResortSystem.cs
rename to Content.Server/Changeling/Systems/ServerChangelingLastResortSystem.cs
index a2b345df8c..de1bdb9302 100644
--- a/Content.Server/Changeling/Systems/ChangelingLastResortSystem.cs
+++ b/Content.Server/Changeling/Systems/ServerChangelingLastResortSystem.cs
@@ -1,5 +1,3 @@
-using Content.Server.Antag;
-using Content.Shared.Administration.Systems;
 using Content.Shared.Antag;
 using Content.Shared.Changeling.Components;
 using Content.Shared.Changeling.Systems;
@@ -9,11 +7,12 @@ using Content.Shared.IdentityManagement;
 using Content.Shared.Mind;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
+using Content.Shared.Zombies;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Changeling.Systems;
 
-public sealed partial class ChangelingLastResortSystem : SharedChangelingLastResortSystem
+public sealed partial class ServerChangelingLastResortSystem : ChangelingLastResortSystem
 {
     private static readonly ProtoId<AntagSpecifierPrototype> ChangelingAntag = "Changeling";
 
@@ -64,10 +63,11 @@ public sealed partial class ChangelingLastResortSystem : SharedChangelingLastRes
         if (!HasComp<HumanoidProfileComponent>(target))
             return false;
 
-        if (HasComp<ChangelingIdentityComponent>(target))
+        if (HasComp<ChangelingIdentityComponent>(target) || HasComp<ZombieComponent>(target))
         {
             if (showPopups)
-                _popup.PopupEntity(Loc.GetString("changeling-takeover-is-changeling"), user);
+                _popup.PopupEntity(Loc.GetString("changeling-takeover-is-changeling"), user, user);
+
             return false;
         }
 
@@ -75,7 +75,8 @@ public sealed partial class ChangelingLastResortSystem : SharedChangelingLastRes
             return true;
 
         if (showPopups)
-            _popup.PopupEntity(Loc.GetString("changeling-takeover-not-dead"), user);
+            _popup.PopupEntity(Loc.GetString("changeling-takeover-not-dead"), user, user);
+
         return false;
     }
 
diff --git a/Content.Server/Chat/ChatUser.cs b/Content.Server/Chat/ChatUser.cs
index 9b63dbc42c..648e275479 100644
--- a/Content.Server/Chat/ChatUser.cs
+++ b/Content.Server/Chat/ChatUser.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chat;
+using Content.Shared.Chat;
 
 namespace Content.Server.Chat;
 
diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs
index 96db494623..e704a013b2 100644
--- a/Content.Server/Chat/Managers/ChatManager.cs
+++ b/Content.Server/Chat/Managers/ChatManager.cs
@@ -6,7 +6,6 @@ using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
 using Content.Server.Administration.Systems;
 using Content.Server.Discord.DiscordLink;
-using Content.Server.Ghost;
 using Content.Server.Players.RateLimiting;
 using Content.Server.Preferences.Managers;
 using Content.Shared.Administration;
@@ -16,7 +15,6 @@ using Content.Shared.Database;
 using Content.Shared.Mind;
 using Content.Shared.Players.RateLimiting;
 using Robust.Shared.Configuration;
-using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Replays;
@@ -50,9 +48,10 @@ internal sealed partial class ChatManager : IChatManager
     [Dependency] private DiscordChatLink _discordLink = default!;
     [Dependency] private ILogManager _logManager = default!;
     [Dependency] private ILocalizationManager _localizationManager = default!;
+    private SharedChatSystem _chatSystem = default!;
     private ISharedSponsorsManager? _sponsorsManager; // Corvax-Sponsors
 
-    private ISawmill? _sawmill = default!;
+private ISawmill? _sawmill = default!;
 
     /// <summary>
     /// The maximum length a player-sent message can be sent
@@ -75,6 +74,8 @@ internal sealed partial class ChatManager : IChatManager
 
         _sawmill = _logManager.GetSawmill("SERVER");
 
+        _chatSystem = _entityManager.System<SharedChatSystem>();
+
         RegisterRateLimits();
     }
 
@@ -126,7 +127,7 @@ internal sealed partial class ChatManager : IChatManager
         // _sawmill might have not been initialized when DispatchServerAnnouncement is called
         // during server setup when some cvars are changed
         _sawmill?.Info(message);
-        
+
         _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Server announcement: {message}");
     }
 
@@ -325,10 +326,11 @@ internal sealed partial class ChatManager : IChatManager
             return;
         }
 
+        var playerName = _chatSystem.ChatNameLinks && player.AttachedEntity is {} attachedEntity ? $"[textlink=\"{FormattedMessage.EscapeStringParameter(player.Name)}\" entity=\"{_entityManager.GetNetEntity(attachedEntity)}\" color=\"{ChatChannel.AdminChat.TextColor().ToHex()}\"]" : FormattedMessage.EscapeText(player.Name);
         var clients = _adminManager.ActiveAdmins.Select(p => p.Channel);
         var wrappedMessage = Loc.GetString("chat-manager-send-admin-chat-wrap-message",
                                         ("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")),
-                                        ("playerName", player.Name), ("message", FormattedMessage.EscapeText(message)));
+                                        ("playerName", playerName), ("message", FormattedMessage.EscapeText(message)));
 
         foreach (var client in clients)
         {
@@ -352,35 +354,12 @@ internal sealed partial class ChatManager : IChatManager
 
     #region Utility
 
-    private bool IsValidWarpDestination(EntityUid source)
-    {
-        if (!source.Valid)
-            return false;
-
-        if (!_entityManager.TryGetComponent(source, out TransformComponent? transform))
-            return false;
-
-        return transform.MapID != MapId.Nullspace;
-    }
-
-    public string PrependFollowButtonIfAppropriate(string wrappedMessage, EntityUid source, INetChannel recipient)
-    {
-        if (IsValidWarpDestination(source) && ShouldShowFollowButton(recipient))
-        {
-            var btnText = _localizationManager.GetString("chat-manager-follow-button");
-            return $"[cmdlink=\"{btnText}\" command=\"{GhostFollowEntityCommand.CommandName} {_entityManager.GetNetEntity(source)}\" /] " + wrappedMessage;
-        }
-
-        return wrappedMessage;
-    }
-
     public void ChatMessageToOne(ChatChannel channel, string message, string wrappedMessage, EntityUid source, bool hideChat, INetChannel client, Color? colorOverride = null, bool recordReplay = false, string? audioPath = null, float audioVolume = 0, NetUserId? author = null)
     {
         var user = author == null ? null : EnsurePlayer(author);
         var netSource = _entityManager.GetNetEntity(source);
         user?.AddEntity(netSource);
 
-        wrappedMessage = PrependFollowButtonIfAppropriate(wrappedMessage, source, client);
         var msg = new ChatMessage(channel, message, wrappedMessage, netSource, user?.Key, hideChat, colorOverride, audioPath, audioVolume);
         _netManager.ServerSendMessage(new MsgChatMessage() { Message = msg }, client);
 
@@ -403,12 +382,8 @@ internal sealed partial class ChatManager : IChatManager
         var netSource = _entityManager.GetNetEntity(source);
         user?.AddEntity(netSource);
 
-        foreach (var client in clients)
-        {
-            var customWrapMessage = PrependFollowButtonIfAppropriate(wrappedMessage, source, client);
-            var msg = new ChatMessage(channel, message, customWrapMessage, netSource, user?.Key, hideChat, colorOverride, audioPath, audioVolume);
-            _netManager.ServerSendMessage(new MsgChatMessage { Message = msg }, client);
-        }
+        var msg = new ChatMessage(channel, message, wrappedMessage, netSource, user?.Key, hideChat, colorOverride, audioPath, audioVolume);
+        _netManager.ServerSendToMany(new MsgChatMessage() { Message = msg }, clients);
 
         if (!recordReplay)
             return;
@@ -416,7 +391,6 @@ internal sealed partial class ChatManager : IChatManager
         if ((channel & ChatChannel.AdminRelated) == 0 ||
             _configurationManager.GetCVar(CCVars.ReplayRecordAdminChat))
         {
-            var msg = new ChatMessage(channel, message, wrappedMessage, netSource, user?.Key, hideChat, colorOverride, audioPath, audioVolume);
             _replay.RecordServerMessage(msg);
         }
     }
@@ -477,22 +451,6 @@ internal sealed partial class ChatManager : IChatManager
     }
 
     #endregion
-
-    private bool ShouldShowFollowButton(INetChannel recipient)
-    {
-        if (!_player.TryGetSessionByChannel(recipient, out var session))
-            return false;
-
-        if (_entityManager.TrySystem(out GhostSystem? ghost))
-        {
-            if (!ghost.CanGhostWarp(session, out _))
-            {
-                return false;
-            }
-        }
-
-        return _netConfigManager.GetClientCVar(recipient, CCVars.InterfaceChatFollowButton);
-    }
 }
 
 public enum OOCChatType : byte
diff --git a/Content.Server/Chat/Managers/IChatManager.cs b/Content.Server/Chat/Managers/IChatManager.cs
index 8cc97ac8c6..9ac2a27c4e 100644
--- a/Content.Server/Chat/Managers/IChatManager.cs
+++ b/Content.Server/Chat/Managers/IChatManager.cs
@@ -49,7 +49,5 @@ namespace Content.Server.Chat.Managers
         /// <param name="player">The player sending a chat message.</param>
         /// <returns>False if the player has violated rate limits and should be blocked from sending further messages.</returns>
         RateLimitStatus HandleRateLimit(ICommonSession player);
-
-        string PrependFollowButtonIfAppropriate(string wrappedMessage, EntityUid source, INetChannel recipient);
     }
 }
diff --git a/Content.Server/Chat/Systems/ChatSystem.PrivateAPI.cs b/Content.Server/Chat/Systems/ChatSystem.PrivateAPI.cs
index e8860fd00e..d3c81e6eec 100644
--- a/Content.Server/Chat/Systems/ChatSystem.PrivateAPI.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.PrivateAPI.cs
@@ -47,7 +47,7 @@ public sealed partial class ChatSystem
                 speech = proto;
         }
 
-        name = FormattedMessage.EscapeText(name);
+        name = ChatNameLinks ? $"[textlink=\"{FormattedMessage.EscapeStringParameter(name)}\" entity=\"{GetNetEntity(source)}\" entitynamecolor=\"true\"]" : FormattedMessage.EscapeText(name);
 
         var wrappedMessage = Loc.GetString(speech.Bold ? "chat-manager-entity-say-bold-wrap-message" : "chat-manager-entity-say-wrap-message",
             ("entityName", name),
@@ -117,7 +117,7 @@ public sealed partial class ChatSystem
             RaiseLocalEvent(source, nameEv);
             name = nameEv.VoiceName;
         }
-        name = FormattedMessage.EscapeText(name);
+        name = ChatNameLinks ? $"[textlink=\"{FormattedMessage.EscapeStringParameter(name)}\" entity=\"{GetNetEntity(source)}\" entitynamecolor=\"true\"]" : FormattedMessage.EscapeText(name);
 
         var wrappedMessage = Loc.GetString("chat-manager-entity-whisper-wrap-message",
             ("entityName", name), ("message", FormattedMessage.EscapeText(message)));
@@ -213,7 +213,7 @@ public sealed partial class ChatSystem
     private void SendLOOC(EntityUid source, ICommonSession player, string message, bool hideChat)
     {
         var name = FormattedMessage.EscapeText(Identity.Name(source, EntityManager));
-
+        name = ChatNameLinks ? $"[textlink=\"{FormattedMessage.EscapeStringParameter(name)}\" entity=\"{GetNetEntity(source)}\" color=\"{ChatChannel.LOOC.TextColor().ToHex()}\"]": FormattedMessage.EscapeText(name);
         if (_adminManager.IsAdmin(player))
         {
             if (!_adminLoocEnabled) return;
@@ -238,18 +238,19 @@ public sealed partial class ChatSystem
             return;
 
         var clients = GetDeadChatClients();
-        var playerName = Name(source);
         string wrappedMessage;
         if (_adminManager.IsAdmin(player))
         {
+            var userName = ChatNameLinks ? $"[textlink=\"{FormattedMessage.EscapeStringParameter(player.Channel.UserName)}\" entity=\"{GetNetEntity(source)}\" color=\"{ChatChannel.Dead.TextColor().ToHex()}\"]" : FormattedMessage.EscapeText(player.Channel.UserName);
             wrappedMessage = Loc.GetString("chat-manager-send-admin-dead-chat-wrap-message",
                 ("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")),
-                ("userName", player.Channel.UserName),
+                ("userName", (userName)),
                 ("message", FormattedMessage.EscapeText(message)));
             _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Admin dead chat from {source}: {message}");
         }
         else
         {
+            var playerName = ChatNameLinks ? $"[textlink=\"{FormattedMessage.EscapeStringParameter(Name(source))}\" entity=\"{GetNetEntity(source)}\" color=\"{ChatChannel.Dead.TextColor().ToHex()}\"]" : FormattedMessage.EscapeText(Name(source));
             wrappedMessage = Loc.GetString("chat-manager-send-dead-chat-wrap-message",
                 ("deadChannelName", Loc.GetString("chat-manager-dead-channel-name")),
                 ("playerName", (playerName)),
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 5735e55719..de9efca90e 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -2,14 +2,13 @@ using System.Globalization;
 using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
 using Content.Server.Chat.Managers;
-using Content.Server.GameTicking;
 using Content.Server.Station.Systems;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Examine;
-using Content.Shared.Ghost;
+using Content.Shared.GameTicking;
 using Content.Shared.Ghost.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Players.RateLimiting;
@@ -40,7 +39,7 @@ public sealed partial class ChatSystem : SharedChatSystem
     [Dependency] private IRobustRandom _random = default!;
     [Dependency] private IAdminLogManager _adminLogger = default!;
     [Dependency] private ActionBlockerSystem _actionBlocker = default!;
-    [Dependency] private StationSystem _stationSystem = default!;
+    [Dependency] private ServerStationSystem _stationSystem = default!;
     [Dependency] private MobStateSystem _mobStateSystem = default!;
     [Dependency] private SharedAudioSystem _audio = default!;
     [Dependency] private ReplacementAccentSystem _wordreplacement = default!;
diff --git a/Content.Server/Chat/V2/Commands/DeleteChatMessageCommand.cs b/Content.Server/Chat/V2/Commands/DeleteChatMessageCommand.cs
index d2dcee704a..98210f7a6b 100644
--- a/Content.Server/Chat/V2/Commands/DeleteChatMessageCommand.cs
+++ b/Content.Server/Chat/V2/Commands/DeleteChatMessageCommand.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using Content.Server.Administration;
 using Content.Server.Chat.V2.Repository;
 using Content.Shared.Administration;
diff --git a/Content.Server/Chat/V2/Commands/NukeChatMessagesCommand.cs b/Content.Server/Chat/V2/Commands/NukeChatMessagesCommand.cs
index 04da1de9d5..09ebd6fa49 100644
--- a/Content.Server/Chat/V2/Commands/NukeChatMessagesCommand.cs
+++ b/Content.Server/Chat/V2/Commands/NukeChatMessagesCommand.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using Content.Server.Administration;
 using Content.Server.Chat.V2.Repository;
 using Content.Shared.Administration;
diff --git a/Content.Server/Chat/V2/Messages.cs b/Content.Server/Chat/V2/Messages.cs
index 31a563cbeb..5ab03bf260 100644
--- a/Content.Server/Chat/V2/Messages.cs
+++ b/Content.Server/Chat/V2/Messages.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chat.Prototypes;
+using Content.Shared.Chat.Prototypes;
 using Content.Shared.Chat.V2;
 using Content.Shared.Radio;
 
diff --git a/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs b/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs
index 678a45fb53..9a21eab3d7 100644
--- a/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs
+++ b/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Console;
diff --git a/Content.Server/Chemistry/Components/ActiveSolutionHeaterComponent.cs b/Content.Server/Chemistry/Components/ActiveSolutionHeaterComponent.cs
index 3159250869..1612bf653b 100644
--- a/Content.Server/Chemistry/Components/ActiveSolutionHeaterComponent.cs
+++ b/Content.Server/Chemistry/Components/ActiveSolutionHeaterComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Chemistry.Components;
+namespace Content.Server.Chemistry.Components;
 
 [RegisterComponent]
 public sealed partial class ActiveSolutionHeaterComponent : Component
diff --git a/Content.Server/Chemistry/Components/BaseSolutionInjectOnEventComponent.cs b/Content.Server/Chemistry/Components/BaseSolutionInjectOnEventComponent.cs
index 708c1ef005..3cf3cca94c 100644
--- a/Content.Server/Chemistry/Components/BaseSolutionInjectOnEventComponent.cs
+++ b/Content.Server/Chemistry/Components/BaseSolutionInjectOnEventComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.FixedPoint;
+using Content.Shared.FixedPoint;
 using Content.Shared.Inventory;
 
 namespace Content.Server.Chemistry.Components;
diff --git a/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs b/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs
index 6b64b82f78..7c121ac495 100644
--- a/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs
+++ b/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Chemistry.Components;
+namespace Content.Server.Chemistry.Components;
 
 /// <summary>
 /// Used for melee weapon entities that should try to inject a
diff --git a/Content.Server/Chemistry/Components/VaporComponent.cs b/Content.Server/Chemistry/Components/VaporComponent.cs
index e07283b09c..45b16e2602 100644
--- a/Content.Server/Chemistry/Components/VaporComponent.cs
+++ b/Content.Server/Chemistry/Components/VaporComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Map;
+using Robust.Shared.Map;
 
 namespace Content.Server.Chemistry.Components
 {
diff --git a/Content.Server/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs
index 739e5504ae..32da54e8be 100644
--- a/Content.Server/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry;
+using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Server.Player;
 using Robust.Shared.Enums;
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs
index cc76a11174..f3c542a7c6 100644
--- a/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.EntitySystems;
 
 namespace Content.Server.Chemistry.EntitySystems;
 
diff --git a/Content.Server/Clock/ClockSystem.cs b/Content.Server/Clock/ClockSystem.cs
index 0c12a63ac4..a278e8ab70 100644
--- a/Content.Server/Clock/ClockSystem.cs
+++ b/Content.Server/Clock/ClockSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.GameTicking.Events;
 using Content.Shared.Clock;
 using Content.Shared.Destructible;
+using Content.Shared.GameTicking.Events;
 using Robust.Server.GameStates;
 using Robust.Shared.Random;
 
diff --git a/Content.Server/Clothing/Systems/OutfitSystem.cs b/Content.Server/Clothing/Systems/OutfitSystem.cs
index ff2b19f7b9..d17b01fc14 100644
--- a/Content.Server/Clothing/Systems/OutfitSystem.cs
+++ b/Content.Server/Clothing/Systems/OutfitSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Hands.Systems;
+using Content.Server.Hands.Systems;
 using Content.Server.Preferences.Managers;
 using Content.Server.Storage.EntitySystems;
 using Content.Shared.Access.Components;
@@ -13,6 +13,7 @@ using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Roles;
 using Content.Shared.Station;
 using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Station.Systems;
 using Content.Shared.Storage;
 using Robust.Shared.Player;
 
@@ -23,7 +24,7 @@ public sealed partial class OutfitSystem : EntitySystem
     [Dependency] private IServerPreferencesManager _preferenceManager = default!;
     [Dependency] private HandsSystem _handSystem = default!;
     [Dependency] private InventorySystem _invSystem = default!;
-    [Dependency] private SharedStationSpawningSystem _spawningSystem = default!;
+    [Dependency] private StationSpawningSystem _spawningSystem = default!;
     [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!;
     [Dependency] private StorageSystem _storageSystem = default!;
 
@@ -43,7 +44,7 @@ public sealed partial class OutfitSystem : EntitySystem
             session = actorComponent.PlayerSession;
             var userId = actorComponent.PlayerSession.UserId;
             var prefs = _preferenceManager.GetPreferences(userId);
-            profile = prefs.SelectedCharacter as HumanoidCharacterProfile;
+            profile = prefs.SelectedCharacter;
         }
 
         if (_invSystem.TryGetSlots(target, out var slots))
diff --git a/Content.Server/Communications/CommsHackerSystem.cs b/Content.Server/Communications/CommsHackerSystem.cs
index 19613078ce..1d0ea03052 100644
--- a/Content.Server/Communications/CommsHackerSystem.cs
+++ b/Content.Server/Communications/CommsHackerSystem.cs
@@ -1,8 +1,8 @@
 using Content.Server.Chat.Systems;
-using Content.Server.GameTicking;
 using Content.Server.Ninja.Systems;
 using Content.Shared.Communications;
 using Content.Shared.DoAfter;
+using Content.Shared.GameTicking;
 using Content.Shared.Interaction;
 using Content.Shared.Random;
 using Content.Shared.Random.Helpers;
diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs
index 3a0879fcc2..3d128e1527 100644
--- a/Content.Server/Communications/CommunicationsConsoleSystem.cs
+++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs
@@ -3,7 +3,6 @@ using Content.Server.Chat.Systems;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Popups;
 using Content.Server.RoundEnd;
-using Content.Server.Screens.Components;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Systems;
 using Content.Shared.Access.Components;
@@ -13,10 +12,11 @@ using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Communications;
 using Content.Shared.Database;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Popups;
+using Content.Shared.Screens;
+using Content.Shared.Station.Systems;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
@@ -252,12 +252,12 @@ namespace Content.Server.Communications
             if (!TryComp<DeviceNetworkComponent>(uid, out var net))
                 return;
 
-            var payload = new NetworkPayload
+            var payload = new ScreenTextPayload
             {
-                [ScreenMasks.Text] = message.Message
+                Text = message.Message,
             };
 
-            _deviceNetworkSystem.QueuePacket(uid, null, payload, net.TransmitFrequency);
+            _deviceNetworkSystem.SendPacket(uid, null, ref payload, net.TransmitFrequency);
 
             _adminLogger.Add(LogType.DeviceNetwork, LogImpact.Low, $"{ToPrettyString(message.Actor):player} has sent the following broadcast: {message.Message:msg}");
         }
diff --git a/Content.Server/Connection/ConnectionManager.Whitelist.cs b/Content.Server/Connection/ConnectionManager.Whitelist.cs
index ec639f7463..b1cf5edc6c 100644
--- a/Content.Server/Connection/ConnectionManager.Whitelist.cs
+++ b/Content.Server/Connection/ConnectionManager.Whitelist.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Connection.Whitelist;
 using Content.Server.Connection.Whitelist.Conditions;
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index b5ced5c486..d6aa47dec4 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -70,7 +70,7 @@ namespace Content.Server.Connection
         private ISharedSponsorsManager? _sponsorsMgr; // Corvax-Sponsors
         private IServerVPNGuardManager? _vpnGuardMgr; // Corvax-VPNGuard
 
-        private GameTicker? _ticker;
+        private ServerGameTicker? _ticker;
 
         private ISawmill _sawmill = default!;
         private readonly Dictionary<NetUserId, TimeSpan> _temporaryBypasses = [];
@@ -318,7 +318,7 @@ namespace Content.Server.Connection
                 }
             }
 
-            _ticker ??= _entityManager.SystemOrNull<GameTicker>();
+            _ticker ??= _entityManager.SystemOrNull<ServerGameTicker>();
             var wasInGame = _ticker != null &&
                             _ticker.PlayerGameStatuses.TryGetValue(userId, out var status) &&
                             status == PlayerGameStatus.JoinedGame;
@@ -407,12 +407,15 @@ namespace Content.Server.Connection
         public async Task<bool> HavePrivilegedJoin(NetUserId userId)
         {
             var adminBypass = _cfg.GetCVar(CCVars.AdminBypassMaxPlayers) && await _db.GetAdminDataForAsync(userId) != null;
-            var havePriorityJoin = _sponsorsMgr != null && _sponsorsMgr.HaveServerPriorityJoin(userId); // Corvax-Sponsors
-            var wasInGame = EntitySystem.TryGet<GameTicker>(out var ticker) &&
-                            ticker.PlayerGameStatuses.TryGetValue(userId, out var status) &&
+            var havePriorityJoin = _sponsorsMgr != null && _sponsorsMgr.HaveServerPriorityJoin(userId); // Corvax-Sponsors  
+
+            _ticker ??= _entityManager.SystemOrNull<ServerGameTicker>();
+            var wasInGame = _ticker != null &&
+                            _ticker.PlayerGameStatuses.TryGetValue(userId, out var status) &&
                             status == PlayerGameStatus.JoinedGame;
+
             return adminBypass ||
-                   havePriorityJoin || // Corvax-Sponsors
+                   havePriorityJoin || // Corvax-Sponsors  
                    wasInGame;
         }
         // Corvax-Queue-End
diff --git a/Content.Server/Connection/GrantConnectBypassCommand.cs b/Content.Server/Connection/GrantConnectBypassCommand.cs
index 4e80f5fcfb..94e55e250a 100644
--- a/Content.Server/Connection/GrantConnectBypassCommand.cs
+++ b/Content.Server/Connection/GrantConnectBypassCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 
diff --git a/Content.Server/Connection/IPIntel/IPIntel.cs b/Content.Server/Connection/IPIntel/IPIntel.cs
index a2e7bc580c..ef77e0793b 100644
--- a/Content.Server/Connection/IPIntel/IPIntel.cs
+++ b/Content.Server/Connection/IPIntel/IPIntel.cs
@@ -1,4 +1,4 @@
-using System.Buffers.Binary;
+using System.Buffers.Binary;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading.Tasks;
diff --git a/Content.Server/Connection/IPIntel/IPIntelAPI.cs b/Content.Server/Connection/IPIntel/IPIntelAPI.cs
index 42cbbf9f93..1e5dc4188e 100644
--- a/Content.Server/Connection/IPIntel/IPIntelAPI.cs
+++ b/Content.Server/Connection/IPIntel/IPIntelAPI.cs
@@ -1,4 +1,4 @@
-using System.Net;
+using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Content.Shared.CCVar;
diff --git a/Content.Server/Connection/UserDataExt.cs b/Content.Server/Connection/UserDataExt.cs
index a409f79a75..11b8e11e48 100644
--- a/Content.Server/Connection/UserDataExt.cs
+++ b/Content.Server/Connection/UserDataExt.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 using Robust.Shared.Network;
 
 namespace Content.Server.Connection;
diff --git a/Content.Server/Connection/Whitelist/BlacklistCommands.cs b/Content.Server/Connection/Whitelist/BlacklistCommands.cs
index da4de80d88..00fbbba210 100644
--- a/Content.Server/Connection/Whitelist/BlacklistCommands.cs
+++ b/Content.Server/Connection/Whitelist/BlacklistCommands.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.Database;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionAlwaysMatch.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionAlwaysMatch.cs
index 9fe5db4012..fb4d8d2e92 100644
--- a/Content.Server/Connection/Whitelist/Conditions/ConditionAlwaysMatch.cs
+++ b/Content.Server/Connection/Whitelist/Conditions/ConditionAlwaysMatch.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Robust.Shared.Network;
 
 namespace Content.Server.Connection.Whitelist.Conditions;
diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionManualBlacklistMembership.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionManualBlacklistMembership.cs
index 9d67129e71..50d07f0351 100644
--- a/Content.Server/Connection/Whitelist/Conditions/ConditionManualBlacklistMembership.cs
+++ b/Content.Server/Connection/Whitelist/Conditions/ConditionManualBlacklistMembership.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Server.Database;
 using Robust.Shared.Network;
 
diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionManualWhitelistMembership.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionManualWhitelistMembership.cs
index a31835f9c2..ba188d6e53 100644
--- a/Content.Server/Connection/Whitelist/Conditions/ConditionManualWhitelistMembership.cs
+++ b/Content.Server/Connection/Whitelist/Conditions/ConditionManualWhitelistMembership.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Server.Database;
 using Robust.Shared.Network;
 
diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionNotesDateRange.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionNotesDateRange.cs
index 1e34bc6373..8479d16e84 100644
--- a/Content.Server/Connection/Whitelist/Conditions/ConditionNotesDateRange.cs
+++ b/Content.Server/Connection/Whitelist/Conditions/ConditionNotesDateRange.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Database;
 using Content.Shared.Database;
diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionNotesPlaytimeRange.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionNotesPlaytimeRange.cs
index d2d22a8cd0..1d8b97df9d 100644
--- a/Content.Server/Connection/Whitelist/Conditions/ConditionNotesPlaytimeRange.cs
+++ b/Content.Server/Connection/Whitelist/Conditions/ConditionNotesPlaytimeRange.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 
 namespace Content.Server.Connection.Whitelist.Conditions;
 
diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionPlayerCount.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionPlayerCount.cs
index 432ad32c4a..ed9aaeaf6d 100644
--- a/Content.Server/Connection/Whitelist/Conditions/ConditionPlayerCount.cs
+++ b/Content.Server/Connection/Whitelist/Conditions/ConditionPlayerCount.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Robust.Server.Player;
 using Robust.Shared.Network;
 
diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionPlaytime.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionPlaytime.cs
index 7b45181e12..7140d578d4 100644
--- a/Content.Server/Connection/Whitelist/Conditions/ConditionPlaytime.cs
+++ b/Content.Server/Connection/Whitelist/Conditions/ConditionPlaytime.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Server.Database;
 using Content.Shared.Players.PlayTimeTracking;
 using Robust.Shared.Network;
diff --git a/Content.Server/Connection/Whitelist/WhitelistCondition.cs b/Content.Server/Connection/Whitelist/WhitelistCondition.cs
index b68fd52996..cfee913184 100644
--- a/Content.Server/Connection/Whitelist/WhitelistCondition.cs
+++ b/Content.Server/Connection/Whitelist/WhitelistCondition.cs
@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Robust.Shared.Network;
diff --git a/Content.Server/Connection/Whitelist/WhitelistPrototype.cs b/Content.Server/Connection/Whitelist/WhitelistPrototype.cs
index af119c7b1d..5521235654 100644
--- a/Content.Server/Connection/Whitelist/WhitelistPrototype.cs
+++ b/Content.Server/Connection/Whitelist/WhitelistPrototype.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/Construction/AnchorOnlyOnStationSystem.cs b/Content.Server/Construction/AnchorOnlyOnStationSystem.cs
index c66bde4061..9b787db52d 100644
--- a/Content.Server/Construction/AnchorOnlyOnStationSystem.cs
+++ b/Content.Server/Construction/AnchorOnlyOnStationSystem.cs
@@ -1,6 +1,6 @@
-using System.Linq;
-using Content.Server.Station.Systems;
+using System.Linq;
 using Content.Shared.Construction.Components;
+using Content.Shared.Station.Systems;
 using Robust.Server.GameObjects;
 
 namespace Content.Server.Construction;
diff --git a/Content.Server/Construction/Completions/AddContainer.cs b/Content.Server/Construction/Completions/AddContainer.cs
index 5885cd8248..732847da2c 100644
--- a/Content.Server/Construction/Completions/AddContainer.cs
+++ b/Content.Server/Construction/Completions/AddContainer.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Construction;
+using Content.Shared.Construction;
 using JetBrains.Annotations;
 
 namespace Content.Server.Construction.Completions
diff --git a/Content.Server/Construction/Completions/AppearanceChange.cs b/Content.Server/Construction/Completions/AppearanceChange.cs
index 15b3816722..ead60f254b 100644
--- a/Content.Server/Construction/Completions/AppearanceChange.cs
+++ b/Content.Server/Construction/Completions/AppearanceChange.cs
@@ -1,4 +1,4 @@
-using Content.Server.Construction.Components;
+using Content.Server.Construction.Components;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs b/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs
index a47dec6742..1d867491b0 100644
--- a/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs
+++ b/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs
@@ -1,4 +1,4 @@
-using Content.Server.Construction.Components;
+using Content.Server.Construction.Components;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 
diff --git a/Content.Server/Construction/Completions/SetStackCount.cs b/Content.Server/Construction/Completions/SetStackCount.cs
index 409d6abf95..102eb97e08 100644
--- a/Content.Server/Construction/Completions/SetStackCount.cs
+++ b/Content.Server/Construction/Completions/SetStackCount.cs
@@ -1,4 +1,4 @@
-using Content.Server.Stack;
+using Content.Server.Stack;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 
diff --git a/Content.Server/Construction/Components/MachineComponent.cs b/Content.Server/Construction/Components/MachineComponent.cs
index 8a0f117712..2869949fda 100644
--- a/Content.Server/Construction/Components/MachineComponent.cs
+++ b/Content.Server/Construction/Components/MachineComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Construction.Components;
+using Content.Shared.Construction.Components;
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/Construction/Components/MachineFrameComponent.cs b/Content.Server/Construction/Components/MachineFrameComponent.cs
index 14e81e8dd3..c51f88bdd7 100644
--- a/Content.Server/Construction/Components/MachineFrameComponent.cs
+++ b/Content.Server/Construction/Components/MachineFrameComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Construction.Components;
+using Content.Shared.Construction.Components;
 using Content.Shared.Stacks;
 using Content.Shared.Tag;
 using Robust.Shared.Containers;
diff --git a/Content.Server/Construction/Conditions/AllWiresCut.cs b/Content.Server/Construction/Conditions/AllWiresCut.cs
index 10cb2e5cf0..31fc4441b0 100644
--- a/Content.Server/Construction/Conditions/AllWiresCut.cs
+++ b/Content.Server/Construction/Conditions/AllWiresCut.cs
@@ -1,4 +1,4 @@
-using Content.Server.Wires;
+using Content.Server.Wires;
 using Content.Shared.Construction;
 using Content.Shared.Examine;
 using JetBrains.Annotations;
diff --git a/Content.Server/Construction/Conditions/EntityAnchored.cs b/Content.Server/Construction/Conditions/EntityAnchored.cs
index 6bcfe0b772..6f6df89e04 100644
--- a/Content.Server/Construction/Conditions/EntityAnchored.cs
+++ b/Content.Server/Construction/Conditions/EntityAnchored.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Construction;
+using Content.Shared.Construction;
 using Content.Shared.Examine;
 using JetBrains.Annotations;
 using Robust.Shared.Utility;
diff --git a/Content.Server/Corvax/Api/AHelp/AHelpBotApiSystem.cs b/Content.Server/Corvax/Api/AHelp/AHelpBotApiSystem.cs
index 964946df4d..6514b19d9a 100644
--- a/Content.Server/Corvax/Api/AHelp/AHelpBotApiSystem.cs
+++ b/Content.Server/Corvax/Api/AHelp/AHelpBotApiSystem.cs
@@ -6,16 +6,15 @@ using System.Net.Http.Headers;
 using System.Net.Http.Json;
 using System.Security.Cryptography;
 using System.Text;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Content.Server.Administration.Systems;
-using Content.Server.GameTicking;
 using Content.Shared.Corvax.CCCVars;
 using Robust.Shared;
 using Robust.Shared.Asynchronous;
 using Robust.Shared.Configuration;
 using Robust.Server.ServerStatus;
+using Content.Shared.GameTicking;
 
 namespace Content.Server.Corvax.Api.AHelp;
 
diff --git a/Content.Server/Corvax/Api/AHelp/BwoinkSystem.CorvaxAHelpApi.cs b/Content.Server/Corvax/Api/AHelp/BwoinkSystem.CorvaxAHelpApi.cs
index 0f5b126d7d..28ac2502d5 100644
--- a/Content.Server/Corvax/Api/AHelp/BwoinkSystem.CorvaxAHelpApi.cs
+++ b/Content.Server/Corvax/Api/AHelp/BwoinkSystem.CorvaxAHelpApi.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Content.Server.GameTicking;
+using Content.Shared.GameTicking;
 using Robust.Shared.Network;
 
 namespace Content.Server.Administration.Systems;
diff --git a/Content.Server/Corvax/Documents/DocumentPrinterSystem.cs b/Content.Server/Corvax/Documents/DocumentPrinterSystem.cs
index 77346b8945..d2a7a5c4de 100644
--- a/Content.Server/Corvax/Documents/DocumentPrinterSystem.cs
+++ b/Content.Server/Corvax/Documents/DocumentPrinterSystem.cs
@@ -4,7 +4,7 @@ using Content.Shared.Corvax.Documents;
 using Content.Shared.GameTicking;
 using Content.Shared.Lathe;
 using Content.Shared.Paper;
-using Content.Shared.Station;
+using Content.Shared.Station.Systems;
 
 namespace Content.Server.Corvax.Documents;
 
@@ -12,8 +12,8 @@ public sealed partial class DocumentPrinterSystem : EntitySystem
 {
     [Dependency] private ItemSlotsSystem _itemSlots = default!;
     [Dependency] private PaperSystem _paper = default!;
-    [Dependency] private SharedStationSystem _station = default!;
-    [Dependency] private SharedGameTicker _gameTicker = default!;
+    [Dependency] private StationSystem _station = default!;
+    [Dependency] private GameTicker _gameTicker = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Server/Corvax/PeacefulRoundEnd/PeacefulRoundEndSystem.cs b/Content.Server/Corvax/PeacefulRoundEnd/PeacefulRoundEndSystem.cs
index fcda99d053..aafa7a87b7 100644
--- a/Content.Server/Corvax/PeacefulRoundEnd/PeacefulRoundEndSystem.cs
+++ b/Content.Server/Corvax/PeacefulRoundEnd/PeacefulRoundEndSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameTicking;
+using Content.Shared.GameTicking;
 using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Corvax.CCCVars;
 using Content.Shared.Mindshield.Components;
@@ -22,7 +22,7 @@ public sealed partial class PeacefulRoundEndSystem : EntitySystem
         SubscribeLocalEvent<RoundEndTextAppendEvent>(OnRoundEnded);
     }
 
-    private void OnRoundEnded(RoundEndTextAppendEvent ev)
+    private void OnRoundEnded(ref RoundEndTextAppendEvent ev)
     {
         if (!_isEnabled) return;
         foreach (var session in _playerManager.Sessions)
diff --git a/Content.Server/Corvax/SecApartment/SecApartmentSystem.cs b/Content.Server/Corvax/SecApartment/SecApartmentSystem.cs
index 4581e36d60..9ee2f75054 100644
--- a/Content.Server/Corvax/SecApartment/SecApartmentSystem.cs
+++ b/Content.Server/Corvax/SecApartment/SecApartmentSystem.cs
@@ -4,10 +4,10 @@ using Content.Server.Medical.CrewMonitoring;
 using Content.Server.Pinpointer;
 using Content.Shared.CrewManifest;
 using Content.Shared.GameTicking;
-using Content.Shared.Medical.SuitSensor;
+using Content.Shared.Medical.SuitSensors;
 using Content.Shared.Roles;
 using Content.Shared.SecApartment;
-using Content.Shared.Station;
+using Content.Shared.Station.Systems;
 using Content.Shared.UserInterface;
 using Robust.Server.GameObjects;
 using Robust.Shared.Map;
@@ -22,7 +22,7 @@ namespace Content.Server.Corvax.SecApartment;
 
 public sealed partial class SecApartmentSystem : EntitySystem
 {
-    [Dependency] private SharedStationSystem _station = default!;
+    [Dependency] private StationSystem _station = default!;
     [Dependency] private CrewManifestSystem _crewManifest = default!;
     [Dependency] private UserInterfaceSystem _ui = default!;
     [Dependency] private IRobustRandom _random = default!;
@@ -441,31 +441,35 @@ public sealed partial class SecApartmentSystem : EntitySystem
         if (manifest == null)
             return result;
 
+        TryComp<CrewMonitoringConsoleComponent>(tablet, out var monitoring);
+
         foreach (var entry in manifest.Entries)
         {
-            if (_securityJobs.Contains(entry.JobPrototype))
+            if (!_securityJobs.Contains(entry.JobPrototype))
+                continue;
+
+            NetEntity? ownerUid = null;
+            SuitSensorStatus? status = null;
+
+            if (monitoring != null)
             {
-                NetEntity? ownerUid = null;
-                SuitSensorStatus? status = null;
-                if (TryComp<CrewMonitoringConsoleComponent>(tablet, out var monitoring))
-                {
-                    var sensor = monitoring.ConnectedSensors.Values
-                        .FirstOrDefault(s => s.Name == entry.Name && s.Job == entry.JobTitle);
+                status = monitoring.ConnectedSensors.Values
+                    .Where(s => s.Name == entry.Name && s.Job == entry.JobTitle)
+                    .Select(s => (SuitSensorStatus?)s)
+                    .FirstOrDefault();
 
-                    status = sensor;
-                    ownerUid = sensor?.OwnerUid;
-                }
-
-                var memberId = GenerateMemberId(entry);
-                result.Add(new CrewMemberInfo(
-                    memberId,
-                    ownerUid,
-                    entry.Name,
-                    entry.JobTitle,
-                    entry.JobIcon,
-                    status
-                ));
+                if (status is { } sensorStatus)
+                    ownerUid = sensorStatus.OwnerUid;
             }
+
+            var memberId = GenerateMemberId(entry);
+            result.Add(new CrewMemberInfo(
+                memberId,
+                ownerUid,
+                entry.Name,
+                entry.JobTitle,
+                entry.JobIcon,
+                status));
         }
 
         return result;
@@ -484,19 +488,18 @@ public sealed partial class SecApartmentSystem : EntitySystem
         foreach (var memberId in squad.Members.Select(m => m.MemberId))
         {
             var memberInfo = securityCrew.FirstOrDefault(c => c.MemberId == memberId);
-            if (memberInfo?.SensorStatus == null)
+            if (memberInfo?.SensorStatus is not { } sensorStatus || !sensorStatus.IsAlive)
                 continue;
 
-            if (!memberInfo.SensorStatus.IsAlive)
+            var ownerUid = GetEntity(sensorStatus.OwnerUid);
+            if (!Exists(ownerUid) || Terminating(ownerUid))
                 continue;
 
-            var ownerUid = GetEntity(memberInfo.SensorStatus.OwnerUid);
             var memberTransform = Transform(ownerUid);
             if (memberTransform.GridUid == null)
                 continue;
 
             var mapPos = _transform.GetMapCoordinates(ownerUid);
-
             trackedPositions.Add(mapPos.Position);
             mapId = mapPos.MapId;
         }
diff --git a/Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs b/Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs
index 69b7ea2ac2..4494f71a84 100644
--- a/Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs
+++ b/Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs
@@ -1,6 +1,6 @@
 using Content.Server.Fax;
 using Content.Server.MassMedia.Systems;
-using Content.Server.Station.Systems;
+using Content.Shared.Station.Systems;
 using System.Linq;
 using Content.Shared.Corvax.CCCVars;
 using Content.Shared.Fax.Components;
diff --git a/Content.Server/Corvax/TTS/TTSSystem.cs b/Content.Server/Corvax/TTS/TTSSystem.cs
index 248d44c79a..c8a59a52e6 100644
--- a/Content.Server/Corvax/TTS/TTSSystem.cs
+++ b/Content.Server/Corvax/TTS/TTSSystem.cs
@@ -2,9 +2,8 @@ using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Communications;
 using Content.Server.Power.Components;
-using Content.Server.Radio;
 using Content.Server.Radio.EntitySystems;
-using Content.Server.Station.Systems;
+using Content.Shared.Station.Systems;
 using Content.Shared.Chat;
 using Content.Shared.Corvax.CCCVars;
 using Content.Shared.Corvax.TTS;
diff --git a/Content.Server/CrewManifest/CrewManifestSystem.cs b/Content.Server/CrewManifest/CrewManifestSystem.cs
index 6cdd89d09f..22e96452fd 100644
--- a/Content.Server/CrewManifest/CrewManifestSystem.cs
+++ b/Content.Server/CrewManifest/CrewManifestSystem.cs
@@ -20,7 +20,7 @@ namespace Content.Server.CrewManifest;
 
 public sealed partial class CrewManifestSystem : EntitySystem
 {
-    [Dependency] private StationSystem _stationSystem = default!;
+    [Dependency] private ServerStationSystem _stationSystem = default!;
     [Dependency] private StationRecordsSystem _recordsSystem = default!;
     [Dependency] private EuiManager _euiManager = default!;
     [Dependency] private IConfigurationManager _configManager = default!;
diff --git a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
index 5dc921332c..dc3578cd85 100644
--- a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
+++ b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
@@ -30,7 +30,7 @@ public sealed partial class CriminalRecordsConsoleSystem : SharedCriminalRecords
     [Dependency] private PopupSystem _popup = default!;
     [Dependency] private RadioSystem _radio = default!;
     [Dependency] private StationRecordsSystem _records = default!;
-    [Dependency] private StationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
     [Dependency] private UserInterfaceSystem _ui = default!;
     [Dependency] private IdentitySystem _identity = default!;
 
diff --git a/Content.Server/CriminalRecords/Systems/CriminalRecordsHackerSystem.cs b/Content.Server/CriminalRecords/Systems/CriminalRecordsHackerSystem.cs
index 57c2bc2028..db23c789a1 100644
--- a/Content.Server/CriminalRecords/Systems/CriminalRecordsHackerSystem.cs
+++ b/Content.Server/CriminalRecords/Systems/CriminalRecordsHackerSystem.cs
@@ -16,7 +16,7 @@ public sealed partial class CriminalRecordsHackerSystem : SharedCriminalRecordsH
     [Dependency] private ChatSystem _chat = default!;
     [Dependency] private CriminalRecordsSystem _criminalRecords = default!;
     [Dependency] private IRobustRandom _random = default!;
-    [Dependency] private StationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
     [Dependency] private StationRecordsSystem _records = default!;
 
     public override void Initialize()
diff --git a/Content.Server/CriminalRecords/Systems/CriminalRecordsSystem.cs b/Content.Server/CriminalRecords/Systems/CriminalRecordsSystem.cs
index ec870f4c7e..b97daa0f94 100644
--- a/Content.Server/CriminalRecords/Systems/CriminalRecordsSystem.cs
+++ b/Content.Server/CriminalRecords/Systems/CriminalRecordsSystem.cs
@@ -22,9 +22,9 @@ namespace Content.Server.CriminalRecords.Systems;
 /// </summary>
 public sealed partial class CriminalRecordsSystem : SharedCriminalRecordsSystem
 {
-    [Dependency] private GameTicker _ticker = default!;
+    [Dependency] private ServerGameTicker _ticker = default!;
     [Dependency] private StationRecordsSystem _records = default!;
-    [Dependency] private StationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
     [Dependency] private CartridgeLoaderSystem _cartridge = default!;
 
     public override void Initialize()
diff --git a/Content.Server/Damage/Components/ExaminableDamageComponent.cs b/Content.Server/Damage/Components/ExaminableDamageComponent.cs
index 26e9e40692..0a02c41d75 100644
--- a/Content.Server/Damage/Components/ExaminableDamageComponent.cs
+++ b/Content.Server/Damage/Components/ExaminableDamageComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Dataset;
+using Content.Shared.Dataset;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Damage.Components;
diff --git a/Content.Server/Damage/Systems/ExaminableDamageSystem.cs b/Content.Server/Damage/Systems/ExaminableDamageSystem.cs
index 6225ced3dc..89eeadaf7b 100644
--- a/Content.Server/Damage/Systems/ExaminableDamageSystem.cs
+++ b/Content.Server/Damage/Systems/ExaminableDamageSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Damage.Components;
+using Content.Server.Damage.Components;
 using Content.Server.Destructible;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
diff --git a/Content.Server/Damage/Systems/StaminaSystem.cs b/Content.Server/Damage/Systems/StaminaSystem.cs
index 71f40b310d..95f4662e32 100644
--- a/Content.Server/Damage/Systems/StaminaSystem.cs
+++ b/Content.Server/Damage/Systems/StaminaSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage.Systems;
+using Content.Shared.Damage.Systems;
 
 namespace Content.Server.Damage.Systems;
 
diff --git a/Content.Server/Database/BanMatcher.cs b/Content.Server/Database/BanMatcher.cs
index 0302c0dc13..fe933a2c1a 100644
--- a/Content.Server/Database/BanMatcher.cs
+++ b/Content.Server/Database/BanMatcher.cs
@@ -1,4 +1,4 @@
-using System.Collections.Immutable;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Net;
 using Content.Server.IP;
diff --git a/Content.Server/Database/EFCoreExtensions.cs b/Content.Server/Database/EFCoreExtensions.cs
index 58dbc4639b..3fe4b84cf2 100644
--- a/Content.Server/Database/EFCoreExtensions.cs
+++ b/Content.Server/Database/EFCoreExtensions.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore;
 
diff --git a/Content.Server/Database/ServerDbEntryManager.cs b/Content.Server/Database/ServerDbEntryManager.cs
index 95c3444df2..b89fae52ec 100644
--- a/Content.Server/Database/ServerDbEntryManager.cs
+++ b/Content.Server/Database/ServerDbEntryManager.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Shared.CCVar;
 using Robust.Shared.Configuration;
 
diff --git a/Content.Server/Database/ServerDbManagerExt.cs b/Content.Server/Database/ServerDbManagerExt.cs
index fad7a7234e..cfacc9c313 100644
--- a/Content.Server/Database/ServerDbManagerExt.cs
+++ b/Content.Server/Database/ServerDbManagerExt.cs
@@ -1,4 +1,4 @@
-using System.Text.Json;
+using System.Text.Json;
 using Robust.Shared.Asynchronous;
 
 namespace Content.Server.Database;
diff --git a/Content.Server/Database/ServerDbPostgres.Notifications.cs b/Content.Server/Database/ServerDbPostgres.Notifications.cs
index 91db2d100f..1a286fc4a7 100644
--- a/Content.Server/Database/ServerDbPostgres.Notifications.cs
+++ b/Content.Server/Database/ServerDbPostgres.Notifications.cs
@@ -1,4 +1,4 @@
-using System.Data;
+using System.Data;
 using System.Threading;
 using System.Threading.Tasks;
 using Content.Server.Administration.Managers;
diff --git a/Content.Server/Database/UnbanDef.cs b/Content.Server/Database/UnbanDef.cs
index 1fa4fc2a6a..f329069e28 100644
--- a/Content.Server/Database/UnbanDef.cs
+++ b/Content.Server/Database/UnbanDef.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Network;
+using Robust.Shared.Network;
 
 namespace Content.Server.Database
 {
diff --git a/Content.Server/Database/UserDbDataManager.cs b/Content.Server/Database/UserDbDataManager.cs
index 8707017043..cce80d0abc 100644
--- a/Content.Server/Database/UserDbDataManager.cs
+++ b/Content.Server/Database/UserDbDataManager.cs
@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using Content.Server.Preferences.Managers;
 using Robust.Shared.Network;
diff --git a/Content.Server/Delivery/DeliverySystem.cs b/Content.Server/Delivery/DeliverySystem.cs
index a8a06889d8..21aec1a9dc 100644
--- a/Content.Server/Delivery/DeliverySystem.cs
+++ b/Content.Server/Delivery/DeliverySystem.cs
@@ -25,7 +25,7 @@ public sealed partial class DeliverySystem : SharedDeliverySystem
     [Dependency] private SharedAppearanceSystem _appearance = default!;
     [Dependency] private SharedAudioSystem _audio = default!;
     [Dependency] private StationRecordsSystem _records = default!;
-    [Dependency] private StationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
     [Dependency] private FingerprintReaderSystem _fingerprintReader = default!;
     [Dependency] private LabelSystem _label = default!;
     [Dependency] private SharedContainerSystem _container = default!;
diff --git a/Content.Server/Destructible/DamageThresholdsSerializer.cs b/Content.Server/Destructible/DamageThresholdsSerializer.cs
index 92c4c83ea3..5f6593db5c 100644
--- a/Content.Server/Destructible/DamageThresholdsSerializer.cs
+++ b/Content.Server/Destructible/DamageThresholdsSerializer.cs
@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 using System.Linq;
 using Content.Server.Destructible.Thresholds;
 using Content.Shared.Destructible.Thresholds.Triggers;
diff --git a/Content.Server/Destructible/DestructibleSystem.BenchmarkHelpers.cs b/Content.Server/Destructible/DestructibleSystem.BenchmarkHelpers.cs
index a00194c911..1ea852c191 100644
--- a/Content.Server/Destructible/DestructibleSystem.BenchmarkHelpers.cs
+++ b/Content.Server/Destructible/DestructibleSystem.BenchmarkHelpers.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage;
+using Content.Shared.Damage;
 
 namespace Content.Server.Destructible;
 
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
index 5bc83702c7..8ffc9ffc37 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Body.Components;
+using Content.Shared.Body.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Inventory;
 using Content.Shared.Popups;
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs
index add8ce335f..85fe48a576 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs
@@ -1,4 +1,4 @@
-using Content.Server.Construction.Components;
+using Content.Server.Construction.Components;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors
 {
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/DoActsBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/DoActsBehavior.cs
index 1086be4958..878c22e343 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/DoActsBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/DoActsBehavior.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Destructible;
+using Content.Shared.Destructible;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors
 {
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/IThresholdBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/IThresholdBehavior.cs
index 0cf0cc032c..09d0a33224 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/IThresholdBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/IThresholdBehavior.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors
 {
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs
index cf337ac76a..22a824abfd 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Destructible.Thresholds.Behaviors;
+namespace Content.Server.Destructible.Thresholds.Behaviors;
 
 [DataDefinition]
 public sealed partial class TimerStartBehavior : IThresholdBehavior
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs
index 66da79063c..e11923e1e5 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Trigger.Systems;
+using Content.Shared.Trigger.Systems;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors;
 
diff --git a/Content.Server/DeviceLinking/Components/Overload/SoundOnOverloadComponent.cs b/Content.Server/DeviceLinking/Components/Overload/SoundOnOverloadComponent.cs
index 2474f2500d..d52374088e 100644
--- a/Content.Server/DeviceLinking/Components/Overload/SoundOnOverloadComponent.cs
+++ b/Content.Server/DeviceLinking/Components/Overload/SoundOnOverloadComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.DeviceLinking.Systems;
+using Content.Server.DeviceLinking.Systems;
 using Robust.Shared.Audio;
 
 namespace Content.Server.DeviceLinking.Components.Overload;
diff --git a/Content.Server/DeviceLinking/Components/Overload/SpawnOnOverloadComponent.cs b/Content.Server/DeviceLinking/Components/Overload/SpawnOnOverloadComponent.cs
index aff1c5639c..0ca9018fab 100644
--- a/Content.Server/DeviceLinking/Components/Overload/SpawnOnOverloadComponent.cs
+++ b/Content.Server/DeviceLinking/Components/Overload/SpawnOnOverloadComponent.cs
@@ -16,5 +16,5 @@ public sealed partial class SpawnOnOverloadComponent : Component
     /// The entity prototype to spawn when the device overloads
     /// </summary>
     [DataField("spawnedPrototype")]
-    public EntProtoId Prototype = "PuddleSparkle";
+    public EntProtoId Prototype = "EffectSparks";
 }
diff --git a/Content.Server/DeviceLinking/Systems/DeviceLinkOverloadSystem.cs b/Content.Server/DeviceLinking/Systems/DeviceLinkOverloadSystem.cs
index 18e0aa4b07..0ef540f86e 100644
--- a/Content.Server/DeviceLinking/Systems/DeviceLinkOverloadSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/DeviceLinkOverloadSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.DeviceLinking.Components.Overload;
+using Content.Server.DeviceLinking.Components.Overload;
 using Robust.Server.Audio;
 using Robust.Shared.Audio;
 using Content.Shared.DeviceLinking.Events;
diff --git a/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs b/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs
index 3f1289cb5c..08acf09fa0 100644
--- a/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs
@@ -1,6 +1,3 @@
-using Content.Server.DeviceLinking.Components;
-using Content.Server.DeviceNetwork;
-using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Shared.DeviceLinking;
 using Content.Shared.DeviceLinking.Events;
@@ -18,28 +15,65 @@ public sealed partial class DeviceLinkSystem : SharedDeviceLinkSystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<DeviceLinkSinkComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
-        SubscribeLocalEvent<DeviceLinkSourceComponent, NewLinkEvent>(OnNewLink);
+        // TODO: make an engine PR to allow for auto-generated relay subscriptions
+        // Should be doable by using reflection on marker interfaces and then adding them to the auto-generated subscriptions
+        // I know it looks absolutely hilarious and horrible, but uuuhhhh anything to avoid boxing allocations!!!!!!!! :godo:
+        SubscribeLocalEvent<DeviceLinkSinkComponent, DeviceNetworkPacketEvent<SignalPayload<LogicStatePayload>>>(OnSignalReceived);
+    }
+
+    private void OnSignalReceived<T>(Entity<DeviceLinkSinkComponent> ent,
+        ref DeviceNetworkPacketEvent<SignalPayload<T>> args) where T : ISignalNetworkPayload
+    {
+        var (uid, component) = ent;
+        if (!component.Ports.Contains(args.Data.InvokedPort))
+            return;
+
+        var eventArgs = new SignalReceivedEvent<T>(args.Data.InvokedPort, args.Data.Payload, args.Sender);
+        RaiseLocalEvent(uid, ref eventArgs);
     }
 
     #region Sending & Receiving
-    public override void InvokePort(EntityUid uid, string port, NetworkPayload? data = null, DeviceLinkSourceComponent? sourceComponent = null)
+
+    public override void InvokePort(Entity<DeviceLinkSourceComponent?> ent, string port)
     {
-        if (!Resolve(uid, ref sourceComponent) || !sourceComponent.Outputs.TryGetValue(port, out var sinks))
+        if (!DeviceLinkSourceQuery.Resolve(ent.Owner, ref ent.Comp) ||
+            !ent.Comp.Outputs.TryGetValue(port, out var sinks))
             return;
 
         foreach (var sinkUid in sinks)
         {
-            if (!sourceComponent.LinkedPorts.TryGetValue(sinkUid, out var links))
+            if (!ent.Comp.LinkedPorts.TryGetValue(sinkUid, out var links))
                 continue;
 
-            if (!TryComp<DeviceLinkSinkComponent>(sinkUid, out var sinkComponent))
+            if (!DeviceLinkSinkQuery.TryComp(sinkUid, out var sinkComponent))
                 continue;
 
             foreach (var (source, sink) in links)
             {
                 if (source == port)
-                    InvokeDirect((uid, sourceComponent), (sinkUid, sinkComponent), source, sink, data);
+                    InvokeDirect((ent.Owner, ent.Comp), (sinkUid, sinkComponent), sink);
+            }
+        }
+    }
+
+    public override void InvokePort<T>(Entity<DeviceLinkSourceComponent?> ent, string port, ref T data)
+    {
+        if (!DeviceLinkSourceQuery.Resolve(ent.Owner, ref ent.Comp) ||
+            !ent.Comp.Outputs.TryGetValue(port, out var sinks))
+            return;
+
+        foreach (var sinkUid in sinks)
+        {
+            if (!ent.Comp.LinkedPorts.TryGetValue(sinkUid, out var links))
+                continue;
+
+            if (!DeviceLinkSinkQuery.TryComp(sinkUid, out var sinkComponent))
+                continue;
+
+            foreach (var (source, sink) in links)
+            {
+                if (source == port)
+                    InvokeDirect(ent!, (sinkUid, sinkComponent), sink, ref data);
             }
         }
     }
@@ -47,9 +81,11 @@ public sealed partial class DeviceLinkSystem : SharedDeviceLinkSystem
     /// <summary>
     /// Raises an event on or sends a network packet directly to a sink from a source.
     /// </summary>
-    private void InvokeDirect(Entity<DeviceLinkSourceComponent> source, Entity<DeviceLinkSinkComponent?> sink, string sourcePort, string sinkPort, NetworkPayload? data)
+    private void InvokeDirect(Entity<DeviceLinkSourceComponent> source,
+        Entity<DeviceLinkSinkComponent?> sink,
+        string sinkPort)
     {
-        if (!Resolve(sink, ref sink.Comp))
+        if (!DeviceLinkSinkQuery.Resolve(sink, ref sink.Comp))
             return;
 
         var invokeCounter = GetEffectiveInvokeCounter(sink.Comp);
@@ -72,41 +108,79 @@ public sealed partial class DeviceLinkSystem : SharedDeviceLinkSystem
             return;
         }
 
-        var payload = new NetworkPayload()
+        var payload = new SignalPayload
         {
-            [InvokedPort] = sinkPort
+            InvokedPort = sinkPort,
         };
 
-        if (data != null)
+        // force using wireless network so things like atmos devices are able to send signals
+        _deviceNetworkSystem.SendPacket(source.Owner,
+            sinkNetwork.Address,
+            ref payload,
+            sinkNetwork.ReceiveFrequency,
+            (int)DeviceNetIdDefaults.Wireless);
+    }
+
+    /// <summary>
+    /// Raises an event on or sends a network packet directly to a sink from a source.
+    /// </summary>
+    private void InvokeDirect<T>(Entity<DeviceLinkSourceComponent> source,
+        Entity<DeviceLinkSinkComponent?> sink,
+        string sinkPort,
+        ref T data) where T : ISignalNetworkPayload
+    {
+        if (!DeviceLinkSinkQuery.Resolve(sink, ref sink.Comp))
+            return;
+
+        var invokeCounter = GetEffectiveInvokeCounter(sink.Comp);
+        if (invokeCounter > sink.Comp.InvokeLimit)
         {
-            //Prevent overriding the invoked port
-            data.Remove(InvokedPort);
-            foreach (var (key, value) in data)
-            {
-                payload.Add(key, value);
-            }
+            SetInvokeCounter(sink.Comp, 0);
+            var args = new DeviceLinkOverloadedEvent();
+            RaiseLocalEvent(sink, ref args);
+            RemoveAllFromSink(sink, sink.Comp);
+            return;
         }
 
+        SetInvokeCounter(sink.Comp, invokeCounter + 1);
+
+        //Just skip using device networking if the source or the sink doesn't support it
+        if (!HasComp<DeviceNetworkComponent>(source) || !TryComp<DeviceNetworkComponent>(sink, out var sinkNetwork))
+        {
+            var eventArgs = new SignalReceivedEvent(sinkPort, source);
+            RaiseLocalEvent(sink, ref eventArgs);
+            return;
+        }
+
+        var payload = new SignalPayload<T>
+        {
+            InvokedPort = sinkPort,
+            Payload = data,
+        };
+
         // force using wireless network so things like atmos devices are able to send signals
-        var network = (int) DeviceNetworkComponent.DeviceNetIdDefaults.Wireless;
-        _deviceNetworkSystem.QueuePacket(source, sinkNetwork.Address, payload, sinkNetwork.ReceiveFrequency, network);
+        _deviceNetworkSystem.SendPacket(source.Owner,
+            sinkNetwork.Address,
+            ref payload,
+            sinkNetwork.ReceiveFrequency,
+            (int)DeviceNetIdDefaults.Wireless);
     }
 
     /// <summary>
     /// Helper function that invokes a port with a high/low binary logic signal.
     /// </summary>
-    public void SendSignal(EntityUid uid, string port, bool signal, DeviceLinkSourceComponent? comp = null)
+    public void SendSignal(Entity<DeviceLinkSourceComponent?> ent, string port, bool signal)
     {
-        if (!Resolve(uid, ref comp))
+        if (!DeviceLinkSourceQuery.Resolve(ent.Owner, ref ent.Comp))
             return;
 
-        var data = new NetworkPayload
+        var data = new LogicStatePayload
         {
-            [DeviceNetworkConstants.LogicState] = signal ? SignalState.High : SignalState.Low
+            State = signal ? SignalState.High : SignalState.Low
         };
-        InvokePort(uid, port, data, comp);
+        InvokePort(ent, port, ref data);
 
-        comp.LastSignals[port] = signal;
+        ent.Comp.LastSignals[port] = signal;
     }
 
     /// <summary>
@@ -116,7 +190,7 @@ public sealed partial class DeviceLinkSystem : SharedDeviceLinkSystem
     /// </summary>
     public void ClearSignal(Entity<DeviceLinkSourceComponent?> ent, string port)
     {
-        if (!Resolve(ent, ref ent.Comp))
+        if (!DeviceLinkSourceQuery.Resolve(ent, ref ent.Comp))
             return;
 
         ent.Comp.LastSignals.Remove(port);
@@ -126,18 +200,21 @@ public sealed partial class DeviceLinkSystem : SharedDeviceLinkSystem
     /// Checks if the payload has a port defined and if the port is present on the sink.
     /// Raises a <see cref="SignalReceivedEvent"/> containing the payload when the check passes
     /// </summary>
-    private void OnPacketReceived(EntityUid uid, DeviceLinkSinkComponent component, DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnSignalReceived(Entity<DeviceLinkSinkComponent> ent, ref DeviceNetworkPacketEvent<SignalPayload> args)
     {
-        if (!args.Data.TryGetValue(InvokedPort, out string? port) || !(component.Ports?.Contains(port) ?? false))
+        var (uid, component) = ent;
+        if (!component.Ports.Contains(args.Data.InvokedPort))
             return;
 
-        var eventArgs = new SignalReceivedEvent(port, args.Sender, args.Data);
-        RaiseLocalEvent(uid,  ref eventArgs);
+        var eventArgs = new SignalReceivedEvent(args.Data.InvokedPort, args.Sender);
+        RaiseLocalEvent(uid, ref eventArgs);
     }
 
     /// <summary>
     /// When linking from a port that currently has a signal being sent, invoke the new link with that signal.
     /// </summary>
+    [SubscribeLocalEvent]
     private void OnNewLink(Entity<DeviceLinkSourceComponent> ent, ref NewLinkEvent args)
     {
         if (args.Source != ent.Owner)
@@ -147,11 +224,12 @@ public sealed partial class DeviceLinkSystem : SharedDeviceLinkSystem
         if (!ent.Comp.LastSignals.TryGetValue(args.SourcePort, out var signal))
             return;
 
-        var payload = new NetworkPayload()
+        var payload = new LogicStatePayload
         {
-            [DeviceNetworkConstants.LogicState] = signal ? SignalState.High : SignalState.Low
+            State = signal ? SignalState.High : SignalState.Low
         };
-        InvokeDirect(ent, args.Sink, args.SourcePort, args.SinkPort, payload);
+        InvokeDirect(ent, args.Sink, args.SinkPort, ref payload);
     }
+
     #endregion
 }
diff --git a/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs b/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs
index 39c84057d9..af3fe102d2 100644
--- a/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs
@@ -1,9 +1,7 @@
 using Content.Server.DeviceLinking.Components;
-using Content.Server.DeviceNetwork;
 using Content.Server.Doors.Systems;
 using Content.Shared.DeviceLinking;
 using Content.Shared.DeviceLinking.Events;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors;
 using JetBrains.Annotations;
@@ -36,10 +34,38 @@ namespace Content.Server.DeviceLinking.Systems
             if (!TryComp(uid, out DoorComponent? door))
                 return;
 
-            var state = SignalState.Momentary;
-            args.Data?.TryGetValue(DeviceNetworkConstants.LogicState, out state);
+            if (args.Port == component.OpenPort)
+            {
+                if (door.State == DoorState.Closed)
+                    _doorSystem.TryOpen(uid, door);
+            }
+            else if (args.Port == component.ClosePort)
+            {
+                if (door.State == DoorState.Open)
+                    _doorSystem.TryClose(uid, door);
+            }
+            else if (args.Port == component.TogglePort)
+            {
+                _doorSystem.TryToggleDoor(uid, door);
+            }
+            else if (args.Port == component.InBolt)
+            {
+                if (!TryComp<DoorBoltComponent>(uid, out var bolts))
+                    return;
 
+                // if its a pulse toggle, otherwise set bolts to high/low
+                var bolt = !bolts.BoltsDown;
+                _doorSystem.SetBoltsDown((uid, bolts), bolt);
+            }
+        }
 
+        [SubscribeLocalEvent]
+        private void OnSignalReceived(EntityUid uid, DoorSignalControlComponent component, ref SignalReceivedEvent<LogicStatePayload> args)
+        {
+            if (!TryComp(uid, out DoorComponent? door))
+                return;
+
+            var state = args.Data.State;
             if (args.Port == component.OpenPort)
             {
                 if (state == SignalState.High || state == SignalState.Momentary)
diff --git a/Content.Server/DeviceLinking/Systems/EdgeDetectorSystem.cs b/Content.Server/DeviceLinking/Systems/EdgeDetectorSystem.cs
index 6e6fc18d0f..e5cb203368 100644
--- a/Content.Server/DeviceLinking/Systems/EdgeDetectorSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/EdgeDetectorSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.DeviceLinking.Components;
 using Content.Shared.DeviceLinking;
 using Content.Shared.DeviceLinking.Events;
-using Content.Shared.DeviceNetwork;
 
 namespace Content.Server.DeviceLinking.Systems;
 
@@ -14,7 +13,6 @@ public sealed partial class EdgeDetectorSystem : EntitySystem
         base.Initialize();
 
         SubscribeLocalEvent<EdgeDetectorComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<EdgeDetectorComponent, SignalReceivedEvent>(OnSignalReceived);
     }
 
     private void OnInit(EntityUid uid, EdgeDetectorComponent comp, ComponentInit args)
@@ -23,25 +21,21 @@ public sealed partial class EdgeDetectorSystem : EntitySystem
         _deviceLink.EnsureSourcePorts(uid, comp.OutputHighPort, comp.OutputLowPort);
     }
 
-    private void OnSignalReceived(EntityUid uid, EdgeDetectorComponent comp, ref SignalReceivedEvent args)
+    [SubscribeLocalEvent]
+    private void OnSignalReceived(EntityUid uid, EdgeDetectorComponent comp, ref SignalReceivedEvent<LogicStatePayload> args)
     {
-        // only handle signals with edges
-        var state = SignalState.Momentary;
-        if (args.Data == null ||
-            !args.Data.TryGetValue(DeviceNetworkConstants.LogicState, out state) ||
-            state == SignalState.Momentary)
-            return;
+        var state = args.Data.State;
 
         if (args.Port != comp.InputPort)
             return;
 
         // make sure the level changed, multiple devices sending the same level are treated as one spamming
-        if (comp.State != state)
-        {
-            comp.State = state;
+        if (comp.State == state)
+            return;
 
-            var port = state == SignalState.High ? comp.OutputHighPort : comp.OutputLowPort;
-            _deviceLink.InvokePort(uid, port);
-        }
+        comp.State = state;
+
+        var port = state == SignalState.High ? comp.OutputHighPort : comp.OutputLowPort;
+        _deviceLink.InvokePort(uid, port);
     }
 }
diff --git a/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs b/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs
index 4a09e3801a..7b51336bef 100644
--- a/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs
@@ -1,12 +1,11 @@
 using Content.Server.DeviceLinking.Components;
-using Content.Server.DeviceNetwork;
 using Content.Shared.DeviceLinking;
 using Content.Shared.DeviceLinking.Events;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Tools.Systems;
 using Robust.Shared.Audio.Systems;
 
@@ -73,8 +72,7 @@ public sealed partial class LogicGateSystem : EntitySystem
             return;
 
         // no sound spamming
-        if (TryComp<UseDelayComponent>(uid, out var useDelay)
-            && !_useDelay.TryResetDelay((uid, useDelay), true))
+        if (!_useDelay.TryResetDelay(uid, true))
             return;
 
         // cycle through possible gates
@@ -96,8 +94,26 @@ public sealed partial class LogicGateSystem : EntitySystem
     {
         // default to momentary for compatibility with non-logic signals.
         // currently only door status and logic gates have logic signal state.
-        var state = SignalState.Momentary;
-        args.Data?.TryGetValue(DeviceNetworkConstants.LogicState, out state);
+
+        // update the state for the correct port
+        if (args.Port == comp.InputPortA)
+        {
+            comp.StateA = SignalState.Momentary;
+            _appearance.SetData(uid, LogicGateVisuals.InputA, false); //If A == High => Sets input A sprite to True
+        }
+        else if (args.Port == comp.InputPortB)
+        {
+            comp.StateB = SignalState.Momentary;
+            _appearance.SetData(uid, LogicGateVisuals.InputB, false); //If B == High => Sets input B sprite to True
+        }
+
+        UpdateOutput(uid, comp);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnSignalReceived(EntityUid uid, LogicGateComponent comp, ref SignalReceivedEvent<LogicStatePayload> args)
+    {
+        var state = args.Data.State;
 
         // update the state for the correct port
         if (args.Port == comp.InputPortA)
diff --git a/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs b/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs
index 394ae0dddf..1faaffc895 100644
--- a/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.DeviceLinking.Components;
 using Content.Shared.DeviceLinking;
 using Content.Shared.DeviceLinking.Events;
-using Content.Shared.DeviceNetwork;
 
 namespace Content.Server.DeviceLinking.Systems;
 
@@ -46,7 +45,19 @@ public sealed partial class MemoryCellSystem : EntitySystem
     private void OnSignalReceived(Entity<MemoryCellComponent> ent, ref SignalReceivedEvent args)
     {
         var state = SignalState.Momentary;
-        args.Data?.TryGetValue(DeviceNetworkConstants.LogicState, out state);
+
+        if (args.Port == ent.Comp.InputPort)
+            ent.Comp.InputState = state;
+        else if (args.Port == ent.Comp.EnablePort)
+            ent.Comp.EnableState = state;
+
+        UpdateOutput(ent);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnSignalReceived(Entity<MemoryCellComponent> ent, ref SignalReceivedEvent<LogicStatePayload> args)
+    {
+        var state = args.Data.State;
 
         if (args.Port == ent.Comp.InputPort)
             ent.Comp.InputState = state;
@@ -58,9 +69,6 @@ public sealed partial class MemoryCellSystem : EntitySystem
 
     private void UpdateOutput(Entity<MemoryCellComponent, DeviceLinkSourceComponent?> ent)
     {
-        if (!Resolve(ent, ref ent.Comp2))
-            return;
-
         if (ent.Comp1.EnableState == SignalState.Low)
             return;
 
@@ -69,6 +77,6 @@ public sealed partial class MemoryCellSystem : EntitySystem
             return;
 
         ent.Comp1.LastOutput = value;
-        _deviceLink.SendSignal(ent, ent.Comp1.OutputPort, value, ent.Comp2);
+        _deviceLink.SendSignal((ent.Owner, ent.Comp2), ent.Comp1.OutputPort, value);
     }
 }
diff --git a/Content.Server/DeviceLinking/Systems/PowerSensorSystem.cs b/Content.Server/DeviceLinking/Systems/PowerSensorSystem.cs
index 79d67c3c0c..30faa28353 100644
--- a/Content.Server/DeviceLinking/Systems/PowerSensorSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/PowerSensorSystem.cs
@@ -7,7 +7,8 @@ using Content.Shared.Interaction;
 using Content.Shared.NodeContainer;
 using Content.Shared.Popups;
 using Content.Shared.Power.Generator;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Tools.Systems;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map.Components;
@@ -67,8 +68,7 @@ public sealed partial class PowerSensorSystem : EntitySystem
             return;
 
         // no sound spamming
-        if (TryComp<UseDelayComponent>(uid, out var useDelay)
-            && !_useDelay.TryResetDelay((uid, useDelay), true))
+        if (!_useDelay.TryResetDelay(uid, true))
             return;
 
         // switch between input and output mode.
diff --git a/Content.Server/DeviceNetwork/Components/Devices/ApcNetSwitchComponent.cs b/Content.Server/DeviceNetwork/Components/Devices/ApcNetSwitchComponent.cs
index 7f298e3cf4..1e706c4520 100644
--- a/Content.Server/DeviceNetwork/Components/Devices/ApcNetSwitchComponent.cs
+++ b/Content.Server/DeviceNetwork/Components/Devices/ApcNetSwitchComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.DeviceNetwork.Systems.Devices;
+using Content.Server.DeviceNetwork.Systems.Devices;
 
 namespace Content.Server.DeviceNetwork.Components.Devices
 {
diff --git a/Content.Server/DeviceNetwork/Components/SingletonDeviceNetServerComponent.cs b/Content.Server/DeviceNetwork/Components/SingletonDeviceNetServerComponent.cs
index 48272ff041..50ea6e7bee 100644
--- a/Content.Server/DeviceNetwork/Components/SingletonDeviceNetServerComponent.cs
+++ b/Content.Server/DeviceNetwork/Components/SingletonDeviceNetServerComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.DeviceNetwork.Systems;
+using Content.Server.DeviceNetwork.Systems;
 
 namespace Content.Server.DeviceNetwork.Components;
 
diff --git a/Content.Server/DeviceNetwork/Systems/ApcNetworkSystem.cs b/Content.Server/DeviceNetwork/Systems/ApcNetworkSystem.cs
index 34895e9bf8..a1c8d18cd6 100644
--- a/Content.Server/DeviceNetwork/Systems/ApcNetworkSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/ApcNetworkSystem.cs
@@ -27,13 +27,14 @@ namespace Content.Server.DeviceNetwork.Systems
         /// <summary>
         /// Checks if both devices are connected to the same apc
         /// </summary>
-        private void OnBeforePacketSent(EntityUid uid, ApcNetworkComponent receiver, BeforePacketSentEvent args)
+        private void OnBeforePacketSent(Entity<ApcNetworkComponent> ent, ref BeforePacketSentEvent args)
         {
-            if (!TryComp(args.Sender, out ApcNetworkComponent? sender)) return;
+            if (!TryComp(args.Sender, out ApcNetworkComponent? sender))
+                return;
 
-            if (sender.ConnectedNode?.NodeGroup == null || !sender.ConnectedNode.NodeGroup.Equals(receiver.ConnectedNode?.NodeGroup))
+            if (sender.ConnectedNode?.NodeGroup == null || !sender.ConnectedNode.NodeGroup.Equals(ent.Comp.ConnectedNode?.NodeGroup))
             {
-                args.Cancel();
+                args.Cancelled = true;
             }
         }
 
diff --git a/Content.Server/DeviceNetwork/Systems/DeviceListSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceListSystem.cs
index f12ed6d245..b551350251 100644
--- a/Content.Server/DeviceNetwork/Systems/DeviceListSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/DeviceListSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.DeviceNetwork.Systems;
@@ -11,6 +12,7 @@ namespace Content.Server.DeviceNetwork.Systems;
 public sealed partial class DeviceListSystem : SharedDeviceListSystem
 {
     [Dependency] private NetworkConfiguratorSystem _configurator = default!;
+
     [Dependency] private EntityQuery<DeviceNetworkComponent> _deviceNetworkQuery = default!;
 
     public override void Initialize()
@@ -82,17 +84,18 @@ public sealed partial class DeviceListSystem : SharedDeviceListSystem
     /// <summary>
     /// Filters the broadcasts recipient list against the device list as either an allow or deny list depending on the components IsAllowList field
     /// </summary>
-    private void OnBeforeBroadcast(EntityUid uid, DeviceListComponent component, BeforeBroadcastAttemptEvent args)
+    private void OnBeforeBroadcast(Entity<DeviceListComponent> ent, ref BeforeBroadcastAttemptEvent args)
     {
+        var component = ent.Comp;
         //Don't filter anything if the device list is empty
         if (component.Devices.Count == 0)
         {
             if (component.IsAllowList)
-                args.Cancel();
+                args.Cancelled = true;
             return;
         }
 
-        HashSet<DeviceNetworkComponent> filteredRecipients = new(args.Recipients.Count);
+        HashSet<Device> filteredRecipients = new(args.Recipients.Count);
 
         foreach (var recipient in args.Recipients)
         {
@@ -106,10 +109,10 @@ public sealed partial class DeviceListSystem : SharedDeviceListSystem
     /// <summary>
     /// Filters incoming packets if that is enabled <see cref="OnBeforeBroadcast"/>
     /// </summary>
-    private void OnBeforePacketSent(EntityUid uid, DeviceListComponent component, BeforePacketSentEvent args)
+    private void OnBeforePacketSent(Entity<DeviceListComponent> ent, ref BeforePacketSentEvent args)
     {
-        if (component.HandleIncomingPackets && component.Devices.Contains(args.Sender) != component.IsAllowList)
-            args.Cancel();
+        if (ent.Comp.HandleIncomingPackets && ent.Comp.Devices.Contains(args.Sender) != ent.Comp.IsAllowList)
+            args.Cancelled = true;
     }
 
     public void OnDeviceShutdown(Entity<DeviceListComponent?> list, Entity<DeviceNetworkComponent> device)
diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs
index e5b75ec831..d4edd463d4 100644
--- a/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs
@@ -27,7 +27,7 @@ public sealed partial class DeviceNetworkJammerSystem : SharedDeviceNetworkJamme
 
         while (query.MoveNext(out var uid, out var jammerComp, out var jammerXform))
         {
-            if (!_jammer.GetJammableNetworks((uid, jammerComp)).Contains(ev.NetworkId))
+            if (!_jammer.GetJammableNetworks((uid, jammerComp)).Contains(ev.NetId))
                 continue;
 
             if (jammerComp.FrequenciesExcluded != null &&
@@ -37,10 +37,9 @@ public sealed partial class DeviceNetworkJammerSystem : SharedDeviceNetworkJamme
             if (_transform.InRange(jammerXform.Coordinates, ev.SenderTransform.Coordinates, jammerComp.Range)
                 || _transform.InRange(jammerXform.Coordinates, xform.Comp.Coordinates, jammerComp.Range))
             {
-                ev.Cancel();
+                ev.Cancelled = true;
                 return;
             }
         }
     }
-
 }
diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs
index 0dc1368809..98997189f7 100644
--- a/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.DeviceNetwork.Components;
-using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.DeviceNetwork.Events;
 
@@ -9,15 +8,15 @@ public sealed partial class DeviceNetworkRequiresPowerSystem : EntitySystem
 {
     public override void Initialize()
     {
+        base.Initialize();
         SubscribeLocalEvent<DeviceNetworkRequiresPowerComponent, BeforePacketSentEvent>(OnBeforePacketSent);
     }
 
-    private void OnBeforePacketSent(EntityUid uid, DeviceNetworkRequiresPowerComponent component,
-        BeforePacketSentEvent args)
+    private void OnBeforePacketSent(Entity<DeviceNetworkRequiresPowerComponent> ent, ref BeforePacketSentEvent args)
     {
-        if (!this.IsPowered(uid, EntityManager))
+        if (!this.IsPowered(ent, EntityManager))
         {
-            args.Cancel();
+            args.Cancelled = true;
         }
     }
 }
diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.API.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.API.cs
new file mode 100644
index 0000000000..ef71af4a4f
--- /dev/null
+++ b/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.API.cs
@@ -0,0 +1,232 @@
+using Content.Shared.DeviceNetwork;
+using Content.Shared.DeviceNetwork.Components;
+using Content.Shared.DeviceNetwork.Events;
+using JetBrains.Annotations;
+
+namespace Content.Server.DeviceNetwork.Systems;
+
+public sealed partial class DeviceNetworkSystem
+{
+    [PublicAPI]
+    public override bool SendPacket<T>(
+        Entity<DeviceNetworkComponent?> ent,
+        string? address,
+        ref T data,
+        uint? frequency = null,
+        int? network = null)
+    {
+        if (!_deviceQuery.Resolve(ent.Owner, ref ent.Comp, false))
+            return false;
+
+        var device = ent.Comp;
+        if (device.Address == string.Empty)
+            return false;
+
+        frequency ??= device.TransmitFrequency;
+
+        if (frequency == null)
+            return false;
+
+        network ??= device.DeviceNetId;
+
+        var packet = new DeviceNetworkPacketEvent<T>(network.Value, address, frequency.Value, device.Address, ent!, data);
+        SendPacket(ref packet);
+        return true;
+    }
+
+    /// <summary>
+    /// Connect an entity with a DeviceNetworkComponent. Note that this will re-use an existing address if the
+    /// device already had one configured. If there is a clash, the device cannot join the network.
+    /// </summary>
+    [PublicAPI]
+    public bool ConnectDevice(Entity<DeviceNetworkComponent?> ent)
+    {
+        if (!_deviceQuery.Resolve(ent.Owner, ref ent.Comp, false))
+            return false;
+
+        if (!TryEnsureNetwork(ent.Comp.DeviceNetId, out var deviceNet))
+            return false;
+
+        var success = deviceNet.Add(ent!);
+        Dirty(ent);
+        return success;
+    }
+
+    /// <summary>
+    /// Disconnect an entity with a DeviceNetworkComponent.
+    /// </summary>
+    /// <param name="ent">The entity to disconnect from its network.</param>
+    /// <param name="preventAutoConnect">
+    /// If true, sets <see cref="DeviceNetworkComponent.AutoConnect"/> to false.
+    /// That way the device doesn't auto reconnect when a game state is loaded.
+    /// </param>
+    /// <returns>True if the device was removed from the network successfully.</returns>
+    [PublicAPI]
+    public bool DisconnectDevice(Entity<DeviceNetworkComponent?> ent, bool preventAutoConnect = true)
+    {
+        if (!_deviceQuery.Resolve(ent.Owner, ref ent.Comp, false))
+            return false;
+
+        if (!TryGetNetwork(ent.Comp.DeviceNetId, out var deviceNet))
+            return false;
+
+        if (preventAutoConnect)
+            ent.Comp.AutoConnect = false;
+
+        var result = deviceNet.Remove(ent!);
+        return result;
+    }
+
+    /// <summary>
+    /// Checks if a device is already connected to its network.
+    /// </summary>
+    /// <returns>True if the device was found in the network with its corresponding network id.</returns>
+    [PublicAPI]
+    public bool IsDeviceConnected(Entity<DeviceNetworkComponent?> ent)
+    {
+        var (uid, deviceComp) = ent;
+        if (!_deviceQuery.Resolve(uid, ref deviceComp, false))
+            return false;
+
+        if (!_networks.TryGetValue(deviceComp.DeviceNetId, out var deviceNet))
+            return false;
+
+        var device = new Device(ent!);
+        return deviceNet.Devices.ContainsValue(device);
+    }
+
+    /// <summary>
+    /// Checks if an address exists in the network with the given netId.
+    /// </summary>
+    [PublicAPI]
+    public bool IsAddressPresent(int netId, string? address)
+    {
+        if (address == null
+            || !_networks.TryGetValue(netId, out var network))
+            return false;
+
+        return network.Devices.ContainsKey(address);
+    }
+
+    /// <summary>
+    /// Sets the receive frequency of an entity.
+    /// </summary>
+    /// <param name="ent">The target device.</param>
+    /// <param name="frequency">The new frequency.</param>
+    [PublicAPI]
+    public void SetReceiveFrequency(Entity<DeviceNetworkComponent?> ent, uint? frequency)
+    {
+        if (!_deviceQuery.Resolve(ent.Owner, ref ent.Comp, false))
+            return;
+
+        if (ent.Comp.ReceiveFrequency == frequency)
+            return;
+
+        if (!TryGetNetwork(ent.Comp.DeviceNetId, out var deviceNet))
+            return;
+
+        var oldFrequency = ent.Comp.ReceiveFrequency;
+        deviceNet.Remove(ent!);
+        ent.Comp.ReceiveFrequency = frequency;
+        deviceNet.Add(ent!);
+
+        var ev = new DeviceReceiveFrequencyChangedEvent(oldFrequency, frequency);
+        RaiseLocalEvent(ent, ref ev);
+
+        Dirty(ent);
+    }
+
+    /// <summary>
+    /// Sets the transmit frequency of an entity.
+    /// </summary>
+    /// <param name="ent">The target device.</param>
+    /// <param name="frequency">The new frequency.</param>
+    [PublicAPI]
+    public void SetTransmitFrequency(Entity<DeviceNetworkComponent?> ent, uint? frequency)
+    {
+        if (!_deviceQuery.Resolve(ent.Owner, ref ent.Comp, false))
+            return;
+
+        var oldFrequency = ent.Comp.TransmitFrequency;
+        ent.Comp.TransmitFrequency = frequency;
+
+        var ev = new DeviceReceiveFrequencyChangedEvent(oldFrequency, frequency);
+        RaiseLocalEvent(ent, ref ev);
+    }
+
+    /// <summary>
+    /// Sets the target device's ability to receive all network packets, regardless of the address.
+    /// </summary>
+    [PublicAPI]
+    public void SetReceiveAll(Entity<DeviceNetworkComponent?> ent, bool receiveAll)
+    {
+        if (!_deviceQuery.Resolve(ent.Owner, ref ent.Comp, false))
+            return;
+
+        if (ent.Comp.ReceiveAll == receiveAll)
+            return;
+
+        if (!TryGetNetwork(ent.Comp.DeviceNetId, out var deviceNet))
+            return;
+
+        deviceNet.Remove(ent!);
+        ent.Comp.ReceiveAll = receiveAll;
+        deviceNet.Add(ent!);
+
+        var ev = new DeviceReceiveAllChangedEvent(receiveAll);
+        RaiseLocalEvent(ent, ref ev);
+
+        Dirty(ent);
+    }
+
+    /// <summary>
+    /// Sets the address of the target device.
+    /// </summary>
+    [PublicAPI]
+    public void SetAddress(Entity<DeviceNetworkComponent?> ent, string address)
+    {
+        if (!_deviceQuery.Resolve(ent.Owner, ref ent.Comp, false))
+            return;
+
+        if (ent.Comp.Address == address && ent.Comp.CustomAddress)
+            return;
+
+        if (!TryGetNetwork(ent.Comp.DeviceNetId, out var deviceNet))
+            return;
+
+        var oldAddress = ent.Comp.Address;
+        deviceNet.Remove(ent!);
+        ent.Comp.CustomAddress = true;
+        ent.Comp.Address = address;
+        deviceNet.Add(ent!);
+
+        var ev = new DeviceAddressChangedEvent(oldAddress, address, ent.Comp.CustomAddress);
+        RaiseLocalEvent(ent, ref ev);
+
+        Dirty(ent);
+    }
+
+    /// <summary>
+    /// Randomizes the address of the target device.
+    /// </summary>
+    [PublicAPI]
+    public void RandomizeAddress(Entity<DeviceNetworkComponent?> ent)
+    {
+        if (!_deviceQuery.Resolve(ent.Owner, ref ent.Comp, false))
+            return;
+
+        if (!TryGetNetwork(ent.Comp.DeviceNetId, out var deviceNet))
+            return;
+
+        var oldAddress = ent.Comp.Address;
+        deviceNet.Remove(ent!);
+        ent.Comp.CustomAddress = false;
+        ent.Comp.Address = "";
+        deviceNet.Add(ent!);
+
+        var ev = new DeviceAddressChangedEvent(oldAddress, ent.Comp.Address, ent.Comp.CustomAddress);
+        RaiseLocalEvent(ent, ref ev);
+
+        Dirty(ent);
+    }
+}
diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
index aa58f568ff..83fa7bf50b 100644
--- a/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
@@ -4,357 +4,224 @@ using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.DeviceNetwork.Systems;
-using Content.Shared.Examine;
-using JetBrains.Annotations;
 using Robust.Shared.Random;
 
-namespace Content.Server.DeviceNetwork.Systems
+namespace Content.Server.DeviceNetwork.Systems;
+
+/// <inheritdoc/>
+public sealed partial class DeviceNetworkSystem : SharedDeviceNetworkSystem
 {
+    [Dependency] private IRobustRandom _random = default!;
+    [Dependency] private SharedTransformSystem _transformSystem = default!;
+    [Dependency] private DeviceListSystem _deviceLists = default!;
+    [Dependency] private NetworkConfiguratorSystem _configurator = default!;
+
+    [Dependency] private EntityQuery<DeviceNetworkComponent> _deviceQuery = default!;
+
     /// <summary>
-    ///     Entity system that handles everything device network related.
-    ///     Device networking allows machines and devices to communicate with each other while adhering to restrictions like range or being connected to the same powernet.
+    /// Basically a cache of devices to connect them together faster.
     /// </summary>
-    [UsedImplicitly]
-    public sealed partial class DeviceNetworkSystem : SharedDeviceNetworkSystem
+    private readonly Dictionary<int, DeviceNet> _networks = new(4);
+
+    /// <summary>
+    /// Automatically attempt to connect some devices when a map starts.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnMapInit(Entity<DeviceNetworkComponent> ent, ref MapInitEvent args)
     {
-        [Dependency] private IRobustRandom _random = default!;
-        [Dependency] private SharedTransformSystem _transformSystem = default!;
-        [Dependency] private DeviceListSystem _deviceLists = default!;
-        [Dependency] private NetworkConfiguratorSystem _configurator = default!;
-
-        private readonly Dictionary<int, DeviceNet> _networks = new(4);
-        private readonly Queue<DeviceNetworkPacketEvent> _queueA = new();
-        private readonly Queue<DeviceNetworkPacketEvent> _queueB = new();
-
-        /// <summary>
-        /// The queue being processed in the current tick
-        /// </summary>
-        private Queue<DeviceNetworkPacketEvent> _activeQueue = null!;
-
-        /// <summary>
-        /// The queue that will be processed in the next tick
-        /// </summary>
-        private Queue<DeviceNetworkPacketEvent> _nextQueue = null!;
-
-
-        public override void Initialize()
+        var device = ent.Comp;
+        if (device.ReceiveFrequency == null
+            && device.ReceiveFrequencyId != null
+            && ProtoMan.TryIndex(device.ReceiveFrequencyId, out var receive))
         {
-            SubscribeLocalEvent<DeviceNetworkComponent, MapInitEvent>(OnMapInit);
-            SubscribeLocalEvent<DeviceNetworkComponent, ComponentShutdown>(OnNetworkShutdown);
-            SubscribeLocalEvent<DeviceNetworkComponent, ExaminedEvent>(OnExamine);
-
-            _activeQueue = _queueA;
-            _nextQueue = _queueB;
+            device.ReceiveFrequency = receive.Frequency;
         }
 
-        public override void Update(float frameTime)
+        if (device.TransmitFrequency == null
+            && device.TransmitFrequencyId != null
+            && ProtoMan.TryIndex(device.TransmitFrequencyId, out var xmit))
         {
-
-            while (_activeQueue.TryDequeue(out var packet))
-            {
-                SendPacket(packet);
-            }
-
-            SwapQueues();
+            device.TransmitFrequency = xmit.Frequency;
         }
 
-        public override bool QueuePacket(EntityUid uid, string? address, NetworkPayload data, uint? frequency = null, int? network = null, DeviceNetworkComponent? device = null)
+        if (device.AutoConnect)
+            ConnectDevice(ent.AsNullable());
+    }
+
+    /// <summary>
+    /// Automatically disconnect when an entity with a DeviceNetworkComponent shuts down.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnNetworkShutdown(Entity<DeviceNetworkComponent> ent, ref ComponentShutdown args)
+    {
+        var component = ent.Comp;
+        foreach (var list in component.DeviceLists)
         {
-            if (!Resolve(uid, ref device, false))
-                return false;
+            if (Deleted(list))
+                return;
 
-            if (device.Address == string.Empty)
-                return false;
+            _deviceLists.OnDeviceShutdown(list, ent);
+        }
 
-            frequency ??= device.TransmitFrequency;
+        foreach (var list in component.Configurators)
+        {
+            if (Deleted(list))
+                return;
 
-            if (frequency == null)
-                return false;
+            _configurator.OnDeviceShutdown(list, ent);
+        }
 
-            network ??= device.DeviceNetId;
+        if (TryGetNetwork(component.DeviceNetId, out var network))
+            network.Remove(ent);
+    }
 
-            _nextQueue.Enqueue(new DeviceNetworkPacketEvent(network.Value, address, frequency.Value, device.Address, uid, data));
+    /// <summary>
+    ///     Try to find a device on a network using its address.
+    /// </summary>
+    private bool TryGetDevice(int netId, string address, [NotNullWhen(true)] out Device? device)
+    {
+        device = null;
+        if (!TryGetNetwork(netId, out var network)
+            || !network.Devices.TryGetValue(address, out var foundDevice))
+            return false;
+
+        device = foundDevice;
+        return true;
+    }
+
+    /// <summary>
+    /// Tries to get an already existing device network, and creates a new network if it doesn't exist.
+    /// </summary>
+    /// <returns>False if the manager is not initialized.</returns>
+    /// <returns></returns>
+    private bool TryEnsureNetwork(int netId, [NotNullWhen(true)] out DeviceNet? network)
+    {
+        network = null;
+
+        if (_networks.TryGetValue(netId, out var deviceNet))
+        {
+            network = deviceNet;
             return true;
         }
 
-        /// <summary>
-        /// Swaps the active queue.
-        /// Queues are swapped so that packets being sent in the current tick get processed in the next tick.
-        /// </summary>
-        /// <remarks>
-        /// This prevents infinite loops while sending packets
-        /// </remarks>
-        private void SwapQueues()
-        {
-            _nextQueue = _activeQueue;
-            _activeQueue = _activeQueue == _queueA ? _queueB : _queueA;
-        }
+        var newDeviceNet = new DeviceNet(netId, _random);
+        _networks[netId] = newDeviceNet;
+        network = newDeviceNet;
+        return true;
+    }
 
-        private void OnExamine(EntityUid uid, DeviceNetworkComponent device, ExaminedEvent args)
+    /// <summary>
+    /// Tries to get an already existing network.
+    /// </summary>
+    /// <returns>False if the manager is not initialized, or the network wasn't found.</returns>
+    private bool TryGetNetwork(int netId, [NotNullWhen(true)] out DeviceNet? network)
+    {
+        network = null;
+
+        if (!_networks.TryGetValue(netId, out var deviceNet))
+            return false;
+
+        network = deviceNet;
+        return true;
+    }
+
+    private void SendPacket<T>(ref DeviceNetworkPacketEvent<T> packet) where T : INetworkPayload
+    {
+        if (!TryEnsureNetwork(packet.NetId, out var network))
+            return;
+
+        if (packet.Address == null)
         {
-            if (device.ExaminableAddress)
+            // Broadcast to all listening devices
+            if (network.ListeningDevices.TryGetValue(packet.Frequency, out var devices) && CheckRecipientsList(packet, ref devices))
             {
-                args.PushText(Loc.GetString("device-address-examine-message", ("address", device.Address)));
+                var deviceCopy = ArrayPool<Device>.Shared.Rent(devices.Count);
+                devices.CopyTo(deviceCopy);
+                SendToConnections(deviceCopy.AsSpan(0, devices.Count), packet);
+                ArrayPool<Device>.Shared.Return(deviceCopy);
             }
         }
-
-        /// <summary>
-        /// Automatically attempt to connect some devices when a map starts.
-        /// </summary>
-        private void OnMapInit(EntityUid uid, DeviceNetworkComponent device, MapInitEvent args)
+        else
         {
-            if (device.ReceiveFrequency == null
-                && device.ReceiveFrequencyId != null
-                && ProtoMan.TryIndex<DeviceFrequencyPrototype>(device.ReceiveFrequencyId, out var receive))
+            var totalDevices = 0;
+            var hasTargetedDevice = false;
+            if (network.ReceiveAllDevices.TryGetValue(packet.Frequency, out var devices))
             {
-                device.ReceiveFrequency = receive.Frequency;
+                totalDevices += devices.Count;
             }
 
-            if (device.TransmitFrequency == null
-                && device.TransmitFrequencyId != null
-                && ProtoMan.TryIndex<DeviceFrequencyPrototype>(device.TransmitFrequencyId, out var xmit))
-            {
-                device.TransmitFrequency = xmit.Frequency;
-            }
-
-            if (device.AutoConnect)
-                ConnectDevice(uid, device);
-        }
-
-        private DeviceNet GetNetwork(int netId)
-        {
-            if (_networks.TryGetValue(netId, out var deviceNet))
-                return deviceNet;
-            var newDeviceNet = new DeviceNet(netId, _random);
-            _networks[netId] = newDeviceNet;
-            return newDeviceNet;
-        }
-
-        /// <summary>
-        /// Automatically disconnect when an entity with a DeviceNetworkComponent shuts down.
-        /// </summary>
-        private void OnNetworkShutdown(EntityUid uid, DeviceNetworkComponent component, ComponentShutdown args)
-        {
-            foreach (var list in component.DeviceLists)
-            {
-                _deviceLists.OnDeviceShutdown(list, (uid, component));
-            }
-
-            foreach (var list in component.Configurators)
-            {
-                _configurator.OnDeviceShutdown(list, (uid, component));
-            }
-
-            GetNetwork(component.DeviceNetId).Remove(component);
-        }
-
-        /// <summary>
-        /// Connect an entity with a DeviceNetworkComponent. Note that this will re-use an existing address if the
-        /// device already had one configured. If there is a clash, the device cannot join the network.
-        /// </summary>
-        public bool ConnectDevice(EntityUid uid, DeviceNetworkComponent? device = null)
-        {
-            if (!Resolve(uid, ref device, false))
-                return false;
-
-            return GetNetwork(device.DeviceNetId).Add(device);
-        }
-
-        /// <summary>
-        /// Disconnect an entity with a DeviceNetworkComponent.
-        /// </summary>
-        public bool DisconnectDevice(EntityUid uid, DeviceNetworkComponent? device, bool preventAutoConnect = true)
-        {
-            if (!Resolve(uid, ref device, false))
-                return false;
-
-            // If manually disconnected, don't auto reconnect when a game state is loaded.
-            if (preventAutoConnect)
-                device.AutoConnect = false;
-
-            return GetNetwork(device.DeviceNetId).Remove(device);
-        }
-
-        /// <summary>
-        /// Checks if a device is already connected to its network
-        /// </summary>
-        /// <returns>True if the device was found in the network with its corresponding network id</returns>
-        public bool IsDeviceConnected(EntityUid uid, DeviceNetworkComponent? device)
-        {
-            if (!Resolve(uid, ref device, false))
-                return false;
-
-            if (!_networks.TryGetValue(device.DeviceNetId, out var deviceNet))
-                return false;
-
-            return deviceNet.Devices.ContainsValue(device);
-        }
-
-        /// <summary>
-        /// Checks if an address exists in the network with the given netId
-        /// </summary>
-        public bool IsAddressPresent(int netId, string? address)
-        {
-            if (address == null || !_networks.TryGetValue(netId, out var network))
-                return false;
-
-            return network.Devices.ContainsKey(address);
-        }
-
-        public void SetReceiveFrequency(EntityUid uid, uint? frequency, DeviceNetworkComponent? device = null)
-        {
-            if (!Resolve(uid, ref device, false))
+            if (!TryGetDevice(packet.NetId, packet.Address, out var device))
                 return;
 
-            if (device.ReceiveFrequency == frequency) return;
-
-            var deviceNet = GetNetwork(device.DeviceNetId);
-            deviceNet.Remove(device);
-            device.ReceiveFrequency = frequency;
-            deviceNet.Add(device);
-        }
-
-        public void SetTransmitFrequency(EntityUid uid, uint? frequency, DeviceNetworkComponent? device = null)
-        {
-            if (Resolve(uid, ref device, false))
-                device.TransmitFrequency = frequency;
-        }
-
-        public void SetReceiveAll(EntityUid uid, bool receiveAll, DeviceNetworkComponent? device = null)
-        {
-            if (!Resolve(uid, ref device, false))
-                return;
-
-            if (device.ReceiveAll == receiveAll) return;
-
-            var deviceNet = GetNetwork(device.DeviceNetId);
-            deviceNet.Remove(device);
-            device.ReceiveAll = receiveAll;
-            deviceNet.Add(device);
-        }
-
-        public void SetAddress(EntityUid uid, string address, DeviceNetworkComponent? device = null)
-        {
-            if (!Resolve(uid, ref device, false))
-                return;
-
-            if (device.Address == address && device.CustomAddress) return;
-
-            var deviceNet = GetNetwork(device.DeviceNetId);
-            deviceNet.Remove(device);
-            device.CustomAddress = true;
-            device.Address = address;
-            deviceNet.Add(device);
-        }
-
-        public void RandomizeAddress(EntityUid uid, DeviceNetworkComponent? device = null)
-        {
-            if (!Resolve(uid, ref device, false))
-                return;
-            var deviceNet = GetNetwork(device.DeviceNetId);
-            deviceNet.Remove(device);
-            device.CustomAddress = false;
-            device.Address = "";
-            deviceNet.Add(device);
-        }
-
-        /// <summary>
-        ///     Try to find a device on a network using its address.
-        /// </summary>
-        private bool TryGetDevice(int netId, string address, [NotNullWhen(true)] out DeviceNetworkComponent? device) =>
-            GetNetwork(netId).Devices.TryGetValue(address, out device);
-
-        private void SendPacket(DeviceNetworkPacketEvent packet)
-        {
-            var network = GetNetwork(packet.NetId);
-            if (packet.Address == null)
+            if (!device.Value.ReceiveAll &&
+                device.Value.ReceiveFrequency == packet.Frequency)
             {
-                // Broadcast to all listening devices
-                if (network.ListeningDevices.TryGetValue(packet.Frequency, out var devices) && CheckRecipientsList(packet, ref devices))
-                {
-                    var deviceCopy = ArrayPool<DeviceNetworkComponent>.Shared.Rent(devices.Count);
-                    devices.CopyTo(deviceCopy);
-                    SendToConnections(deviceCopy.AsSpan(0, devices.Count), packet);
-                    ArrayPool<DeviceNetworkComponent>.Shared.Return(deviceCopy);
-                }
+                totalDevices += 1;
+                hasTargetedDevice = true;
             }
-            else
+            var deviceCopy = ArrayPool<Device>.Shared.Rent(totalDevices);
+            if (devices != null)
             {
-                var totalDevices = 0;
-                var hasTargetedDevice = false;
-                if (network.ReceiveAllDevices.TryGetValue(packet.Frequency, out var devices))
-                {
-                    totalDevices += devices.Count;
-                }
-                if (TryGetDevice(packet.NetId, packet.Address, out var device) &&
-                    !device.ReceiveAll &&
-                    device.ReceiveFrequency == packet.Frequency)
-                {
-                    totalDevices += 1;
-                    hasTargetedDevice = true;
-                }
-                var deviceCopy = ArrayPool<DeviceNetworkComponent>.Shared.Rent(totalDevices);
-                if (devices != null)
-                {
-                    devices.CopyTo(deviceCopy);
-                }
-                if (hasTargetedDevice)
-                {
-                    deviceCopy[totalDevices - 1] = device!;
-                }
-                SendToConnections(deviceCopy.AsSpan(0, totalDevices), packet);
-                ArrayPool<DeviceNetworkComponent>.Shared.Return(deviceCopy);
+                devices.CopyTo(deviceCopy);
             }
+            if (hasTargetedDevice)
+            {
+                deviceCopy[totalDevices - 1] = device.Value;
+            }
+            SendToConnections(deviceCopy.AsSpan(0, totalDevices), packet);
+            ArrayPool<Device>.Shared.Return(deviceCopy);
         }
+    }
 
-        /// <summary>
-        /// Sends the <see cref="BeforeBroadcastAttemptEvent"/> to the sending entity if the packets SendBeforeBroadcastAttemptEvent field is set to true.
-        /// The recipients is set to the modified recipient list.
-        /// </summary>
-        /// <returns>false if the broadcast was canceled</returns>
-        private bool CheckRecipientsList(DeviceNetworkPacketEvent packet, ref HashSet<DeviceNetworkComponent> recipients)
-        {
-            if (!_networks.ContainsKey(packet.NetId) || !_networks[packet.NetId].Devices.ContainsKey(packet.SenderAddress))
-                return false;
-
-            var sender = _networks[packet.NetId].Devices[packet.SenderAddress];
-            if (!sender.SendBroadcastAttemptEvent)
-                return true;
-
-            var beforeBroadcastAttemptEvent = new BeforeBroadcastAttemptEvent(recipients);
-            RaiseLocalEvent(packet.Sender, beforeBroadcastAttemptEvent, true);
-
-            if (beforeBroadcastAttemptEvent.Cancelled || beforeBroadcastAttemptEvent.ModifiedRecipients == null)
-                return false;
-
-            recipients = beforeBroadcastAttemptEvent.ModifiedRecipients;
+    /// <summary>
+    /// Sends the <see cref="BeforeBroadcastAttemptEvent"/> to the sending entity if the packets SendBeforeBroadcastAttemptEvent field is set to true.
+    /// The recipients is set to the modified recipient list.
+    /// </summary>
+    /// <returns>false if the broadcast was canceled</returns>
+    private bool CheckRecipientsList<T>(DeviceNetworkPacketEvent<T> packet, ref HashSet<Device> recipients) where T : INetworkPayload
+    {
+        if (!packet.Sender.Comp.SendBroadcastAttemptEvent)
             return true;
+
+        var beforeBroadcastAttemptEvent = new BeforeBroadcastAttemptEvent(recipients);
+        RaiseLocalEvent(packet.Sender, ref beforeBroadcastAttemptEvent, true);
+
+        if (beforeBroadcastAttemptEvent.Cancelled || beforeBroadcastAttemptEvent.ModifiedRecipients == null)
+            return false;
+
+        recipients = beforeBroadcastAttemptEvent.ModifiedRecipients;
+        return true;
+    }
+
+    private void SendToConnections<T>(ReadOnlySpan<Device> connections, DeviceNetworkPacketEvent<T> packet) where T : INetworkPayload
+    {
+        if (Deleted(packet.Sender))
+        {
+            return;
         }
 
-        private void SendToConnections(ReadOnlySpan<DeviceNetworkComponent> connections, DeviceNetworkPacketEvent packet)
+        var xform = Transform(packet.Sender);
+
+        var senderPos = _transformSystem.GetWorldPosition(xform);
+
+        foreach (var connection in connections)
         {
-            if (Deleted(packet.Sender))
-            {
-                return;
-            }
+            if (connection.Owner == packet.Sender.Owner)
+                continue;
 
-            var xform = Transform(packet.Sender);
+            var beforeEv = new BeforePacketSentEvent(packet.NetId,
+                packet.Address,
+                packet.Frequency,
+                packet.SenderAddress,
+                packet.Sender,
+                xform,
+                senderPos);
+            RaiseLocalEvent(connection.Owner, ref beforeEv);
 
-            var senderPos = _transformSystem.GetWorldPosition(xform);
+            if (beforeEv.Cancelled)
+                continue;
 
-            foreach (var connection in connections)
-            {
-                if (connection.Owner == packet.Sender)
-                    continue;
-
-                BeforePacketSentEvent beforeEv = new(packet.Sender, xform, senderPos, connection.NetIdEnum.ToString(), packet.Frequency);
-                RaiseLocalEvent(connection.Owner, beforeEv, false);
-
-                if (!beforeEv.Cancelled)
-                    RaiseLocalEvent(connection.Owner, packet, false);
-                else
-                    beforeEv.Uncancel();
-            }
+            RaiseLocalEvent(connection.Owner, ref packet);
         }
     }
 }
diff --git a/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs b/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs
index a432c10291..27ab0c6139 100644
--- a/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs
@@ -1,8 +1,8 @@
 using Content.Server.DeviceNetwork.Components.Devices;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.Interaction;
 using Content.Shared.DeviceNetwork.Components;
+using Content.Shared.DeviceNetwork.Payloads;
 
 namespace Content.Server.DeviceNetwork.Systems.Devices
 {
@@ -15,43 +15,38 @@ namespace Content.Server.DeviceNetwork.Systems.Devices
             base.Initialize();
 
             SubscribeLocalEvent<ApcNetSwitchComponent, InteractHandEvent>(OnInteracted);
-            SubscribeLocalEvent<ApcNetSwitchComponent, DeviceNetworkPacketEvent>(OnPackedReceived);
         }
 
-        /// <summary>
-        /// Toggles the state of the switch and sents a <see cref="DeviceNetworkConstants.CmdSetState"/> command with the
-        /// <see cref="DeviceNetworkConstants.StateEnabled"/> value set to state.
-        /// </summary>
-        private void OnInteracted(EntityUid uid, ApcNetSwitchComponent component, InteractHandEvent args)
+        private void OnInteracted(Entity<ApcNetSwitchComponent> ent, ref InteractHandEvent args)
         {
-            if (!TryComp(uid, out DeviceNetworkComponent? networkComponent)) return;
+            var (uid, component) = ent;
+            if (!TryComp(uid, out DeviceNetworkComponent? networkComponent))
+                return;
 
             component.State = !component.State;
 
             if (networkComponent.TransmitFrequency == null)
                 return;
 
-            var payload = new NetworkPayload
+            var payload = new ApcNetTogglePayload
             {
-                [DeviceNetworkConstants.Command] = DeviceNetworkConstants.CmdSetState,
-                [DeviceNetworkConstants.StateEnabled] = component.State,
+                Enabled = component.State,
             };
 
-            _deviceNetworkSystem.QueuePacket(uid, null, payload, device: networkComponent);
+            _deviceNetworkSystem.SendPacket(uid, null, ref payload);
 
             args.Handled = true;
         }
 
-        /// <summary>
-        /// Listens to the <see cref="DeviceNetworkConstants.CmdSetState"/> command of other switches to sync state
-        /// </summary>
-        private void OnPackedReceived(EntityUid uid, ApcNetSwitchComponent component, DeviceNetworkPacketEvent args)
+        [SubscribeLocalEvent]
+        private void OnPackedReceived(Entity<ApcNetSwitchComponent> ent, ref DeviceNetworkPacketEvent<ApcNetTogglePayload> args)
         {
-            if (!TryComp(uid, out DeviceNetworkComponent? networkComponent) || args.SenderAddress == networkComponent.Address) return;
-            if (!args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? command) || command != DeviceNetworkConstants.CmdSetState) return;
-            if (!args.Data.TryGetValue(DeviceNetworkConstants.StateEnabled, out bool enabled)) return;
+            var (uid, component) = ent;
+            if (!TryComp(uid, out DeviceNetworkComponent? networkComponent)
+                || args.SenderAddress == networkComponent.Address)
+                return;
 
-            component.State = enabled;
+            component.State = args.Data.Enabled;
         }
     }
 }
diff --git a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
index b507284852..3b8e43d0dd 100644
--- a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.Medical.CrewMonitoring;
 using Content.Server.Station.Systems;
@@ -14,7 +14,7 @@ namespace Content.Server.DeviceNetwork.Systems;
 public sealed partial class SingletonDeviceNetServerSystem : EntitySystem
 {
     [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!;
-    [Dependency] private StationSystem _stationSystem = default!;
+    [Dependency] private ServerStationSystem _stationSystem = default!;
 
     public override void Initialize()
     {
@@ -103,10 +103,10 @@ public sealed partial class SingletonDeviceNetServerSystem : EntitySystem
         var connectedEvent = new DeviceNetServerConnectedEvent();
         RaiseLocalEvent(uid, ref connectedEvent);
 
-        if (_deviceNetworkSystem.IsDeviceConnected(uid, device))
+        if (_deviceNetworkSystem.IsDeviceConnected((uid, device)))
             return;
 
-        _deviceNetworkSystem.ConnectDevice(uid, device);
+        _deviceNetworkSystem.ConnectDevice((uid, device));
     }
 
     /// <summary>
@@ -122,7 +122,7 @@ public sealed partial class SingletonDeviceNetServerSystem : EntitySystem
         var disconnectedEvent = new DeviceNetServerDisconnectedEvent();
         RaiseLocalEvent(uid, ref disconnectedEvent);
 
-        _deviceNetworkSystem.DisconnectDevice(uid, device, false);
+        _deviceNetworkSystem.DisconnectDevice((uid, device), false);
     }
 }
 
diff --git a/Content.Server/DeviceNetwork/Systems/StationLimitedNetworkSystem.cs b/Content.Server/DeviceNetwork/Systems/StationLimitedNetworkSystem.cs
index fbb8b2e35a..cfbfdc8816 100644
--- a/Content.Server/DeviceNetwork/Systems/StationLimitedNetworkSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/StationLimitedNetworkSystem.cs
@@ -2,7 +2,6 @@ using Content.Server.DeviceNetwork.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.DeviceNetwork.Events;
 using JetBrains.Annotations;
-using Robust.Shared.Map;
 
 namespace Content.Server.DeviceNetwork.Systems
 {
@@ -12,7 +11,8 @@ namespace Content.Server.DeviceNetwork.Systems
     [UsedImplicitly]
     public sealed partial class StationLimitedNetworkSystem : EntitySystem
     {
-        [Dependency] private StationSystem _stationSystem = default!;
+        [Dependency] private ServerStationSystem _stationSystem = default!;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -54,14 +54,15 @@ namespace Content.Server.DeviceNetwork.Systems
         /// <summary>
         /// Checks if both devices are limited to the same station
         /// </summary>
-        private void OnBeforePacketSent(EntityUid uid, StationLimitedNetworkComponent component, BeforePacketSentEvent args)
+        private void OnBeforePacketSent(Entity<StationLimitedNetworkComponent> ent, ref BeforePacketSentEvent args)
         {
+            var (uid, component) = ent;
             if (!component.StationId.HasValue)
                 TrySetStationId(uid, component);
 
             if (!CheckStationId(args.Sender, component.AllowNonStationPackets, component.StationId))
             {
-                args.Cancel();
+                args.Cancelled = true;
             }
         }
 
diff --git a/Content.Server/DeviceNetwork/Systems/WiredNetworkSystem.cs b/Content.Server/DeviceNetwork/Systems/WiredNetworkSystem.cs
index f8258ecaf6..52700a175e 100644
--- a/Content.Server/DeviceNetwork/Systems/WiredNetworkSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/WiredNetworkSystem.cs
@@ -16,11 +16,11 @@ namespace Content.Server.DeviceNetwork.Systems
         /// <summary>
         /// Checks if both devices are on the same grid
         /// </summary>
-        private void OnBeforePacketSent(EntityUid uid, WiredNetworkComponent component, BeforePacketSentEvent args)
+        private void OnBeforePacketSent(Entity<WiredNetworkComponent> ent, ref BeforePacketSentEvent args)
         {
-            if (Transform(uid).GridUid != args.SenderTransform.GridUid)
+            if (Transform(ent).GridUid != args.SenderTransform.GridUid)
             {
-                args.Cancel();
+                args.Cancelled = true;
             }
         }
 
diff --git a/Content.Server/DeviceNetwork/Systems/WirelessNetworkSystem.cs b/Content.Server/DeviceNetwork/Systems/WirelessNetworkSystem.cs
index 0506f1cce6..3b72a97d35 100644
--- a/Content.Server/DeviceNetwork/Systems/WirelessNetworkSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/WirelessNetworkSystem.cs
@@ -18,10 +18,10 @@ namespace Content.Server.DeviceNetwork.Systems
         /// <summary>
         /// Gets the position of both the sending and receiving entity and checks if the receiver is in range of the sender.
         /// </summary>
-        private void OnBeforePacketSent(EntityUid uid, WirelessNetworkComponent component, BeforePacketSentEvent args)
+        private void OnBeforePacketSent(Entity<WirelessNetworkComponent> ent, ref BeforePacketSentEvent args)
         {
             var ownPosition = args.SenderPosition;
-            var xform = Transform(uid);
+            var xform = Transform(ent);
 
             // not a wireless to wireless connection, just let it happen
             if (!TryComp<WirelessNetworkComponent>(args.Sender, out var sendingComponent))
@@ -30,7 +30,7 @@ namespace Content.Server.DeviceNetwork.Systems
             if (xform.MapID != args.SenderTransform.MapID
                 || (ownPosition - _transformSystem.GetWorldPosition(xform)).Length() > sendingComponent.Range)
             {
-                args.Cancel();
+                args.Cancelled = true;
             }
         }
     }
diff --git a/Content.Server/Discord/DiscordLink/DiscordChatLink.cs b/Content.Server/Discord/DiscordLink/DiscordChatLink.cs
index 90db4a44d9..36db08f0e2 100644
--- a/Content.Server/Discord/DiscordLink/DiscordChatLink.cs
+++ b/Content.Server/Discord/DiscordLink/DiscordChatLink.cs
@@ -1,4 +1,4 @@
-using Content.Server.Chat.Managers;
+using Content.Server.Chat.Managers;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using NetCord;
diff --git a/Content.Server/Discord/DiscordLink/DiscordLink.cs b/Content.Server/Discord/DiscordLink/DiscordLink.cs
index 8e2781322c..4e87e4fed1 100644
--- a/Content.Server/Discord/DiscordLink/DiscordLink.cs
+++ b/Content.Server/Discord/DiscordLink/DiscordLink.cs
@@ -1,4 +1,4 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 using Content.Shared.CCVar;
 using NetCord;
diff --git a/Content.Server/Discord/DiscordLink/DiscordSawmillLogger.cs b/Content.Server/Discord/DiscordLink/DiscordSawmillLogger.cs
index c6ca6acd0e..8df52af23d 100644
--- a/Content.Server/Discord/DiscordLink/DiscordSawmillLogger.cs
+++ b/Content.Server/Discord/DiscordLink/DiscordSawmillLogger.cs
@@ -1,4 +1,4 @@
-using NetCord.Logging;
+using NetCord.Logging;
 using NLogLevel = NetCord.Logging.LogLevel;
 using LogLevel = Robust.Shared.Log.LogLevel;
 
diff --git a/Content.Server/Discord/WebhookData.cs b/Content.Server/Discord/WebhookData.cs
index 1a669237e1..f433c00c45 100644
--- a/Content.Server/Discord/WebhookData.cs
+++ b/Content.Server/Discord/WebhookData.cs
@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Content.Server.Discord;
 
diff --git a/Content.Server/Discord/WebhookEmbedFooter.cs b/Content.Server/Discord/WebhookEmbedFooter.cs
index 9eda006ed2..3bfc75736a 100644
--- a/Content.Server/Discord/WebhookEmbedFooter.cs
+++ b/Content.Server/Discord/WebhookEmbedFooter.cs
@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Content.Server.Discord;
 
diff --git a/Content.Server/Discord/WebhookIdentifier.cs b/Content.Server/Discord/WebhookIdentifier.cs
index 71706fe766..8e351398b2 100644
--- a/Content.Server/Discord/WebhookIdentifier.cs
+++ b/Content.Server/Discord/WebhookIdentifier.cs
@@ -1,3 +1,3 @@
-namespace Content.Server.Discord;
+namespace Content.Server.Discord;
 
 public record struct WebhookIdentifier(string Id, string Token);
diff --git a/Content.Server/Discord/WebhookMessages/EventWebhook.cs b/Content.Server/Discord/WebhookMessages/EventWebhook.cs
index 8812afaabf..661555a825 100644
--- a/Content.Server/Discord/WebhookMessages/EventWebhook.cs
+++ b/Content.Server/Discord/WebhookMessages/EventWebhook.cs
@@ -1,4 +1,4 @@
-using Robust.Server;
+using Robust.Server;
 
 namespace Content.Server.Discord.WebhookMessages;
 
diff --git a/Content.Server/Discord/WebhookMessages/VoteWebhooks.cs b/Content.Server/Discord/WebhookMessages/VoteWebhooks.cs
index ba41aa4602..19d0d25906 100644
--- a/Content.Server/Discord/WebhookMessages/VoteWebhooks.cs
+++ b/Content.Server/Discord/WebhookMessages/VoteWebhooks.cs
@@ -39,7 +39,7 @@ public sealed partial class VoteWebhooks : IPostInjectInit
             fields.Add(newVote);
         }
 
-        var gameTicker = _entSys.GetEntitySystemOrNull<GameTicker>();
+        var gameTicker = _entSys.GetEntitySystemOrNull<ServerGameTicker>();
         _sawmill = Logger.GetSawmill("discord");
 
         var runLevel = gameTicker != null ? Loc.GetString($"game-run-level-{gameTicker.RunLevel}") : "";
diff --git a/Content.Server/Discord/WebhookUser.cs b/Content.Server/Discord/WebhookUser.cs
index 103f41800c..369aee832e 100644
--- a/Content.Server/Discord/WebhookUser.cs
+++ b/Content.Server/Discord/WebhookUser.cs
@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Content.Server.Discord;
 
diff --git a/Content.Server/Drowsiness/DrowsinessSystem.cs b/Content.Server/Drowsiness/DrowsinessSystem.cs
index 2ffb9cf65e..3f0ef82323 100644
--- a/Content.Server/Drowsiness/DrowsinessSystem.cs
+++ b/Content.Server/Drowsiness/DrowsinessSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Bed.Sleep;
+using Content.Shared.Bed.Sleep;
 using Content.Shared.Drowsiness;
 using Content.Shared.StatusEffectNew;
 using Content.Shared.StatusEffectNew.Components;
diff --git a/Content.Server/Drunk/DrunkSystem.cs b/Content.Server/Drunk/DrunkSystem.cs
index 9b51a076ae..050fa3dfb2 100644
--- a/Content.Server/Drunk/DrunkSystem.cs
+++ b/Content.Server/Drunk/DrunkSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Drunk;
+using Content.Shared.Drunk;
 
 namespace Content.Server.Drunk;
 
diff --git a/Content.Server/Electrocution/Components/ElectrocutionComponent.cs b/Content.Server/Electrocution/Components/ElectrocutionComponent.cs
index 30cd869d50..851a678688 100644
--- a/Content.Server/Electrocution/Components/ElectrocutionComponent.cs
+++ b/Content.Server/Electrocution/Components/ElectrocutionComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Electrocution;
+namespace Content.Server.Electrocution;
 
 /// <summary>
 /// Component for virtual electrocution entities (representing an in-progress shock).
diff --git a/Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs b/Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs
deleted file mode 100644
index 3e882db758..0000000000
--- a/Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Engineering.Components
-{
-    /// <summary>
-    /// This component enables the spawn of a specific entity upon being interacted with.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class SpawnAfterInteractComponent : Component
-    {
-        /// <summary>
-        /// The prototype id of the entity to be spawned in.
-        /// </summary>
-        [DataField(required: true)]
-        public EntProtoId Prototype;
-
-        /// <summary>
-        /// Stops the spawn if the target space is no longer in reach, unless true.
-        /// </summary>
-        [DataField]
-        public bool IgnoreDistance;
-
-        /// <summary>
-        /// The length of the interact action.
-        /// </summary>
-        [DataField("doAfter")]
-        public float DoAfterTime = 0;
-
-        /// <summary>
-        /// If the entity with this component should be deleted upon a successful spawn.
-        /// </summary>
-        [DataField]
-        public bool RemoveOnInteract;
-    }
-}
diff --git a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
deleted file mode 100644
index 89b773282b..0000000000
--- a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using Content.Server.Engineering.Components;
-using Content.Server.Stack;
-using Content.Shared.Coordinates.Helpers;
-using Content.Shared.DoAfter;
-using Content.Shared.Interaction;
-using Content.Shared.Maps;
-using Content.Shared.Physics;
-using Content.Shared.Stacks;
-using JetBrains.Annotations;
-using Robust.Shared.Map.Components;
-
-namespace Content.Server.Engineering.EntitySystems
-{
-    [UsedImplicitly]
-    public sealed partial class SpawnAfterInteractSystem : EntitySystem
-    {
-        [Dependency] private SharedDoAfterSystem _doAfterSystem = default!;
-        [Dependency] private StackSystem _stackSystem = default!;
-        [Dependency] private TurfSystem _turfSystem = default!;
-        [Dependency] private SharedTransformSystem _transform = default!;
-        [Dependency] private SharedMapSystem _maps = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<SpawnAfterInteractComponent, AfterInteractEvent>(HandleAfterInteract);
-        }
-
-        private async void HandleAfterInteract(EntityUid uid, SpawnAfterInteractComponent component, AfterInteractEvent args)
-        {
-            if (!args.CanReach && !component.IgnoreDistance)
-                return;
-            if (string.IsNullOrEmpty(component.Prototype))
-                return;
-
-            var gridUid = _transform.GetGrid(args.ClickLocation);
-            if (!TryComp<MapGridComponent>(gridUid, out var grid))
-                return;
-            if (!_maps.TryGetTileRef(gridUid.Value, grid, args.ClickLocation, out var tileRef))
-                return;
-
-            bool IsTileClear()
-            {
-                return tileRef.Tile.IsEmpty == false && !_turfSystem.IsTileBlocked(tileRef, CollisionGroup.MobMask);
-            }
-
-            if (!IsTileClear())
-                return;
-
-            if (component.DoAfterTime > 0)
-            {
-                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, component.DoAfterTime, new AwaitedDoAfterEvent(), null)
-                {
-                    BreakOnMove = true,
-                };
-                var result = await _doAfterSystem.WaitDoAfter(doAfterArgs);
-
-                if (result != DoAfterStatus.Finished)
-                    return;
-            }
-
-            if (component.Deleted || !IsTileClear())
-                return;
-
-            if (TryComp<StackComponent>(uid, out var stackComp)
-                && component.RemoveOnInteract && !_stackSystem.TryUse((uid, stackComp), 1))
-            {
-                return;
-            }
-
-            Spawn(component.Prototype, args.ClickLocation.SnapToGrid(grid));
-
-            if (component.RemoveOnInteract && stackComp == null)
-                TryQueueDel(uid);
-        }
-    }
-}
diff --git a/Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs b/Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs
index 6a30b10716..d2ac8cc5df 100644
--- a/Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs
+++ b/Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Body.Components;
+using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Shared.EntityConditions;
 using Content.Shared.EntityConditions.Conditions.Body;
diff --git a/Content.Server/EntityConditions/Conditions/ObjectiveTargetEntityConditionSystem.cs b/Content.Server/EntityConditions/Conditions/ObjectiveTargetEntityConditionSystem.cs
index 101e929634..c87057b8ad 100644
--- a/Content.Server/EntityConditions/Conditions/ObjectiveTargetEntityConditionSystem.cs
+++ b/Content.Server/EntityConditions/Conditions/ObjectiveTargetEntityConditionSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Objectives.Components;
+using Content.Server.Objectives.Components;
 using Content.Shared.EntityConditions;
 using Content.Shared.EntityConditions.Conditions.Mind;
 using Content.Shared.Mind;
diff --git a/Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs
index 7d24a0b68c..2dae14d289 100644
--- a/Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.EntityEffects;
 using Content.Shared.EntityEffects.Effects.Atmos;
 
diff --git a/Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs
index 688b50f858..c5664a4d01 100644
--- a/Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Atmos.Components;
 using Content.Shared.EntityEffects;
 using Content.Shared.EntityEffects.Effects.Atmos;
diff --git a/Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs
index e5ec6737d8..d2d5ad819d 100644
--- a/Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Atmos.Components;
 using Content.Shared.EntityEffects;
 using Content.Shared.EntityEffects.Effects.Atmos;
diff --git a/Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs b/Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs
index 4c65ab95a8..5483217350 100644
--- a/Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs
+++ b/Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Body.Components;
+using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Shared.EntityEffects;
 using Content.Shared.EntityEffects.Effects.Body;
diff --git a/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs
index 7af72f5d0e..6057d30c04 100644
--- a/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Explosion.EntitySystems;
+using Content.Server.Explosion.EntitySystems;
 using Content.Shared.EntityEffects;
 using Content.Shared.EntityEffects.Effects;
 using Content.Shared.Explosion.Components;
diff --git a/Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs
index c19f62742c..1adba0216d 100644
--- a/Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Ghost.Roles.Components;
+using Content.Server.Ghost.Roles.Components;
 using Content.Server.RuntimeFun;
 using Content.Shared.EntityEffects;
 using Content.Shared.EntityEffects.Effects;
diff --git a/Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs
index 5889dc26b5..6f7ea0b972 100644
--- a/Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Polymorph.Components;
+using Content.Server.Polymorph.Components;
 using Content.Server.Polymorph.Systems;
 using Content.Shared.EntityEffects;
 
@@ -8,12 +8,15 @@ namespace Content.Server.EntityEffects.Effects;
 /// Polymorphs this entity into another entity.
 /// </summary>
 /// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class PolymorphEntityEffectSystem : EntityEffectSystem<PolymorphableComponent, Shared.EntityEffects.Effects.Polymorph>
+public sealed partial class PolymorphEntityEffectSystem : EntityEffectSystem<MetaDataComponent, Shared.EntityEffects.Effects.Polymorph>
 {
     [Dependency] private PolymorphSystem _polymorph = default!;
 
-    protected override void Effect(Entity<PolymorphableComponent> entity, ref EntityEffectEvent<Shared.EntityEffects.Effects.Polymorph> args)
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<Shared.EntityEffects.Effects.Polymorph> args)
     {
+        if (!args.Effect.Force && !HasComp<PolymorphableComponent>(entity))
+            return;
+
         _polymorph.PolymorphEntity(entity, args.Effect.Prototype);
     }
 }
diff --git a/Content.Server/EntityEffects/Effects/Smite/GhostKickEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Smite/GhostKickEntityEffectSystem.cs
new file mode 100644
index 0000000000..ac4b9d53cb
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Smite/GhostKickEntityEffectSystem.cs
@@ -0,0 +1,20 @@
+using Content.Server.GhostKick;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Smite;
+using Robust.Shared.Player;
+
+namespace Content.Server.EntityEffects.Effects.Smite;
+
+/// <summary>
+/// Disconnects this entity's player using the ghost kick manager.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class GhostKickEntityEffectSystem : EntityEffectSystem<ActorComponent, GhostKickEffect>
+{
+    [Dependency] private GhostKickManager _ghostKick = default!;
+
+    protected override void Effect(Entity<ActorComponent> entity, ref EntityEffectEvent<GhostKickEffect> args)
+    {
+        _ghostKick.DoDisconnect(entity.Comp.PlayerSession.Channel, Loc.GetString(args.Effect.Reason));
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Smite/HomingRodEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Smite/HomingRodEntityEffectSystem.cs
new file mode 100644
index 0000000000..c49077539d
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Smite/HomingRodEntityEffectSystem.cs
@@ -0,0 +1,45 @@
+using System.Numerics;
+using Content.Server.Physics.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Smite;
+using Content.Shared.Movement.Components;
+using Robust.Shared.Random;
+using Robust.Shared.Spawners;
+
+namespace Content.Server.EntityEffects.Effects.Smite;
+
+/// <summary>
+/// Spawns a rod at a distance and makes it chase this entity.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class HomingRodEntityEffectSystem : EntityEffectSystem<MetaDataComponent, HomingRod>
+{
+    [Dependency] private IRobustRandom _random = default!;
+    [Dependency] private SharedTransformSystem _transform = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<HomingRod> args)
+    {
+        var speed = args.Effect.Speed;
+        if (args.Effect.MatchTargetSprintSpeed &&
+            TryComp<MovementSpeedModifierComponent>(entity, out var movement))
+            speed = movement.CurrentSprintSpeed + 0.001f;
+
+        if (speed <= 0)
+            return;
+
+        var offset = _random.NextAngle().RotateVec(new Vector2(args.Effect.Distance, 0));
+        var spawnCoords = _transform.GetMapCoordinates(entity).Offset(offset);
+        var rod = Spawn(args.Effect.Prototype, spawnCoords);
+
+        EnsureComp<ChasingWalkComponent>(rod, out var chasing);
+        chasing.NextChangeVectorTime = TimeSpan.MaxValue;
+        chasing.ChasingEntity = entity.Owner;
+        chasing.ImpulseInterval = 0.1f;
+        chasing.RotateWithImpulse = true;
+        chasing.MaxSpeed = speed;
+        chasing.Speed = speed;
+
+        if (TryComp<TimedDespawnComponent>(rod, out var despawn))
+            despawn.Lifetime = offset.Length() / speed * 3;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Smite/SiliconLawBoundEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Smite/SiliconLawBoundEntityEffectSystem.cs
new file mode 100644
index 0000000000..2d9ec53b7b
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Smite/SiliconLawBoundEntityEffectSystem.cs
@@ -0,0 +1,22 @@
+using Content.Server.Silicons.Laws;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Smite;
+using Content.Shared.Silicons.Laws.Components;
+
+namespace Content.Server.EntityEffects.Effects.Smite;
+
+/// <summary>
+/// Binds this entity to its law provider and notifies it of its laws.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class SiliconLawBoundEntityEffectSystem : EntityEffectSystem<SiliconLawProviderComponent, SiliconLawBound>
+{
+    [Dependency] private SiliconLawSystem _siliconLaws = default!;
+
+    protected override void Effect(Entity<SiliconLawProviderComponent> entity, ref EntityEffectEvent<SiliconLawBound> args)
+    {
+        EnsureComp<SiliconLawBoundComponent>(entity);
+        _siliconLaws.GetLaws(entity.Owner);
+        _siliconLaws.NotifyLawsChanged(entity);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Smite/TabletopDimensionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Smite/TabletopDimensionEntityEffectSystem.cs
new file mode 100644
index 0000000000..1acba70d6d
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Smite/TabletopDimensionEntityEffectSystem.cs
@@ -0,0 +1,26 @@
+using Content.Server.Tabletop;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Smite;
+using Content.Shared.Tabletop.Components;
+
+namespace Content.Server.EntityEffects.Effects.Smite;
+
+/// <summary>
+/// Spawns a game board and moves this entity into its tabletop session.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class TabletopDimensionEntityEffectSystem : EntityEffectSystem<MetaDataComponent, TabletopDimension>
+{
+    [Dependency] private TabletopSystem _tabletop = default!;
+    [Dependency] private SharedTransformSystem _transform = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<TabletopDimension> args)
+    {
+        var xform = Transform(entity);
+        var board = Spawn(args.Effect.Prototype, xform.Coordinates);
+        var session = _tabletop.EnsureSession(Comp<TabletopGameComponent>(board));
+
+        _transform.SetMapCoordinates(entity, session.Position);
+        _transform.SetWorldRotationNoLerp((entity.Owner, xform), Angle.Zero);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs
index 7294d9933e..178ac243d9 100644
--- a/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Fluids.EntitySystems;
+using Content.Server.Fluids.EntitySystems;
 using Content.Server.Spreader;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Coordinates.Helpers;
diff --git a/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs
index abcc54fdda..9525bff88b 100644
--- a/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Explosion.EntitySystems;
+using Content.Server.Explosion.EntitySystems;
 using Content.Shared.EntityEffects;
 using ExplosionEffect = Content.Shared.EntityEffects.Effects.Transform.Explosion;
 
diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs
index e07ed73b25..fbabeedb5b 100644
--- a/Content.Server/Entry/EntryPoint.cs
+++ b/Content.Server/Entry/EntryPoint.cs
@@ -164,7 +164,7 @@ namespace Content.Server.Entry
             _discordChatLink.Initialize();
             _euiManager.Initialize();
             _gameMap.Initialize();
-            _entSys.GetEntitySystem<GameTicker>().PostInitialize();
+            _entSys.GetEntitySystem<ServerGameTicker>().PostInitialize();
             _ban.Initialize();
             _connection.PostInit();
             _multiServerKick.Initialize();
diff --git a/Content.Server/Explosion/Components/ExplosionAirtightGridComponent.cs b/Content.Server/Explosion/Components/ExplosionAirtightGridComponent.cs
index 68f576dcb9..6b3d944f4b 100644
--- a/Content.Server/Explosion/Components/ExplosionAirtightGridComponent.cs
+++ b/Content.Server/Explosion/Components/ExplosionAirtightGridComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Explosion.EntitySystems;
+using Content.Server.Explosion.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Map.Components;
diff --git a/Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs b/Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs
index 20a73b46b5..fd61247305 100644
--- a/Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs
+++ b/Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs
@@ -1,4 +1,5 @@
-using Content.Server.Explosion.EntitySystems;
+using Content.Server.Explosion.EntitySystems;
+using Content.Shared.Weapons.Ranged.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 
@@ -35,16 +36,16 @@ public sealed partial class ProjectileGrenadeComponent : Component
     public bool RandomAngle = false;
 
     /// <summary>
-    /// The minimum speed the projectiles may come out at
+    /// The minimum speed the projectiles may come out at, to vary the spread.
     /// </summary>
     [DataField]
-    public float MinVelocity = 2f;
+    public float MinVelocity = 42f;
 
     /// <summary>
-    /// The maximum speed the projectiles may come out at
+    /// The maximum speed the projectiles may come out at, to vary the spread.
     /// </summary>
     [DataField]
-    public float MaxVelocity = 6f;
+    public float MaxVelocity = 46f;
 
     /// <summary>
     /// The trigger key that will activate the grenade.
diff --git a/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs b/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs
index 17590d4f74..b23a809f98 100644
--- a/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs
@@ -1,4 +1,5 @@
-using Content.Server.Explosion.Components;
+using System.Numerics;
+using Content.Server.Explosion.Components;
 using Content.Server.Weapons.Ranged.Systems;
 using Content.Shared.Trigger;
 using Robust.Server.GameObjects;
@@ -85,8 +86,8 @@ public sealed partial class ProjectileGrenadeSystem : EntitySystem
             // velocity is randomized to make the projectiles look
             // slightly uneven, doesn't really change much, but it looks better
             var direction = angle.ToVec().Normalized();
-            var velocity = _random.NextVector2(component.MinVelocity, component.MaxVelocity);
-            _gun.ShootProjectile(contentUid, direction, velocity, null);
+            var velocity = _random.NextFloat(component.MinVelocity, component.MaxVelocity);
+            _gun.ShootProjectile(contentUid, direction, Vector2.Zero, null, speed: velocity);
         }
     }
 
diff --git a/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs b/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
index 6e2f284f7c..0564f67958 100644
--- a/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Explosion.Components;
+using Content.Shared.Explosion.Components;
 using Content.Shared.Throwing;
 using Content.Shared.Trigger;
 using Content.Shared.Trigger.Systems;
diff --git a/Content.Server/Fax/AdminUI/AdminFaxEui.cs b/Content.Server/Fax/AdminUI/AdminFaxEui.cs
index 21089befe0..9e5b5e0f17 100644
--- a/Content.Server/Fax/AdminUI/AdminFaxEui.cs
+++ b/Content.Server/Fax/AdminUI/AdminFaxEui.cs
@@ -1,5 +1,3 @@
-using Content.Server.Construction.Conditions;
-using Content.Server.DeviceNetwork.Components;
 using Content.Server.EUI;
 using Content.Shared.Eui;
 using Content.Shared.Fax.Components;
diff --git a/Content.Server/Fax/FaxConstants.cs b/Content.Server/Fax/FaxConstants.cs
deleted file mode 100644
index 8578172381..0000000000
--- a/Content.Server/Fax/FaxConstants.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-namespace Content.Server.Fax;
-
-public static class FaxConstants
-{
-    // Commands
-
-    /**
-     * Used to get other faxes connected to current network
-     */
-    public const string FaxPingCommand = "fax_ping";
-
-    /**
-     * Used as response to ping command
-     */
-    public const string FaxPongCommand = "fax_pong";
-
-    /**
-     * Used when fax sending data to destination fax
-     */
-    public const string FaxPrintCommand = "fax_print";
-
-    // Data
-
-    public const string FaxNameData = "fax_data_name";
-    public const string FaxPaperNameData = "fax_data_title";
-    public const string FaxPaperLabelData = "fax_data_label";
-    public const string FaxPaperPrototypeData = "fax_data_prototype";
-    public const string FaxPaperContentData = "fax_data_content";
-    public const string FaxPaperStampStateData = "fax_data_stamp_state";
-    public const string FaxPaperStampedByData = "fax_data_stamped_by";
-    public const string FaxSyndicateData = "fax_data_i_am_syndicate";
-    public const string FaxPaperLockedData = "fax_data_locked";
-    public const string FaxPaperSenderFaxNameData = "fax_data_sender_fax_name";
-}
diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs
index cddb9b4854..3f131fb2c5 100644
--- a/Content.Server/Fax/FaxSystem.cs
+++ b/Content.Server/Fax/FaxSystem.cs
@@ -8,8 +8,6 @@ using Content.Server.Tools;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
-using Content.Shared.DeviceNetwork;
-using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.Emag.Systems;
 using Content.Shared.Fax;
@@ -31,7 +29,6 @@ using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 
 namespace Content.Server.Fax;
 
@@ -41,7 +38,6 @@ public sealed partial class FaxSystem : EntitySystem
     [Dependency] private IAdminManager _adminManager = default!;
     [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!;
     [Dependency] private SharedAppearanceSystem _appearanceSystem = default!;
-    [Dependency] private SharedGameTicker _gameTicker = default!;
     [Dependency] private PopupSystem _popupSystem = default!;
     [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!;
     [Dependency] private PaperSystem _paperSystem = default!;
@@ -71,7 +67,6 @@ public sealed partial class FaxSystem : EntitySystem
         SubscribeLocalEvent<FaxMachineComponent, EntInsertedIntoContainerMessage>(OnItemSlotChanged);
         SubscribeLocalEvent<FaxMachineComponent, EntRemovedFromContainerMessage>(OnItemSlotChanged);
         SubscribeLocalEvent<FaxMachineComponent, PowerChangedEvent>(OnPowerChanged);
-        SubscribeLocalEvent<FaxMachineComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
 
         // Interaction
         SubscribeLocalEvent<FaxMachineComponent, InteractUsingEvent>(OnInteractUsing);
@@ -261,56 +256,32 @@ public sealed partial class FaxSystem : EntitySystem
         args.Handled = true;
     }
 
-    private void OnPacketReceived(EntityUid uid, FaxMachineComponent component, DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnPingPayload(Entity<FaxMachineComponent> ent, ref DeviceNetworkPacketEvent<FaxPingPayload> args)
     {
-        if (!HasComp<DeviceNetworkComponent>(uid) || string.IsNullOrEmpty(args.SenderAddress))
+        var isForSyndie = _emag.CheckFlag(ent.Owner, EmagType.Interaction) && args.Data.IsSyndicate;
+        if (!isForSyndie && !ent.Comp.ResponsePings)
             return;
 
-        if (args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? command))
+        var pong = new FaxPongPayload
         {
-            switch (command)
-            {
-                case FaxConstants.FaxPingCommand:
-                    var isForSyndie = _emag.CheckFlag(uid, EmagType.Interaction) &&
-                                      args.Data.ContainsKey(FaxConstants.FaxSyndicateData);
-                    if (!isForSyndie && !component.ResponsePings)
-                        return;
+            FaxName = ent.Comp.FaxName,
+        };
 
-                    var payload = new NetworkPayload()
-                    {
-                        { DeviceNetworkConstants.Command, FaxConstants.FaxPongCommand },
-                        { FaxConstants.FaxNameData, component.FaxName }
-                    };
-                    _deviceNetworkSystem.QueuePacket(uid, args.SenderAddress, payload);
+        _deviceNetworkSystem.SendPacket(ent.Owner, args.SenderAddress, ref pong);
+    }
 
-                    break;
-                case FaxConstants.FaxPongCommand:
-                    if (!args.Data.TryGetValue(FaxConstants.FaxNameData, out string? faxName))
-                        return;
+    [SubscribeLocalEvent]
+    private void OnPongPayload(Entity<FaxMachineComponent> ent, ref DeviceNetworkPacketEvent<FaxPongPayload> args)
+    {
+        ent.Comp.KnownFaxes[args.SenderAddress] = args.Data.FaxName;
+        UpdateUserInterface(ent.Owner, ent.Comp);
+    }
 
-                    component.KnownFaxes[args.SenderAddress] = faxName;
-
-                    UpdateUserInterface(uid, component);
-
-                    break;
-                case FaxConstants.FaxPrintCommand:
-                    if (!args.Data.TryGetValue(FaxConstants.FaxPaperNameData, out string? name) ||
-                        !args.Data.TryGetValue(FaxConstants.FaxPaperContentData, out string? content))
-                        return;
-
-                    args.Data.TryGetValue(FaxConstants.FaxPaperLabelData, out string? label);
-                    args.Data.TryGetValue(FaxConstants.FaxPaperStampStateData, out string? stampState);
-                    args.Data.TryGetValue(FaxConstants.FaxPaperStampedByData, out List<StampDisplayInfo>? stampedBy);
-                    args.Data.TryGetValue(FaxConstants.FaxPaperPrototypeData, out string? prototypeId);
-                    args.Data.TryGetValue(FaxConstants.FaxPaperLockedData, out bool? locked);
-                    args.Data.TryGetValue(FaxConstants.FaxPaperSenderFaxNameData, out string? senderFaxName);
-
-                    var printout = new FaxPrintout(content, name, label, prototypeId, stampState, stampedBy, locked ?? false, senderFaxName);
-                    Receive(uid, printout, args.SenderAddress);
-
-                    break;
-            }
-        }
+    [SubscribeLocalEvent]
+    private void OnPrintPayload(Entity<FaxMachineComponent> ent, ref DeviceNetworkPacketEvent<FaxPrintPayload> args)
+    {
+        Receive(ent, args.Data.Data, args.SenderAddress);
     }
 
     private void OnToggleInterface(EntityUid uid, FaxMachineComponent component, AfterActivatableUIOpenEvent args)
@@ -413,15 +384,12 @@ public sealed partial class FaxSystem : EntitySystem
         component.DestinationFaxAddress = null;
         component.KnownFaxes.Clear();
 
-        var payload = new NetworkPayload()
+        var payload = new FaxPingPayload
         {
-            { DeviceNetworkConstants.Command, FaxConstants.FaxPingCommand }
+            IsSyndicate = _emag.CheckFlag(uid, EmagType.Interaction),
         };
 
-        if (_emag.CheckFlag(uid, EmagType.Interaction))
-            payload.Add(FaxConstants.FaxSyndicateData, true);
-
-        _deviceNetworkSystem.QueuePacket(uid, null, payload);
+        _deviceNetworkSystem.SendPacket(uid, null, ref payload);
     }
 
     /// <summary>
@@ -522,57 +490,26 @@ public sealed partial class FaxSystem : EntitySystem
            !TryComp<PaperComponent>(sendEntity, out var paper))
             return;
 
+        if (metadata.EntityPrototype == null)
+            return;
+
         TryComp<NameModifierComponent>(sendEntity, out var nameMod);
 
         TryComp<LabelComponent>(sendEntity, out var labelComponent);
 
-        var content = paper.Content;
-
-        if (component.AddSenderInfo)
+        var payload = new FaxPrintPayload
         {
-            var faxMachineAddress = TryComp<DeviceNetworkComponent>(uid, out var deviceNetworkComponent)
-            ? deviceNetworkComponent.Address
-            : Loc.GetString("device-address-unknown");
-
-            var time = _gameTicker.RoundDuration();
-            var timeString = TimeSpan.FromSeconds(Math.Truncate(time.TotalSeconds)).ToString();
-
-            content += "\n";
-            content += Loc.GetString(component.SenderInfo,
-                ("sender_name", component.FaxName),
-                ("sender_addr", faxMachineAddress),
-                ("recipient_name", component.DestinationFaxName ?? Loc.GetString("fax-machine-popup-source-unknown")),
-                ("recipient_addr", component.DestinationFaxAddress),
-                ("time", timeString)
-            );
-        }
-
-        var payload = new NetworkPayload()
-        {
-            { DeviceNetworkConstants.Command, FaxConstants.FaxPrintCommand },
-            { FaxConstants.FaxPaperNameData, nameMod?.BaseName ?? metadata.EntityName },
-            { FaxConstants.FaxPaperLabelData, labelComponent?.CurrentLabel },
-            { FaxConstants.FaxPaperContentData, content },
-            { FaxConstants.FaxPaperLockedData, paper.EditingDisabled },
-            { FaxConstants.FaxPaperSenderFaxNameData, component.FaxName ?? Loc.GetString("fax-machine-popup-source-unknown") }
+            Data = new FaxPrintout(
+                    paper.Content,
+                    nameMod?.BaseName ?? metadata.EntityName,
+                    labelComponent?.CurrentLabel,
+                    metadata.EntityPrototype.ID,
+                    paper.StampState,
+                    paper.StampedBy,
+                    paper.EditingDisabled),
         };
 
-        if (metadata.EntityPrototype != null)
-        {
-            // TODO: Ideally, we could just make a copy of the whole entity when it's
-            // faxed, in order to preserve visuals, etc.. This functionality isn't
-            // available yet, so we'll pass along the originating prototypeId and fall
-            // back to component.PrintPaperId in SpawnPaperFromQueue if we can't find one here.
-            payload[FaxConstants.FaxPaperPrototypeData] = metadata.EntityPrototype.ID;
-        }
-
-        if (paper.StampState != null)
-        {
-            payload[FaxConstants.FaxPaperStampStateData] = paper.StampState;
-            payload[FaxConstants.FaxPaperStampedByData] = paper.StampedBy;
-        }
-
-        _deviceNetworkSystem.QueuePacket(uid, component.DestinationFaxAddress, payload);
+        _deviceNetworkSystem.SendPacket(uid, component.DestinationFaxAddress, ref payload);
 
         _adminLogger.Add(LogType.Action,
             LogImpact.Low,
@@ -615,7 +552,7 @@ public sealed partial class FaxSystem : EntitySystem
 
         var printout = component.PrintingQueue.Dequeue();
 
-        var entityToSpawn = component.PrintPaperId;
+        var entityToSpawn = ProtoMan.HasIndex(printout.PrototypeId) ? printout.PrototypeId : component.PrintPaperId;
         var printed = Spawn(entityToSpawn, Transform(uid).Coordinates);
 
         if (TryComp<PaperComponent>(printed, out var paper))
diff --git a/Content.Server/FeedbackSystem/FeedbackCommand.cs b/Content.Server/FeedbackSystem/FeedbackCommand.cs
index 7b0412cbd7..ca73ad8312 100644
--- a/Content.Server/FeedbackSystem/FeedbackCommand.cs
+++ b/Content.Server/FeedbackSystem/FeedbackCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.FeedbackSystem;
 using Robust.Shared.Player;
diff --git a/Content.Server/FeedbackSystem/FeedbackSystem.cs b/Content.Server/FeedbackSystem/FeedbackSystem.cs
index 4c9aae7d64..35d866746a 100644
--- a/Content.Server/FeedbackSystem/FeedbackSystem.cs
+++ b/Content.Server/FeedbackSystem/FeedbackSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameTicking;
+using Content.Server.GameTicking;
 using Content.Shared.FeedbackSystem;
 using Content.Shared.GameTicking;
 using Robust.Shared.Prototypes;
@@ -8,7 +8,7 @@ namespace Content.Server.FeedbackSystem;
 public sealed partial class FeedbackSystem : EntitySystem
 {
     [Dependency] private ServerFeedbackManager _feedbackManager = null!;
-    [Dependency] private GameTicker _gameTicker = null!;
+    [Dependency] private ServerGameTicker _gameTicker = null!;
 
     public override void Initialize()
     {
diff --git a/Content.Server/FeedbackSystem/OpenFeedbackPopupCommand.cs b/Content.Server/FeedbackSystem/OpenFeedbackPopupCommand.cs
index bf7e7520a8..30084b2219 100644
--- a/Content.Server/FeedbackSystem/OpenFeedbackPopupCommand.cs
+++ b/Content.Server/FeedbackSystem/OpenFeedbackPopupCommand.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using Content.Shared.FeedbackSystem;
 using Robust.Shared.Toolshed;
 
diff --git a/Content.Server/FeedbackSystem/ServerFeedbackManager.cs b/Content.Server/FeedbackSystem/ServerFeedbackManager.cs
index 98e6c382ce..d4bfb0748c 100644
--- a/Content.Server/FeedbackSystem/ServerFeedbackManager.cs
+++ b/Content.Server/FeedbackSystem/ServerFeedbackManager.cs
@@ -1,4 +1,4 @@
-using Content.Shared.FeedbackSystem;
+using Content.Shared.FeedbackSystem;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/Fluids/EntitySystems/SpraySystem.cs b/Content.Server/Fluids/EntitySystems/SpraySystem.cs
index bfc685df8e..953d5dc9f3 100644
--- a/Content.Server/Fluids/EntitySystems/SpraySystem.cs
+++ b/Content.Server/Fluids/EntitySystems/SpraySystem.cs
@@ -5,7 +5,6 @@ using Content.Shared.CCVar;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Fluids;
 using Content.Shared.Interaction;
-using Content.Shared.Timing;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
@@ -13,6 +12,7 @@ using Robust.Shared.Physics.Components;
 using System.Numerics;
 using Content.Shared.Fluids.EntitySystems;
 using Content.Shared.Fluids.Components;
+using Content.Shared.Timing.Systems;
 using Robust.Server.Containers;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
@@ -190,6 +190,6 @@ public sealed partial class SpraySystem : SharedSpraySystem
         audioParams = audioParams.WithVariation(0.125f);
         _audio.PlayPvs(entity.Comp.SpraySound, entity, audioParams);
 
-        _useDelay.TryResetDelay(entity);
+        _useDelay.TryResetDelay(entity.Owner);
     }
 }
diff --git a/Content.Server/Fluids/ShowFluidsCommand.cs b/Content.Server/Fluids/ShowFluidsCommand.cs
index 2bf0f562eb..e981321dc2 100644
--- a/Content.Server/Fluids/ShowFluidsCommand.cs
+++ b/Content.Server/Fluids/ShowFluidsCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.Fluids.EntitySystems;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
diff --git a/Content.Server/GameTicking/Commands/DelayStartCommand.cs b/Content.Server/GameTicking/Commands/DelayStartCommand.cs
index d82d2f0f12..df5f750e87 100644
--- a/Content.Server/GameTicking/Commands/DelayStartCommand.cs
+++ b/Content.Server/GameTicking/Commands/DelayStartCommand.cs
@@ -1,5 +1,6 @@
 using Content.Server.Administration;
 using Content.Shared.Administration;
+using Content.Shared.GameTicking;
 using Robust.Shared.Console;
 
 namespace Content.Server.GameTicking.Commands;
@@ -11,7 +12,7 @@ sealed class DelayStartCommand : LocalizedEntityCommands
 
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var ticker = EntityManager.System<GameTicker>();
+        var ticker = EntityManager.System<ServerGameTicker>();
         if (ticker.RunLevel != GameRunLevel.PreRoundLobby)
         {
             shell.WriteLine(Loc.GetString("delaystart-preround-only"));
diff --git a/Content.Server/GameTicking/Commands/DynamicRuleCommand.cs b/Content.Server/GameTicking/Commands/DynamicRuleCommand.cs
index 798e7d0d3a..c908889f8c 100644
--- a/Content.Server/GameTicking/Commands/DynamicRuleCommand.cs
+++ b/Content.Server/GameTicking/Commands/DynamicRuleCommand.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Administration;
 using Content.Server.GameTicking.Rules;
 using Content.Shared.Administration;
diff --git a/Content.Server/GameTicking/Commands/EndRoundCommand.cs b/Content.Server/GameTicking/Commands/EndRoundCommand.cs
index 8fa427fdc2..13e104bca7 100644
--- a/Content.Server/GameTicking/Commands/EndRoundCommand.cs
+++ b/Content.Server/GameTicking/Commands/EndRoundCommand.cs
@@ -1,5 +1,6 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Shared.Administration;
+using Content.Shared.GameTicking;
 using Robust.Shared.Console;
 
 namespace Content.Server.GameTicking.Commands;
@@ -7,7 +8,7 @@ namespace Content.Server.GameTicking.Commands;
 [AdminCommand(AdminFlags.Round)]
 public sealed partial class EndRoundCommand : LocalizedEntityCommands
 {
-    [Dependency] private GameTicker _gameTicker = default!;
+    [Dependency] private ServerGameTicker _gameTicker = default!;
 
     public override string Command => "endround";
 
diff --git a/Content.Server/GameTicking/Commands/ForcePresetCommand.cs b/Content.Server/GameTicking/Commands/ForcePresetCommand.cs
index a7c38f5a3e..43bec7b175 100644
--- a/Content.Server/GameTicking/Commands/ForcePresetCommand.cs
+++ b/Content.Server/GameTicking/Commands/ForcePresetCommand.cs
@@ -1,7 +1,8 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Administration;
-using Content.Server.GameTicking.Presets;
 using Content.Shared.Administration;
+using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Prototypes;
 using Robust.Shared.Console;
 using Robust.Shared.Prototypes;
 
@@ -11,7 +12,7 @@ namespace Content.Server.GameTicking.Commands
     public sealed partial class ForcePresetCommand : LocalizedEntityCommands
     {
         [Dependency] private IPrototypeManager _prototypeManager = default!;
-        [Dependency] private GameTicker _ticker = default!;
+        [Dependency] private ServerGameTicker _ticker = default!;
 
         public override string Command => "forcepreset";
 
diff --git a/Content.Server/GameTicking/Commands/GoLobbyCommand.cs b/Content.Server/GameTicking/Commands/GoLobbyCommand.cs
index 23d7dc4c8d..094cb93902 100644
--- a/Content.Server/GameTicking/Commands/GoLobbyCommand.cs
+++ b/Content.Server/GameTicking/Commands/GoLobbyCommand.cs
@@ -1,7 +1,7 @@
-using Content.Server.Administration;
-using Content.Server.GameTicking.Presets;
+using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
+using Content.Shared.GameTicking.Prototypes;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 
@@ -11,7 +11,7 @@ namespace Content.Server.GameTicking.Commands
     public sealed partial class GoLobbyCommand : LocalizedEntityCommands
     {
         [Dependency] private IConfigurationManager _configManager = default!;
-        [Dependency] private GameTicker _gameTicker = default!;
+        [Dependency] private ServerGameTicker _gameTicker = default!;
 
         public override string Command => "golobby";
 
diff --git a/Content.Server/GameTicking/Commands/JoinGameCommand.cs b/Content.Server/GameTicking/Commands/JoinGameCommand.cs
index 1148dd4160..20b4dd99f4 100644
--- a/Content.Server/GameTicking/Commands/JoinGameCommand.cs
+++ b/Content.Server/GameTicking/Commands/JoinGameCommand.cs
@@ -47,8 +47,8 @@ namespace Content.Server.GameTicking.Commands
                 return;
             }
 
-            var ticker = _entManager.System<GameTicker>();
-            var stationJobs = _entManager.System<StationJobsSystem>();
+            var ticker = _entManager.System<ServerGameTicker>();
+            var stationJobs = _entManager.System<ServerStationJobsSystem>();
 
             if (ticker.PlayerGameStatuses.TryGetValue(player.UserId, out var status) && status == PlayerGameStatus.JoinedGame)
             {
diff --git a/Content.Server/GameTicking/Commands/ObserveCommand.cs b/Content.Server/GameTicking/Commands/ObserveCommand.cs
index 45d911887d..c61d60cdd9 100644
--- a/Content.Server/GameTicking/Commands/ObserveCommand.cs
+++ b/Content.Server/GameTicking/Commands/ObserveCommand.cs
@@ -23,7 +23,7 @@ namespace Content.Server.GameTicking.Commands
                 return;
             }
 
-            var ticker = _e.System<GameTicker>();
+            var ticker = _e.System<ServerGameTicker>();
 
             if (ticker.RunLevel == GameRunLevel.PreRoundLobby)
             {
diff --git a/Content.Server/GameTicking/Commands/RespawnCommand.cs b/Content.Server/GameTicking/Commands/RespawnCommand.cs
index 479549bd5f..f0d5caf152 100644
--- a/Content.Server/GameTicking/Commands/RespawnCommand.cs
+++ b/Content.Server/GameTicking/Commands/RespawnCommand.cs
@@ -12,7 +12,7 @@ namespace Content.Server.GameTicking.Commands
     {
         [Dependency] private IPlayerManager _player = default!;
         [Dependency] private IPlayerLocator _locator = default!;
-        [Dependency] private GameTicker _gameTicker = default!;
+        [Dependency] private ServerGameTicker _gameTicker = default!;
         [Dependency] private MindSystem _mind = default!;
 
         public override string Command => "respawn";
diff --git a/Content.Server/GameTicking/Commands/RestartRoundCommand.cs b/Content.Server/GameTicking/Commands/RestartRoundCommand.cs
index cd9c77ce0c..c125e6fa32 100644
--- a/Content.Server/GameTicking/Commands/RestartRoundCommand.cs
+++ b/Content.Server/GameTicking/Commands/RestartRoundCommand.cs
@@ -1,6 +1,7 @@
 using Content.Server.Administration;
 using Content.Server.RoundEnd;
 using Content.Shared.Administration;
+using Content.Shared.GameTicking;
 using Robust.Shared.Console;
 
 namespace Content.Server.GameTicking.Commands;
@@ -8,7 +9,7 @@ namespace Content.Server.GameTicking.Commands;
 [AdminCommand(AdminFlags.Round)]
 public sealed partial class RestartRoundCommand : LocalizedEntityCommands
 {
-    [Dependency] private GameTicker _gameTicker = default!;
+    [Dependency] private ServerGameTicker _gameTicker = default!;
     [Dependency] private RoundEndSystem _roundEndSystem = default!;
 
     public override string Command => "restartround";
@@ -28,7 +29,7 @@ public sealed partial class RestartRoundCommand : LocalizedEntityCommands
 [AdminCommand(AdminFlags.Round)]
 public sealed partial class RestartRoundNowCommand : LocalizedEntityCommands
 {
-    [Dependency] private GameTicker _gameTicker = default!;
+    [Dependency] private ServerGameTicker _gameTicker = default!;
 
     public override string Command => "restartroundnow";
 
diff --git a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
index a577867ec4..a8c208904a 100644
--- a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
+++ b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
@@ -1,7 +1,6 @@
-using System.Linq;
 using Content.Server.Administration;
-using Content.Server.GameTicking.Presets;
 using Content.Shared.Administration;
+using Content.Shared.GameTicking.Prototypes;
 using Robust.Shared.Console;
 
 namespace Content.Server.GameTicking.Commands
@@ -23,7 +22,7 @@ namespace Content.Server.GameTicking.Commands
                 return;
             }
 
-            var ticker = _entity.System<GameTicker>();
+            var ticker = _entity.System<ServerGameTicker>();
 
             if (!ticker.TryFindGamePreset(args[0], out var preset))
             {
diff --git a/Content.Server/GameTicking/Commands/StartRoundCommand.cs b/Content.Server/GameTicking/Commands/StartRoundCommand.cs
index 90d4ffa35a..3e5e9652d8 100644
--- a/Content.Server/GameTicking/Commands/StartRoundCommand.cs
+++ b/Content.Server/GameTicking/Commands/StartRoundCommand.cs
@@ -1,5 +1,6 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Shared.Administration;
+using Content.Shared.GameTicking;
 using Robust.Shared.Console;
 
 namespace Content.Server.GameTicking.Commands;
@@ -7,7 +8,7 @@ namespace Content.Server.GameTicking.Commands;
 [AdminCommand(AdminFlags.Round)]
 public sealed partial class StartRoundCommand : LocalizedEntityCommands
 {
-    [Dependency] private GameTicker _gameTicker = default!;
+    [Dependency] private ServerGameTicker _gameTicker = default!;
 
     public override string Command => "startround";
 
diff --git a/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs b/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs
index bd62c509c4..1a8291882f 100644
--- a/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs
+++ b/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Robust.Shared.Configuration;
diff --git a/Content.Server/GameTicking/Commands/ToggleReadyCommand.cs b/Content.Server/GameTicking/Commands/ToggleReadyCommand.cs
index b990e92ca7..16361c4930 100644
--- a/Content.Server/GameTicking/Commands/ToggleReadyCommand.cs
+++ b/Content.Server/GameTicking/Commands/ToggleReadyCommand.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Administration;
+using Content.Shared.GameTicking;
 using Robust.Shared.Console;
 
 namespace Content.Server.GameTicking.Commands;
@@ -6,7 +7,7 @@ namespace Content.Server.GameTicking.Commands;
 [AnyCommand]
 public sealed partial class ToggleReadyCommand : LocalizedEntityCommands
 {
-    [Dependency] private GameTicker _gameTicker = default!;
+    [Dependency] private ServerGameTicker _gameTicker = default!;
 
     public override string Command => "toggleready";
 
diff --git a/Content.Server/GameTicking/Events/GetDisallowedJobsEvent.cs b/Content.Server/GameTicking/Events/GetDisallowedJobsEvent.cs
index cd15cfb8f8..95c273f9ed 100644
--- a/Content.Server/GameTicking/Events/GetDisallowedJobsEvent.cs
+++ b/Content.Server/GameTicking/Events/GetDisallowedJobsEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Roles;
+using Content.Shared.Roles;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/GameTicking/Events/IsRoleAllowedEvent.cs b/Content.Server/GameTicking/Events/IsRoleAllowedEvent.cs
index 76d2805d1c..cc79b2e043 100644
--- a/Content.Server/GameTicking/Events/IsRoleAllowedEvent.cs
+++ b/Content.Server/GameTicking/Events/IsRoleAllowedEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Roles;
+using Content.Shared.Roles;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/GameTicking/Events/NoJobsAvailableSpawningEvent.cs b/Content.Server/GameTicking/Events/NoJobsAvailableSpawningEvent.cs
index c1e2d99dc4..47fd1bfca9 100644
--- a/Content.Server/GameTicking/Events/NoJobsAvailableSpawningEvent.cs
+++ b/Content.Server/GameTicking/Events/NoJobsAvailableSpawningEvent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Player;
+using Robust.Shared.Player;
 
 namespace Content.Server.GameTicking.Events;
 
diff --git a/Content.Server/GameTicking/GameTicker.CVars.cs b/Content.Server/GameTicking/GameTicker.CVars.cs
deleted file mode 100644
index c247c66471..0000000000
--- a/Content.Server/GameTicking/GameTicker.CVars.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using Content.Server.Discord;
-using Content.Shared.CCVar;
-using Content.Shared.GameTicking;
-
-namespace Content.Server.GameTicking
-{
-    public sealed partial class GameTicker
-    {
-        [ViewVariables]
-        public bool LobbyEnabled { get; private set; }
-
-        [ViewVariables]
-        public bool DummyTicker { get; private set; } = false;
-
-        [ViewVariables]
-        public TimeSpan LobbyDuration { get; private set; } = TimeSpan.Zero;
-
-        [ViewVariables]
-        public bool DisallowLateJoin { get; private set; } = false;
-
-        [ViewVariables]
-        public string? ServerName { get; private set; }
-
-        [ViewVariables]
-        private string? DiscordRoundEndRole { get; set; }
-
-        private WebhookIdentifier? _webhookIdentifier;
-
-        [ViewVariables]
-        private string? RoundEndSoundCollection { get; set; }
-
-#if EXCEPTION_TOLERANCE
-        [ViewVariables]
-        public int RoundStartFailShutdownCount { get; private set; } = 0;
-#endif
-
-        private void InitializeCVars()
-        {
-            Subs.CVar(_cfg, CCVars.GameLobbyEnabled, value =>
-            {
-                LobbyEnabled = value;
-                foreach (var (userId, status) in _playerGameStatuses)
-                {
-                    if (status == PlayerGameStatus.JoinedGame)
-                        continue;
-                    _playerGameStatuses[userId] =
-                        LobbyEnabled ? PlayerGameStatus.NotReadyToPlay : PlayerGameStatus.ReadyToPlay;
-                }
-            }, true);
-            Subs.CVar(_cfg, CCVars.GameDummyTicker, value => DummyTicker = value, true);
-            Subs.CVar(_cfg, CCVars.GameLobbyDuration, value => LobbyDuration = TimeSpan.FromSeconds(value), true);
-            Subs.CVar(_cfg, CCVars.GameDisallowLateJoins,
-                value => { DisallowLateJoin = value; UpdateLateJoinStatus(); }, true);
-            Subs.CVar(_cfg, CCVars.AdminLogsServerName, value =>
-            {
-                // TODO why tf is the server name on admin logs
-                ServerName = value;
-            }, true);
-            Subs.CVar(_cfg, CCVars.DiscordRoundUpdateWebhook, value =>
-            {
-                if (!string.IsNullOrWhiteSpace(value))
-                {
-                    _discord.GetWebhook(value, data => _webhookIdentifier = data.ToIdentifier());
-                }
-            }, true);
-            Subs.CVar(_cfg, CCVars.DiscordRoundEndRoleWebhook, value =>
-            {
-                DiscordRoundEndRole = value;
-
-                if (value == string.Empty)
-                {
-                    DiscordRoundEndRole = null;
-                }
-            }, true);
-            Subs.CVar(_cfg, CCVars.RoundEndSoundCollection, value => RoundEndSoundCollection = value, true);
-#if EXCEPTION_TOLERANCE
-            Subs.CVar(_cfg, CCVars.RoundStartFailShutdownCount, value => RoundStartFailShutdownCount = value, true);
-#endif
-            Subs.CVar(_cfg, CCVars.GameTickerIgnoredPresets, value => _ignoredRules = value.Split(","));
-        }
-    }
-}
diff --git a/Content.Server/GameTicking/GameTicker.GameRule.cs b/Content.Server/GameTicking/GameTicker.GameRule.cs
deleted file mode 100644
index 5c2d93078c..0000000000
--- a/Content.Server/GameTicking/GameTicker.GameRule.cs
+++ /dev/null
@@ -1,573 +0,0 @@
-using System.Linq;
-using System.Text;
-using Content.Server.Administration;
-using Content.Server.GameTicking.Rules.Components;
-using Content.Shared.Administration;
-using Content.Shared.CCVar;
-using Content.Shared.Database;
-using Content.Shared.GameTicking.Components;
-using Content.Shared.Prototypes;
-using Content.Shared.Whitelist;
-using JetBrains.Annotations;
-using Robust.Shared.Console;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.GameTicking;
-
-public sealed partial class GameTicker
-{
-    /// <summary>
-    /// Designated game rule that spawns a fake antagonist to discourage metagaming.
-    /// Has to be a string since <see cref="EntProtoId"/> cannot be a const.
-    /// </summary>
-    public const string DummyGameRule = "DummyNonAntag";
-
-    [ViewVariables] private readonly List<(TimeSpan, string)> _allPreviousGameRules = new();
-
-    /// <summary>
-    /// List of ignored game rules, these rules won't be spawned by normal means.
-    /// This list is populated by <see cref="CCVars.GameTickerIgnoredPresets"/>
-    /// </summary>
-    [ViewVariables] private string[] _ignoredRules = [];
-
-    [Dependency] private EntityWhitelistSystem _whitelist = null!;
-
-    /// <summary>
-    ///     A list storing the start times of all game rules that have been started this round.
-    ///     Game rules can be started and stopped at any time, including midround.
-    /// </summary>
-    public override IReadOnlyList<(TimeSpan, string)> AllPreviousGameRules => _allPreviousGameRules;
-
-    private void InitializeGameRules()
-    {
-        // Add game rule command.
-        _consoleHost.RegisterCommand("addgamerule",
-            string.Empty,
-            "addgamerule <rules>",
-            AddGameRuleCommand,
-            AddGameRuleCompletions);
-
-        // End game rule command.
-        _consoleHost.RegisterCommand("endgamerule",
-            string.Empty,
-            "endgamerule <rules>",
-            EndGameRuleCommand,
-            EndGameRuleCompletions);
-
-        // Clear game rules command.
-        _consoleHost.RegisterCommand("cleargamerules",
-            string.Empty,
-            "cleargamerules",
-            ClearGameRulesCommand);
-
-        // List game rules command.
-        var localizedHelp = Loc.GetString("listgamerules-command-help");
-
-        _consoleHost.RegisterCommand("listgamerules",
-            string.Empty,
-            $"listgamerules - {localizedHelp}",
-            ListGameRuleCommand);
-
-        SubscribeLocalEvent<RoundStartAttemptEvent>(OnStartAttempt);
-    }
-
-    private void ShutdownGameRules()
-    {
-        _consoleHost.UnregisterCommand("addgamerule");
-        _consoleHost.UnregisterCommand("endgamerule");
-        _consoleHost.UnregisterCommand("cleargamerules");
-        _consoleHost.UnregisterCommand("listgamerules");
-    }
-
-    /// <summary>
-    /// Adds a game rule to the list, but does not
-    /// start it yet, instead waiting until the rule is actually started by other code (usually roundstart)
-    /// </summary>
-    /// <returns>The entity for the added gamerule</returns>
-    public EntityUid AddGameRule([ForbidLiteral] string ruleId)
-    {
-        var ruleEntity = Spawn(ruleId, MapCoordinates.Nullspace);
-        _sawmill.Info($"Added game rule {ToPrettyString(ruleEntity)}");
-        _adminLogger.Add(LogType.EventStarted, $"Added game rule {ToPrettyString(ruleEntity)}");
-        var str = Loc.GetString("station-event-system-run-event", ("eventName", ToPrettyString(ruleEntity)));
-#if DEBUG
-        _chatManager.SendAdminAlert(str);
-#else
-        if (RunLevel == GameRunLevel.InRound) // avoids telling admins the round type before it starts so that can be handled elsewhere.
-        {
-            _chatManager.SendAdminAlert(str);
-        }
-#endif
-        Log.Info(str);
-
-        var ev = new GameRuleAddedEvent(ruleEntity, ruleId);
-        RaiseLocalEvent(ruleEntity, ref ev, true);
-
-        var currentTime = RunLevel == GameRunLevel.PreRoundLobby ? TimeSpan.Zero : RoundDuration();
-        if (!HasComp<RoundstartStationVariationRuleComponent>(ruleEntity) && !HasComp<StationVariationPassRuleComponent>(ruleEntity))
-        {
-            _allPreviousGameRules.Add((currentTime, ruleId + " (Pending)"));
-        }
-
-        return ruleEntity;
-    }
-
-    /// <summary>
-    /// Tries to add a gamerule to the current round, but ignores any <see cref="_ignoredRules"/>
-    /// </summary>
-    /// <param name="gameRule">Game rule entity that we are trying to spawn</param>
-    /// <returns>The entityUid of the spawned game rule, if it wasn't ignored.</returns>
-    public EntityUid? AddFilteredGameRule([ForbidLiteral] EntProtoId gameRule)
-    {
-        if (IsIgnored(gameRule))
-            return null;
-
-        return AddGameRule(gameRule);
-    }
-
-    /// <summary>
-    /// Checks if this GameRule should be ignored before a spawning attempt.
-    /// </summary>
-    /// <param name="gameRule">GameRule we are trying to validate</param>
-    /// <returns>True if the gamerule should be ignored and not spawned.</returns>
-    public bool IsIgnored([ForbidLiteral] EntProtoId gameRule)
-    {
-        return _ignoredRules.Contains(gameRule);
-    }
-
-    /// <summary>
-    /// Game rules can be 'started' separately from being added. 'Starting' them usually
-    /// happens at round start while they can be added and removed before then.
-    /// </summary>
-    public bool StartGameRule([ForbidLiteral] string ruleId)
-    {
-        return StartGameRule(ruleId, out _);
-    }
-
-    /// <summary>
-    /// Game rules can be 'started' separately from being added. 'Starting' them usually
-    /// happens at round start while they can be added and removed before then.
-    /// </summary>
-    public bool StartGameRule([ForbidLiteral] string ruleId, out EntityUid ruleEntity)
-    {
-        ruleEntity = AddGameRule(ruleId);
-        return StartGameRule(ruleEntity);
-    }
-
-    /// <summary>
-    /// Game rules can be 'started' separately from being added. 'Starting' them usually
-    /// happens at round start while they can be added and removed before then.
-    /// </summary>
-    public bool StartGameRule(EntityUid ruleEntity, GameRuleComponent? ruleData = null)
-    {
-        if (!Resolve(ruleEntity, ref ruleData))
-            ruleData ??= EnsureComp<GameRuleComponent>(ruleEntity);
-
-        // can't start an already active rule
-        if (HasComp<ActiveGameRuleComponent>(ruleEntity) || HasComp<EndedGameRuleComponent>(ruleEntity))
-            return false;
-
-        if (MetaData(ruleEntity).EntityPrototype?.ID is not { } id) // you really fucked up
-            return false;
-
-        // If we already have it, then we just skip the delay as it has already happened.
-        if (!RemComp<DelayedStartRuleComponent>(ruleEntity) && ruleData.Delay != null)
-        {
-            var delayTime = TimeSpan.FromSeconds(ruleData.Delay.Value.Next(_robustRandom));
-
-            if (delayTime > TimeSpan.Zero)
-            {
-                _sawmill.Info($"Queued start for game rule {ToPrettyString(ruleEntity)} with delay {delayTime}");
-                _adminLogger.Add(LogType.EventStarted,
-                    $"Queued start for game rule {ToPrettyString(ruleEntity)} with delay {delayTime}");
-
-                var delayed = EnsureComp<DelayedStartRuleComponent>(ruleEntity);
-                delayed.RuleStartTime = _gameTiming.CurTime + (delayTime);
-                return true;
-            }
-        }
-
-        var currentTime = RunLevel == GameRunLevel.PreRoundLobby ? TimeSpan.Zero : RoundDuration();
-
-        // Remove the first occurrence of the pending entry before adding the started entry
-        var pendingRuleIndex = _allPreviousGameRules.FindIndex(rule => rule.Item2 == id + " (Pending)");
-        if (pendingRuleIndex >= 0)
-        {
-            _allPreviousGameRules.RemoveAt(pendingRuleIndex);
-        }
-
-        if (!HasComp<RoundstartStationVariationRuleComponent>(ruleEntity) && !HasComp<StationVariationPassRuleComponent>(ruleEntity))
-        {
-            _allPreviousGameRules.Add((currentTime, id));
-        }
-
-        _sawmill.Info($"Started game rule {ToPrettyString(ruleEntity)}");
-        _adminLogger.Add(LogType.EventStarted, $"Started game rule {ToPrettyString(ruleEntity)}");
-
-        EnsureComp<ActiveGameRuleComponent>(ruleEntity);
-        ruleData.ActivatedAt = _gameTiming.CurTime;
-
-        var ev = new GameRuleStartedEvent(ruleEntity, id);
-        RaiseLocalEvent(ruleEntity, ref ev, true);
-        return true;
-    }
-
-    /// <summary>
-    /// Ends a game rule.
-    /// </summary>
-    [PublicAPI]
-    public bool EndGameRule(EntityUid ruleEntity, GameRuleComponent? ruleData = null)
-    {
-        if (!Resolve(ruleEntity, ref ruleData))
-            return false;
-
-        // don't end it multiple times
-        if (HasComp<EndedGameRuleComponent>(ruleEntity))
-            return false;
-
-        if (MetaData(ruleEntity).EntityPrototype?.ID is not { } id) // you really fucked up
-            return false;
-
-        RemComp<ActiveGameRuleComponent>(ruleEntity);
-        EnsureComp<EndedGameRuleComponent>(ruleEntity);
-
-        _sawmill.Info($"Ended game rule {ToPrettyString(ruleEntity)}");
-        _adminLogger.Add(LogType.EventStopped, $"Ended game rule {ToPrettyString(ruleEntity)}");
-
-        var ev = new GameRuleEndedEvent(ruleEntity, id);
-        RaiseLocalEvent(ruleEntity, ref ev, true);
-        return true;
-    }
-
-    /// <summary>
-    ///     Returns true if a game rule with the given component has been added.
-    /// </summary>
-    public bool IsGameRuleAdded<T>()
-        where T : IComponent
-    {
-        var query = EntityQueryEnumerator<T, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out _, out _))
-        {
-            if (HasComp<EndedGameRuleComponent>(uid))
-                continue;
-
-            return true;
-        }
-
-        return false;
-    }
-
-    public bool IsGameRuleAdded(EntityUid ruleEntity, GameRuleComponent? component = null)
-    {
-        return Resolve(ruleEntity, ref component) && !HasComp<EndedGameRuleComponent>(ruleEntity);
-    }
-
-    public bool IsGameRuleAdded([ForbidLiteral] string rule)
-    {
-        foreach (var ruleEntity in GetAddedGameRules())
-        {
-            if (MetaData(ruleEntity).EntityPrototype?.ID == rule)
-                return true;
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    /// Returns true if a game rule that passes the whitelist and blacklist has been added.
-    /// </summary>
-    /// <param name="ruleWhitelist">whitelist for the game rules</param>
-    /// <param name="ruleBlacklist">blacklist for the game rules</param>
-    public bool IsGameRuleAdded(EntityWhitelist? ruleWhitelist, EntityWhitelist? ruleBlacklist = null)
-    {
-        foreach (var ruleEntity in GetAddedGameRules())
-        {
-            if (_whitelist.CheckBoth(ruleEntity, ruleBlacklist, ruleWhitelist))
-                return true;
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    ///     Returns true if a game rule with the given component is active..
-    /// </summary>
-    public bool IsGameRuleActive<T>()
-        where T : IComponent
-    {
-        var query = EntityQueryEnumerator<T, ActiveGameRuleComponent, GameRuleComponent>();
-        // out, damned underscore!!!
-        while (query.MoveNext(out _, out _, out _, out _))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    public bool IsGameRuleActive(EntityUid ruleEntity, GameRuleComponent? component = null)
-    {
-        return Resolve(ruleEntity, ref component) && HasComp<ActiveGameRuleComponent>(ruleEntity);
-    }
-
-    public bool IsGameRuleActive([ForbidLiteral] string rule)
-    {
-        foreach (var ruleEntity in GetActiveGameRules())
-        {
-            if (MetaData(ruleEntity).EntityPrototype?.ID == rule)
-                return true;
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    /// Returns true if a game rule that passes the whitelist and blacklist is active.
-    /// </summary>
-    /// <param name="ruleWhitelist">whitelist for the game rules</param>
-    /// <param name="ruleBlacklist">blacklist for the game rules</param>
-    public bool IsGameRuleActive(EntityWhitelist? ruleWhitelist, EntityWhitelist? ruleBlacklist = null)
-    {
-        foreach (var ruleEntity in GetActiveGameRules())
-        {
-            if (_whitelist.CheckBoth(ruleEntity, ruleBlacklist, ruleWhitelist))
-                return true;
-        }
-
-        return false;
-    }
-
-    public void ClearGameRules()
-    {
-        foreach (var rule in GetAddedGameRules())
-        {
-            EndGameRule(rule);
-        }
-    }
-
-    /// <summary>
-    /// Gets all the gamerule entities that have been added.
-    /// </summary>
-    public IEnumerable<EntityUid> GetAddedGameRules()
-    {
-        var query = EntityQueryEnumerator<GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var ruleData))
-        {
-            if (IsGameRuleAdded(uid, ruleData))
-                yield return uid;
-        }
-    }
-
-    /// <summary>
-    /// Gets all the gamerule entities with {T} component that have been added.
-    /// </summary>
-    public IEnumerable<Entity<T>> GetAddedGameRules<T>() where T : Component
-    {
-        var query = EntityQueryEnumerator<T, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var comp, out var ruleData))
-        {
-            if (IsGameRuleAdded(uid, ruleData))
-                yield return (uid, comp);
-        }
-    }
-
-
-    /// <summary>
-    /// Gets all the gamerule entities which are currently active.
-    /// </summary>
-    public IEnumerable<EntityUid> GetActiveGameRules()
-    {
-        var query = EntityQueryEnumerator<ActiveGameRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out _, out _))
-        {
-            yield return uid;
-        }
-    }
-
-    /// <summary>
-    /// Gets all the gamerule entities with {T} component that are currently active.
-    /// </summary>
-    public IEnumerable<Entity<T>> GetActiveGameRules<T>() where T : Component
-    {
-        var query = EntityQueryEnumerator<T, ActiveGameRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var comp, out _, out _))
-        {
-            yield return (uid, comp);
-        }
-    }
-
-    /// <summary>
-    /// Gets all gamerule prototypes
-    /// </summary>
-    public IEnumerable<EntityPrototype> GetAllGameRulePrototypes()
-    {
-        foreach (var proto in ProtoMan.EnumeratePrototypes<EntityPrototype>())
-        {
-            if (proto.Abstract)
-                continue;
-
-            if (proto.HasComponent<GameRuleComponent>())
-                yield return proto;
-        }
-    }
-
-    private void UpdateGameRules()
-    {
-        var query = EntityQueryEnumerator<DelayedStartRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var delay, out var rule))
-        {
-            if (_gameTiming.CurTime < delay.RuleStartTime)
-                continue;
-
-            StartGameRule(uid, rule);
-        }
-    }
-
-    private void OnStartAttempt(RoundStartAttemptEvent args)
-    {
-        if (args.Forced || args.Cancelled)
-            return;
-
-        var query = EntityQueryEnumerator<GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var gameRule))
-        {
-            var minPlayers = gameRule.MinPlayers;
-            var name = ToPrettyString(uid);
-
-            if (args.Players.Length >= minPlayers)
-                continue;
-
-            if (gameRule.CancelPresetOnTooFewPlayers)
-            {
-                _chatManager.SendAdminAnnouncement(Loc.GetString("preset-not-enough-ready-players",
-                    ("readyPlayersCount", args.Players.Length),
-                    ("minimumPlayers", minPlayers),
-                    ("presetName", name)));
-                args.Cancel();
-                //TODO remove this once announcements are logged
-                Log.Info($"Rule '{name}' requires {minPlayers} players, but only {args.Players.Length} are ready.");
-            }
-            else
-            {
-                EndGameRule(uid, gameRule);
-            }
-        }
-    }
-
-    #region Command Implementations
-
-    [AdminCommand(AdminFlags.Fun)]
-    private void AddGameRuleCommand(IConsoleShell shell, string argstr, string[] args)
-    {
-        if (args.Length == 0)
-            return;
-
-        foreach (var rule in args)
-        {
-            if (!ProtoMan.HasIndex(rule))
-            {
-                shell.WriteError($"Invalid game rule {rule} was skipped.");
-
-                continue;
-            }
-
-            if (shell.Player != null)
-            {
-                _adminLogger.Add(LogType.EventStarted, $"{shell.Player} tried to add game rule [{rule}] via command");
-                _chatManager.SendAdminAnnouncement(Loc.GetString("add-gamerule-admin", ("rule", rule), ("admin", shell.Player)));
-            }
-            else
-            {
-                _adminLogger.Add(LogType.EventStarted, $"Unknown tried to add game rule [{rule}] via command");
-            }
-            var ent = AddGameRule(rule);
-
-            // Start rule if we're already in the middle of a round
-            if(RunLevel == GameRunLevel.InRound)
-                StartGameRule(ent);
-
-        }
-    }
-
-    private CompletionResult AddGameRuleCompletions(IConsoleShell shell, string[] args)
-    {
-        return CompletionResult.FromHintOptions(GetAllGameRulePrototypes().Select(p => p.ID), "<rule>");
-    }
-
-    [AdminCommand(AdminFlags.Fun)]
-    private void EndGameRuleCommand(IConsoleShell shell, string argstr, string[] args)
-    {
-        if (args.Length == 0)
-            return;
-
-        foreach (var rule in args)
-        {
-            if (!NetEntity.TryParse(rule, out var ruleEntNet) || !TryGetEntity(ruleEntNet, out var ruleEnt))
-                continue;
-            if (shell.Player != null)
-            {
-                _adminLogger.Add(LogType.EventStopped, $"{shell.Player} tried to end game rule [{rule}] via command");
-            }
-            else
-            {
-                _adminLogger.Add(LogType.EventStopped, $"Unknown tried to end game rule [{rule}] via command");
-            }
-
-            EndGameRule(ruleEnt.Value);
-        }
-    }
-
-    private CompletionResult EndGameRuleCompletions(IConsoleShell shell, string[] args)
-    {
-        var opts = GetAddedGameRules().Select(ent => new CompletionOption(ent.ToString(), ToPrettyString(ent))).ToList();
-        return CompletionResult.FromHintOptions(opts, "<added rule>");
-    }
-
-    [AdminCommand(AdminFlags.Fun)]
-    private void ClearGameRulesCommand(IConsoleShell shell, string argstr, string[] args)
-    {
-        ClearGameRules();
-    }
-
-    [AdminCommand(AdminFlags.Admin)]
-    private void ListGameRuleCommand(IConsoleShell shell, string argstr, string[] args)
-    {
-        _sawmill.Info($"{shell.Player} tried to get list of game rules via command");
-        _adminLogger.Add(LogType.Action, $"{shell.Player} tried to get list of game rules via command");
-        var message = GetGameRulesListMessage(false);
-        shell.WriteLine(message);
-    }
-    private string GetGameRulesListMessage(bool forChatWindow)
-    {
-        if (_allPreviousGameRules.Count > 0)
-        {
-            var sortedRules = _allPreviousGameRules.OrderBy(rule => rule.Item1).ToList();
-            var message = new StringBuilder();
-            message.AppendLine();
-
-            if (!forChatWindow)
-            {
-                var header = Loc.GetString("list-gamerule-admin-header");
-                message.AppendLine();
-                message.AppendLine(header);
-                message.AppendLine("|------------|------------------");
-            }
-
-            foreach (var (time, rule) in sortedRules)
-            {
-                var formattedTime = time.ToString(@"hh\:mm\:ss");
-                message.AppendLine($"| {formattedTime,-10} | {rule,-16} ");
-            }
-
-            return message.ToString().TrimEnd('\n');
-        }
-        else
-        {
-            return Loc.GetString("list-gamerule-admin-no-rules");
-
-        }
-    }
-
-    #endregion
-}
diff --git a/Content.Server/GameTicking/GameTicker.Lobby.cs b/Content.Server/GameTicking/GameTicker.Lobby.cs
deleted file mode 100644
index 6be7e3abca..0000000000
--- a/Content.Server/GameTicking/GameTicker.Lobby.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-using System.Linq;
-using Content.Shared.GameTicking;
-using Content.Server.Station.Components;
-using Robust.Shared.Network;
-using Robust.Shared.Player;
-using System.Text;
-
-namespace Content.Server.GameTicking
-{
-    public sealed partial class GameTicker
-    {
-        [ViewVariables]
-        private readonly Dictionary<NetUserId, PlayerGameStatus> _playerGameStatuses = new();
-
-        [ViewVariables]
-        private TimeSpan _roundStartTime;
-
-        /// <summary>
-        /// How long before RoundStartTime do we load maps.
-        /// </summary>
-        [ViewVariables]
-        public TimeSpan RoundPreloadTime { get; } = TimeSpan.FromSeconds(15);
-
-        [ViewVariables]
-        private TimeSpan _pauseTime;
-
-        [ViewVariables]
-        public new bool Paused { get; set; }
-
-        [ViewVariables]
-        private bool _roundStartCountdownHasNotStartedYetDueToNoPlayers;
-
-        /// <summary>
-        /// The game status of a players user Id. May contain disconnected players
-        /// </summary>
-        public IReadOnlyDictionary<NetUserId, PlayerGameStatus> PlayerGameStatuses => _playerGameStatuses;
-
-        public void UpdateInfoText()
-        {
-            RaiseNetworkEvent(GetInfoMsg(), Filter.Empty().AddPlayers(_playerManager.NetworkedSessions));
-        }
-
-        private string GetInfoText()
-        {
-            var preset = CurrentPreset ?? Preset;
-            if (preset == null)
-            {
-                return string.Empty;
-            }
-
-            var playerCount = $"{_playerManager.PlayerCount}";
-            var readyCount = _playerGameStatuses.Values.Count(x => x == PlayerGameStatus.ReadyToPlay);
-
-            var stationNames = new StringBuilder();
-            var query =
-                EntityQueryEnumerator<StationJobsComponent, StationSpawningComponent, MetaDataComponent>();
-
-            var foundOne = false;
-
-            while (query.MoveNext(out _, out _, out var meta))
-            {
-                foundOne = true;
-                if (stationNames.Length > 0)
-                    stationNames.Append('\n');
-
-                stationNames.Append(meta.EntityName);
-            }
-
-            if (!foundOne)
-            {
-                stationNames.Append(_gameMapManager.GetSelectedMap()?.MapName ??
-                                    Loc.GetString("game-ticker-no-map-selected"));
-            }
-
-            var gmTitle = (Decoy == null) ? Loc.GetString(preset.ModeTitle) : Loc.GetString(Decoy.ModeTitle);
-            var desc = (Decoy == null) ? Loc.GetString(preset.Description) : Loc.GetString(Decoy.Description);
-            return Loc.GetString(
-                RunLevel == GameRunLevel.PreRoundLobby
-                    ? "game-ticker-get-info-preround-text"
-                    : "game-ticker-get-info-text",
-                ("roundId", RoundId),
-                ("playerCount", playerCount),
-                ("readyCount", readyCount),
-                ("mapName", stationNames.ToString()),
-                ("gmTitle", gmTitle),
-                ("desc", desc));
-        }
-
-        private TickerConnectionStatusEvent GetConnectionStatusMsg()
-        {
-            return new TickerConnectionStatusEvent(RoundStartTimeSpan);
-        }
-
-        private TickerLobbyStatusEvent GetStatusMsg(ICommonSession session)
-        {
-            _playerGameStatuses.TryGetValue(session.UserId, out var status);
-            return new TickerLobbyStatusEvent(RunLevel != GameRunLevel.PreRoundLobby, LobbyBackground, status == PlayerGameStatus.ReadyToPlay, _roundStartTime, RoundPreloadTime, RoundStartTimeSpan, Paused);
-        }
-
-        private void SendStatusToAll()
-        {
-            foreach (var player in _playerManager.Sessions)
-            {
-                RaiseNetworkEvent(GetStatusMsg(player), player.Channel);
-            }
-        }
-
-        private TickerLobbyInfoEvent GetInfoMsg()
-        {
-            return new(GetInfoText());
-        }
-
-        private void UpdateLateJoinStatus()
-        {
-            RaiseNetworkEvent(new TickerLateJoinStatusEvent(DisallowLateJoin));
-        }
-
-        public bool PauseStart(bool pause = true)
-        {
-            if (Paused == pause)
-            {
-                return false;
-            }
-
-            Paused = pause;
-
-            if (pause)
-            {
-                _pauseTime = _gameTiming.CurTime;
-            }
-            else if (_pauseTime != default)
-            {
-                _roundStartTime += _gameTiming.CurTime - _pauseTime;
-            }
-
-            RaiseNetworkEvent(new TickerLobbyCountdownEvent(_roundStartTime, Paused));
-
-            _chatManager.DispatchServerAnnouncement(Loc.GetString(Paused
-                ? "game-ticker-pause-start"
-                : "game-ticker-pause-start-resumed"));
-
-            return true;
-        }
-
-        public bool TogglePause()
-        {
-            PauseStart(!Paused);
-            return Paused;
-        }
-
-        public void ToggleReadyAll(bool ready)
-        {
-            var status = ready ? PlayerGameStatus.ReadyToPlay : PlayerGameStatus.NotReadyToPlay;
-            foreach (var playerUserId in _playerGameStatuses.Keys)
-            {
-                _playerGameStatuses[playerUserId] = status;
-                if (!_playerManager.TryGetSessionById(playerUserId, out var playerSession))
-                    continue;
-                RaiseNetworkEvent(GetStatusMsg(playerSession), playerSession.Channel);
-            }
-        }
-
-        public void ToggleReady(ICommonSession player, bool ready)
-        {
-            if (!_playerGameStatuses.ContainsKey(player.UserId))
-                return;
-
-            if (!_userDb.IsLoadComplete(player))
-                return;
-
-            if (RunLevel != GameRunLevel.PreRoundLobby)
-            {
-                return;
-            }
-
-            _playerGameStatuses[player.UserId] = ready ? PlayerGameStatus.ReadyToPlay : PlayerGameStatus.NotReadyToPlay;
-            RaiseNetworkEvent(GetStatusMsg(player), player.Channel);
-            // update server info to reflect new ready count
-            UpdateInfoText();
-        }
-
-        public bool UserHasJoinedGame(ICommonSession session)
-            => UserHasJoinedGame(session.UserId);
-
-        public bool UserHasJoinedGame(NetUserId userId)
-            => PlayerGameStatuses.TryGetValue(userId, out var status) && status == PlayerGameStatus.JoinedGame;
-    }
-}
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
deleted file mode 100644
index ade9e2a575..0000000000
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ /dev/null
@@ -1,1000 +0,0 @@
-using System.Linq;
-using System.Numerics;
-using Content.Server.Announcements;
-using Content.Server.Discord;
-using Content.Server.GameTicking.Events;
-using Content.Server.Maps;
-using Content.Server.Roles;
-using Content.Shared.CCVar;
-using Content.Shared.Database;
-using Content.Shared.GameTicking;
-using Content.Shared.Maps;
-using Content.Shared.Mind;
-using Content.Shared.Players;
-using Content.Shared.Preferences;
-using Content.Shared.Roles.Components;
-using JetBrains.Annotations;
-using Prometheus;
-using Robust.Shared.Asynchronous;
-using Robust.Shared.Audio;
-using Robust.Shared.EntitySerialization;
-using Robust.Shared.EntitySerialization.Systems;
-using Robust.Shared.Map;
-using Robust.Shared.Network;
-using Robust.Shared.Player;
-using Robust.Shared.Random;
-using Robust.Shared.Utility;
-
-namespace Content.Server.GameTicking
-{
-    public sealed partial class GameTicker
-    {
-        [Dependency] private DiscordWebhook _discord = default!;
-        [Dependency] private RoleSystem _role = default!;
-        [Dependency] private ITaskManager _taskManager = default!;
-
-        private static readonly Counter RoundNumberMetric = Metrics.CreateCounter(
-            "ss14_round_number",
-            "Round number.");
-
-        private static readonly Gauge RoundLengthMetric = Metrics.CreateGauge(
-            "ss14_round_length",
-            "Round length in seconds.");
-
-#if EXCEPTION_TOLERANCE
-        [ViewVariables]
-        private int _roundStartFailCount = 0;
-#endif
-
-        [ViewVariables]
-        private bool _startingRound;
-
-        [ViewVariables]
-        private GameRunLevel _runLevel;
-
-        private RoundEndMessageEvent.RoundEndPlayerInfo[]? _replayRoundPlayerInfo;
-
-        private string? _replayRoundText;
-
-        [ViewVariables]
-        public GameRunLevel RunLevel
-        {
-            get => _runLevel;
-            private set
-            {
-                // Game admins can run `restartroundnow` while still in-lobby, which'd break things with this check.
-                // if (_runLevel == value) return;
-
-                var old = _runLevel;
-                _runLevel = value;
-
-                RaiseLocalEvent(new GameRunLevelChangedEvent(old, value));
-            }
-        }
-
-        /// <summary>
-        /// Returns true if the round's map is eligible to be updated.
-        /// </summary>
-        /// <returns></returns>
-        public bool CanUpdateMap()
-        {
-            return RunLevel == GameRunLevel.PreRoundLobby &&
-                   _roundStartTime - RoundPreloadTime > _gameTiming.CurTime;
-        }
-
-        /// <summary>
-        ///     Loads all the maps for the given round.
-        /// </summary>
-        /// <remarks>
-        ///     Must be called before the runlevel is set to InRound.
-        /// </remarks>
-        private void LoadMaps()
-        {
-            if (_map.MapExists(DefaultMap))
-                return;
-
-            AddGamePresetRules();
-
-            var maps = new List<GameMapPrototype>();
-
-            // the map might have been force-set by something
-            // (i.e. votemap or forcemap)
-            var mainStationMap = _gameMapManager.GetSelectedMap();
-            if (mainStationMap == null)
-            {
-                // otherwise set the map using the config rules
-                _gameMapManager.SelectMapByConfigRules();
-                mainStationMap = _gameMapManager.GetSelectedMap();
-            }
-
-            // Small chance the above could return no map.
-            // ideally SelectMapByConfigRules will always find a valid map
-            if (mainStationMap != null)
-            {
-                maps.Add(mainStationMap);
-            }
-            else
-            {
-                throw new Exception("invalid config; couldn't select a valid station map!");
-            }
-
-            if (CurrentPreset?.MapPool != null &&
-                ProtoMan.TryIndex<GameMapPoolPrototype>(CurrentPreset.MapPool, out var pool) &&
-                !pool.Maps.Contains(mainStationMap.ID))
-            {
-                var msg = Loc.GetString("game-ticker-start-round-invalid-map",
-                    ("map", mainStationMap.MapName),
-                    ("mode", Loc.GetString(CurrentPreset.ModeTitle)));
-                Log.Debug(msg);
-                SendServerMessage(msg);
-            }
-
-            // Let game rules dictate what maps we should load.
-            RaiseLocalEvent(new LoadingMapsEvent(maps));
-
-            if (maps.Count == 0)
-            {
-                _map.CreateMap(out var mapId, runMapInit: false);
-                DefaultMap = mapId;
-                return;
-            }
-
-            for (var i = 0; i < maps.Count; i++)
-            {
-                LoadGameMap(maps[i], out var mapId);
-                DebugTools.Assert(!_map.IsInitialized(mapId));
-
-                if (i == 0)
-                    DefaultMap = mapId;
-            }
-        }
-
-        public PreGameMapLoad RaisePreLoad(
-            GameMapPrototype proto,
-            DeserializationOptions? opts = null,
-            Vector2? offset = null,
-            Angle? rot = null)
-        {
-            offset ??= proto.MaxRandomOffset != 0f
-                ? _robustRandom.NextVector2(proto.MaxRandomOffset)
-                : Vector2.Zero;
-
-            rot ??= proto.RandomRotation
-                ? _robustRandom.NextAngle()
-                : Angle.Zero;
-
-            opts ??= DeserializationOptions.Default;
-            var ev = new PreGameMapLoad(proto, opts.Value, offset.Value, rot.Value);
-            RaiseLocalEvent(ev);
-            return ev;
-        }
-
-        /// <summary>
-        ///     Loads a new map, allowing systems interested in it to handle loading events.
-        ///     In the base game, this is required to be used if you want to load a station.
-        ///     This does not initialze maps, unles specified via the <see cref="DeserializationOptions"/>.
-        /// </summary>
-        /// <remarks>
-        /// This is basically a wrapper around a <see cref="MapLoaderSystem"/> method that auto generate
-        /// some <see cref="MapLoadOptions"/> using information in a prototype, and raise some events to allow content
-        /// to modify the options and react to the map creation.
-        /// </remarks>
-        /// <param name="proto">Game map prototype to load in.</param>
-        /// <param name="mapId">The id of the map that was loaded.</param>
-        /// <param name="options">Entity loading options, including whether the maps should be initialized.</param>
-        /// <param name="stationName">Name to assign to the loaded station.</param>
-        /// <returns>All loaded entities and grids.</returns>
-        public IReadOnlyList<EntityUid> LoadGameMap(
-            GameMapPrototype proto,
-            out MapId mapId,
-            DeserializationOptions? options = null,
-            string? stationName = null,
-            Vector2? offset = null,
-            Angle? rot = null)
-        {
-            var ev = RaisePreLoad(proto, options, offset, rot);
-
-            if (ev.GameMap.IsGrid)
-            {
-                var mapUid = _map.CreateMap(out mapId, runMapInit: options?.InitializeMaps ?? false);
-                if (!_loader.TryLoadGrid(mapId,
-                        ev.GameMap.MapPath,
-                        out var grid,
-                        ev.Options,
-                        ev.Offset,
-                        ev.Rotation))
-                {
-                    throw new Exception($"Failed to load game-map grid {ev.GameMap.ID}");
-                }
-
-                _metaData.SetEntityName(mapUid, proto.MapName);
-                var g = new List<EntityUid> { grid.Value.Owner };
-                RaiseLocalEvent(new PostGameMapLoad(proto, mapId, g, stationName));
-                return g;
-            }
-
-            if (!_loader.TryLoadMap(ev.GameMap.MapPath,
-                    out var map,
-                    out var grids,
-                    ev.Options,
-                    ev.Offset,
-                    ev.Rotation))
-            {
-                throw new Exception($"Failed to load game map {ev.GameMap.ID}");
-            }
-
-            mapId = map.Value.Comp.MapId;
-            _metaData.SetEntityName(map.Value.Owner, proto.MapName);
-            var gridUids = grids.Select(x => x.Owner).ToList();
-            RaiseLocalEvent(new PostGameMapLoad(proto, mapId, gridUids, stationName));
-            return gridUids;
-        }
-
-        /// <summary>
-        /// Variant of <see cref="LoadGameMap"/> that attempts to assign the provided <see cref="MapId"/> to the
-        /// loaded map.
-        /// </summary>
-        public IReadOnlyList<EntityUid> LoadGameMapWithId(
-            GameMapPrototype proto,
-            MapId mapId,
-            DeserializationOptions? opts = null,
-            string? stationName = null,
-            Vector2? offset = null,
-            Angle? rot = null)
-        {
-            var ev = RaisePreLoad(proto, opts, offset, rot);
-
-            if (ev.GameMap.IsGrid)
-            {
-                var mapUid = _map.CreateMap(mapId);
-                if (!_loader.TryLoadGrid(mapId,
-                        ev.GameMap.MapPath,
-                        out var grid,
-                        ev.Options,
-                        ev.Offset,
-                        ev.Rotation))
-                {
-                    throw new Exception($"Failed to load game-map grid {ev.GameMap.ID}");
-                }
-
-                _metaData.SetEntityName(mapUid, proto.MapName);
-                var g = new List<EntityUid> { grid.Value.Owner };
-                RaiseLocalEvent(new PostGameMapLoad(proto, mapId, g, stationName));
-                return g;
-            }
-
-            if (!_loader.TryLoadMapWithId(
-                    mapId,
-                    ev.GameMap.MapPath,
-                    out var map,
-                    out var grids,
-                    ev.Options,
-                    ev.Offset,
-                    ev.Rotation))
-            {
-                throw new Exception($"Failed to load map");
-            }
-
-            _metaData.SetEntityName(map.Value.Owner, proto.MapName);
-            var gridUids = grids.Select(x => x.Owner).ToList();
-            RaiseLocalEvent(new PostGameMapLoad(proto, mapId, gridUids, stationName));
-            return gridUids;
-        }
-
-        /// <summary>
-        /// Variant of <see cref="LoadGameMap"/> that loads and then merges a game map onto an existing map.
-        /// </summary>
-        public IReadOnlyList<EntityUid> MergeGameMap(
-            GameMapPrototype proto,
-            MapId targetMap,
-            DeserializationOptions? opts = null,
-            string? stationName = null,
-            Vector2? offset = null,
-            Angle? rot = null)
-        {
-            // TODO MAP LOADING use a new event?
-            // This is quite different from the other methods, which will actually create a **new** map.
-            var ev = RaisePreLoad(proto, opts, offset, rot);
-
-            if (ev.GameMap.IsGrid)
-            {
-                if (!_loader.TryLoadGrid(targetMap,
-                        ev.GameMap.MapPath,
-                        out var grid,
-                        ev.Options,
-                        ev.Offset,
-                        ev.Rotation))
-                {
-                    throw new Exception($"Failed to load game-map grid {ev.GameMap.ID}");
-                }
-
-                var g = new List<EntityUid> { grid.Value.Owner };
-                // TODO MAP LOADING use a new event?
-                RaiseLocalEvent(new PostGameMapLoad(proto, targetMap, g, stationName));
-                return g;
-            }
-
-            if (!_loader.TryMergeMap(targetMap,
-                    ev.GameMap.MapPath,
-                    out var grids,
-                    ev.Options,
-                    ev.Offset,
-                    ev.Rotation))
-            {
-                throw new Exception($"Failed to load map");
-            }
-
-            var gridUids = grids.Select(x => x.Owner).ToList();
-
-            // TODO MAP LOADING use a new event?
-            RaiseLocalEvent(new PostGameMapLoad(proto, targetMap, gridUids, stationName));
-            return gridUids;
-        }
-
-        public int ReadyPlayerCount()
-        {
-            var total = 0;
-            foreach (var (userId, status) in _playerGameStatuses)
-            {
-                if (LobbyEnabled && status == PlayerGameStatus.NotReadyToPlay)
-                    continue;
-
-                if (!_playerManager.TryGetSessionById(userId, out _))
-                    continue;
-
-                total++;
-            }
-
-            return total;
-        }
-
-        public void StartRound(bool force = false)
-        {
-#if EXCEPTION_TOLERANCE
-            try
-            {
-#endif
-            // If this game ticker is a dummy or the round is already being started, do nothing!
-            if (DummyTicker || _startingRound)
-                return;
-
-            _startingRound = true;
-
-            if (RoundId == 0)
-                IncrementRoundNumber();
-
-            ReplayStartRound();
-
-            DebugTools.Assert(RunLevel == GameRunLevel.PreRoundLobby);
-            _sawmill.Info("Starting round!");
-
-            SendServerMessage(Loc.GetString("game-ticker-start-round"));
-
-            var readyPlayers = new List<ICommonSession>();
-            var readyPlayerProfiles = new Dictionary<NetUserId, HumanoidCharacterProfile>();
-            var autoDeAdmin = _cfg.GetCVar(CCVars.AdminDeadminOnJoin);
-            foreach (var (userId, status) in _playerGameStatuses)
-            {
-                if (LobbyEnabled && status != PlayerGameStatus.ReadyToPlay) continue;
-                if (!_playerManager.TryGetSessionById(userId, out var session)) continue;
-
-                if (autoDeAdmin && _adminManager.IsAdmin(session))
-                {
-                    _adminManager.DeAdmin(session);
-                }
-#if DEBUG
-                DebugTools.Assert(_userDb.IsLoadComplete(session), $"Player was readied up but didn't have user DB data loaded yet??");
-#endif
-
-                readyPlayers.Add(session);
-                HumanoidCharacterProfile profile;
-                if (_prefsManager.TryGetCachedPreferences(userId, out var preferences))
-                {
-                    profile = (HumanoidCharacterProfile)preferences.SelectedCharacter;
-                }
-                else
-                {
-                    var speciesToBlacklist =
-                        new HashSet<string>(_cfg.GetCVar(CCVars.ICNewAccountSpeciesBlacklist).Split(","));
-                    profile = HumanoidCharacterProfile.Random(speciesToBlacklist);
-                }
-                readyPlayerProfiles.Add(userId, profile);
-            }
-
-            DebugTools.AssertEqual(readyPlayers.Count, ReadyPlayerCount());
-
-            // Just in case it hasn't been loaded previously we'll try loading it.
-            LoadMaps();
-
-            // map has been selected so update the lobby info text
-            // applies to players who didn't ready up
-            UpdateInfoText();
-
-            StartGamePresetRules();
-
-            RoundLengthMetric.Set(0);
-
-            var startingEvent = new RoundStartingEvent(RoundId);
-            RaiseLocalEvent(startingEvent);
-
-            var origReadyPlayers = readyPlayers.ToArray();
-
-            if (!StartPreset(origReadyPlayers, force))
-            {
-                _startingRound = false;
-                return;
-            }
-
-            // MapInitialize *before* spawning players, our codebase is too shit to do it afterwards...
-            _map.InitializeMap(DefaultMap);
-
-            SpawnPlayers(readyPlayers, readyPlayerProfiles, force);
-
-            _roundStartDateTime = DateTime.UtcNow;
-            RunLevel = GameRunLevel.InRound;
-
-            RoundStartTimeSpan = _gameTiming.CurTime;
-            SendStatusToAll();
-            ReqWindowAttentionAll();
-            UpdateLateJoinStatus();
-            AnnounceRound();
-            UpdateInfoText();
-            SendRoundStartedDiscordMessage();
-            RaiseLocalEvent(new RoundStartedEvent(RoundId)); // Corvax
-
-#if EXCEPTION_TOLERANCE
-            }
-            catch (Exception e)
-            {
-                _roundStartFailCount++;
-
-                if (RoundStartFailShutdownCount > 0 && _roundStartFailCount >= RoundStartFailShutdownCount)
-                {
-                    _sawmill.Fatal($"Failed to start a round {_roundStartFailCount} time(s) in a row... Shutting down!");
-                    _runtimeLog.LogException(e, nameof(GameTicker));
-                    _baseServer.Shutdown("Restarting server");
-                    return;
-                }
-
-                _sawmill.Error($"Exception caught while trying to start the round! Restarting round...");
-                _runtimeLog.LogException(e, nameof(GameTicker));
-                _startingRound = false;
-                RestartRound();
-                return;
-            }
-
-            // Round started successfully! Reset counter...
-            _roundStartFailCount = 0;
-#endif
-            _startingRound = false;
-        }
-
-        private void RefreshLateJoinAllowed()
-        {
-            var refresh = new RefreshLateJoinAllowedEvent();
-            RaiseLocalEvent(refresh);
-            DisallowLateJoin = refresh.DisallowLateJoin;
-        }
-
-        public void EndRound(string text = "")
-        {
-            // If this game ticker is a dummy, do nothing!
-            if (DummyTicker)
-                return;
-
-            DebugTools.Assert(RunLevel == GameRunLevel.InRound);
-            _sawmill.Info("Ending round!");
-
-            RunLevel = GameRunLevel.PostRound;
-
-            try
-            {
-                ShowRoundEndScoreboard(text);
-            }
-            catch (Exception e)
-            {
-                Log.Error($"Error while showing round end scoreboard: {e}");
-            }
-
-            try
-            {
-                SendRoundEndDiscordMessage();
-            }
-            catch (Exception e)
-            {
-                Log.Error($"Error while sending round end Discord message: {e}");
-            }
-        }
-
-        public void ShowRoundEndScoreboard(string text = "")
-        {
-            // Log end of round
-            _adminLogger.Add(LogType.EmergencyShuttle, LogImpact.High, $"Round ended, showing summary");
-
-            //Tell every client the round has ended.
-            var gamemodeTitle = CurrentPreset != null ? Loc.GetString(CurrentPreset.ModeTitle) : string.Empty;
-
-            // Let things add text here.
-            var textEv = new RoundEndTextAppendEvent();
-            RaiseLocalEvent(textEv);
-
-            var roundEndText = $"{text}\n{textEv.Text}";
-
-            //Get the timespan of the round.
-            var roundDuration = RoundDuration();
-
-            //Generate a list of basic player info to display in the end round summary.
-            var listOfPlayerInfo = new List<RoundEndMessageEvent.RoundEndPlayerInfo>();
-            // Grab the great big book of all the Minds, we'll need them for this.
-            var allMinds = EntityQueryEnumerator<MindComponent>();
-            var pvsOverride = _cfg.GetCVar(CCVars.RoundEndPVSOverrides);
-            while (allMinds.MoveNext(out var mindId, out var mind))
-            {
-                // TODO don't list redundant observer roles?
-                // I.e., if a player was an observer ghost, then a hamster ghost role, maybe just list hamster and not
-                // the observer role?
-                var userId = mind.UserId ?? mind.OriginalOwnerUserId;
-
-                var connected = false;
-                var observer = _role.MindHasRole<ObserverRoleComponent>(mindId);
-                // Continuing
-                if (userId != null && _playerManager.ValidSessionId(userId.Value))
-                {
-                    connected = true;
-                }
-                ContentPlayerData? contentPlayerData = null;
-                if (userId != null && _playerManager.TryGetPlayerData(userId.Value, out var playerData))
-                {
-                    contentPlayerData = playerData.ContentData();
-                }
-                // Finish
-
-                var antag = _roles.MindIsAntagonist(mindId);
-
-                var playerIcName = "Unknown";
-
-                if (mind.CharacterName != null)
-                    playerIcName = mind.CharacterName;
-                else if (mind.CurrentEntity != null && TryName(mind.CurrentEntity.Value, out var icName))
-                    playerIcName = icName;
-
-                if (TryGetEntity(mind.OriginalOwnedEntity, out var entity) && pvsOverride)
-                {
-                    _pvsOverride.AddGlobalOverride(entity.Value);
-                }
-
-                var roles = _roles.MindGetAllRoleInfo(mindId);
-
-                var playerEndRoundInfo = new RoundEndMessageEvent.RoundEndPlayerInfo()
-                {
-                    // Note that contentPlayerData?.Name sticks around after the player is disconnected.
-                    // This is as opposed to ply?.Name which doesn't.
-                    PlayerOOCName = contentPlayerData?.Name ?? "(IMPOSSIBLE: REGISTERED MIND WITH NO OWNER)",
-                    // Character name takes precedence over current entity name
-                    PlayerICName = playerIcName,
-                    PlayerGuid = userId,
-                    PlayerNetEntity = GetNetEntity(entity),
-                    Role = antag
-                        ? roles.First(role => role.Antagonist).Name
-                        : roles.FirstOrDefault().Name ?? Loc.GetString("game-ticker-unknown-role"),
-                    Antag = antag,
-                    JobPrototypes = roles.Where(role => !role.Antagonist).Select(role => role.Prototype).ToArray(),
-                    AntagPrototypes = roles.Where(role => role.Antagonist).Select(role => role.Prototype).ToArray(),
-                    Observer = observer,
-                    Connected = connected
-                };
-                listOfPlayerInfo.Add(playerEndRoundInfo);
-            }
-
-            // This ordering mechanism isn't great (no ordering of minds) but functions
-            var listOfPlayerInfoFinal = listOfPlayerInfo.OrderBy(pi => pi.PlayerOOCName).ToArray();
-            var sound = RoundEndSoundCollection == null ? null : _audio.ResolveSound(new SoundCollectionSpecifier(RoundEndSoundCollection));
-
-            var roundEndMessageEvent = new RoundEndMessageEvent(
-                gamemodeTitle,
-                roundEndText,
-                roundDuration,
-                RoundId,
-                listOfPlayerInfoFinal.Length,
-                listOfPlayerInfoFinal,
-                sound
-            );
-            RaiseNetworkEvent(roundEndMessageEvent);
-            RaiseLocalEvent(roundEndMessageEvent);
-            RaiseLocalEvent(new RoundEndedEvent(RoundId, roundDuration)); // Corvax
-
-            _replayRoundPlayerInfo = listOfPlayerInfoFinal;
-            _replayRoundText = roundEndText;
-        }
-
-        private async void SendRoundEndDiscordMessage()
-        {
-            try
-            {
-                if (_webhookIdentifier == null)
-                    return;
-
-                var duration = RoundDuration();
-                var content = Loc.GetString("discord-round-notifications-end",
-                    ("id", RoundId),
-                    ("hours", Math.Truncate(duration.TotalHours)),
-                    ("minutes", duration.Minutes),
-                    ("seconds", duration.Seconds));
-                var payload = new WebhookPayload { Content = content };
-
-                await _discord.CreateMessage(_webhookIdentifier.Value, payload);
-
-                if (DiscordRoundEndRole == null)
-                    return;
-
-                content = Loc.GetString("discord-round-notifications-end-ping", ("roleId", DiscordRoundEndRole));
-                payload = new WebhookPayload { Content = content };
-                payload.AllowedMentions.AllowRoleMentions();
-
-                await _discord.CreateMessage(_webhookIdentifier.Value, payload);
-            }
-            catch (Exception e)
-            {
-                Log.Error($"Error while sending discord round end message:\n{e}");
-            }
-        }
-
-        public void RestartRound()
-        {
-            // If this game ticker is a dummy, do nothing!
-            if (DummyTicker)
-                return;
-
-            ReplayEndRound();
-
-            // Handle restart for server update
-            if (_serverUpdates.RoundEnded())
-                return;
-
-            // Check if the GamePreset needs to be reset
-            TryResetPreset();
-
-            _sawmill.Info("Restarting round!");
-
-            SendServerMessage(Loc.GetString("game-ticker-restart-round"));
-
-            RoundNumberMetric.Inc();
-
-            PlayersJoinedRoundNormally = 0;
-
-            RunLevel = GameRunLevel.PreRoundLobby;
-            RandomizeLobbyBackground();
-            ResettingCleanup();
-            IncrementRoundNumber();
-            SendRoundStartingDiscordMessage();
-
-            if (!LobbyEnabled)
-            {
-                StartRound();
-            }
-            else
-            {
-                if (_playerManager.PlayerCount == 0)
-                    _roundStartCountdownHasNotStartedYetDueToNoPlayers = true;
-                else
-                    _roundStartTime = _gameTiming.CurTime + LobbyDuration;
-
-                SendStatusToAll();
-                UpdateInfoText();
-
-                ReqWindowAttentionAll();
-            }
-        }
-
-        private async void SendRoundStartingDiscordMessage()
-        {
-            try
-            {
-                if (_webhookIdentifier == null)
-                    return;
-
-                var content = Loc.GetString("discord-round-notifications-new");
-
-                var payload = new WebhookPayload { Content = content };
-
-                await _discord.CreateMessage(_webhookIdentifier.Value, payload);
-            }
-            catch (Exception e)
-            {
-                Log.Error($"Error while sending discord round starting message:\n{e}");
-            }
-        }
-
-        /// <summary>
-        ///     Cleanup that has to run to clear up anything from the previous round.
-        ///     Stuff like wiping the previous map clean.
-        /// </summary>
-        private void ResettingCleanup()
-        {
-            // Move everybody currently in the server to lobby.
-            foreach (var player in _playerManager.Sessions)
-            {
-                PlayerJoinLobby(player);
-            }
-
-            // Round restart cleanup event, so entity systems can reset.
-            var ev = new RoundRestartCleanupEvent();
-            RaiseLocalEvent(ev);
-
-            // So clients' entity systems can clean up too...
-            RaiseNetworkEvent(ev);
-
-            EntityManager.FlushEntities();
-
-            _banManager.Restart();
-
-            _gameMapManager.ClearSelectedMap();
-
-            // Clear up any game rules.
-            ClearGameRules();
-            CurrentPreset = null;
-
-            _allPreviousGameRules.Clear();
-
-            DisallowLateJoin = false;
-            _playerGameStatuses.Clear();
-            foreach (var session in _playerManager.Sessions)
-            {
-                _playerGameStatuses[session.UserId] = LobbyEnabled ? PlayerGameStatus.NotReadyToPlay : PlayerGameStatus.ReadyToPlay;
-            }
-        }
-
-        public bool DelayStart(TimeSpan time)
-        {
-            if (_runLevel != GameRunLevel.PreRoundLobby)
-            {
-                return false;
-            }
-
-            _roundStartTime += time;
-
-            RaiseNetworkEvent(new TickerLobbyCountdownEvent(_roundStartTime, Paused));
-
-            _chatManager.DispatchServerAnnouncement(Loc.GetString("game-ticker-delay-start", ("seconds", time.TotalSeconds)));
-
-            return true;
-        }
-
-        private void UpdateRoundFlow(float frameTime)
-        {
-            if (RunLevel == GameRunLevel.InRound)
-            {
-                RoundLengthMetric.Inc(frameTime);
-            }
-
-            if (_roundStartTime == TimeSpan.Zero ||
-                RunLevel != GameRunLevel.PreRoundLobby ||
-                Paused ||
-                _roundStartTime - RoundPreloadTime > _gameTiming.CurTime ||
-                _roundStartCountdownHasNotStartedYetDueToNoPlayers)
-            {
-                return;
-            }
-
-            if (_roundStartTime < _gameTiming.CurTime)
-            {
-                StartRound();
-            }
-            // Preload maps so we can start faster
-            else if (_roundStartTime - RoundPreloadTime < _gameTiming.CurTime)
-            {
-                LoadMaps();
-            }
-        }
-
-        private void AnnounceRound()
-        {
-            if (CurrentPreset == null) return;
-
-            var options = ProtoMan.EnumeratePrototypes<RoundAnnouncementPrototype>().ToList();
-
-            if (options.Count == 0)
-                return;
-
-            var proto = _robustRandom.Pick(options);
-
-            if (proto.Message != null)
-                _chatSystem.DispatchGlobalAnnouncement(Loc.GetString(proto.Message), playSound: true);
-
-            if (proto.Sound != null)
-                _audio.PlayGlobal(proto.Sound, Filter.Broadcast(), true);
-        }
-
-        private async void SendRoundStartedDiscordMessage()
-        {
-            try
-            {
-                if (_webhookIdentifier == null)
-                    return;
-
-                var mapName = _gameMapManager.GetSelectedMap()?.MapName ?? Loc.GetString("discord-round-notifications-unknown-map");
-                var content = Loc.GetString("discord-round-notifications-started", ("id", RoundId), ("map", mapName));
-
-                var payload = new WebhookPayload { Content = content };
-
-                await _discord.CreateMessage(_webhookIdentifier.Value, payload);
-            }
-            catch (Exception e)
-            {
-                Log.Error($"Error while sending discord round start message:\n{e}");
-            }
-        }
-    }
-
-    public enum GameRunLevel
-    {
-        PreRoundLobby = 0,
-        InRound = 1,
-        PostRound = 2
-    }
-
-    public sealed class GameRunLevelChangedEvent
-    {
-        public GameRunLevel Old { get; }
-        public GameRunLevel New { get; }
-
-        public GameRunLevelChangedEvent(GameRunLevel old, GameRunLevel @new)
-        {
-            Old = old;
-            New = @new;
-        }
-    }
-
-    /// <summary>
-    ///     Event raised before maps are loaded in pre-round setup.
-    ///     Contains a list of game map prototypes to load; modify it if you want to load different maps,
-    ///     for example as part of a game rule.
-    /// </summary>
-    [PublicAPI]
-    public sealed class LoadingMapsEvent : EntityEventArgs
-    {
-        public List<GameMapPrototype> Maps;
-
-        public LoadingMapsEvent(List<GameMapPrototype> maps)
-        {
-            Maps = maps;
-        }
-    }
-
-    /// <summary>
-    ///     Event raised before the game loads a given map.
-    ///     This event is mutable, and load options should be tweaked if necessary.
-    /// </summary>
-    /// <remarks>
-    ///     You likely want to subscribe to this after StationSystem.
-    /// </remarks>
-    [PublicAPI]
-    public sealed class PreGameMapLoad(GameMapPrototype gameMap, DeserializationOptions options, Vector2 offset, Angle rotation) : EntityEventArgs
-    {
-        public readonly GameMapPrototype GameMap = gameMap;
-        public DeserializationOptions Options = options;
-        public Vector2 Offset = offset;
-        public Angle Rotation = rotation;
-    }
-
-    /// <summary>
-    ///     Event raised after the game loads a given map.
-    /// </summary>
-    /// <remarks>
-    ///     You likely want to subscribe to this after StationSystem.
-    /// </remarks>
-    [PublicAPI]
-    public sealed class PostGameMapLoad : EntityEventArgs
-    {
-        public readonly GameMapPrototype GameMap;
-        public readonly MapId Map;
-        public readonly IReadOnlyList<EntityUid> Grids;
-        public readonly string? StationName;
-
-        public PostGameMapLoad(GameMapPrototype gameMap, MapId map, IReadOnlyList<EntityUid> grids, string? stationName)
-        {
-            GameMap = gameMap;
-            Map = map;
-            Grids = grids;
-            StationName = stationName;
-        }
-    }
-
-    /// <summary>
-    ///     Event raised to refresh the late join status.
-    ///     If you want to disallow late joins, listen to this and call Disallow.
-    /// </summary>
-    public sealed class RefreshLateJoinAllowedEvent
-    {
-        public bool DisallowLateJoin { get; private set; } = false;
-
-        public void Disallow()
-        {
-            DisallowLateJoin = true;
-        }
-    }
-
-    /// <summary>
-    ///     Attempt event raised on round start.
-    ///     This can be listened to by GameRule systems to cancel round start if some condition is not met, like player count.
-    /// </summary>
-    public sealed class RoundStartAttemptEvent : CancellableEntityEventArgs
-    {
-        public ICommonSession[] Players { get; }
-        public bool Forced { get; }
-
-        public RoundStartAttemptEvent(ICommonSession[] players, bool forced)
-        {
-            Players = players;
-            Forced = forced;
-        }
-    }
-
-    /// <summary>
-    ///     Event raised before readied up players are spawned and given jobs by the GameTicker.
-    ///     You can use this to spawn people off-station, like in the case of nuke ops or wizard.
-    ///     Remove the players you spawned from the PlayerPool and call <see cref="GameTicker.PlayerJoinGame"/> on them.
-    /// </summary>
-    public sealed class RulePlayerSpawningEvent
-    {
-        /// <summary>
-        ///     Pool of players to be spawned.
-        ///     If you want to handle a specific player being spawned, remove it from this list and do what you need.
-        /// </summary>
-        /// <remarks>If you spawn a player by yourself from this event, don't forget to call <see cref="GameTicker.PlayerJoinGame"/> on them.</remarks>
-        public List<ICommonSession> PlayerPool { get; }
-        public IReadOnlyDictionary<NetUserId, HumanoidCharacterProfile> Profiles { get; }
-        public bool Forced { get; }
-
-        public RulePlayerSpawningEvent(List<ICommonSession> playerPool, IReadOnlyDictionary<NetUserId, HumanoidCharacterProfile> profiles, bool forced)
-        {
-            PlayerPool = playerPool;
-            Profiles = profiles;
-            Forced = forced;
-        }
-    }
-
-    /// <summary>
-    ///     Event raised after players were assigned jobs by the GameTicker and have been spawned in.
-    ///     You can give on-station people special roles by listening to this event.
-    /// </summary>
-    public sealed class RulePlayerJobsAssignedEvent
-    {
-        public ICommonSession[] Players { get; }
-        public IReadOnlyDictionary<NetUserId, HumanoidCharacterProfile> Profiles { get; }
-        public bool Forced { get; }
-
-        public RulePlayerJobsAssignedEvent(ICommonSession[] players, IReadOnlyDictionary<NetUserId, HumanoidCharacterProfile> profiles, bool forced)
-        {
-            Players = players;
-            Profiles = profiles;
-            Forced = forced;
-        }
-    }
-
-    /// <summary>
-    ///     Event raised to allow subscribers to add text to the round end summary screen.
-    /// </summary>
-    public sealed class RoundEndTextAppendEvent
-    {
-        private bool _doNewLine;
-
-        /// <summary>
-        ///     Text to display in the round end summary screen.
-        /// </summary>
-        public string Text { get; private set; } = string.Empty;
-
-        /// <summary>
-        ///     Invoke this method to add text to the round end summary screen.
-        /// </summary>
-        /// <param name="text"></param>
-        public void AddLine(string text)
-        {
-            if (_doNewLine)
-                Text += "\n";
-
-            Text += text;
-            _doNewLine = true;
-        }
-    }
-}
diff --git a/Content.Server/GameTicking/GameTicker.StatusShell.cs b/Content.Server/GameTicking/GameTicker.StatusShell.cs
deleted file mode 100644
index c731205120..0000000000
--- a/Content.Server/GameTicking/GameTicker.StatusShell.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System.Linq;
-using System.Text.Json.Nodes;
-using Content.Corvax.Interfaces.Server;
-using Content.Shared.CCVar;
-using Content.Shared.GameTicking;
-using Robust.Server.ServerStatus;
-using Robust.Shared.Configuration;
-
-namespace Content.Server.GameTicking
-{
-    public sealed partial class GameTicker
-    {
-        /// <summary>
-        ///     Used for thread safety, given <see cref="IStatusHost.OnStatusRequest"/> is called from another thread.
-        /// </summary>
-        private readonly object _statusShellLock = new();
-
-        /// <summary>
-        ///     Round start time in UTC, for status shell purposes.
-        /// </summary>
-        [ViewVariables]
-        private DateTime _roundStartDateTime;
-
-        /// <summary>
-        ///     For access to CVars in status responses.
-        /// </summary>
-        [Dependency] private IConfigurationManager _cfg = default!;
-        /// <summary>
-        ///     For access to the round ID in status responses.
-        /// </summary>
-        [Dependency] private SharedGameTicker _gameTicker = default!;
-
-        private void InitializeStatusShell()
-        {
-            IoCManager.Resolve<IStatusHost>().OnStatusRequest += GetStatusResponse;
-        }
-
-        private void GetStatusResponse(JsonNode jObject)
-        {
-            var preset = CurrentPreset ?? Preset;
-
-            // This method is raised from another thread, so this better be thread safe!
-            lock (_statusShellLock)
-            {
-                // Corvax-Queue-Start
-                var players = IoCManager.Instance?.TryResolveType<IServerJoinQueueManager>(out var joinQueueManager) ?? false
-                    ? joinQueueManager.ActualPlayersCount
-                    : _playerManager.PlayerCount;
-
-                players = _cfg.GetCVar(CCVars.AdminsCountInReportedPlayerCount)
-                    ? players
-                    : players - _adminManager.ActiveAdmins.Count();
-                // Corvax-Queue-End
-
-                jObject["name"] = _baseServer.ServerName;
-                jObject["map"] = _gameMapManager.GetSelectedMap()?.MapName;
-                jObject["round_id"] = _gameTicker.RoundId;
-                jObject["players"] = players; // Corvax-Queue
-                jObject["soft_max_players"] = _cfg.GetCVar(CCVars.SoftMaxPlayers);
-                jObject["panic_bunker"] = _cfg.GetCVar(CCVars.PanicBunkerEnabled);
-                jObject["run_level"] = (int) _runLevel;
-                if (preset != null)
-                    jObject["preset"] = (Decoy == null) ? Loc.GetString(preset.ModeTitle) : Loc.GetString(Decoy.ModeTitle);
-                if (_runLevel >= GameRunLevel.InRound)
-                {
-                    jObject["round_start_time"] = _roundStartDateTime.ToString("o");
-                }
-            }
-        }
-    }
-}
diff --git a/Content.Server/GameTicking/Presets/GamePresetPrototype.cs b/Content.Server/GameTicking/Presets/GamePresetPrototype.cs
deleted file mode 100644
index febaef8270..0000000000
--- a/Content.Server/GameTicking/Presets/GamePresetPrototype.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Content.Server.Maps;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.GameTicking.Presets
-{
-    /// <summary>
-    ///     A round-start setup preset, such as which antagonists to spawn.
-    /// </summary>
-    [Prototype]
-    public sealed partial class GamePresetPrototype : IPrototype
-    {
-        [IdDataField]
-        public string ID { get; private set; } = default!;
-
-        [DataField]
-        public string[] Alias = Array.Empty<string>();
-
-        [DataField("name")]
-        public string ModeTitle = "????";
-
-        [DataField]
-        public string Description = string.Empty;
-
-        [DataField]
-        public bool ShowInVote;
-
-        [DataField]
-        public int? MinPlayers;
-
-        [DataField]
-        public int? MaxPlayers;
-
-        [DataField]
-        public IReadOnlyList<EntProtoId> Rules { get; private set; } = Array.Empty<EntProtoId>();
-
-        /// <summary>
-        /// If specified, the gamemode will only be run with these maps.
-        /// If none are elligible, the global fallback will be used.
-        /// </summary>
-        [DataField("supportedMaps")]
-        public ProtoId<GameMapPoolPrototype>? MapPool;
-    }
-}
diff --git a/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs b/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs
index 6216abebb3..de03fd8915 100644
--- a/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs
@@ -1,7 +1,9 @@
 using Content.Server.Antag;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Preferences.Managers;
+using Content.Shared.Antag;
 using Content.Shared.Body;
+using Content.Shared.GameTicking.Rules;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
diff --git a/Content.Server/GameTicking/Rules/Components/DeathMatchRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/DeathMatchRuleComponent.cs
index b2479d8a39..3690237571 100644
--- a/Content.Server/GameTicking/Rules/Components/DeathMatchRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/DeathMatchRuleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.EntityTable.EntitySelectors;
+using Content.Shared.EntityTable.EntitySelectors;
 using Content.Shared.FixedPoint;
 using Content.Shared.Roles;
 using Robust.Shared.Network;
diff --git a/Content.Server/GameTicking/Rules/Components/InactivityRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/InactivityRuleComponent.cs
index 5d1bd5f073..2850cd8865 100644
--- a/Content.Server/GameTicking/Rules/Components/InactivityRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/InactivityRuleComponent.cs
@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 
 namespace Content.Server.GameTicking.Rules.Components;
 
diff --git a/Content.Server/GameTicking/Rules/Components/KillCalloutRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/KillCalloutRuleComponent.cs
index e82a952290..4d49e7ee08 100644
--- a/Content.Server/GameTicking/Rules/Components/KillCalloutRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/KillCalloutRuleComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.GameTicking.Rules.Components;
+namespace Content.Server.GameTicking.Rules.Components;
 
 /// <summary>
 /// This is used for a rule that announces kills globally.
diff --git a/Content.Server/GameTicking/Rules/Components/MaxTimeRestartRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/MaxTimeRestartRuleComponent.cs
index 4706f6216b..cdc5f4f5ba 100644
--- a/Content.Server/GameTicking/Rules/Components/MaxTimeRestartRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/MaxTimeRestartRuleComponent.cs
@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 
 namespace Content.Server.GameTicking.Rules.Components;
 
diff --git a/Content.Server/GameTicking/Rules/Components/NukeOpsShuttleComponent.cs b/Content.Server/GameTicking/Rules/Components/NukeOpsShuttleComponent.cs
index 3d097cd7c7..9b0c2035b1 100644
--- a/Content.Server/GameTicking/Rules/Components/NukeOpsShuttleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/NukeOpsShuttleComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.GameTicking.Rules.Components;
+namespace Content.Server.GameTicking.Rules.Components;
 
 /// <summary>
 /// Tags grid as nuke ops shuttle
diff --git a/Content.Server/GameTicking/Rules/Components/RespawnDeadRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/RespawnDeadRuleComponent.cs
index f6e4a3b129..209076049f 100644
--- a/Content.Server/GameTicking/Rules/Components/RespawnDeadRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/RespawnDeadRuleComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.GameTicking.Rules.Components;
+namespace Content.Server.GameTicking.Rules.Components;
 
 /// <summary>
 /// This is used for gamemodes that automatically respawn players when they're no longer alive.
diff --git a/Content.Server/GameTicking/Rules/Components/RespawnTrackerComponent.cs b/Content.Server/GameTicking/Rules/Components/RespawnTrackerComponent.cs
index b9c8fe1096..6587d12d39 100644
--- a/Content.Server/GameTicking/Rules/Components/RespawnTrackerComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/RespawnTrackerComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Network;
+using Robust.Shared.Network;
 
 namespace Content.Server.GameTicking.Rules.Components;
 
diff --git a/Content.Server/GameTicking/Rules/Components/SandboxRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/SandboxRuleComponent.cs
index 9ed7b4e529..f1fc5b162a 100644
--- a/Content.Server/GameTicking/Rules/Components/SandboxRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/SandboxRuleComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.GameTicking.Rules.Components;
+namespace Content.Server.GameTicking.Rules.Components;
 
 [RegisterComponent, Access(typeof(SandboxRuleSystem))]
 public sealed partial class SandboxRuleComponent : Component
diff --git a/Content.Server/GameTicking/Rules/Components/SecretRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/SecretRuleComponent.cs
index f2d21ee93c..6bf40a2ed2 100644
--- a/Content.Server/GameTicking/Rules/Components/SecretRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/SecretRuleComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.GameTicking.Rules.Components;
+namespace Content.Server.GameTicking.Rules.Components;
 
 [RegisterComponent, Access(typeof(SecretRuleSystem))]
 public sealed partial class SecretRuleComponent : Component
diff --git a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
index 44a2121835..0305fa3d27 100644
--- a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
@@ -8,7 +8,9 @@ using Content.Server.Station.Systems;
 using Content.Shared.EntityTable;
 using Content.Shared.GameTicking;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules;
 using Content.Shared.Points;
+using Content.Shared.Station.Systems;
 using Robust.Server.Player;
 using Robust.Shared.Utility;
 
@@ -43,7 +45,7 @@ public sealed partial class DeathMatchRuleSystem : GameRuleSystem<DeathMatchRule
         var query = EntityQueryEnumerator<DeathMatchRuleComponent, RespawnTrackerComponent, PointManagerComponent, GameRuleComponent>();
         while (query.MoveNext(out var uid, out var dm, out var tracker, out var point, out var rule))
         {
-            if (!GameTicker.IsGameRuleActive(uid, rule))
+            if (!GameTicker.IsGameRuleActive((uid, rule)))
                 continue;
 
             var newMind = _mind.CreateMind(ev.Player.UserId, ev.Profile.Name);
@@ -71,8 +73,9 @@ public sealed partial class DeathMatchRuleSystem : GameRuleSystem<DeathMatchRule
         var query = EntityQueryEnumerator<DeathMatchRuleComponent, RespawnTrackerComponent, GameRuleComponent>();
         while (query.MoveNext(out var uid, out _, out var tracker, out var rule))
         {
-            if (!GameTicker.IsGameRuleActive(uid, rule))
+            if (!GameTicker.IsGameRuleActive((uid, rule)))
                 continue;
+
             _respawn.AddToTracker((ev.Mob, null), (uid, tracker));
         }
     }
@@ -82,7 +85,7 @@ public sealed partial class DeathMatchRuleSystem : GameRuleSystem<DeathMatchRule
         var query = EntityQueryEnumerator<DeathMatchRuleComponent, PointManagerComponent, GameRuleComponent>();
         while (query.MoveNext(out var uid, out var dm, out var point, out var rule))
         {
-            if (!GameTicker.IsGameRuleActive(uid, rule))
+            if (!GameTicker.IsGameRuleActive((uid, rule)))
                 continue;
 
             // YOU SUICIDED OR GOT THROWN INTO LAVA!
@@ -117,12 +120,12 @@ public sealed partial class DeathMatchRuleSystem : GameRuleSystem<DeathMatchRule
         _roundEnd.EndRound(component.RestartDelay);
     }
 
-    protected override void AppendRoundEndText(EntityUid uid, DeathMatchRuleComponent component, GameRuleComponent gameRule, ref RoundEndTextAppendEvent args)
+    protected override void AppendRoundEndText(Entity<DeathMatchRuleComponent> entity, ref RoundEndTextAppendEvent args)
     {
-        if (!TryComp<PointManagerComponent>(uid, out var point))
+        if (!TryComp<PointManagerComponent>(entity, out var point))
             return;
 
-        if (component.Victor != null && _player.TryGetPlayerData(component.Victor.Value, out var data))
+        if (entity.Comp.Victor != null && _player.TryGetPlayerData(entity.Comp.Victor.Value, out var data))
         {
             args.AddLine(Loc.GetString("point-scoreboard-winner", ("player", data.UserName)));
             args.AddLine("");
diff --git a/Content.Server/GameTicking/Rules/DynamicRuleSystem.cs b/Content.Server/GameTicking/Rules/DynamicRuleSystem.cs
index bc9d9d01d1..f84668b4f5 100644
--- a/Content.Server/GameTicking/Rules/DynamicRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/DynamicRuleSystem.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics;
 using Content.Server.Administration.Logs;
 using Content.Server.RoundEnd;
 using Content.Shared.Database;
@@ -6,6 +5,7 @@ using Content.Shared.EntityTable;
 using Content.Shared.EntityTable.Conditions;
 using Content.Shared.GameTicking.Components;
 using Content.Shared.GameTicking.Rules;
+using Content.Shared.GameTicking.Rules.Components;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
@@ -36,13 +36,14 @@ public sealed partial class DynamicRuleSystem : GameRuleSystem<DynamicRuleCompon
         Execute((uid, component));
     }
 
-    protected override void Ended(EntityUid uid, DynamicRuleComponent component, GameRuleComponent gameRule, GameRuleEndedEvent args)
+    // TODO: We may not actually want to do this
+    protected override void Ended(Entity<DynamicRuleComponent> rule, ref GameRuleEndedEvent args)
     {
-        base.Ended(uid, component, gameRule, args);
+        base.Ended(rule, ref args);
 
-        foreach (var rule in component.Rules)
+        foreach (var gameRule in rule.Comp.Rules)
         {
-            GameTicker.EndGameRule(rule);
+            GameTicker.EndGameRule(gameRule);
         }
     }
 
@@ -102,10 +103,10 @@ public sealed partial class DynamicRuleSystem : GameRuleSystem<DynamicRuleCompon
 
         foreach (var rule in GetRuleSpawns(entity))
         {
-            var res = GameTicker.StartGameRule(rule, out var ruleUid);
-            Debug.Assert(res);
+            if (!GameTicker.StartGameRule(rule, out var ruleUid))
+                continue;
 
-            executedRules.Add(ruleUid);
+            executedRules.Add(ruleUid.Value);
 
             if (TryComp<DynamicRuleCostComponent>(ruleUid, out var cost))
             {
@@ -130,7 +131,7 @@ public sealed partial class DynamicRuleSystem : GameRuleSystem<DynamicRuleCompon
         var query = EntityQueryEnumerator<DynamicRuleComponent, GameRuleComponent>();
         while (query.MoveNext(out var uid, out _, out var comp))
         {
-            if (!GameTicker.IsGameRuleActive(uid, comp))
+            if (!GameTicker.IsGameRuleActive((uid, comp)))
                 continue;
             rules.Add(uid);
         }
diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
deleted file mode 100644
index 9c8c26bdc7..0000000000
--- a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Content.Server.Station.Components;
-using Content.Shared.GameTicking.Components;
-using Content.Shared.Station.Components;
-using Robust.Shared.Collections;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Utility;
-
-namespace Content.Server.GameTicking.Rules;
-
-public abstract partial class GameRuleSystem<T> where T: IComponent
-{
-    protected EntityQueryEnumerator<ActiveGameRuleComponent, T, GameRuleComponent> QueryActiveRules()
-    {
-        return EntityQueryEnumerator<ActiveGameRuleComponent, T, GameRuleComponent>();
-    }
-
-    protected EntityQueryEnumerator<DelayedStartRuleComponent, T, GameRuleComponent> QueryDelayedRules()
-    {
-        return EntityQueryEnumerator<DelayedStartRuleComponent, T, GameRuleComponent>();
-    }
-
-    /// <summary>
-    /// Queries all gamerules, regardless of if they're active or not.
-    /// </summary>
-    protected EntityQueryEnumerator<T, GameRuleComponent> QueryAllRules()
-    {
-        return EntityQueryEnumerator<T, GameRuleComponent>();
-    }
-
-    /// <summary>
-    ///     Utility function for finding a random event-eligible station entity
-    /// </summary>
-    protected bool TryGetRandomStation([NotNullWhen(true)] out EntityUid? station, Func<EntityUid, bool>? filter = null)
-    {
-        var stations = new ValueList<EntityUid>(Count<StationEventEligibleComponent>());
-
-        filter ??= _ => true;
-        var query = AllEntityQuery<StationEventEligibleComponent>();
-
-        while (query.MoveNext(out var uid, out _))
-        {
-            if (!filter(uid))
-                continue;
-
-            stations.Add(uid);
-        }
-
-        if (stations.Count == 0)
-        {
-            station = null;
-            return false;
-        }
-
-        // TODO: Engine PR.
-        station = stations[RobustRandom.Next(stations.Count)];
-        return true;
-    }
-
-    protected bool TryFindRandomTile(out Vector2i tile,
-        [NotNullWhen(true)] out EntityUid? targetStation,
-        out EntityUid targetGrid,
-        out EntityCoordinates targetCoords)
-    {
-        tile = default;
-        targetStation = EntityUid.Invalid;
-        targetGrid = EntityUid.Invalid;
-        targetCoords = EntityCoordinates.Invalid;
-        if (TryGetRandomStation(out targetStation))
-        {
-            return TryFindRandomTileOnStation((targetStation.Value, Comp<StationDataComponent>(targetStation.Value)),
-                out tile,
-                out targetGrid,
-                out targetCoords);
-        }
-
-        return false;
-    }
-
-    protected bool TryFindRandomTileOnStation(Entity<StationDataComponent> station,
-        out Vector2i tile,
-        out EntityUid targetGrid,
-        out EntityCoordinates targetCoords,
-        int numAttempts = 10)
-    {
-        tile = default;
-        targetCoords = EntityCoordinates.Invalid;
-        targetGrid = EntityUid.Invalid;
-
-        // Weight grid choice by tilecount
-        var totalTiles = 0;
-        var grids = new List<(Entity<MapGridComponent> Entity, int Count, List<TileRef> Tiles)>();
-        foreach (var possibleTarget in station.Comp.Grids)
-        {
-            if (!TryComp<MapGridComponent>(possibleTarget, out var comp))
-                continue;
-
-            // Get the tile count for the given grid.
-            var tileCount = _map.GetFilledTileCount((possibleTarget, comp));
-
-            // Just to be sure, no empty elements.
-            if (tileCount > 0)
-            {
-                grids.Add(((possibleTarget, comp), tileCount, new()));
-                totalTiles += tileCount;
-            }
-        }
-
-        if (grids.Count == 0)
-        {
-            targetGrid = EntityUid.Invalid;
-            return false;
-        }
-
-        for (var i = 0; i < numAttempts; i++)
-        {
-            // Find random tile within list.
-            var nextTileIndex = RobustRandom.Next(totalTiles);
-            TileRef? randomTileRef = null;
-            MapGridComponent gridComp = default!;
-            var startIndex = 0;
-            for (int j = 0; j < grids.Count; j++)
-            {
-                var grid = grids[j];
-                // If the index is in this particular grid, find it and remove the tile to prevent selecting it twice.
-                if (nextTileIndex >= startIndex + grid.Count)
-                {
-                    startIndex += grid.Count;
-                    continue;
-                }
-
-                (targetGrid, gridComp) = grid.Entity;
-
-                // Empty list: hasn't been queried yet - get our tiles.
-                if (grid.Tiles.Count <= 0)
-                {
-                    grid.Tiles = _map.GetAllTiles(targetGrid, gridComp).ToList();
-
-                    // Actual list count doesn't match expected count (a bug - return failure).
-                    Debug.Assert(grid.Tiles.Count == grid.Count);
-                    if (grid.Tiles.Count != grid.Count)
-                        return false;
-                }
-
-                var ourTileIndex = nextTileIndex - startIndex;
-                randomTileRef = grid.Tiles[ourTileIndex];
-                grid.Tiles.RemoveSwap(ourTileIndex);
-                grid.Count--;
-                totalTiles--;
-
-                // Empty list, remove element
-                if (grid.Tiles.Count <= 0)
-                    grids.RemoveSwap(j);
-
-                break;
-            }
-
-            // Out of valid tiles, return early.
-            if (randomTileRef is not { } tileRef)
-                return false;
-
-            // Invalid tile, try again.
-            if (_atmosphere.IsTileSpace(targetGrid, Transform(targetGrid).MapUid, tileRef.GridIndices)
-                || _atmosphere.IsTileAirBlockedCached(targetGrid, tileRef.GridIndices))
-            {
-                continue;
-            }
-
-            targetCoords = _map.GridTileToLocal(targetGrid, gridComp, tileRef.GridIndices);
-            tile = tileRef.GridIndices;
-            return true;
-        }
-
-        return false;
-    }
-
-    protected void ForceEndSelf(EntityUid uid, GameRuleComponent? component = null)
-    {
-        GameTicker.EndGameRule(uid, component);
-    }
-}
diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.cs
deleted file mode 100644
index 5398503ea8..0000000000
--- a/Content.Server/GameTicking/Rules/GameRuleSystem.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.GameTicking.Components;
-using Robust.Server.GameObjects;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
-
-namespace Content.Server.GameTicking.Rules;
-
-public abstract partial class GameRuleSystem<T> : EntitySystem where T : IComponent
-{
-    [Dependency] protected IGameTiming Timing = default!;
-    [Dependency] protected IRobustRandom RobustRandom = default!;
-    [Dependency] protected GameTicker GameTicker = default!;
-
-    // Not protected, just to be used in utility methods
-    [Dependency] private AtmosphereSystem _atmosphere = default!;
-    [Dependency] private MapSystem _map = default!;
-
-    [Dependency] protected EntityQuery<GameRuleComponent> GameRuleQuery = default!;
-    [Dependency] protected EntityQuery<T> RuleQuery = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<T, GameRuleAddedEvent>(OnGameRuleAdded);
-        SubscribeLocalEvent<T, GameRuleStartedEvent>(OnGameRuleStarted);
-        SubscribeLocalEvent<T, GameRuleEndedEvent>(OnGameRuleEnded);
-        SubscribeLocalEvent<RoundEndTextAppendEvent>(OnRoundEndTextAppend);
-    }
-
-    private void OnGameRuleAdded(EntityUid uid, T component, ref GameRuleAddedEvent args)
-    {
-        if (!GameRuleQuery.TryComp(uid, out var ruleData))
-            return;
-
-        Added(uid, component, ruleData, args);
-    }
-
-    private void OnGameRuleStarted(EntityUid uid, T component, ref GameRuleStartedEvent args)
-    {
-        if (!GameRuleQuery.TryComp(uid, out var ruleData))
-            return;
-
-        Started(uid, component, ruleData, args);
-    }
-
-    private void OnGameRuleEnded(EntityUid uid, T component, ref GameRuleEndedEvent args)
-    {
-        if (!GameRuleQuery.TryComp(uid, out var ruleData))
-            return;
-
-        Ended(uid, component, ruleData, args);
-    }
-
-    private void OnRoundEndTextAppend(RoundEndTextAppendEvent ev)
-    {
-        var query = QueryAllRules();
-        while (query.MoveNext(out var uid, out var comp, out var ruleData))
-        {
-            AppendRoundEndText(uid, comp, ruleData, ref ev);
-        }
-    }
-
-    /// <summary>
-    /// Called when the gamerule is added
-    /// </summary>
-    protected virtual void Added(EntityUid uid, T component, GameRuleComponent gameRule, GameRuleAddedEvent args)
-    {
-
-    }
-
-    /// <summary>
-    /// Called when the gamerule begins
-    /// </summary>
-    protected virtual void Started(EntityUid uid, T component, GameRuleComponent gameRule, GameRuleStartedEvent args)
-    {
-
-    }
-
-    /// <summary>
-    /// Called when the gamerule ends
-    /// </summary>
-    protected virtual void Ended(EntityUid uid, T component, GameRuleComponent gameRule, GameRuleEndedEvent args)
-    {
-
-    }
-
-    /// <summary>
-    /// Called at the end of a round when text needs to be added for a game rule.
-    /// </summary>
-    protected virtual void AppendRoundEndText(EntityUid uid, T component, GameRuleComponent gameRule, ref RoundEndTextAppendEvent args)
-    {
-
-    }
-
-    /// <summary>
-    /// Called on an active gamerule entity in the Update function
-    /// </summary>
-    protected virtual void ActiveTick(EntityUid uid, T component, GameRuleComponent gameRule, float frameTime)
-    {
-
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<T, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var comp1, out var comp2))
-        {
-            if (!GameTicker.IsGameRuleActive(uid, comp2))
-                continue;
-
-            ActiveTick(uid, comp1, comp2, frameTime);
-        }
-    }
-}
diff --git a/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs b/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs
index cc67b76a51..1fd287be13 100644
--- a/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs
@@ -1,7 +1,9 @@
 using System.Threading;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking.Rules.Components;
+using Content.Shared.GameTicking;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules;
 using Robust.Server.Player;
 using Robust.Shared.Player;
 using Timer = Robust.Shared.Timing.Timer;
@@ -27,11 +29,11 @@ public sealed partial class InactivityTimeRestartRuleSystem : GameRuleSystem<Ina
         _playerManager.PlayerStatusChanged -= PlayerStatusChanged;
     }
 
-    protected override void Ended(EntityUid uid, InactivityRuleComponent component, GameRuleComponent gameRule, GameRuleEndedEvent args)
+    protected override void Ended(Entity<InactivityRuleComponent> rule, ref GameRuleEndedEvent args)
     {
-        base.Ended(uid, component, gameRule, args);
+        base.Ended(rule, ref args);
 
-        StopTimer(uid, component);
+        StopTimer(rule, rule.Comp);
     }
 
     public void RestartTimer(EntityUid uid, InactivityRuleComponent? component = null)
@@ -66,12 +68,9 @@ public sealed partial class InactivityTimeRestartRuleSystem : GameRuleSystem<Ina
 
     private void RunLevelChanged(GameRunLevelChangedEvent args)
     {
-        var query = EntityQueryEnumerator<InactivityRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var inactivity, out var gameRule))
+        var query = QueryActiveRules();
+        while (query.MoveNext(out var uid, out var inactivity, out _, out _))
         {
-            if (!GameTicker.IsGameRuleActive(uid, gameRule))
-                return;
-
             switch (args.New)
             {
                 case GameRunLevel.InRound:
@@ -90,7 +89,7 @@ public sealed partial class InactivityTimeRestartRuleSystem : GameRuleSystem<Ina
         var query = EntityQueryEnumerator<InactivityRuleComponent, GameRuleComponent>();
         while (query.MoveNext(out var uid, out var inactivity, out var gameRule))
         {
-            if (!GameTicker.IsGameRuleActive(uid, gameRule))
+            if (!GameTicker.IsGameRuleActive((uid, gameRule)))
                 return;
 
             if (GameTicker.RunLevel != GameRunLevel.InRound)
diff --git a/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs b/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs
index a61eab34c7..8be4de428d 100644
--- a/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs
@@ -1,8 +1,9 @@
-using Content.Server.Chat.Managers;
+using Content.Server.Chat.Managers;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.KillTracking;
 using Content.Shared.Chat;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules;
 using Robust.Server.Player;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
@@ -31,7 +32,7 @@ public sealed partial class KillCalloutRuleSystem : GameRuleSystem<KillCalloutRu
         var query = EntityQueryEnumerator<KillCalloutRuleComponent, GameRuleComponent>();
         while (query.MoveNext(out var uid, out var kill, out var rule))
         {
-            if (!GameTicker.IsGameRuleActive(uid, rule))
+            if (!GameTicker.IsGameRuleActive((uid, rule)))
                 continue;
 
             var callout = GetCallout(kill, ev);
diff --git a/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs b/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs
index 5740ffe8fe..66f36caca5 100644
--- a/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs
@@ -1,7 +1,9 @@
 using System.Threading;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking.Rules.Components;
+using Content.Shared.GameTicking;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules;
 using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Server.GameTicking.Rules;
@@ -21,15 +23,15 @@ public sealed partial class MaxTimeRestartRuleSystem : GameRuleSystem<MaxTimeRes
     {
         base.Started(uid, component, gameRule, args);
 
-        if(GameTicker.RunLevel == GameRunLevel.InRound)
+        if (GameTicker.RunLevel == GameRunLevel.InRound)
             RestartTimer(component);
     }
 
-    protected override void Ended(EntityUid uid, MaxTimeRestartRuleComponent component, GameRuleComponent gameRule, GameRuleEndedEvent args)
+    protected override void Ended(Entity<MaxTimeRestartRuleComponent> rule, ref GameRuleEndedEvent args)
     {
-        base.Ended(uid, component, gameRule, args);
+        base.Ended(rule, ref args);
 
-        StopTimer(component);
+        StopTimer(rule);
     }
 
     public void RestartTimer(MaxTimeRestartRuleComponent component)
@@ -60,7 +62,7 @@ public sealed partial class MaxTimeRestartRuleSystem : GameRuleSystem<MaxTimeRes
         var query = EntityQueryEnumerator<MaxTimeRestartRuleComponent, GameRuleComponent>();
         while (query.MoveNext(out var uid, out var timer, out var gameRule))
         {
-            if (!GameTicker.IsGameRuleActive(uid, gameRule))
+            if (!GameTicker.IsGameRuleActive((uid, gameRule)))
                 return;
 
             switch (args.New)
diff --git a/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs b/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
index c960cfc156..d69c2934c1 100644
--- a/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
@@ -1,9 +1,9 @@
 using Content.Server.Chat.Managers;
-using Content.Server.Database.Migrations.Postgres;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Chat;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Mind;
 using Content.Shared.Mobs;
@@ -24,7 +24,7 @@ public sealed partial class RespawnRuleSystem : GameRuleSystem<RespawnDeadRuleCo
     [Dependency] private IChatManager _chatManager = default!;
     [Dependency] private IGameTiming _timing = default!;
     [Dependency] private IPlayerManager _playerManager = default!;
-    [Dependency] private StationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -54,6 +54,7 @@ public sealed partial class RespawnRuleSystem : GameRuleSystem<RespawnDeadRuleCo
 
                 if (session.GetMind() is { } mind && TryComp<MindComponent>(mind, out var mindComp) && mindComp.OwnedEntity.HasValue)
                     QueueDel(mindComp.OwnedEntity.Value);
+
                 GameTicker.MakeJoinGame(session, station, silent: true);
                 tracker.RespawnQueue.Remove(player);
             }
@@ -84,7 +85,7 @@ public sealed partial class RespawnRuleSystem : GameRuleSystem<RespawnDeadRuleCo
         var query = EntityQueryEnumerator<RespawnDeadRuleComponent, RespawnTrackerComponent, GameRuleComponent>();
         while (query.MoveNext(out var uid, out var respawnRule, out  var tracker, out var rule))
         {
-            if (!GameTicker.IsGameRuleActive(uid, rule))
+            if (!GameTicker.IsGameRuleActive((uid, rule)))
                 continue;
 
             if (respawnRule.AlwaysRespawnDead)
@@ -109,6 +110,7 @@ public sealed partial class RespawnRuleSystem : GameRuleSystem<RespawnDeadRuleCo
 
             if (respawnTracker.Comp.DeleteBody)
                 QueueDel(player);
+
             GameTicker.MakeJoinGame(player.Comp.PlayerSession, station, silent: true);
             return false;
         }
diff --git a/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs b/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs
index f8301a8e37..03fb6aa4b0 100644
--- a/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs
@@ -1,8 +1,9 @@
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Components;
 using Content.Server.Station.Events;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules;
+using Content.Shared.GameTicking.Rules.Components;
 using Content.Shared.Station.Components;
 using Content.Shared.Storage;
 using Robust.Shared.Random;
@@ -26,7 +27,7 @@ public sealed partial class RoundstartStationVariationRuleSystem : GameRuleSyste
         var spawns = EntitySpawnCollection.GetSpawns(component.Rules, _random);
         foreach (var rule in spawns)
         {
-            GameTicker.AddFilteredGameRule(rule);
+            GameTicker.AddGameRule(rule);
         }
     }
 
@@ -47,13 +48,6 @@ public sealed partial class RoundstartStationVariationRuleSystem : GameRuleSyste
         var passQuery = EntityQueryEnumerator<StationVariationPassRuleComponent, GameRuleComponent>();
         while (passQuery.MoveNext(out var uid, out _, out _))
         {
-            // TODO: for some reason, ending a game rule just gives it a marker comp,
-            // and doesnt delete it
-            // so we have to check here that it isnt an ended game rule (which could happen if a preset failed to start
-            // or it was ended before station maps spawned etc etc etc)
-            if (HasComp<EndedGameRuleComponent>(uid))
-                continue;
-
             RaiseLocalEvent(uid, ref passEv);
         }
 
@@ -62,7 +56,7 @@ public sealed partial class RoundstartStationVariationRuleSystem : GameRuleSyste
 }
 
 /// <summary>
-///     Raised directed on game rule entities which are added and marked as <see cref="StationVariationPassRuleComponent"/>
+///     Raised directed on game rule entities which are added and marked as <see cref="Shared.GameTicking.Rules.Components.StationVariationPassRuleComponent"/>
 ///     when a new station is initialized that should be varied.
 /// </summary>
 /// <param name="Station">The new station that was added, and its config & grids.</param>
diff --git a/Content.Server/GameTicking/Rules/RuleGridsSystem.cs b/Content.Server/GameTicking/Rules/RuleGridsSystem.cs
index 6ad59099ce..3a50ce752e 100644
--- a/Content.Server/GameTicking/Rules/RuleGridsSystem.cs
+++ b/Content.Server/GameTicking/Rules/RuleGridsSystem.cs
@@ -1,6 +1,9 @@
 using Content.Server.Antag;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Spawners.Components;
+using Content.Shared.Antag;
+using Content.Shared.GameTicking.Rules;
+using Content.Shared.Spawners.Components;
 using Content.Shared.Whitelist;
 using Robust.Server.Physics;
 using Robust.Shared.Map;
@@ -28,7 +31,7 @@ public sealed partial class RuleGridsSystem : GameRuleSystem<RuleGridsComponent>
     private void OnGridSplit(ref GridSplitEvent args)
     {
         var rule = QueryActiveRules();
-        while (rule.MoveNext(out _, out var comp, out _))
+        while (rule.MoveNext(out var comp, out _, out _))
         {
             if (!comp.MapGrids.Contains(args.Grid))
                 continue;
diff --git a/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs b/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs
index 88e9686402..fd1d7c6d48 100644
--- a/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Sandbox;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules;
 
 namespace Content.Server.GameTicking.Rules;
 
@@ -8,15 +9,15 @@ public sealed partial class SandboxRuleSystem : GameRuleSystem<SandboxRuleCompon
 {
     [Dependency] private SandboxSystem _sandbox = default!;
 
-    protected override void Started(EntityUid uid, SandboxRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
+    protected override void Started(Entity<SandboxRuleComponent, GameRuleComponent> rule, ref GameRuleStartedEvent args)
     {
-        base.Started(uid, component, gameRule, args);
+        base.Started(rule, ref args);
         _sandbox.IsSandboxEnabled = true;
     }
 
-    protected override void Ended(EntityUid uid, SandboxRuleComponent component, GameRuleComponent gameRule, GameRuleEndedEvent args)
+    protected override void Ended(Entity<SandboxRuleComponent> rule, ref GameRuleEndedEvent args)
     {
-        base.Ended(uid, component, gameRule, args);
+        base.Ended(rule, ref args);
         _sandbox.IsSandboxEnabled = false;
     }
 }
diff --git a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
index d8594ebf98..d249bad118 100644
--- a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
@@ -1,12 +1,14 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Administration.Logs;
-using Content.Server.GameTicking.Presets;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Shared.GameTicking.Components;
 using Content.Shared.Random;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
+using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Prototypes;
+using Content.Shared.GameTicking.Rules;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Configuration;
@@ -48,7 +50,7 @@ public sealed partial class SecretRuleSystem : GameRuleSystem<SecretRuleComponen
             if (GameTicker.IsIgnored(rule))
                 continue;
 
-            EntityUid ruleEnt;
+            Entity<GameRuleComponent>? ruleEnt;
 
             // if we're pre-round (i.e. will only be added)
             // then just add rules. if we're added in the middle of the round (or at any other point really)
@@ -58,17 +60,22 @@ public sealed partial class SecretRuleSystem : GameRuleSystem<SecretRuleComponen
             else
                 GameTicker.StartGameRule(rule, out ruleEnt);
 
-            component.AdditionalGameRules.Add(ruleEnt);
+            if (ruleEnt == null)
+                continue;
+
+            component.AdditionalGameRules.Add(ruleEnt.Value);
         }
     }
 
-    protected override void Ended(EntityUid uid, SecretRuleComponent component, GameRuleComponent gameRule, GameRuleEndedEvent args)
+    // TODO: We PROBABLY SHOULD NOT BE DOING THIS as the only time Secret ends naturally is end of round which already cleans up these rules.
+    // TODO: IN ADDITION We should end secret once it spawns its rules so we don't tick it :V or pause it?
+    protected override void Ended(Entity<SecretRuleComponent> rule, ref GameRuleEndedEvent args)
     {
-        base.Ended(uid, component, gameRule, args);
+        base.Ended(rule, ref args);
 
-        foreach (var rule in component.AdditionalGameRules)
+        foreach (var gameRule in rule.Comp.AdditionalGameRules)
         {
-            GameTicker.EndGameRule(rule);
+            GameTicker.EndGameRule(gameRule);
         }
     }
 
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/ServerNukeopsRuleSystem.cs
similarity index 79%
rename from Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
rename to Content.Server/GameTicking/Rules/ServerNukeopsRuleSystem.cs
index 368302104a..599809db8c 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/ServerNukeopsRuleSystem.cs
@@ -1,32 +1,33 @@
-using Content.Server.Antag;
+using System.Linq;
+using System.Text;
 using Content.Server.Communications;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Nuke;
 using Content.Server.NukeOps;
 using Content.Server.Pinpointer;
 using Content.Server.Popups;
-using Content.Server.Roles;
 using Content.Server.RoundEnd;
 using Content.Server.Shuttles.Events;
 using Content.Server.Shuttles.Systems;
-using Content.Server.Station.Components;
+using Content.Server.Station.Systems;
 using Content.Server.Store.Systems;
 using Content.Shared.Access.Systems;
-using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Rules;
+using Content.Shared.GameTicking.Rules.Components;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
-using Content.Shared.NPC.Components;
-using Content.Shared.NPC.Systems;
 using Content.Shared.Nuke;
 using Content.Shared.NukeOps;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Components;
 using Content.Shared.Roles.Jobs;
-using Content.Shared.Station;
+using Content.Shared.RoundEnd;
 using Content.Shared.Station.Components;
 using Content.Shared.StationRecords;
+using Content.Shared.StationRecords.Systems;
 using Content.Shared.Store;
 using Content.Shared.Store.Components;
 using Content.Shared.Tag;
@@ -36,31 +37,24 @@ using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 using Robust.Shared.Utility;
-using System.Data;
-using System.Linq;
-using System.Text;
-using Content.Shared.StationRecords.Systems;
-using Content.Shared.CombatMode.Pacification;//Corvax-DionaPacifist
 
 namespace Content.Server.GameTicking.Rules;
 
-public sealed partial class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
+/// <inheritdoc/>
+public sealed partial class ServerNukeopsRuleSystem : NukeopsRuleSystem
 {
-    [Dependency] private AntagSelectionSystem _antag = default!;
     [Dependency] private EmergencyShuttleSystem _emergency = default!;
     [Dependency] private SharedIdCardSystem _idCard = default!;
     [Dependency] private SharedJobSystem _jobs = default!;
     [Dependency] private IPlayerManager _player = default!;
     [Dependency] private SharedMindSystem _mind = default!;
     [Dependency] private NavMapSystem _navMap = default!;
-    [Dependency] private NpcFactionSystem _npcFaction = default!;
     [Dependency] private PopupSystem _popupSystem = default!;
     [Dependency] private RoundEndSystem _roundEndSystem = default!;
     [Dependency] private SharedContainerSystem _containers = default!;
     [Dependency] private SharedRoleSystem _roles = default!;
-    [Dependency] private SharedStationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
     [Dependency] private StationRecordsSystem _records = default!;
     [Dependency] private StoreSystem _store = default!;
     [Dependency] private TagSystem _tag = default!;
@@ -68,68 +62,14 @@ public sealed partial class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleCompon
     private static readonly ProtoId<CurrencyPrototype> TelecrystalCurrencyPrototype = "Telecrystal";
     private static readonly ProtoId<TagPrototype> NukeOpsUplinkTagPrototype = "NukeOpsUplink";
 
-    // TODO: This shouldn't be matching by ProtoId.
-    // It would be better if this were checked by component or something,
-    // but it needs to be distinct between the full Nukeops and Loneops rules,
-    // which NukeopsRuleComponent currently isn't.
-    // Better yet, maybe the behaviors this is used for could be moved to the rule component.
-    private static readonly EntProtoId NukeopsGameRule = "Nukeops";
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<NukeExplodedEvent>(OnNukeExploded);
-        SubscribeLocalEvent<GameRunLevelChangedEvent>(OnRunLevelChanged);
-        SubscribeLocalEvent<NukeDisarmSuccessEvent>(OnNukeDisarm);
-
-        SubscribeLocalEvent<NukeOperativeComponent, ComponentRemove>(OnComponentRemove);
-        SubscribeLocalEvent<NukeOperativeComponent, MobStateChangedEvent>(OnMobStateChanged);
-        SubscribeLocalEvent<NukeOperativeComponent, EntityZombifiedEvent>(OnOperativeZombified);
-
-        SubscribeLocalEvent<NukeopsRoleComponent, GetBriefingEvent>(OnGetBriefing);
-
-        SubscribeLocalEvent<ConsoleFTLAttemptEvent>(OnShuttleFTLAttempt);
-        SubscribeLocalEvent<WarDeclaredEvent>(OnWarDeclared);
-        SubscribeLocalEvent<CommunicationConsoleCallShuttleAttemptEvent>(OnShuttleCallAttempt);
-
-        SubscribeLocalEvent<NukeopsRuleComponent, AfterAntagEntitySelectedEvent>(OnAfterAntagEntSelected);
-        SubscribeLocalEvent<NukeopsRuleComponent, RuleLoadedGridsEvent>(OnRuleLoadedGrids);
-    }
-
-    protected override void Started(EntityUid uid,
-        NukeopsRuleComponent component,
-        GameRuleComponent gameRule,
-        GameRuleStartedEvent args)
-    {
-        var eligible = new List<Entity<StationEventEligibleComponent, NpcFactionMemberComponent>>();
-        var eligibleQuery = EntityQueryEnumerator<StationEventEligibleComponent, NpcFactionMemberComponent>();
-        while (eligibleQuery.MoveNext(out var eligibleUid, out var eligibleComp, out var member))
-        {
-            if (!_npcFaction.IsFactionHostile(component.Faction, (eligibleUid, member)))
-                continue;
-
-            eligible.Add((eligibleUid, eligibleComp, member));
-        }
-
-        if (eligible.Count == 0)
-            return;
-
-        component.TargetStation = RobustRandom.Pick(eligible);
-        var ev = new NukeopsTargetStationSelectedEvent(uid, component.TargetStation);
-        RaiseLocalEvent(ref ev);
-    }
-
     #region Event Handlers
-    protected override void AppendRoundEndText(EntityUid uid,
-        NukeopsRuleComponent component,
-        GameRuleComponent gameRule,
+    protected override void AppendRoundEndText(Entity<NukeopsRuleComponent> rule,
         ref RoundEndTextAppendEvent args)
     {
-        var winText = Loc.GetString($"nukeops-{component.WinType.ToString().ToLower()}");
+        var winText = Loc.GetString($"nukeops-{rule.Comp.WinType.ToString().ToLower()}");
         args.AddLine(winText);
 
-        foreach (var cond in component.WinConditions)
+        foreach (var cond in rule.Comp.WinConditions)
         {
             var text = Loc.GetString($"nukeops-cond-{cond.ToString().ToLower()}");
             args.AddLine(text);
@@ -137,7 +77,7 @@ public sealed partial class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleCompon
 
         // Print disk location if nuke didn't explode and is not armed
         List<WinCondition> diskWinConditions = [WinCondition.NukeDiskOnCentCom, WinCondition.NukeDiskNotOnCentCom];
-        if (component.WinConditions.Any(diskWinConditions.Contains))
+        if (rule.Comp.WinConditions.Any(diskWinConditions.Contains))
         {
             var diskQuery = AllEntityQuery<NukeDiskComponent, TransformComponent>();
             while (diskQuery.MoveNext(out var diskUid, out _, out var transform))
@@ -194,7 +134,7 @@ public sealed partial class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleCompon
 
         args.AddLine(Loc.GetString("nukeops-list-start"));
 
-        var antags = _antag.GetAntagIdentifiers(uid);
+        var antags = Antag.GetAntagIdentifiers(rule.Owner);
 
         foreach (var (_, sessionData, name) in antags)
         {
@@ -203,10 +143,13 @@ public sealed partial class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleCompon
         args.AddLine("");
     }
 
+    [SubscribeLocalEvent]
     private void OnNukeExploded(NukeExplodedEvent ev)
     {
+        // TODO: Why are we querying the active rules for NukeOps, then within EACH UID checking if the NukeOpsGameRule exists???
+        // TODO: O(N^2) Operations ass.
         var query = QueryActiveRules();
-        while (query.MoveNext(out var uid, out _, out var nukeops, out _))
+        while (query.MoveNext(out var uid, out var nukeops, out _, out _))
         {
             if (ev.OwningStation != null)
             {
@@ -250,7 +193,8 @@ public sealed partial class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleCompon
                 _roundEndSystem.EndRound();
             }
             else
-            { // It's a LoneOp. Only end the round if the station was destroyed
+            {
+                // It's a LoneOp. Only end the round if the station was destroyed
                 var handled = false;
                 foreach (var cond in nukeops.WinConditions)
                 {
@@ -269,13 +213,14 @@ public sealed partial class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleCompon
         }
     }
 
+    [SubscribeLocalEvent]
     private void OnRunLevelChanged(GameRunLevelChangedEvent ev)
     {
         if (ev.New is not GameRunLevel.PostRound)
             return;
 
         var query = QueryActiveRules();
-        while (query.MoveNext(out var uid, out _, out var nukeops, out _))
+        while (query.MoveNext(out var uid, out var nukeops, out _, out _))
         {
             OnRoundEnd((uid, nukeops));
         }
@@ -320,13 +265,13 @@ public sealed partial class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleCompon
             }
         }
 
-        if (_antag.AllAntagsAlive(ent.Owner))
+        if (Antag.AllAntagsAlive(ent.Owner))
         {
             ent.Comp.WinConditions.Add(WinCondition.AllNukiesAlive);
         }
         else
         {
-            ent.Comp.WinConditions.Add(_antag.AnyAliveAntags(ent.Owner)
+            ent.Comp.WinConditions.Add(Antag.AnyAliveAntags(ent.Owner)
                 ? WinCondition.SomeNukiesAlive
                 : WinCondition.AllNukiesDead);
         }
@@ -353,27 +298,32 @@ public sealed partial class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleCompon
             : WinCondition.NukeDiskNotOnCentCom);
     }
 
+    [SubscribeLocalEvent]
     private void OnNukeDisarm(NukeDisarmSuccessEvent ev)
     {
         CheckRoundShouldEnd();
     }
 
-    private void OnComponentRemove(EntityUid uid, NukeOperativeComponent component, ComponentRemove args)
+    [SubscribeLocalEvent]
+    private void OnComponentRemove(Entity<NukeOperativeComponent> entity, ref ComponentRemove args)
     {
         CheckRoundShouldEnd();
     }
 
-    private void OnMobStateChanged(EntityUid uid, NukeOperativeComponent component, MobStateChangedEvent ev)
+    [SubscribeLocalEvent]
+    private void OnMobStateChanged(Entity<NukeOperativeComponent> entity, ref MobStateChangedEvent ev)
     {
         if (ev.NewMobState == MobState.Dead)
             CheckRoundShouldEnd();
     }
 
-    private void OnOperativeZombified(EntityUid uid, NukeOperativeComponent component, ref EntityZombifiedEvent args)
+    [SubscribeLocalEvent]
+    private void OnOperativeZombified(Entity<NukeOperativeComponent> entity, ref EntityZombifiedEvent args)
     {
-        RemCompDeferred(uid, component);
+        RemCompDeferred(entity, entity.Comp);
     }
 
+    [SubscribeLocalEvent]
     private void OnRuleLoadedGrids(Entity<NukeopsRuleComponent> ent, ref RuleLoadedGridsEvent args)
     {
         // Check each nukie shuttle
@@ -389,10 +339,11 @@ public sealed partial class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleCompon
         }
     }
 
+    [SubscribeLocalEvent]
     private void OnShuttleFTLAttempt(ref ConsoleFTLAttemptEvent ev)
     {
         var query = QueryActiveRules();
-        while (query.MoveNext(out var uid, out _, out var nukeops, out _))
+        while (query.MoveNext(out var uid, out var nukeops, out _, out _))
         {
             if (ev.Uid != GetShuttle((uid, nukeops)))
                 continue;
@@ -414,10 +365,11 @@ public sealed partial class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleCompon
         }
     }
 
+    [SubscribeLocalEvent]
     private void OnShuttleCallAttempt(ref CommunicationConsoleCallShuttleAttemptEvent ev)
     {
         var query = QueryActiveRules();
-        while (query.MoveNext(out _, out _, out var nukeops, out _))
+        while (query.MoveNext(out var nukeops, out _, out _))
         {
             // Can't call while war nukies are preparing to arrive
             if (nukeops is { WarDeclaredTime: not null })
@@ -434,11 +386,12 @@ public sealed partial class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleCompon
         }
     }
 
+    [SubscribeLocalEvent]
     private void OnWarDeclared(ref WarDeclaredEvent ev)
     {
         // TODO: this is VERY awful for multi-nukies
         var query = QueryActiveRules();
-        while (query.MoveNext(out var uid, out _, out var nukeops, out _))
+        while (query.MoveNext(out var uid, out var nukeops, out _, out _))
         {
             if (nukeops.WarDeclaredTime != null)
                 continue;
@@ -513,7 +466,7 @@ public sealed partial class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleCompon
     private void CheckRoundShouldEnd()
     {
         var query = QueryActiveRules();
-        while (query.MoveNext(out var uid, out _, out var nukeops, out _))
+        while (query.MoveNext(out var uid, out var nukeops, out _, out _))
         {
             CheckRoundShouldEnd((uid, nukeops));
         }
@@ -588,25 +541,6 @@ public sealed partial class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleCompon
         nukeops.RoundEndBehavior = RoundEndBehavior.Nothing;
     }
 
-    private void OnAfterAntagEntSelected(Entity<NukeopsRuleComponent> ent, ref AfterAntagEntitySelectedEvent args)
-    {
-        var target = (ent.Comp.TargetStation is not null) ? Name(ent.Comp.TargetStation.Value) : "the target";
-
-        RemComp<PacifiedComponent>(args.EntityUid); // Corvax-DionaPacifist: Allow dionas nukes to harm
-        _antag.SendBriefing(args.Session,
-            Loc.GetString("nukeops-welcome",
-                ("station", target),
-                ("name", Name(ent))),
-            Color.Red,
-            ent.Comp.GreetSoundNotification);
-    }
-
-    private void OnGetBriefing(Entity<NukeopsRoleComponent> role, ref GetBriefingEvent args)
-    {
-        // TODO Different character screen briefing for the 3 nukie types
-        args.Append(Loc.GetString("nukeops-briefing"));
-    }
-
     /// <remarks>
     /// Is this method the shitty glue holding together the last of my sanity? yes.
     /// Do i have a better solution? not presently.
@@ -706,20 +640,3 @@ public sealed partial class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleCompon
             job = idCard.Comp.LocalizedJobTitle ?? job;
     }
 }
-
-/// <summary>
-/// Raised when a station has been assigned as a target for the NukeOps rule.
-/// </summary>
-[ByRefEvent]
-public readonly struct NukeopsTargetStationSelectedEvent(EntityUid ruleEntity, EntityUid? targetStation)
-{
-    /// <summary>
-    /// The entity containing the NukeOps gamerule.
-    /// </summary>
-    public readonly EntityUid RuleEntity = ruleEntity;
-
-    /// <summary>
-    /// The target station, if it exists.
-    /// </summary>
-    public readonly EntityUid? TargetStation = targetStation;
-}
diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/ServerRevolutionaryRuleSystem.cs
similarity index 87%
rename from Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
rename to Content.Server/GameTicking/Rules/ServerRevolutionaryRuleSystem.cs
index 9a63c0fca1..a5648f6df6 100644
--- a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/ServerRevolutionaryRuleSystem.cs
@@ -1,8 +1,6 @@
 using System.Linq;
 using Content.Server.Administration.Logs;
-using Content.Server.Antag;
 using Content.Server.EUI;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Mind;
 using Content.Server.Popups;
 using Content.Server.Revolutionary;
@@ -11,12 +9,18 @@ using Content.Server.Roles;
 using Content.Server.RoundEnd;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Systems;
+using Content.Shared.Antag;
+using Content.Shared.Cuffs.Components;
 using Content.Shared.Database;
 using Content.Shared.Flash;
+using Content.Shared.GameTicking;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules;
+using Content.Shared.GameTicking.Rules.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Mind.Components;
+using Content.Shared.Mindshield;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
@@ -25,25 +29,20 @@ using Content.Shared.NPC.Systems;
 using Content.Shared.Revolutionary;
 using Content.Shared.Revolutionary.Components;
 using Content.Shared.Roles.Components;
+using Content.Shared.RoundEnd;
 using Content.Shared.Stunnable;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using Content.Shared.Cuffs.Components;
-using Robust.Shared.Player;
-using Content.Shared.Mindshield;
 
 namespace Content.Server.GameTicking.Rules;
 
-/// <summary>
-/// Where all the main stuff for Revolutionaries happens (Assigning Head Revs, Command on station, and checking for the game to end.)
-/// </summary>
-public sealed partial class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleComponent>
+public sealed partial class ServerRevolutionaryRuleSystem : RevolutionaryRuleSystem
 {
     [Dependency] private AntagSelectionSystem _antag = default!;
     [Dependency] private EmergencyShuttleSystem _emergencyShuttle = default!;
     [Dependency] private EuiManager _euiMan = default!;
     [Dependency] private IAdminLogManager _adminLogManager = default!;
-    [Dependency] private IGameTiming _timing = default!;
     [Dependency] private ISharedPlayerManager _player = default!;
     [Dependency] private MindSystem _mind = default!;
     [Dependency] private MobStateSystem _mobState = default!;
@@ -52,7 +51,7 @@ public sealed partial class RevolutionaryRuleSystem : GameRuleSystem<Revolutiona
     [Dependency] private RoleSystem _role = default!;
     [Dependency] private RoundEndSystem _roundEnd = default!;
     [Dependency] private SharedStunSystem _stun = default!;
-    [Dependency] private StationSystem _stationSystem = default!;
+    [Dependency] private ServerStationSystem _stationSystem = default!;
     [Dependency] private MindShieldSystem _mindShield = default!;
 
     //Used in OnPostFlash, no reference to the rule component is available
@@ -67,37 +66,33 @@ public sealed partial class RevolutionaryRuleSystem : GameRuleSystem<Revolutiona
         SubscribeLocalEvent<HeadRevolutionaryComponent, AfterFlashedEvent>(OnPostFlash);
         SubscribeLocalEvent<HeadRevolutionaryComponent, MobStateChangedEvent>(OnHeadRevMobStateChanged);
 
-        SubscribeLocalEvent<RevolutionaryRoleComponent, GetBriefingEvent>(OnGetBriefing);
-
     }
 
-    protected override void Started(EntityUid uid, RevolutionaryRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
+    protected override void Started(Entity<RevolutionaryRuleComponent, GameRuleComponent> entity, ref GameRuleStartedEvent args)
     {
-        base.Started(uid, component, gameRule, args);
-        component.CommandCheck = _timing.CurTime + component.TimerWait;
+        base.Started(entity, ref args);
+        entity.Comp1.CommandCheck = Timing.CurTime + entity.Comp1.TimerWait;
     }
 
     protected override void ActiveTick(EntityUid uid, RevolutionaryRuleComponent component, GameRuleComponent gameRule, float frameTime)
     {
         base.ActiveTick(uid, component, gameRule, frameTime);
-        if (component.CommandCheck <= _timing.CurTime)
+        if (component.CommandCheck <= Timing.CurTime)
         {
-            component.CommandCheck = _timing.CurTime + component.TimerWait;
+            component.CommandCheck = Timing.CurTime + component.TimerWait;
 
             if (CheckCommandLose())
             {
                 _roundEnd.DoRoundEndBehavior(RoundEndBehavior.ShuttleCall, component.ShuttleCallTime);
-                GameTicker.EndGameRule(uid, gameRule);
+                GameTicker.EndGameRule((uid, gameRule));
             }
         }
     }
 
-    protected override void AppendRoundEndText(EntityUid uid,
-        RevolutionaryRuleComponent component,
-        GameRuleComponent gameRule,
+    protected override void AppendRoundEndText(Entity<RevolutionaryRuleComponent> rule,
         ref RoundEndTextAppendEvent args)
     {
-        base.AppendRoundEndText(uid, component, gameRule, ref args);
+        base.AppendRoundEndText(rule, ref args);
 
         var revsLost = CheckRevsLose();
         var commandLost = CheckCommandLose();
@@ -106,7 +101,7 @@ public sealed partial class RevolutionaryRuleSystem : GameRuleSystem<Revolutiona
         var index = (commandLost ? 1 : 0) | (revsLost ? 2 : 0);
         args.AddLine(Loc.GetString(Outcomes[index]));
 
-        var sessionData = _antag.GetAntagIdentifiers(uid).ToList();
+        var sessionData = _antag.GetAntagIdentifiers(rule.Owner).ToList();
         args.AddLine(Loc.GetString("rev-headrev-count", ("initialCount", sessionData.Count)));
         foreach (var (mind, data, name) in sessionData)
         {
@@ -123,13 +118,6 @@ public sealed partial class RevolutionaryRuleSystem : GameRuleSystem<Revolutiona
         args.AddLine("");
     }
 
-    private void OnGetBriefing(EntityUid uid, RevolutionaryRoleComponent comp, ref GetBriefingEvent args)
-    {
-        var ent = args.Mind.Comp.OwnedEntity;
-        var head = HasComp<HeadRevolutionaryComponent>(ent);
-        args.Append(Loc.GetString(head ? "head-rev-briefing" : "rev-briefing"));
-    }
-
     /// <summary>
     /// Called when a Head Rev uses a flash in melee to convert somebody else.
     /// </summary>
diff --git a/Content.Server/GameTicking/Rules/ServerTraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/ServerTraitorRuleSystem.cs
new file mode 100644
index 0000000000..da437ab7ee
--- /dev/null
+++ b/Content.Server/GameTicking/Rules/ServerTraitorRuleSystem.cs
@@ -0,0 +1,60 @@
+using Content.Server.Objectives;
+using Content.Server.Traitor.Uplink;
+using Content.Shared.FixedPoint;
+using Content.Shared.PDA;
+using Content.Shared.GameTicking.Rules;
+using Content.Shared.GameTicking.Rules.Components;
+
+namespace Content.Server.GameTicking.Rules;
+
+public sealed partial class ServerTraitorRuleSystem : TraitorRuleSystem
+{
+    [Dependency] private UplinkSystem _uplink = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        Log.Level = LogLevel.Debug;
+    }
+
+    protected override (Note[]?, string) RequestUplink(EntityUid traitor, FixedPoint2 startingBalance, string briefing)
+    {
+        var pda = _uplink.FindUplinkTarget(traitor);
+
+        Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink add");
+        var uplinked = _uplink.AddUplink(traitor, startingBalance, out var code, pda, giveDiscounts: true, bindToPda: false);
+
+        if (code != null && uplinked == AddUplinkResult.Pda)
+        {
+            Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink is PDA");
+
+            // If giveUplink is false the uplink code part is omitted
+            briefing = string.Format("{0}\n{1}",
+                briefing,
+                Loc.GetString("traitor-role-uplink-code-short", ("code", string.Join("-", code).Replace("sharp", "#"))));
+            return (code, briefing);
+        }
+
+        if (uplinked == AddUplinkResult.Implant)
+        {
+            Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink is implant");
+            briefing += "\n" + Loc.GetString("traitor-role-uplink-implant-short");
+        }
+        else
+        {
+            Log.Error($"MakeTraitor failed on {ToPrettyString(traitor)} - No uplink could be added");
+        }
+
+
+        return (null, briefing);
+    }
+
+    // TODO: AntagCodewordsComponent
+    [SubscribeLocalEvent]
+    private void OnObjectivesTextPrepend(EntityUid uid, TraitorRuleComponent comp, ref ObjectivesTextPrependEvent args)
+    {
+        if(comp.GiveCodewords)
+            args.Text += "\n" + Loc.GetString("traitor-round-end-codewords", ("codewords", string.Join(", ", Codeword.GetCodewords(comp.CodewordFactionPrototypeId))));
+    }
+}
diff --git a/Content.Server/GameTicking/Rules/ServerXenoborgsRuleSystem.cs b/Content.Server/GameTicking/Rules/ServerXenoborgsRuleSystem.cs
new file mode 100644
index 0000000000..69dce2495e
--- /dev/null
+++ b/Content.Server/GameTicking/Rules/ServerXenoborgsRuleSystem.cs
@@ -0,0 +1,43 @@
+using Content.Server.RoundEnd;
+using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules;
+using Content.Shared.GameTicking.Rules.Components;
+using Content.Shared.Objectives.Systems;
+using Robust.Shared.Timing;
+
+namespace Content.Server.GameTicking.Rules;
+
+public sealed partial class ServerXenoborgsRuleSystem : XenoborgsRuleSystem
+{
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private RoundEndSystem _roundEnd = default!;
+    [Dependency] private AliveHumanoidTargetSystem _target = default!;
+
+    protected override void ActiveTick(EntityUid uid, XenoborgsRuleComponent component, GameRuleComponent gameRule, float frameTime)
+    {
+        base.ActiveTick(uid, component, gameRule, frameTime);
+
+        if (!component.NextRoundEndCheck.HasValue || component.NextRoundEndCheck > _timing.CurTime)
+            return;
+
+        CheckRoundEnd(component);
+        component.NextRoundEndCheck = _timing.CurTime + component.EndCheckDelay;
+    }
+
+    private void CheckRoundEnd(XenoborgsRuleComponent xenoborgsRuleComponent)
+    {
+        var numXenoborgs = GetNumberXenoborgs();
+        var numHumans = _target.GetMinds().Count;
+
+        xenoborgsRuleComponent.MaxNumberXenoborgs = Math.Max(xenoborgsRuleComponent.MaxNumberXenoborgs, numXenoborgs);
+
+        if (xenoborgsRuleComponent.XenoborgShuttleCalled
+            || (float)numXenoborgs / (numHumans + numXenoborgs) <= xenoborgsRuleComponent.XenoborgShuttleCallPercentage
+            || _roundEnd.IsRoundEndRequested())
+            return;
+
+        GameTicker.StationAnnouncement("xenoborg-shuttle-call", color: Color.BlueViolet);
+        _roundEnd.RequestRoundEnd(null, null, false, cantRecall: true);
+        xenoborgsRuleComponent.XenoborgShuttleCalled = true;
+    }
+}
diff --git a/Content.Server/GameTicking/Rules/ServerZombieRuleSystem.cs b/Content.Server/GameTicking/Rules/ServerZombieRuleSystem.cs
new file mode 100644
index 0000000000..f61d69b6de
--- /dev/null
+++ b/Content.Server/GameTicking/Rules/ServerZombieRuleSystem.cs
@@ -0,0 +1,60 @@
+using Content.Server.Chat.Systems;
+using Content.Server.Popups;
+using Content.Server.RoundEnd;
+using Content.Server.Zombies;
+using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules;
+using Content.Shared.GameTicking.Rules.Components;
+using Content.Shared.Zombies;
+
+namespace Content.Server.GameTicking.Rules;
+
+public sealed partial class ServerZombieRuleSystem : ZombieRuleSystem
+{
+    [Dependency] private ChatSystem _chat = default!;
+    [Dependency] private PopupSystem _popup = default!;
+    [Dependency] private RoundEndSystem _roundEnd = default!;
+    [Dependency] private ZombieSystem _zombie = default!;
+
+    protected override void ActiveTick(EntityUid uid, ZombieRuleComponent component, GameRuleComponent gameRule, float frameTime)
+    {
+        base.ActiveTick(uid, component, gameRule, frameTime);
+        if (!component.NextRoundEndCheck.HasValue || component.NextRoundEndCheck > Timing.CurTime)
+            return;
+        CheckRoundEnd(component);
+        component.NextRoundEndCheck = Timing.CurTime + component.EndCheckDelay;
+    }
+
+    /// <summary>
+    ///     The big kahoona function for checking if the round is gonna end
+    /// </summary>
+    private void CheckRoundEnd(ZombieRuleComponent zombieRuleComponent)
+    {
+        var healthy = GetHealthyHumans();
+        if (healthy.Count == 1) // Only one human left. spooky
+            _popup.PopupEntity(Loc.GetString("zombie-alone"), healthy[0], healthy[0]);
+
+        if (GetInfectedFraction(false) > zombieRuleComponent.ZombieShuttleCallPercentage && !_roundEnd.IsRoundEndRequested())
+        {
+            foreach (var station in Station.GetStations())
+            {
+                _chat.DispatchStationAnnouncement(station, Loc.GetString("zombie-shuttle-call"), colorOverride: Color.Crimson);
+            }
+
+            _roundEnd.DoRoundEndBehavior(zombieRuleComponent.ZombieRoundEndBehavior, zombieRuleComponent.ZombieEvacShuttleTime);
+        }
+
+        // we include dead for this count because we don't want to end the round
+        // when everyone gets on the shuttle.
+        if (GetInfectedFraction() >= 1) // Oops, all zombies
+            _roundEnd.EndRound();
+    }
+
+    [SubscribeLocalEvent]
+    private void OnZombifySelf(EntityUid uid, IncurableZombieComponent component, ZombifySelfActionEvent args)
+    {
+        _zombie.ZombifyEntity(uid);
+        if (component.Action != null)
+            Del(component.Action.Value);
+    }
+}
diff --git a/Content.Server/GameTicking/Rules/SubGamemodesSystem.cs b/Content.Server/GameTicking/Rules/SubGamemodesSystem.cs
index 069a4d5ccc..ff58164a40 100644
--- a/Content.Server/GameTicking/Rules/SubGamemodesSystem.cs
+++ b/Content.Server/GameTicking/Rules/SubGamemodesSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.GameTicking.Rules.Components;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules;
 using Content.Shared.Storage;
 
 namespace Content.Server.GameTicking.Rules;
diff --git a/Content.Server/GameTicking/Rules/VariationPass/BaseEntityReplaceVariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/BaseEntityReplaceVariationPassSystem.cs
index f264272cb9..9b81a622c2 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/BaseEntityReplaceVariationPassSystem.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/BaseEntityReplaceVariationPassSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameTicking.Rules.VariationPass.Components;
+using Content.Server.GameTicking.Rules.VariationPass.Components;
 using Content.Shared.Storage;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
diff --git a/Content.Server/GameTicking/Rules/VariationPass/Components/EntityReplaceVariationPassComponent.cs b/Content.Server/GameTicking/Rules/VariationPass/Components/EntityReplaceVariationPassComponent.cs
index 6603251754..08bd5a9b5b 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/Components/EntityReplaceVariationPassComponent.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/Components/EntityReplaceVariationPassComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Storage;
+using Content.Shared.Storage;
 using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/GameTicking/Rules/VariationPass/Components/EntitySpawnVariationPassComponent.cs b/Content.Server/GameTicking/Rules/VariationPass/Components/EntitySpawnVariationPassComponent.cs
index f7ddd7ce9d..87ac90918e 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/Components/EntitySpawnVariationPassComponent.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/Components/EntitySpawnVariationPassComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Random;
+using Content.Shared.Random;
 using Content.Shared.Storage;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/GameTicking/Rules/VariationPass/Components/PoweredLightVariationPassComponent.cs b/Content.Server/GameTicking/Rules/VariationPass/Components/PoweredLightVariationPassComponent.cs
index 98c58e0a04..f5637c0b8e 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/Components/PoweredLightVariationPassComponent.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/Components/PoweredLightVariationPassComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Light.Components;
+using Content.Shared.Light.Components;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.GameTicking.Rules.VariationPass.Components;
diff --git a/Content.Server/GameTicking/Rules/VariationPass/Components/PuddleMessVariationPassComponent.cs b/Content.Server/GameTicking/Rules/VariationPass/Components/PuddleMessVariationPassComponent.cs
index 787d338652..bf9e670004 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/Components/PuddleMessVariationPassComponent.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/Components/PuddleMessVariationPassComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Random;
+using Content.Shared.Random;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.GameTicking.Rules.VariationPass.Components;
diff --git a/Content.Server/GameTicking/Rules/VariationPass/Components/ReinforcedWallReplaceVariationPassComponent.cs b/Content.Server/GameTicking/Rules/VariationPass/Components/ReinforcedWallReplaceVariationPassComponent.cs
index 82095fe224..2b857418e4 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/Components/ReinforcedWallReplaceVariationPassComponent.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/Components/ReinforcedWallReplaceVariationPassComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.GameTicking.Rules.VariationPass.Components;
+namespace Content.Server.GameTicking.Rules.VariationPass.Components;
 
 
 [RegisterComponent]
diff --git a/Content.Server/GameTicking/Rules/VariationPass/Components/ReplacementMarkers/ReinforcedWallReplacementMarkerComponent.cs b/Content.Server/GameTicking/Rules/VariationPass/Components/ReplacementMarkers/ReinforcedWallReplacementMarkerComponent.cs
index 00f55b7e25..c50ed877c4 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/Components/ReplacementMarkers/ReinforcedWallReplacementMarkerComponent.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/Components/ReplacementMarkers/ReinforcedWallReplacementMarkerComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.GameTicking.Rules.VariationPass.Components.ReplacementMarkers;
+namespace Content.Server.GameTicking.Rules.VariationPass.Components.ReplacementMarkers;
 
 /// <summary>
 /// This component marks replaceable reinforced walls for use with fast queries in variation passes.
diff --git a/Content.Server/GameTicking/Rules/VariationPass/Components/ReplacementMarkers/WallReplacementMarkerComponent.cs b/Content.Server/GameTicking/Rules/VariationPass/Components/ReplacementMarkers/WallReplacementMarkerComponent.cs
index 6df0432198..9f8d46d8d5 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/Components/ReplacementMarkers/WallReplacementMarkerComponent.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/Components/ReplacementMarkers/WallReplacementMarkerComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.GameTicking.Rules.VariationPass.Components.ReplacementMarkers;
+namespace Content.Server.GameTicking.Rules.VariationPass.Components.ReplacementMarkers;
 
 /// <summary>
 /// This component marks replaceable walls for use with fast queries in variation passes.
diff --git a/Content.Server/GameTicking/Rules/VariationPass/Components/WallReplaceVariationPassComponent.cs b/Content.Server/GameTicking/Rules/VariationPass/Components/WallReplaceVariationPassComponent.cs
index 3598deeb26..8a4c949efb 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/Components/WallReplaceVariationPassComponent.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/Components/WallReplaceVariationPassComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.GameTicking.Rules.VariationPass.Components;
+namespace Content.Server.GameTicking.Rules.VariationPass.Components;
 
 
 [RegisterComponent]
diff --git a/Content.Server/GameTicking/Rules/VariationPass/EntitySpawnVariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/EntitySpawnVariationPassSystem.cs
index 9014ad0e4d..50d998c6c6 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/EntitySpawnVariationPassSystem.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/EntitySpawnVariationPassSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameTicking.Rules.VariationPass.Components;
+using Content.Server.GameTicking.Rules.VariationPass.Components;
 using Content.Shared.Storage;
 using Robust.Shared.Random;
 
@@ -16,7 +16,7 @@ public sealed partial class EntitySpawnVariationPassSystem : VariationPassSystem
 
         for (var i = 0; i < trashTiles; i++)
         {
-            if (!TryFindRandomTileOnStation(args.Station, out _, out _, out var coords))
+            if (!Stations.TryFindRandomTileOnStation(args.Station, out _, out _, out var coords))
                 continue;
 
             var ents = EntitySpawnCollection.GetSpawns(ent.Comp.Entities, Random);
diff --git a/Content.Server/GameTicking/Rules/VariationPass/PoweredLightVariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/PoweredLightVariationPassSystem.cs
index 385ddd69c9..185b8204c6 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/PoweredLightVariationPassSystem.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/PoweredLightVariationPassSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameTicking.Rules.VariationPass.Components;
+using Content.Server.GameTicking.Rules.VariationPass.Components;
 using Content.Server.Light.Components;
 using Content.Server.Light.EntitySystems;
 using Content.Shared.Light.Components;
diff --git a/Content.Server/GameTicking/Rules/VariationPass/PuddleMessVariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/PuddleMessVariationPassSystem.cs
index 360c3378bc..67f31b5a15 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/PuddleMessVariationPassSystem.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/PuddleMessVariationPassSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Fluids.EntitySystems;
+using Content.Server.Fluids.EntitySystems;
 using Content.Server.GameTicking.Rules.VariationPass.Components;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Random.Helpers;
@@ -23,7 +23,7 @@ public sealed partial class PuddleMessVariationPassSystem : VariationPassSystem<
 
         for (var i = 0; i < puddleTiles; i++)
         {
-            if (!TryFindRandomTileOnStation(args.Station, out _, out _, out var coords))
+            if (!Stations.TryFindRandomTileOnStation(args.Station, out _, out _, out var coords))
                 continue;
 
             var sol = proto.Pick(Random);
diff --git a/Content.Server/GameTicking/Rules/VariationPass/ReinforcedWallReplaceVariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/ReinforcedWallReplaceVariationPassSystem.cs
index 84fd05713d..a831ec464f 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/ReinforcedWallReplaceVariationPassSystem.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/ReinforcedWallReplaceVariationPassSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameTicking.Rules.VariationPass.Components;
+using Content.Server.GameTicking.Rules.VariationPass.Components;
 using Content.Server.GameTicking.Rules.VariationPass.Components.ReplacementMarkers;
 
 namespace Content.Server.GameTicking.Rules.VariationPass;
diff --git a/Content.Server/GameTicking/Rules/VariationPass/VariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/VariationPassSystem.cs
index ff64b168f1..a3edaff886 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/VariationPassSystem.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/VariationPassSystem.cs
@@ -1,4 +1,5 @@
-using Content.Server.Station.Systems;
+using Content.Server.Station.Systems;
+using Content.Shared.GameTicking.Rules;
 using Robust.Shared.Random;
 
 namespace Content.Server.GameTicking.Rules.VariationPass;
@@ -10,7 +11,7 @@ namespace Content.Server.GameTicking.Rules.VariationPass;
 public abstract partial class VariationPassSystem<T> : GameRuleSystem<T>
     where T: IComponent
 {
-    [Dependency] protected StationSystem Stations = default!;
+    [Dependency] protected ServerStationSystem Stations = default!;
     [Dependency] protected IRobustRandom Random = default!;
 
     public override void Initialize()
diff --git a/Content.Server/GameTicking/Rules/VariationPass/WallReplaceVariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/WallReplaceVariationPassSystem.cs
index 54bec8efbe..9d093a7a0d 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/WallReplaceVariationPassSystem.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/WallReplaceVariationPassSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameTicking.Rules.VariationPass.Components;
+using Content.Server.GameTicking.Rules.VariationPass.Components;
 using Content.Server.GameTicking.Rules.VariationPass.Components.ReplacementMarkers;
 
 namespace Content.Server.GameTicking.Rules.VariationPass;
diff --git a/Content.Server/GameTicking/ServerGameTicker.CVars.cs b/Content.Server/GameTicking/ServerGameTicker.CVars.cs
new file mode 100644
index 0000000000..d147093008
--- /dev/null
+++ b/Content.Server/GameTicking/ServerGameTicker.CVars.cs
@@ -0,0 +1,101 @@
+using Content.Server.Discord;
+using Content.Shared.CCVar;
+using Content.Shared.GameTicking;
+
+namespace Content.Server.GameTicking;
+
+public sealed partial class ServerGameTicker
+{
+    [ViewVariables]
+    public bool LobbyEnabled { get; private set; }
+
+    [ViewVariables]
+    public bool DummyTicker { get; private set; } = false;
+
+    [ViewVariables]
+    public TimeSpan LobbyDuration { get; private set; } = TimeSpan.Zero;
+
+    [ViewVariables]
+    public bool DisallowLateJoin { get; private set; } = false;
+
+    [ViewVariables]
+    public string? ServerName { get; private set; }
+
+    [ViewVariables]
+    private string? DiscordRoundEndRole { get; set; }
+
+    private WebhookIdentifier? _webhookIdentifier;
+
+    [ViewVariables]
+    private string? RoundEndSoundCollection { get; set; }
+
+#if EXCEPTION_TOLERANCE
+        [ViewVariables]
+        public int RoundStartFailShutdownCount { get; private set; } = 0;
+#endif
+
+    protected override void InitializeCVars()
+    {
+        base.InitializeCVars();
+
+        Subs.CVar(Cfg, CCVars.ICRandomCharacters, e => _randomizeCharacters = e, true);
+        Subs.CVar(Cfg,
+            CCVars.GameLobbyEnabled,
+            value =>
+        {
+            LobbyEnabled = value;
+            foreach (var (userId, status) in _playerGameStatuses)
+            {
+                if (status == PlayerGameStatus.JoinedGame)
+                    continue;
+                _playerGameStatuses[userId] =
+                    LobbyEnabled ? PlayerGameStatus.NotReadyToPlay : PlayerGameStatus.ReadyToPlay;
+            }
+        },
+            true);
+        Subs.CVar(Cfg, CCVars.GameDummyTicker, value => DummyTicker = value, true);
+        Subs.CVar(Cfg, CCVars.GameLobbyDuration, value => LobbyDuration = TimeSpan.FromSeconds(value), true);
+        Subs.CVar(Cfg,
+            CCVars.GameDisallowLateJoins,
+            value =>
+            {
+                DisallowLateJoin = value;
+                UpdateLateJoinStatus();
+            },
+            true);
+        Subs.CVar(Cfg,
+            CCVars.AdminLogsServerName,
+            value =>
+        {
+            // TODO why tf is the server name on admin logs
+            ServerName = value;
+        },
+            true);
+        Subs.CVar(Cfg,
+            CCVars.DiscordRoundUpdateWebhook,
+            value =>
+        {
+            if (!string.IsNullOrWhiteSpace(value))
+            {
+                _discord.GetWebhook(value, data => _webhookIdentifier = data.ToIdentifier());
+            }
+        },
+            true);
+        Subs.CVar(Cfg,
+            CCVars.DiscordRoundEndRoleWebhook,
+            value =>
+        {
+            DiscordRoundEndRole = value;
+
+            if (value == string.Empty)
+            {
+                DiscordRoundEndRole = null;
+            }
+        },
+            true);
+        Subs.CVar(Cfg, CCVars.RoundEndSoundCollection, value => RoundEndSoundCollection = value, true);
+#if EXCEPTION_TOLERANCE
+            Subs.CVar(Cfg, CCVars.RoundStartFailShutdownCount, value => RoundStartFailShutdownCount = value, true);
+#endif
+    }
+}
diff --git a/Content.Server/GameTicking/ServerGameTicker.Chat.cs b/Content.Server/GameTicking/ServerGameTicker.Chat.cs
new file mode 100644
index 0000000000..712562db85
--- /dev/null
+++ b/Content.Server/GameTicking/ServerGameTicker.Chat.cs
@@ -0,0 +1,40 @@
+using Content.Shared.Station.Components;
+using Robust.Shared.Audio;
+using Robust.Shared.Map;
+using Robust.Shared.Player;
+
+namespace Content.Server.GameTicking;
+
+public sealed partial class ServerGameTicker
+{
+    public override void GameAnnouncement(LocId announcement, SoundSpecifier? announcementSound = null, Color? color = null)
+    {
+        var filter = Filter.Empty().AddWhere(UserHasJoinedGame);
+        Chat.DispatchFilteredAnnouncement(filter, Loc.GetString(announcement), announcementSound: announcementSound, colorOverride: color);
+    }
+
+    public override void MapAnnouncement(MapId map, LocId announcement, SoundSpecifier? announcementSound = null, Color? color = null)
+    {
+        var filter = Filter.Empty().AddInMap(map);
+        Chat.DispatchFilteredAnnouncement(filter, Loc.GetString(announcement), announcementSound: announcementSound, colorOverride: color);
+    }
+
+    public override void StationMapAnnouncement(Entity<StationDataComponent> station, LocId announcement, SoundSpecifier? announcementSound = null, Color? color = null)
+    {
+        var filter = Station.GetOnMap(station.Comp);
+        Chat.DispatchFilteredAnnouncement(filter, Loc.GetString(announcement), announcementSound: announcementSound, colorOverride: color);
+    }
+
+    public override void StationAnnouncement(LocId announcement, SoundSpecifier? announcementSound = null, Color? color = null)
+    {
+        foreach (var station in Station.GetStations())
+        {
+            StationAnnouncement(station, announcement, announcementSound, color);
+        }
+    }
+
+    public override void StationAnnouncement(EntityUid station, LocId announcement, SoundSpecifier? announcementSound = null, Color? color = null)
+    {
+        _chatSystem.DispatchStationAnnouncement(station, Loc.GetString(announcement), announcementSound: announcementSound, colorOverride: color);
+    }
+}
diff --git a/Content.Server/GameTicking/GameTicker.GamePreset.cs b/Content.Server/GameTicking/ServerGameTicker.GamePreset.cs
similarity index 75%
rename from Content.Server/GameTicking/GameTicker.GamePreset.cs
rename to Content.Server/GameTicking/ServerGameTicker.GamePreset.cs
index 9a473cd4e6..ac3f754f36 100644
--- a/Content.Server/GameTicking/GameTicker.GamePreset.cs
+++ b/Content.Server/GameTicking/ServerGameTicker.GamePreset.cs
@@ -1,18 +1,14 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameTicking.Presets;
-using Content.Server.Maps;
 using Content.Shared.CCVar;
-using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Prototypes;
 using Content.Shared.Maps;
-using JetBrains.Annotations;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
 
 namespace Content.Server.GameTicking;
 
-public sealed partial class GameTicker
+public sealed partial class ServerGameTicker
 {
     public const float PresetFailedCooldownIncrease = 30f;
 
@@ -38,7 +34,7 @@ public sealed partial class GameTicker
 
     private bool StartPreset(ICommonSession[] origReadyPlayers, bool force)
     {
-        _sawmill.Info($"Attempting to start preset '{CurrentPreset?.ID}'");
+        Log.Info($"Attempting to start preset '{CurrentPreset?.ID}'");
         var startAttempt = new RoundStartAttemptEvent(origReadyPlayers, force);
         RaiseLocalEvent(startAttempt);
 
@@ -55,17 +51,17 @@ public sealed partial class GameTicker
             DelayStart(TimeSpan.FromSeconds(PresetFailedCooldownIncrease));
         }
 
-        if (_cfg.GetCVar(CCVars.GameLobbyFallbackEnabled))
+        if (Cfg.GetCVar(CCVars.GameLobbyFallbackEnabled))
         {
-            var fallbackPresets = _cfg.GetCVar(CCVars.GameLobbyFallbackPreset).Split(",");
+            var fallbackPresets = Cfg.GetCVar(CCVars.GameLobbyFallbackPreset).Split(",");
             var startFailed = true;
 
-            _sawmill.Info($"Fallback - Failed to start round, attempting to start fallback presets.");
+            Log.Info($"Fallback - Failed to start round, attempting to start fallback presets.");
             foreach (var preset in fallbackPresets)
             {
-                _sawmill.Info($"Fallback - Clearing up gamerules");
+                Log.Info($"Fallback - Clearing up gamerules");
                 ClearGameRules();
-                _sawmill.Info($"Fallback - Attempting to start '{preset}'");
+                Log.Info($"Fallback - Attempting to start '{preset}'");
                 SetGamePreset(preset, resetDelay: 1);
                 AddGamePresetRules();
                 StartGamePresetRules();
@@ -83,7 +79,7 @@ public sealed partial class GameTicker
                     startFailed = false;
                     break;
                 }
-                _sawmill.Info($"Fallback - '{preset}' failed to start.");
+                Log.Info($"Fallback - '{preset}' failed to start.");
             }
 
             if (startFailed)
@@ -95,7 +91,7 @@ public sealed partial class GameTicker
 
         else
         {
-            _sawmill.Info($"Fallback - Failed to start preset but fallbacks are disabled. Returning to Lobby.");
+            Log.Info($"Fallback - Failed to start preset but fallbacks are disabled. Returning to Lobby.");
             FailedPresetRestart();
             return false;
         }
@@ -105,7 +101,7 @@ public sealed partial class GameTicker
 
     private void InitializeGamePreset()
     {
-        SetGamePreset(LobbyEnabled ? _cfg.GetCVar(CCVars.GameLobbyDefaultPreset) : "sandbox");
+        SetGamePreset(LobbyEnabled ? Cfg.GetCVar(CCVars.GameLobbyDefaultPreset) : "sandbox");
     }
 
     public void SetGamePreset(GamePresetPrototype? preset, bool force = false, GamePresetPrototype? decoy = null, int? resetDelay = null)
@@ -203,7 +199,7 @@ public sealed partial class GameTicker
         CurrentPreset = Preset;
         foreach (var rule in Preset.Rules)
         {
-            AddFilteredGameRule(rule);
+            AddGameRule(rule);
         }
 
         return true;
@@ -228,44 +224,9 @@ public sealed partial class GameTicker
         }
     }
 
-    /// <inhereitdoc cref="GetMinimumPlayerCount(GamePresetPrototype)"/>
-    [PublicAPI]
-    public int GetMinimumPlayerCount(ProtoId<GamePresetPrototype> proto)
-    {
-        if (!ProtoMan.Resolve(proto, out var preset))
-            return 0;
-
-        return GetMinimumPlayerCount(preset);
-    }
-
-    /// <summary>
-    /// Gets the minimum number of players required for a game preset to start.
-    /// Checks both the preset itself, and all rules to find the minimum.
-    /// </summary>
-    /// <param name="proto">Game preset prototype we're checking.</param>
-    /// <returns>Minimum number of players required for the rule to start.</returns>
-    [PublicAPI]
-    public int GetMinimumPlayerCount(GamePresetPrototype proto)
-    {
-        var min = proto.MinPlayers ?? 0;
-        foreach (var entProto in proto.Rules)
-        {
-            if (!ProtoMan.Resolve(entProto, out var ent))
-                continue;
-
-            if (!ent.TryComp<GameRuleComponent>(out var rule, Factory))
-                continue;
-
-            min = Math.Max(min, rule.MinPlayers);
-        }
-
-        return min;
-    }
-
     private void IncrementRoundNumber()
     {
         var playerIds = _playerGameStatuses.Keys.Select(player => player.UserId).ToArray();
-        var serverName = _cfg.GetCVar(CCVars.AdminLogsServerName);
 
         // TODO FIXME AAAAAAAAAAAAAAAAAAAH THIS IS BROKEN
         // Task.Run as a terrible dirty workaround to avoid synchronization context deadlock from .Result here.
diff --git a/Content.Server/GameTicking/ServerGameTicker.GameRule.cs b/Content.Server/GameTicking/ServerGameTicker.GameRule.cs
new file mode 100644
index 0000000000..32f7d8afdc
--- /dev/null
+++ b/Content.Server/GameTicking/ServerGameTicker.GameRule.cs
@@ -0,0 +1,240 @@
+using System.Linq;
+using System.Text;
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Content.Shared.Database;
+using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Components;
+using Robust.Shared.Console;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.GameTicking;
+
+public sealed partial class ServerGameTicker
+{
+    private void InitializeGameRules()
+    {
+        // Add game rule command.
+        _consoleHost.RegisterCommand("addgamerule",
+            string.Empty,
+            "addgamerule <rules>",
+            AddGameRuleCommand,
+            AddGameRuleCompletions);
+
+        // End game rule command.
+        _consoleHost.RegisterCommand("endgamerule",
+            string.Empty,
+            "endgamerule <rules>",
+            EndGameRuleCommand,
+            EndGameRuleCompletions);
+
+        // Clear game rules command.
+        _consoleHost.RegisterCommand("cleargamerules",
+            string.Empty,
+            "cleargamerules",
+            ClearGameRulesCommand);
+
+        // List game rules command.
+        var localizedHelp = Loc.GetString("listgamerules-command-help");
+
+        _consoleHost.RegisterCommand("listgamerules",
+            string.Empty,
+            $"listgamerules - {localizedHelp}",
+            ListGameRuleCommand);
+
+        SubscribeLocalEvent<RoundStartAttemptEvent>(OnStartAttempt);
+    }
+
+    private void ShutdownGameRules()
+    {
+        _consoleHost.UnregisterCommand("addgamerule");
+        _consoleHost.UnregisterCommand("endgamerule");
+        _consoleHost.UnregisterCommand("cleargamerules");
+        _consoleHost.UnregisterCommand("listgamerules");
+    }
+
+    /// <summary>
+    /// Adds a game rule to the list, but does not
+    /// start it yet, instead waiting until the rule is actually started by other code (usually roundstart)
+    /// </summary>
+    /// <returns>The entity for the added gamerule</returns>
+    protected override Entity<GameRuleComponent> SpawnGameRule(EntProtoId ruleId)
+    {
+        var ruleEntity = base.SpawnGameRule(ruleId);
+        var str = Loc.GetString("station-event-system-run-event", ("eventName", ToPrettyString(ruleEntity)));
+#if DEBUG
+        _chatManager.SendAdminAlert(str);
+#else
+        if (RunLevel == GameRunLevel.InRound) // avoids telling admins the round type before it starts so that can be handled elsewhere.
+            _chatManager.SendAdminAlert(str);
+#endif
+        Log.Info(str);
+
+        return ruleEntity;
+    }
+
+    public void ClearGameRules()
+    {
+        foreach (var rule in GetAddedGameRules())
+        {
+            EndGameRule(rule);
+        }
+    }
+
+    private void UpdateGameRules()
+    {
+        var query = EntityQueryEnumerator<DelayedStartRuleComponent, GameRuleComponent>();
+        while (query.MoveNext(out var uid, out var delay, out var rule))
+        {
+            if (Timing.CurTime < delay.RuleStartTime)
+                continue;
+
+            StartGameRule((uid, rule));
+        }
+    }
+
+    private void OnStartAttempt(RoundStartAttemptEvent args)
+    {
+        if (args.Forced || args.Cancelled)
+            return;
+
+        var query = EntityQueryEnumerator<GameRuleComponent>();
+        while (query.MoveNext(out var uid, out var gameRule))
+        {
+            var minPlayers = gameRule.MinPlayers;
+            var name = ToPrettyString(uid);
+
+            if (args.Players.Length >= minPlayers)
+                continue;
+
+            if (gameRule.CancelPresetOnTooFewPlayers)
+            {
+                _chatManager.SendAdminAnnouncement(Loc.GetString("preset-not-enough-ready-players",
+                    ("readyPlayersCount", args.Players.Length),
+                    ("minimumPlayers", minPlayers),
+                    ("presetName", name)));
+                args.Cancel();
+                //TODO remove this once announcements are logged
+                Log.Info($"Rule '{name}' requires {minPlayers} players, but only {args.Players.Length} are ready.");
+            }
+            else
+            {
+                EndGameRule((uid, gameRule));
+            }
+        }
+    }
+
+    #region Command Implementations
+
+    [AdminCommand(AdminFlags.Fun)]
+    private void AddGameRuleCommand(IConsoleShell shell, string argstr, string[] args)
+    {
+        if (args.Length == 0)
+            return;
+
+        foreach (var rule in args)
+        {
+            if (!ProtoMan.HasIndex(rule))
+            {
+                shell.WriteError($"Invalid game rule {rule} was skipped.");
+
+                continue;
+            }
+
+            if (shell.Player != null)
+            {
+                Admin.Add(LogType.EventStarted, $"{shell.Player} tried to add game rule [{rule}] via command");
+                _chatManager.SendAdminAnnouncement(Loc.GetString("add-gamerule-admin", ("rule", rule), ("admin", shell.Player)));
+            }
+            else
+            {
+                Admin.Add(LogType.EventStarted, $"Unknown tried to add game rule [{rule}] via command");
+            }
+            var ent = SpawnGameRule(rule);
+
+            // Start rule if we're already in the middle of a round
+            // TODO: DO WE EVEN NEED THIS CHECK???
+            if (RunLevel == GameRunLevel.InRound)
+                StartGameRule(ent.AsNullable());
+        }
+    }
+
+    private CompletionResult AddGameRuleCompletions(IConsoleShell shell, string[] args)
+    {
+        return CompletionResult.FromHintOptions(GetAllGameRulePrototypes().Select(p => p.ID), "<rule>");
+    }
+
+    [AdminCommand(AdminFlags.Fun)]
+    private void EndGameRuleCommand(IConsoleShell shell, string argstr, string[] args)
+    {
+        if (args.Length == 0)
+            return;
+
+        foreach (var rule in args)
+        {
+            if (!NetEntity.TryParse(rule, out var ruleEntNet) || !TryGetEntity(ruleEntNet, out var ruleEnt))
+                continue;
+            if (shell.Player != null)
+            {
+                Admin.Add(LogType.EventStopped, $"{shell.Player} tried to end game rule [{rule}] via command");
+            }
+            else
+            {
+                Admin.Add(LogType.EventStopped, $"Unknown tried to end game rule [{rule}] via command");
+            }
+
+            EndGameRule(ruleEnt.Value);
+        }
+    }
+
+    private CompletionResult EndGameRuleCompletions(IConsoleShell shell, string[] args)
+    {
+        var opts = GetAddedGameRules().Select(ent => new CompletionOption(ent.ToString(), ToPrettyString(ent))).ToList();
+        return CompletionResult.FromHintOptions(opts, "<added rule>");
+    }
+
+    [AdminCommand(AdminFlags.Fun)]
+    private void ClearGameRulesCommand(IConsoleShell shell, string argstr, string[] args)
+    {
+        ClearGameRules();
+    }
+
+    [AdminCommand(AdminFlags.Admin)]
+    private void ListGameRuleCommand(IConsoleShell shell, string argstr, string[] args)
+    {
+        Log.Info($"{shell.Player} tried to get list of game rules via command");
+        Admin.Add(LogType.Action, $"{shell.Player} tried to get list of game rules via command");
+        var message = GetGameRulesListMessage(false);
+        shell.WriteLine(message);
+    }
+
+    private string GetGameRulesListMessage(bool forChatWindow)
+    {
+        if (AllRoundGameRules.Count > 0)
+        {
+            var message = new StringBuilder();
+            message.AppendLine();
+
+            if (!forChatWindow)
+            {
+                var header = Loc.GetString("list-gamerule-admin-header");
+                message.AppendLine();
+                message.AppendLine(header);
+                message.AppendLine("|------------|---------------------------");
+            }
+
+            foreach (var (time, rule, stage) in AllRoundGameRules)
+            {
+                var formattedTime = time.ToString(@"hh\:mm\:ss");
+                var name = RuleToString(rule, stage);
+                message.AppendLine($"| {formattedTime,-10} | {name,-24} ");
+            }
+
+            return message.ToString().TrimEnd('\n');
+        }
+
+        return Loc.GetString("list-gamerule-admin-no-rules");
+    }
+
+    #endregion
+}
diff --git a/Content.Server/GameTicking/ServerGameTicker.Lobby.cs b/Content.Server/GameTicking/ServerGameTicker.Lobby.cs
new file mode 100644
index 0000000000..7098562198
--- /dev/null
+++ b/Content.Server/GameTicking/ServerGameTicker.Lobby.cs
@@ -0,0 +1,187 @@
+using System.Linq;
+using Content.Shared.GameTicking;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+using System.Text;
+using Content.Shared.Station.Components;
+
+namespace Content.Server.GameTicking;
+
+public sealed partial class ServerGameTicker
+{
+    [ViewVariables]
+    private readonly Dictionary<NetUserId, PlayerGameStatus> _playerGameStatuses = new();
+
+    [ViewVariables]
+    private TimeSpan _roundStartTime;
+
+    /// <summary>
+    /// How long before RoundStartTime do we load maps.
+    /// </summary>
+    [ViewVariables]
+    public TimeSpan RoundPreloadTime { get; } = TimeSpan.FromSeconds(15);
+
+    [ViewVariables]
+    private TimeSpan _pauseTime;
+
+    [ViewVariables]
+    public new bool Paused { get; set; }
+
+    [ViewVariables]
+    private bool _roundStartCountdownHasNotStartedYetDueToNoPlayers;
+
+    /// <summary>
+    /// The game status of a players user Id. May contain disconnected players
+    /// </summary>
+    public IReadOnlyDictionary<NetUserId, PlayerGameStatus> PlayerGameStatuses => _playerGameStatuses;
+
+    public void UpdateInfoText()
+    {
+        RaiseNetworkEvent(GetInfoMsg(), Filter.Empty().AddPlayers(_playerManager.NetworkedSessions));
+    }
+
+    // TODO: You can move this to shared.
+    // TODO: You *should* move this to shared >:)
+    // TODO: If you are reading this, move this to shared!
+    private string GetInfoText()
+    {
+        var preset = CurrentPreset ?? Preset;
+        if (preset == null)
+        {
+            return string.Empty;
+        }
+
+        var playerCount = $"{_playerManager.PlayerCount}";
+        var readyCount = _playerGameStatuses.Values.Count(x => x == PlayerGameStatus.ReadyToPlay);
+
+        var stationNames = new StringBuilder();
+        var query =
+            EntityQueryEnumerator<StationJobsComponent, StationSpawningComponent, MetaDataComponent>();
+
+        var foundOne = false;
+
+        while (query.MoveNext(out _, out _, out var meta))
+        {
+            foundOne = true;
+            if (stationNames.Length > 0)
+                stationNames.Append('\n');
+
+            stationNames.Append(meta.EntityName);
+        }
+
+        if (!foundOne)
+        {
+            stationNames.Append(_gameMapManager.GetSelectedMap()?.MapName ??
+                                Loc.GetString("game-ticker-no-map-selected"));
+        }
+
+        var gmTitle = (Decoy == null) ? Loc.GetString(preset.ModeTitle) : Loc.GetString(Decoy.ModeTitle);
+        var desc = (Decoy == null) ? Loc.GetString(preset.Description) : Loc.GetString(Decoy.Description);
+        return Loc.GetString(
+            RunLevel == GameRunLevel.PreRoundLobby
+                ? "game-ticker-get-info-preround-text"
+                : "game-ticker-get-info-text",
+            ("roundId", RoundId),
+            ("playerCount", playerCount),
+            ("readyCount", readyCount),
+            ("mapName", stationNames.ToString()),
+            ("gmTitle", gmTitle),
+            ("desc", desc));
+    }
+
+    private TickerConnectionStatusEvent GetConnectionStatusMsg()
+    {
+        return new TickerConnectionStatusEvent(RoundStartTimeSpan);
+    }
+
+    private TickerLobbyStatusEvent GetStatusMsg(ICommonSession session)
+    {
+        _playerGameStatuses.TryGetValue(session.UserId, out var status);
+        return new TickerLobbyStatusEvent(RunLevel != GameRunLevel.PreRoundLobby, LobbyBackground, status == PlayerGameStatus.ReadyToPlay, _roundStartTime, RoundPreloadTime, RoundStartTimeSpan, Paused);
+    }
+
+    private void SendStatusToAll()
+    {
+        foreach (var player in _playerManager.Sessions)
+        {
+            RaiseNetworkEvent(GetStatusMsg(player), player.Channel);
+        }
+    }
+
+    private TickerLobbyInfoEvent GetInfoMsg()
+    {
+        return new(GetInfoText());
+    }
+
+    private void UpdateLateJoinStatus()
+    {
+        RaiseNetworkEvent(new TickerLateJoinStatusEvent(DisallowLateJoin));
+    }
+
+    public bool PauseStart(bool pause = true)
+    {
+        if (Paused == pause)
+        {
+            return false;
+        }
+
+        Paused = pause;
+
+        if (pause)
+        {
+            _pauseTime = Timing.CurTime;
+        }
+        else if (_pauseTime != default)
+        {
+            _roundStartTime += Timing.CurTime - _pauseTime;
+        }
+
+        RaiseNetworkEvent(new TickerLobbyCountdownEvent(_roundStartTime, Paused));
+
+        _chatManager.DispatchServerAnnouncement(Loc.GetString(Paused
+            ? "game-ticker-pause-start"
+            : "game-ticker-pause-start-resumed"));
+
+        return true;
+    }
+
+    public bool TogglePause()
+    {
+        PauseStart(!Paused);
+        return Paused;
+    }
+
+    public void ToggleReadyAll(bool ready)
+    {
+        var status = ready ? PlayerGameStatus.ReadyToPlay : PlayerGameStatus.NotReadyToPlay;
+        foreach (var playerUserId in _playerGameStatuses.Keys)
+        {
+            _playerGameStatuses[playerUserId] = status;
+            if (!_playerManager.TryGetSessionById(playerUserId, out var playerSession))
+                continue;
+            RaiseNetworkEvent(GetStatusMsg(playerSession), playerSession.Channel);
+        }
+    }
+
+    public void ToggleReady(ICommonSession player, bool ready)
+    {
+        if (!_playerGameStatuses.ContainsKey(player.UserId))
+            return;
+
+        if (!_userDb.IsLoadComplete(player))
+            return;
+
+        if (RunLevel != GameRunLevel.PreRoundLobby)
+        {
+            return;
+        }
+
+        _playerGameStatuses[player.UserId] = ready ? PlayerGameStatus.ReadyToPlay : PlayerGameStatus.NotReadyToPlay;
+        RaiseNetworkEvent(GetStatusMsg(player), player.Channel);
+        // update server info to reflect new ready count
+        UpdateInfoText();
+    }
+
+    public override bool UserHasJoinedGame(NetUserId userId)
+        => PlayerGameStatuses.TryGetValue(userId, out var status) && status == PlayerGameStatus.JoinedGame;
+}
diff --git a/Content.Server/GameTicking/GameTicker.LobbyBackground.cs b/Content.Server/GameTicking/ServerGameTicker.LobbyBackground.cs
similarity index 92%
rename from Content.Server/GameTicking/GameTicker.LobbyBackground.cs
rename to Content.Server/GameTicking/ServerGameTicker.LobbyBackground.cs
index bf522919a3..21b50b1bf3 100644
--- a/Content.Server/GameTicking/GameTicker.LobbyBackground.cs
+++ b/Content.Server/GameTicking/ServerGameTicker.LobbyBackground.cs
@@ -5,7 +5,7 @@ using System.Linq;
 
 namespace Content.Server.GameTicking;
 
-public sealed partial class GameTicker
+public sealed partial class ServerGameTicker
 {
     [ViewVariables]
     public ProtoId<LobbyBackgroundPrototype>? LobbyBackground { get; private set; }
@@ -37,7 +37,7 @@ public sealed partial class GameTicker
     private void RandomizeLobbyBackground()
     {
         if (_lobbyBackgrounds != null && _lobbyBackgrounds.Count != 0)
-            LobbyBackground = _robustRandom.Pick(_lobbyBackgrounds);
+            LobbyBackground = Random.Pick(_lobbyBackgrounds);
         else
             LobbyBackground = null;
     }
diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/ServerGameTicker.Player.cs
similarity index 85%
rename from Content.Server/GameTicking/GameTicker.Player.cs
rename to Content.Server/GameTicking/ServerGameTicker.Player.cs
index 18ee32ca78..5458c6608c 100644
--- a/Content.Server/GameTicking/GameTicker.Player.cs
+++ b/Content.Server/GameTicking/ServerGameTicker.Player.cs
@@ -18,7 +18,7 @@ using Robust.Shared.Utility;
 namespace Content.Server.GameTicking
 {
     [UsedImplicitly]
-    public sealed partial class GameTicker
+    public sealed partial class ServerGameTicker
     {
         [Dependency] private IPlayerManager _playerManager = default!;
 
@@ -32,7 +32,7 @@ namespace Content.Server.GameTicking
         {
             var session = args.Session;
 
-            if (_mind.TryGetMind(session.UserId, out var mindId, out var mind))
+            if (Mind.TryGetMind(session.UserId, out var mindId, out var mind))
             {
                 if (args.NewStatus != SessionStatus.Disconnected)
                 {
@@ -73,15 +73,15 @@ namespace Content.Server.GameTicking
 
                     RaiseNetworkEvent(GetConnectionStatusMsg(), session.Channel);
 
-                    if (firstConnection && _cfg.GetCVar(CCVars.AdminNewPlayerJoinSound))
-                        _audio.PlayGlobal(new SoundPathSpecifier("/Audio/Effects/newplayerping.ogg"),
+                    if (firstConnection && Cfg.GetCVar(CCVars.AdminNewPlayerJoinSound))
+                        Audio.PlayGlobal(new SoundPathSpecifier("/Audio/Effects/newplayerping.ogg"),
                             Filter.Empty().AddPlayers(_adminManager.ActiveAdmins), false,
                             audioParams: new AudioParams { Volume = -5f });
 
                     if (LobbyEnabled && _roundStartCountdownHasNotStartedYetDueToNoPlayers)
                     {
                         _roundStartCountdownHasNotStartedYetDueToNoPlayers = false;
-                        _roundStartTime = _gameTiming.CurTime + LobbyDuration;
+                        _roundStartTime = Timing.CurTime + LobbyDuration;
                     }
 
                     break;
@@ -98,7 +98,7 @@ namespace Content.Server.GameTicking
                         else
                             SpawnWaitDb();
 
-                        _adminLogger.Add(LogType.Connection, LogImpact.Low, $"User {args.Session:Player} attached to {(args.Session.AttachedEntity != null ? ToPrettyString(args.Session.AttachedEntity) : "nothing"):entity} connected to the game.");
+                        Admin.Add(LogType.Connection, LogImpact.Low, $"User {args.Session:Player} attached to {(args.Session.AttachedEntity != null ? ToPrettyString(args.Session.AttachedEntity) : "nothing"):entity} connected to the game.");
                         break;
                     }
 
@@ -125,7 +125,7 @@ namespace Content.Server.GameTicking
                         }
                     }
 
-                    _adminLogger.Add(LogType.Connection, LogImpact.Low, $"User {args.Session:Player} attached to {(args.Session.AttachedEntity != null ? ToPrettyString(args.Session.AttachedEntity) : "nothing"):entity} connected to the game.");
+                    Admin.Add(LogType.Connection, LogImpact.Low, $"User {args.Session:Player} attached to {(args.Session.AttachedEntity != null ? ToPrettyString(args.Session.AttachedEntity) : "nothing"):entity} connected to the game.");
 
                     break;
                 }
@@ -141,8 +141,9 @@ namespace Content.Server.GameTicking
                     // Corvax-Queue-start: Delete data only if player was in game
                     if (_playerGameStatuses.ContainsKey(args.Session.UserId))
                     {
-                        _userDb.ClientDisconnected(session);
-                        _adminLogger.Add(LogType.Connection, LogImpact.Low, $"User {args.Session:Player} attached to {(args.Session.AttachedEntity != null ? ToPrettyString(args.Session.AttachedEntity) : "nothing"):entity} disconnected from the game.");
+                    _userDb.ClientDisconnected(session);
+
+                    Admin.Add(LogType.Connection, LogImpact.Low, $"User {args.Session:Player} attached to {(args.Session.AttachedEntity != null ? ToPrettyString(args.Session.AttachedEntity) : "nothing"):entity} disconnected from the game.");
                     }
                     // Corvax-Queue-end
                     break;
@@ -185,7 +186,7 @@ namespace Content.Server.GameTicking
 
             async void AddPlayerToDb(Guid id)
             {
-                if (RoundId != 0 && _runLevel != GameRunLevel.PreRoundLobby)
+                if (RoundId != 0 && RunLevel != GameRunLevel.PreRoundLobby)
                 {
                     await _db.AddRoundPlayers(RoundId, id);
                 }
@@ -197,7 +198,7 @@ namespace Content.Server.GameTicking
             return (HumanoidCharacterProfile) _prefsManager.GetPreferences(p.UserId).SelectedCharacter;
         }
 
-        public void PlayerJoinGame(ICommonSession session, bool silent = false)
+        public override void PlayerJoinGame(ICommonSession session, bool silent = false)
         {
             if (!silent)
                 _chatManager.DispatchServerMessage(session, Loc.GetString("game-ticker-player-join-game-message"));
@@ -207,13 +208,15 @@ namespace Content.Server.GameTicking
 
             if (_adminManager.HasAdminFlag(session, AdminFlags.Admin))
             {
-                if (_allPreviousGameRules.Count > 0)
+                if (AllRoundGameRules.Count > 0)
                 {
+                    // TODO: Try version of this method
                     var rulesMessage = GetGameRulesListMessage(true);
                     _chatManager.SendAdminAnnouncementMessage(session, Loc.GetString("starting-rule-selected-preset", ("preset", rulesMessage)));
                 }
             }
 
+            // TODO: We may not need to network this anymore >:D
             RaiseNetworkEvent(new TickerJoinGameEvent(), session.Channel);
         }
 
diff --git a/Content.Server/GameTicking/GameTicker.Replays.cs b/Content.Server/GameTicking/ServerGameTicker.Replays.cs
similarity index 89%
rename from Content.Server/GameTicking/GameTicker.Replays.cs
rename to Content.Server/GameTicking/ServerGameTicker.Replays.cs
index 68b391f8e4..36f71f0869 100644
--- a/Content.Server/GameTicking/GameTicker.Replays.cs
+++ b/Content.Server/GameTicking/ServerGameTicker.Replays.cs
@@ -3,14 +3,13 @@ using Robust.Shared;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Replays;
 using Robust.Shared.Serialization.Manager;
-using Robust.Shared.Serialization.Markdown;
 using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Serialization.Markdown.Value;
 using Robust.Shared.Utility;
 
 namespace Content.Server.GameTicking;
 
-public sealed partial class GameTicker
+public sealed partial class ServerGameTicker
 {
     [Dependency] private IReplayRecordingManager _replays = default!;
     [Dependency] private IResourceManager _resourceManager = default!;
@@ -32,7 +31,7 @@ public sealed partial class GameTicker
     {
         try
         {
-            if (!_cfg.GetCVar(CCVars.ReplayAutoRecord))
+            if (!Cfg.GetCVar(CCVars.ReplayAutoRecord))
                 return;
 
             if (_replays.IsRecording)
@@ -45,7 +44,7 @@ public sealed partial class GameTicker
 
             var finalPath = GetAutoReplayPath();
             var recordPath = finalPath;
-            var tempDir = _cfg.GetCVar(CCVars.ReplayAutoRecordTempDir);
+            var tempDir = Cfg.GetCVar(CCVars.ReplayAutoRecordTempDir);
             ResPath? moveToPath = null;
 
             // Set the round end player and text back to null to prevent it from writing the previous round's data.
@@ -54,7 +53,7 @@ public sealed partial class GameTicker
 
             if (!string.IsNullOrEmpty(tempDir))
             {
-                var baseReplayPath = new ResPath(_cfg.GetCVar(CVars.ReplayDirectory)).ToRootedPath();
+                var baseReplayPath = new ResPath(Cfg.GetCVar(CVars.ReplayDirectory)).ToRootedPath();
                 moveToPath = baseReplayPath / finalPath;
 
                 var fileName = finalPath.Filename;
@@ -127,14 +126,14 @@ public sealed partial class GameTicker
         metadata["gamemode"] = new ValueDataNode(CurrentPreset != null ? Loc.GetString(CurrentPreset.ModeTitle) : string.Empty);
         metadata["roundEndPlayers"] = _serialman.WriteValue(_replayRoundPlayerInfo);
         metadata["roundEndText"] = new ValueDataNode(_replayRoundText);
-        metadata["server_id"] = new ValueDataNode(_cfg.GetCVar(CCVars.ServerId));
-        metadata["server_name"] = new ValueDataNode(_cfg.GetCVar(CCVars.AdminLogsServerName));
+        metadata["server_id"] = new ValueDataNode(Cfg.GetCVar(CCVars.ServerId));
+        metadata["server_name"] = new ValueDataNode(ServerName);
         metadata["roundId"] = new ValueDataNode(RoundId.ToString());
     }
 
     private ResPath GetAutoReplayPath()
     {
-        var cfgValue = _cfg.GetCVar(CCVars.ReplayAutoRecordName);
+        var cfgValue = Cfg.GetCVar(CCVars.ReplayAutoRecordName);
 
         var time = DateTime.UtcNow;
 
diff --git a/Content.Server/GameTicking/ServerGameTicker.RoundFlow.cs b/Content.Server/GameTicking/ServerGameTicker.RoundFlow.cs
new file mode 100644
index 0000000000..981ea1ab9c
--- /dev/null
+++ b/Content.Server/GameTicking/ServerGameTicker.RoundFlow.cs
@@ -0,0 +1,878 @@
+using System.Linq;
+using System.Numerics;
+using Content.Server.Announcements;
+using Content.Server.Discord;
+using Content.Server.GameTicking.Events;
+using Content.Server.Roles;
+using Content.Shared.CCVar;
+using Content.Shared.Database;
+using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Events;
+using Content.Shared.Maps;
+using Content.Shared.Mind;
+using Content.Shared.Players;
+using Content.Shared.Preferences;
+using Content.Shared.Roles.Components;
+using JetBrains.Annotations;
+using Prometheus;
+using Robust.Shared.Asynchronous;
+using Robust.Shared.Audio;
+using Robust.Shared.EntitySerialization;
+using Robust.Shared.Map;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+using Robust.Shared.Random;
+using Robust.Shared.Utility;
+
+namespace Content.Server.GameTicking;
+
+public sealed partial class ServerGameTicker
+{
+    [Dependency] private DiscordWebhook _discord = default!;
+    [Dependency] private RoleSystem _role = default!;
+    [Dependency] private ITaskManager _taskManager = default!;
+
+    private static readonly Counter RoundNumberMetric = Metrics.CreateCounter(
+        "ss14_round_number",
+        "Round number.");
+
+    private static readonly Gauge RoundLengthMetric = Metrics.CreateGauge(
+        "ss14_round_length",
+        "Round length in seconds.");
+
+#if EXCEPTION_TOLERANCE
+        [ViewVariables]
+        private int _roundStartFailCount = 0;
+#endif
+
+    [ViewVariables]
+    private bool _startingRound;
+
+    private RoundEndMessageEvent.RoundEndPlayerInfo[]? _replayRoundPlayerInfo;
+
+    private string? _replayRoundText;
+
+    /// <summary>
+    /// Returns true if the round's map is eligible to be updated.
+    /// </summary>
+    /// <returns></returns>
+    public bool CanUpdateMap()
+    {
+        return RunLevel == GameRunLevel.PreRoundLobby &&
+               _roundStartTime - RoundPreloadTime > Timing.CurTime;
+    }
+
+    /// <summary>
+    ///     Loads all the maps for the given round.
+    /// </summary>
+    /// <remarks>
+    ///     Must be called before the runlevel is set to InRound.
+    /// </remarks>
+    private void LoadMaps()
+    {
+        if (Map.MapExists(DefaultMap))
+            return;
+
+        AddGamePresetRules();
+
+        var maps = new List<GameMapPrototype>();
+
+        // the map might have been force-set by something
+        // (i.e. votemap or forcemap)
+        var mainStationMap = _gameMapManager.GetSelectedMap();
+        if (mainStationMap == null)
+        {
+            // otherwise set the map using the config rules
+            _gameMapManager.SelectMapByConfigRules();
+            mainStationMap = _gameMapManager.GetSelectedMap();
+        }
+
+        // Small chance the above could return no map.
+        // ideally SelectMapByConfigRules will always find a valid map
+        if (mainStationMap != null)
+        {
+            maps.Add(mainStationMap);
+        }
+        else
+        {
+            throw new Exception("invalid config; couldn't select a valid station map!");
+        }
+
+        if (CurrentPreset?.MapPool != null &&
+            ProtoMan.TryIndex(CurrentPreset.MapPool, out var pool) &&
+            !pool.Maps.Contains(mainStationMap.ID))
+        {
+            var msg = Loc.GetString("game-ticker-start-round-invalid-map",
+                ("map", mainStationMap.MapName),
+                ("mode", Loc.GetString(CurrentPreset.ModeTitle)));
+            Log.Debug(msg);
+            SendServerMessage(msg);
+        }
+
+        // Let game rules dictate what maps we should load.
+        RaiseLocalEvent(new LoadingMapsEvent(maps));
+
+        if (maps.Count == 0)
+        {
+            Map.CreateMap(out var mapId, runMapInit: false);
+            DefaultMap = mapId;
+            return;
+        }
+
+        for (var i = 0; i < maps.Count; i++)
+        {
+            LoadGameMap(maps[i], out var mapId);
+            DebugTools.Assert(!Map.IsInitialized(mapId));
+
+            if (i == 0)
+                DefaultMap = mapId;
+        }
+    }
+
+    public PreGameMapLoad RaisePreLoad(
+        GameMapPrototype proto,
+        DeserializationOptions? opts = null,
+        Vector2? offset = null,
+        Angle? rot = null)
+    {
+        offset ??= proto.MaxRandomOffset != 0f
+            ? Random.NextVector2(proto.MaxRandomOffset)
+            : Vector2.Zero;
+
+        rot ??= proto.RandomRotation
+            ? Random.NextAngle()
+            : Angle.Zero;
+
+        opts ??= DeserializationOptions.Default;
+        var ev = new PreGameMapLoad(proto, opts.Value, offset.Value, rot.Value);
+        RaiseLocalEvent(ev);
+        return ev;
+    }
+
+    public override IReadOnlyList<EntityUid> LoadGameMap(
+        GameMapPrototype proto,
+        out MapId mapId,
+        DeserializationOptions? options = null,
+        string? stationName = null,
+        Vector2? offset = null,
+        Angle? rot = null)
+    {
+        var ev = RaisePreLoad(proto, options, offset, rot);
+
+        if (ev.GameMap.IsGrid)
+        {
+            var mapUid = Map.CreateMap(out mapId, runMapInit: options?.InitializeMaps ?? false);
+            if (!_loader.TryLoadGrid(mapId,
+                    ev.GameMap.MapPath,
+                    out var grid,
+                    ev.Options,
+                    ev.Offset,
+                    ev.Rotation))
+            {
+                throw new Exception($"Failed to load game-map grid {ev.GameMap.ID}");
+            }
+
+            Meta.SetEntityName(mapUid, proto.MapName);
+            var g = new List<EntityUid> { grid.Value.Owner };
+            RaiseLocalEvent(new PostGameMapLoad(proto, mapId, g, stationName));
+            return g;
+        }
+
+        if (!_loader.TryLoadMap(ev.GameMap.MapPath,
+                out var map,
+                out var grids,
+                ev.Options,
+                ev.Offset,
+                ev.Rotation))
+        {
+            throw new Exception($"Failed to load game map {ev.GameMap.ID}");
+        }
+
+        mapId = map.Value.Comp.MapId;
+        Meta.SetEntityName(map.Value.Owner, proto.MapName);
+        var gridUids = grids.Select(x => x.Owner).ToList();
+        RaiseLocalEvent(new PostGameMapLoad(proto, mapId, gridUids, stationName));
+        return gridUids;
+    }
+
+    /// <summary>
+    /// Variant of <see cref="LoadGameMap"/> that attempts to assign the provided <see cref="MapId"/> to the
+    /// loaded map.
+    /// </summary>
+    public IReadOnlyList<EntityUid> LoadGameMapWithId(
+        GameMapPrototype proto,
+        MapId mapId,
+        DeserializationOptions? opts = null,
+        string? stationName = null,
+        Vector2? offset = null,
+        Angle? rot = null)
+    {
+        var ev = RaisePreLoad(proto, opts, offset, rot);
+
+        if (ev.GameMap.IsGrid)
+        {
+            var mapUid = Map.CreateMap(mapId);
+            if (!_loader.TryLoadGrid(mapId,
+                    ev.GameMap.MapPath,
+                    out var grid,
+                    ev.Options,
+                    ev.Offset,
+                    ev.Rotation))
+            {
+                throw new Exception($"Failed to load game-map grid {ev.GameMap.ID}");
+            }
+
+            Meta.SetEntityName(mapUid, proto.MapName);
+            var g = new List<EntityUid> { grid.Value.Owner };
+            RaiseLocalEvent(new PostGameMapLoad(proto, mapId, g, stationName));
+            return g;
+        }
+
+        if (!_loader.TryLoadMapWithId(
+                mapId,
+                ev.GameMap.MapPath,
+                out var map,
+                out var grids,
+                ev.Options,
+                ev.Offset,
+                ev.Rotation))
+        {
+            throw new Exception($"Failed to load map");
+        }
+
+        Meta.SetEntityName(map.Value.Owner, proto.MapName);
+        var gridUids = grids.Select(x => x.Owner).ToList();
+        RaiseLocalEvent(new PostGameMapLoad(proto, mapId, gridUids, stationName));
+        return gridUids;
+    }
+
+    /// <summary>
+    /// Variant of <see cref="LoadGameMap"/> that loads and then merges a game map onto an existing map.
+    /// </summary>
+    public IReadOnlyList<EntityUid> MergeGameMap(
+        GameMapPrototype proto,
+        MapId targetMap,
+        DeserializationOptions? opts = null,
+        string? stationName = null,
+        Vector2? offset = null,
+        Angle? rot = null)
+    {
+        // TODO MAP LOADING use a new event?
+        // This is quite different from the other methods, which will actually create a **new** map.
+        var ev = RaisePreLoad(proto, opts, offset, rot);
+
+        if (ev.GameMap.IsGrid)
+        {
+            if (!_loader.TryLoadGrid(targetMap,
+                    ev.GameMap.MapPath,
+                    out var grid,
+                    ev.Options,
+                    ev.Offset,
+                    ev.Rotation))
+            {
+                throw new Exception($"Failed to load game-map grid {ev.GameMap.ID}");
+            }
+
+            var g = new List<EntityUid> { grid.Value.Owner };
+            // TODO MAP LOADING use a new event?
+            RaiseLocalEvent(new PostGameMapLoad(proto, targetMap, g, stationName));
+            return g;
+        }
+
+        if (!_loader.TryMergeMap(targetMap,
+                ev.GameMap.MapPath,
+                out var grids,
+                ev.Options,
+                ev.Offset,
+                ev.Rotation))
+        {
+            throw new Exception($"Failed to load map");
+        }
+
+        var gridUids = grids.Select(x => x.Owner).ToList();
+
+        // TODO MAP LOADING use a new event?
+        RaiseLocalEvent(new PostGameMapLoad(proto, targetMap, gridUids, stationName));
+        return gridUids;
+    }
+
+    public override int ReadyPlayerCount()
+    {
+        var total = 0;
+        foreach (var (userId, status) in _playerGameStatuses)
+        {
+            if (LobbyEnabled && status == PlayerGameStatus.NotReadyToPlay)
+                continue;
+
+            if (!_playerManager.TryGetSessionById(userId, out _))
+                continue;
+
+            total++;
+        }
+
+        return total;
+    }
+
+    public void StartRound(bool force = false)
+    {
+#if EXCEPTION_TOLERANCE
+            try
+            {
+#endif
+        // If this game ticker is a dummy or the round is already being started, do nothing!
+        if (DummyTicker || _startingRound)
+            return;
+
+        _startingRound = true;
+
+        if (RoundId == 0)
+            IncrementRoundNumber();
+
+        ReplayStartRound();
+
+        DebugTools.Assert(RunLevel == GameRunLevel.PreRoundLobby);
+        Log.Info("Starting round!");
+
+        SendServerMessage(Loc.GetString("game-ticker-start-round"));
+
+        var readyPlayers = new List<ICommonSession>();
+        var readyPlayerProfiles = new Dictionary<NetUserId, HumanoidCharacterProfile>();
+        var autoDeAdmin = Cfg.GetCVar(CCVars.AdminDeadminOnJoin);
+        foreach (var (userId, status) in _playerGameStatuses)
+        {
+            if (LobbyEnabled && status != PlayerGameStatus.ReadyToPlay)
+                continue;
+
+            if (!_playerManager.TryGetSessionById(userId, out var session))
+                continue;
+
+            if (autoDeAdmin && _adminManager.IsAdmin(session))
+            {
+                _adminManager.DeAdmin(session);
+            }
+#if DEBUG
+            DebugTools.Assert(_userDb.IsLoadComplete(session), $"Player was readied up but didn't have user DB data loaded yet??");
+#endif
+
+            readyPlayers.Add(session);
+            HumanoidCharacterProfile profile;
+            if (_prefsManager.TryGetCachedPreferences(userId, out var preferences))
+            {
+                profile = preferences.SelectedCharacter;
+            }
+            else
+            {
+                var speciesToBlacklist =
+                    new HashSet<string>(Cfg.GetCVar(CCVars.ICNewAccountSpeciesBlacklist).Split(","));
+                profile = HumanoidCharacterProfile.Random(speciesToBlacklist);
+            }
+            readyPlayerProfiles.Add(userId, profile);
+        }
+
+        DebugTools.AssertEqual(readyPlayers.Count, ReadyPlayerCount());
+
+        // Just in case it hasn't been loaded previously we'll try loading it.
+        LoadMaps();
+
+        // map has been selected so update the lobby info text
+        // applies to players who didn't ready up
+        UpdateInfoText();
+
+        StartGamePresetRules();
+
+        RoundLengthMetric.Set(0);
+
+        var startingEvent = new RoundStartingEvent(RoundId);
+        RaiseLocalEvent(startingEvent);
+
+        var origReadyPlayers = readyPlayers.ToArray();
+
+        if (!StartPreset(origReadyPlayers, force))
+        {
+            _startingRound = false;
+            return;
+        }
+
+        // MapInitialize *before* spawning players, our codebase is too shit to do it afterwards...
+        Map.InitializeMap(DefaultMap);
+
+        SpawnPlayers(readyPlayers, readyPlayerProfiles, force);
+
+        _roundStartDateTime = DateTime.UtcNow;
+        RunLevel = GameRunLevel.InRound;
+
+        RoundStartTimeSpan = Timing.CurTime;
+        SendStatusToAll();
+        ReqWindowAttentionAll();
+        UpdateLateJoinStatus();
+        AnnounceRound();
+        UpdateInfoText();
+        SendRoundStartedDiscordMessage();
+
+#if EXCEPTION_TOLERANCE
+            }
+            catch (Exception e)
+            {
+                _roundStartFailCount++;
+
+                if (RoundStartFailShutdownCount > 0 && _roundStartFailCount >= RoundStartFailShutdownCount)
+                {
+                    Log.Fatal($"Failed to start a round {_roundStartFailCount} time(s) in a row... Shutting down!");
+                    _runtimeLog.LogException(e, nameof(GameTicker));
+                    _baseServer.Shutdown("Restarting server");
+                    return;
+                }
+
+                Log.Error($"Exception caught while trying to start the round! Restarting round...");
+                _runtimeLog.LogException(e, nameof(GameTicker));
+                _startingRound = false;
+                RestartRound();
+                return;
+            }
+
+            // Round started successfully! Reset counter...
+            _roundStartFailCount = 0;
+#endif
+        _startingRound = false;
+    }
+
+    private void RefreshLateJoinAllowed()
+    {
+        var refresh = new RefreshLateJoinAllowedEvent();
+        RaiseLocalEvent(refresh);
+        DisallowLateJoin = refresh.DisallowLateJoin;
+    }
+
+    public override void EndRound(string text = "")
+    {
+        // If this game ticker is a dummy, do nothing!
+        if (DummyTicker)
+            return;
+
+        DebugTools.Assert(RunLevel == GameRunLevel.InRound);
+        Log.Info("Ending round!");
+
+        RunLevel = GameRunLevel.PostRound;
+
+        try
+        {
+            ShowRoundEndScoreboard(text);
+        }
+        catch (Exception e)
+        {
+            Log.Error($"Error while showing round end scoreboard: {e}");
+        }
+
+        try
+        {
+            SendRoundEndDiscordMessage();
+        }
+        catch (Exception e)
+        {
+            Log.Error($"Error while sending round end Discord message: {e}");
+        }
+    }
+
+    public void ShowRoundEndScoreboard(string text = "")
+    {
+        // Log end of round
+        Admin.Add(LogType.EmergencyShuttle, LogImpact.High, $"Round ended, showing summary");
+
+        //Tell every client the round has ended.
+        var gamemodeTitle = CurrentPreset != null ? Loc.GetString(CurrentPreset.ModeTitle) : string.Empty;
+
+        // Let things add text here.
+        var textEv = new RoundEndTextAppendEvent();
+        RaiseLocalEvent(ref textEv);
+
+        var roundEndText = $"{text}\n{textEv.Text}";
+
+        //Get the timespan of the round.
+        var roundDuration = RoundDuration();
+
+        //Generate a list of basic player info to display in the end round summary.
+        var listOfPlayerInfo = new List<RoundEndMessageEvent.RoundEndPlayerInfo>();
+        // Grab the great big book of all the Minds, we'll need them for this.
+        var allMinds = EntityQueryEnumerator<MindComponent>();
+        var pvsOverride = Cfg.GetCVar(CCVars.RoundEndPVSOverrides);
+        while (allMinds.MoveNext(out var mindId, out var mind))
+        {
+            // TODO don't list redundant observer roles?
+            // I.e., if a player was an observer ghost, then a hamster ghost role, maybe just list hamster and not
+            // the observer role?
+            var userId = mind.UserId ?? mind.OriginalOwnerUserId;
+
+            var connected = false;
+            var observer = _role.MindHasRole<ObserverRoleComponent>(mindId);
+            // Continuing
+            if (userId != null && _playerManager.ValidSessionId(userId.Value))
+            {
+                connected = true;
+            }
+            ContentPlayerData? contentPlayerData = null;
+            if (userId != null && _playerManager.TryGetPlayerData(userId.Value, out var playerData))
+            {
+                contentPlayerData = playerData.ContentData();
+            }
+            // Finish
+
+            var antag = Role.MindIsAntagonist(mindId);
+
+            var playerIcName = "Unknown";
+
+            if (mind.CharacterName != null)
+                playerIcName = mind.CharacterName;
+            else if (mind.CurrentEntity != null && TryName(mind.CurrentEntity.Value, out var icName))
+                playerIcName = icName;
+
+            if (TryGetEntity(mind.OriginalOwnedEntity, out var entity) && pvsOverride)
+            {
+                _pvsOverride.AddGlobalOverride(entity.Value);
+            }
+
+            var roles = Role.MindGetAllRoleInfo(mindId);
+
+            var playerEndRoundInfo = new RoundEndMessageEvent.RoundEndPlayerInfo()
+            {
+                // Note that contentPlayerData?.Name sticks around after the player is disconnected.
+                // This is as opposed to ply?.Name which doesn't.
+                PlayerOOCName = contentPlayerData?.Name ?? "(IMPOSSIBLE: REGISTERED MIND WITH NO OWNER)",
+                // Character name takes precedence over current entity name
+                PlayerICName = playerIcName,
+                PlayerGuid = userId,
+                PlayerNetEntity = GetNetEntity(entity),
+                Role = antag
+                    ? roles.First(role => role.Antagonist).Name
+                    : roles.FirstOrDefault().Name ?? Loc.GetString("game-ticker-unknown-role"),
+                Antag = antag,
+                JobPrototypes = roles.Where(role => !role.Antagonist).Select(role => role.Prototype).ToArray(),
+                AntagPrototypes = roles.Where(role => role.Antagonist).Select(role => role.Prototype).ToArray(),
+                Observer = observer,
+                Connected = connected
+            };
+            listOfPlayerInfo.Add(playerEndRoundInfo);
+        }
+
+        // This ordering mechanism isn't great (no ordering of minds) but functions
+        var listOfPlayerInfoFinal = listOfPlayerInfo.OrderBy(pi => pi.PlayerOOCName).ToArray();
+        var sound = RoundEndSoundCollection == null ? null : Audio.ResolveSound(new SoundCollectionSpecifier(RoundEndSoundCollection));
+
+        var roundEndMessageEvent = new RoundEndMessageEvent(
+            gamemodeTitle,
+            roundEndText,
+            roundDuration,
+            RoundId,
+            listOfPlayerInfoFinal.Length,
+            listOfPlayerInfoFinal,
+            sound
+        );
+        RaiseNetworkEvent(roundEndMessageEvent);
+        RaiseLocalEvent(roundEndMessageEvent);
+
+        _replayRoundPlayerInfo = listOfPlayerInfoFinal;
+        _replayRoundText = roundEndText;
+    }
+
+    private async void SendRoundEndDiscordMessage()
+    {
+        try
+        {
+            if (_webhookIdentifier == null)
+                return;
+
+            var duration = RoundDuration();
+            var content = Loc.GetString("discord-round-notifications-end",
+                ("id", RoundId),
+                ("hours", Math.Truncate(duration.TotalHours)),
+                ("minutes", duration.Minutes),
+                ("seconds", duration.Seconds));
+            var payload = new WebhookPayload { Content = content };
+
+            await _discord.CreateMessage(_webhookIdentifier.Value, payload);
+
+            if (DiscordRoundEndRole == null)
+                return;
+
+            content = Loc.GetString("discord-round-notifications-end-ping", ("roleId", DiscordRoundEndRole));
+            payload = new WebhookPayload { Content = content };
+            payload.AllowedMentions.AllowRoleMentions();
+
+            await _discord.CreateMessage(_webhookIdentifier.Value, payload);
+        }
+        catch (Exception e)
+        {
+            Log.Error($"Error while sending discord round end message:\n{e}");
+        }
+    }
+
+    public override void RestartRound()
+    {
+        // If this game ticker is a dummy, do nothing!
+        if (DummyTicker)
+            return;
+
+        ReplayEndRound();
+
+        // Handle restart for server update
+        if (_serverUpdates.RoundEnded())
+            return;
+
+        // Check if the GamePreset needs to be reset
+        TryResetPreset();
+
+        Log.Info("Restarting round!");
+
+        SendServerMessage(Loc.GetString("game-ticker-restart-round"));
+
+        RoundNumberMetric.Inc();
+
+        PlayersJoinedRoundNormally = 0;
+
+        RunLevel = GameRunLevel.PreRoundLobby;
+        RandomizeLobbyBackground();
+        ResettingCleanup();
+        IncrementRoundNumber();
+        SendRoundStartingDiscordMessage();
+
+        if (!LobbyEnabled)
+        {
+            StartRound();
+        }
+        else
+        {
+            if (_playerManager.PlayerCount == 0)
+                _roundStartCountdownHasNotStartedYetDueToNoPlayers = true;
+            else
+                _roundStartTime = Timing.CurTime + LobbyDuration;
+
+            SendStatusToAll();
+            UpdateInfoText();
+
+            ReqWindowAttentionAll();
+        }
+    }
+
+    private async void SendRoundStartingDiscordMessage()
+    {
+        try
+        {
+            if (_webhookIdentifier == null)
+                return;
+
+            var content = Loc.GetString("discord-round-notifications-new");
+
+            var payload = new WebhookPayload { Content = content };
+
+            await _discord.CreateMessage(_webhookIdentifier.Value, payload);
+        }
+        catch (Exception e)
+        {
+            Log.Error($"Error while sending discord round starting message:\n{e}");
+        }
+    }
+
+    /// <summary>
+    ///     Cleanup that has to run to clear up anything from the previous round.
+    ///     Stuff like wiping the previous map clean.
+    /// </summary>
+    private void ResettingCleanup()
+    {
+        // Move everybody currently in the server to lobby.
+        foreach (var player in _playerManager.Sessions)
+        {
+            PlayerJoinLobby(player);
+        }
+
+        // Round restart cleanup event, so entity systems can reset.
+        var ev = new RoundRestartCleanupEvent();
+        RaiseLocalEvent(ev);
+
+        // So clients' entity systems can clean up too...
+        RaiseNetworkEvent(ev);
+
+        EntityManager.FlushEntities();
+
+        _banManager.Restart();
+
+        _gameMapManager.ClearSelectedMap();
+
+        // Clear up any game rules.
+        CurrentPreset = null;
+
+        AllRoundGameRules.Clear();
+
+        DisallowLateJoin = false;
+        _playerGameStatuses.Clear();
+        foreach (var session in _playerManager.Sessions)
+        {
+            _playerGameStatuses[session.UserId] = LobbyEnabled ? PlayerGameStatus.NotReadyToPlay : PlayerGameStatus.ReadyToPlay;
+        }
+    }
+
+    public bool DelayStart(TimeSpan time)
+    {
+        if (RunLevel != GameRunLevel.PreRoundLobby)
+        {
+            return false;
+        }
+
+        _roundStartTime += time;
+
+        RaiseNetworkEvent(new TickerLobbyCountdownEvent(_roundStartTime, Paused));
+
+        _chatManager.DispatchServerAnnouncement(Loc.GetString("game-ticker-delay-start", ("seconds", time.TotalSeconds)));
+
+        return true;
+    }
+
+    private void UpdateRoundFlow(float frameTime)
+    {
+        if (RunLevel == GameRunLevel.InRound)
+        {
+            RoundLengthMetric.Inc(frameTime);
+        }
+
+        if (_roundStartTime == TimeSpan.Zero ||
+            RunLevel != GameRunLevel.PreRoundLobby ||
+            Paused ||
+            _roundStartTime - RoundPreloadTime > Timing.CurTime ||
+            _roundStartCountdownHasNotStartedYetDueToNoPlayers)
+        {
+            return;
+        }
+
+        if (_roundStartTime < Timing.CurTime)
+        {
+            StartRound();
+        }
+        // Preload maps so we can start faster
+        else if (_roundStartTime - RoundPreloadTime < Timing.CurTime)
+        {
+            LoadMaps();
+        }
+    }
+
+    private void AnnounceRound()
+    {
+        if (CurrentPreset == null)
+            return;
+
+        var options = ProtoMan.EnumeratePrototypes<RoundAnnouncementPrototype>().ToList();
+
+        if (options.Count == 0)
+            return;
+
+        var proto = Random.Pick(options);
+
+        if (proto.Message != null)
+            _chatSystem.DispatchGlobalAnnouncement(Loc.GetString(proto.Message), playSound: true);
+
+        if (proto.Sound != null)
+            Audio.PlayGlobal(proto.Sound, Filter.Broadcast(), true);
+    }
+
+    private async void SendRoundStartedDiscordMessage()
+    {
+        try
+        {
+            if (_webhookIdentifier == null)
+                return;
+
+            var mapName = _gameMapManager.GetSelectedMap()?.MapName ?? Loc.GetString("discord-round-notifications-unknown-map");
+            var content = Loc.GetString("discord-round-notifications-started", ("id", RoundId), ("map", mapName));
+
+            var payload = new WebhookPayload { Content = content };
+
+            await _discord.CreateMessage(_webhookIdentifier.Value, payload);
+        }
+        catch (Exception e)
+        {
+            Log.Error($"Error while sending discord round start message:\n{e}");
+        }
+    }
+}
+
+/// <summary>
+///     Event raised before maps are loaded in pre-round setup.
+///     Contains a list of game map prototypes to load; modify it if you want to load different maps,
+///     for example as part of a game rule.
+/// </summary>
+[PublicAPI]
+public sealed class LoadingMapsEvent : EntityEventArgs
+{
+    public List<GameMapPrototype> Maps;
+
+    public LoadingMapsEvent(List<GameMapPrototype> maps)
+    {
+        Maps = maps;
+    }
+}
+
+/// <summary>
+///     Event raised before the game loads a given map.
+///     This event is mutable, and load options should be tweaked if necessary.
+/// </summary>
+/// <remarks>
+///     You likely want to subscribe to this after StationSystem.
+/// </remarks>
+[PublicAPI]
+public sealed class PreGameMapLoad(GameMapPrototype gameMap, DeserializationOptions options, Vector2 offset, Angle rotation) : EntityEventArgs
+{
+    public readonly GameMapPrototype GameMap = gameMap;
+    public DeserializationOptions Options = options;
+    public Vector2 Offset = offset;
+    public Angle Rotation = rotation;
+}
+
+/// <summary>
+///     Event raised after the game loads a given map.
+/// </summary>
+/// <remarks>
+///     You likely want to subscribe to this after StationSystem.
+/// </remarks>
+[PublicAPI]
+public sealed class PostGameMapLoad : EntityEventArgs
+{
+    public readonly GameMapPrototype GameMap;
+    public readonly MapId Map;
+    public readonly IReadOnlyList<EntityUid> Grids;
+    public readonly string? StationName;
+
+    public PostGameMapLoad(GameMapPrototype gameMap, MapId map, IReadOnlyList<EntityUid> grids, string? stationName)
+    {
+        GameMap = gameMap;
+        Map = map;
+        Grids = grids;
+        StationName = stationName;
+    }
+}
+
+/// <summary>
+///     Event raised to refresh the late join status.
+///     If you want to disallow late joins, listen to this and call Disallow.
+/// </summary>
+public sealed class RefreshLateJoinAllowedEvent
+{
+    public bool DisallowLateJoin { get; private set; }
+
+    public void Disallow()
+    {
+        DisallowLateJoin = true;
+    }
+}
+
+/// <summary>
+///     Attempt event raised on round start.
+///     This can be listened to by GameRule systems to cancel round start if some condition is not met, like player count.
+/// </summary>
+public sealed class RoundStartAttemptEvent : CancellableEntityEventArgs
+{
+    public ICommonSession[] Players { get; }
+    public bool Forced { get; }
+
+    public RoundStartAttemptEvent(ICommonSession[] players, bool forced)
+    {
+        Players = players;
+        Forced = forced;
+    }
+}
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/ServerGameTicker.Spawning.cs
similarity index 85%
rename from Content.Server/GameTicking/GameTicker.Spawning.cs
rename to Content.Server/GameTicking/ServerGameTicker.Spawning.cs
index 2942aea18d..37707480a9 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/ServerGameTicker.Spawning.cs
@@ -4,8 +4,6 @@ using System.Numerics;
 using Content.Server.Administration.Managers;
 using Content.Server.Administration.Systems;
 using Content.Server.GameTicking.Events;
-using Content.Server.Spawners.Components;
-using Content.Server.Station.Components;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.GameTicking;
@@ -18,6 +16,8 @@ using Content.Shared.Random;
 using Content.Shared.Random.Helpers;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Jobs;
+using Content.Shared.Spawners.Components;
+using Content.Shared.Station.Components;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Network;
@@ -28,7 +28,7 @@ using Robust.Shared.Utility;
 
 namespace Content.Server.GameTicking
 {
-    public sealed partial class GameTicker
+    public sealed partial class ServerGameTicker
     {
         [Dependency] private IAdminManager _adminManager = default!;
         [Dependency] private SharedJobSystem _jobs = default!;
@@ -177,7 +177,7 @@ namespace Content.Server.GameTicking
             if (station == EntityUid.Invalid)
             {
                 var stations = GetSpawnableStations();
-                _robustRandom.Shuffle(stations);
+                Random.Shuffle(stations);
                 if (stations.Count == 0)
                     station = EntityUid.Invalid;
                 else
@@ -193,7 +193,7 @@ namespace Content.Server.GameTicking
             string speciesId;
             if (_randomizeCharacters)
             {
-                var weightId = _cfg.GetCVar(CCVars.ICRandomSpeciesWeights);
+                var weightId = Cfg.GetCVar(CCVars.ICRandomSpeciesWeights);
 
                 // If blank, choose a round start species.
                 if (string.IsNullOrEmpty(weightId))
@@ -209,12 +209,12 @@ namespace Content.Server.GameTicking
 
                     speciesId = roundStart.Count == 0
                         ? HumanoidCharacterProfile.DefaultSpecies
-                        : _robustRandom.Pick(roundStart);
+                        : Random.Pick(roundStart);
                 }
                 else
                 {
                     var weights = ProtoMan.Index<WeightedRandomSpeciesPrototype>(weightId);
-                    speciesId = weights.Pick(_robustRandom);
+                    speciesId = weights.Pick(Random);
                 }
 
                 // The random profile must retain the job priorities set by the player
@@ -303,13 +303,13 @@ namespace Content.Server.GameTicking
 
             if (lateJoin)
             {
-                _adminLogger.Add(LogType.LateJoin,
+                Admin.Add(LogType.LateJoin,
                     LogImpact.Medium,
                     $"Player {player.Name} late joined as {character.Name:characterName} on station {Name(station):stationName} with {ToPrettyString(mob):entity} as a {jobName:jobName}.");
             }
             else
             {
-                _adminLogger.Add(LogType.RoundStartJoin,
+                Admin.Add(LogType.RoundStartJoin,
                     LogImpact.Medium,
                     $"Player {player.Name} joined as {character.Name:characterName} on station {Name(station):stationName} with {ToPrettyString(mob):entity} as a {jobName:jobName}.");
             }
@@ -365,22 +365,22 @@ namespace Content.Server.GameTicking
             DebugTools.AssertNotNull(mobMaybe);
             mob = mobMaybe!.Value;
 
-            var newMind = _mind.CreateMind(data.UserId, Name(mob));
-            _mind.SetUserId(newMind, data.UserId);
+            var newMind = Mind.CreateMind(data.UserId, Name(mob));
+            Mind.SetUserId(newMind, data.UserId);
 
             _playTimeTrackings.PlayerRolesChanged(player);
 
-            _mind.TransferTo(newMind, mob);
+            Mind.TransferTo(newMind, mob);
 
-            _roles.MindAddJobRole(newMind, silent: silent, jobPrototype: jobId);
+            Role.MindAddJobRole(newMind, silent: silent, jobPrototype: jobId);
             jobName = _jobs.MindTryGetJobName(newMind);
             _admin.UpdatePlayerList(player);
         }
 
         public void Respawn(ICommonSession player)
         {
-            _mind.WipeMind(player);
-            _adminLogger.Add(LogType.Respawn, LogImpact.Medium, $"Player {player} was respawned.");
+            Mind.WipeMind(player);
+            Admin.Add(LogType.Respawn, LogImpact.Medium, $"Player {player} was respawned.");
 
             if (LobbyEnabled)
                 PlayerJoinLobby(player);
@@ -388,14 +388,8 @@ namespace Content.Server.GameTicking
                 SpawnPlayer(player, EntityUid.Invalid);
         }
 
-        /// <summary>
-        /// Makes a player join into the game and spawn on a station.
-        /// </summary>
-        /// <param name="player">The player joining</param>
-        /// <param name="station">The station they're spawning on</param>
-        /// <param name="jobId">An optional job for them to spawn as</param>
-        /// <param name="silent">Whether or not the player should be greeted upon joining</param>
-        public void MakeJoinGame(ICommonSession player, EntityUid station, string? jobId = null, bool silent = false)
+        /// <inheritdoc/>
+        public override void MakeJoinGame(ICommonSession player, EntityUid station, string? jobId = null, bool silent = false)
         {
             if (!_playerGameStatuses.ContainsKey(player.UserId))
                 return;
@@ -433,17 +427,17 @@ namespace Content.Server.GameTicking
             if (mind == null)
             {
                 var name = GetPlayerProfile(player).Name;
-                var (mindId, mindComp) = _mind.CreateMind(player.UserId, name);
+                var (mindId, mindComp) = Mind.CreateMind(player.UserId, name);
                 mind = (mindId, mindComp);
-                _mind.SetUserId(mind.Value, player.UserId);
+                Mind.SetUserId(mind.Value, player.UserId);
                 makeObserver = true;
             }
 
             var ghost = _ghost.SpawnGhost(mind.Value);
             if (makeObserver)
-                _roles.MindAddRole(mind.Value, "MindRoleObserver");
+                Role.MindAddRole(mind.Value, "MindRoleObserver");
 
-            _adminLogger.Add(LogType.LateJoin,
+            Admin.Add(LogType.LateJoin,
                 LogImpact.Low,
                 $"{player.Name} late joined the round as an Observer with {ToPrettyString(ghost):entity}.");
         }
@@ -454,10 +448,9 @@ namespace Content.Server.GameTicking
         {
             _possiblePositions.Clear();
             var spawnPointQuery = EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
-            while (spawnPointQuery.MoveNext(out var uid, out var point, out var transform))
+            while (spawnPointQuery.MoveNext(out var point, out var transform))
             {
                 if (point.SpawnType != SpawnPointType.Observer
-                   || TerminatingOrDeleted(uid)
                    || transform.MapUid == null
                    || TerminatingOrDeleted(transform.MapUid.Value))
                 {
@@ -470,15 +463,12 @@ namespace Content.Server.GameTicking
             // Fallback to a random grid.
             if (_possiblePositions.Count == 0)
             {
-                var query = AllEntityQuery<MapGridComponent>();
-                while (query.MoveNext(out var uid, out var grid))
+                var query = EntityQueryEnumerator<MapGridComponent>();
+                while (query.MoveNext(out var uid, out _))
                 {
-                    if (!TryComp(uid, out MetaDataComponent? meta) || meta.EntityPaused || TerminatingOrDeleted(uid))
-                    {
-                        continue;
-                    }
-
-                    _possiblePositions.Add(new EntityCoordinates(uid, Vector2.Zero));
+                    // Band-aid fix cause we aren't queueing observer re-attach.
+                    if (!TerminatingOrDeleted(uid))
+                        _possiblePositions.Add(new EntityCoordinates(uid, Vector2.Zero));
                 }
             }
 
@@ -487,44 +477,39 @@ namespace Content.Server.GameTicking
                 // TODO: This is just here for the eye lerping.
                 // Ideally engine would just spawn them on grid directly I guess? Right now grid traversal is handling it during
                 // update which means we need to add a hack somewhere around it.
-                var spawn = _robustRandom.Pick(_possiblePositions);
-                var toMap = _transform.ToMapCoordinates(spawn);
+                var spawn = Random.Pick(_possiblePositions);
+                var toMap = XForm.ToMapCoordinates(spawn);
 
-                if (_map.TryFindGridAt(toMap, out var gridUid, out _))
+                if (Map.TryFindGridAt(toMap, out var gridUid, out _) && !TerminatingOrDeleted(gridUid))
                 {
                     var gridXform = Transform(gridUid);
-
-                    return new EntityCoordinates(gridUid, Vector2.Transform(toMap.Position, _transform.GetInvWorldMatrix(gridXform)));
+                    return new EntityCoordinates(gridUid, Vector2.Transform(toMap.Position, XForm.GetInvWorldMatrix(gridXform)));
                 }
 
                 return spawn;
             }
 
-            if (_map.MapExists(DefaultMap))
+            if (Map.MapExists(DefaultMap))
             {
-                var mapUid = _map.GetMapOrInvalid(DefaultMap);
+                var mapUid = Map.GetMapOrInvalid(DefaultMap);
                 if (!TerminatingOrDeleted(mapUid))
                     return new EntityCoordinates(mapUid, Vector2.Zero);
             }
 
             // Just pick a point at this point I guess.
-            foreach (var map in _map.GetAllMapIds())
+            foreach (var map in Map.GetAllMapIds())
             {
-                var mapUid = _map.GetMapOrInvalid(map);
+                var mapUid = Map.GetMapOrInvalid(map);
+                var meta = MetaData(mapUid);
 
-                if (!TryComp(mapUid, out MetaDataComponent? meta)
-                    || meta.EntityPaused
-                    || TerminatingOrDeleted(mapUid))
-                {
+                if (meta.EntityPaused || TerminatingOrDeleted(mapUid, meta))
                     continue;
-                }
 
                 return new EntityCoordinates(mapUid, Vector2.Zero);
             }
 
-            // AAAAAAAAAAAAA
-            // This should be an error, if it didn't cause tests to start erroring when they delete a player.
-            _sawmill.Warning("Found no observer spawn points!");
+            // You REALLY fucked up
+            Log.Error("Found no observer spawn points!");
             return EntityCoordinates.Invalid;
         }
 
diff --git a/Content.Server/GameTicking/ServerGameTicker.StatusShell.cs b/Content.Server/GameTicking/ServerGameTicker.StatusShell.cs
new file mode 100644
index 0000000000..4d58bd2585
--- /dev/null
+++ b/Content.Server/GameTicking/ServerGameTicker.StatusShell.cs
@@ -0,0 +1,65 @@
+using System.Linq;
+using System.Text.Json.Nodes;
+using Content.Shared.CCVar;
+using Content.Shared.GameTicking;
+using Robust.Server.ServerStatus;
+using Content.Corvax.Interfaces.Server;
+
+namespace Content.Server.GameTicking;
+
+public sealed partial class ServerGameTicker
+{
+    /// <summary>
+    ///     Used for thread safety, given <see cref="IStatusHost.OnStatusRequest"/> is called from another thread.
+    /// </summary>
+    private readonly object _statusShellLock = new();
+
+    /// <summary>
+    ///     Round start time in UTC, for status shell purposes.
+    /// </summary>
+    [ViewVariables]
+    private DateTime _roundStartDateTime;
+
+    private void InitializeStatusShell()
+    {
+        IoCManager.Resolve<IStatusHost>().OnStatusRequest += GetStatusResponse;
+    }
+
+    private void GetStatusResponse(JsonNode jObject)
+    {
+        var preset = CurrentPreset ?? Preset;
+
+        // This method is raised from another thread, so this better be thread safe!
+        lock (_statusShellLock)
+        {
+            // Corvax-Queue-Start
+            var players = IoCManager.Instance?.TryResolveType<IServerJoinQueueManager>(out var joinQueueManager) ?? false
+                ? joinQueueManager.ActualPlayersCount
+                : _playerManager.PlayerCount;
+
+            players = Cfg.GetCVar(CCVars.AdminsCountInReportedPlayerCount)
+                    ? players
+                    : players - _adminManager.ActiveAdmins.Count();
+            // Corvax-Queue-End
+
+            jObject["name"] = _baseServer.ServerName;
+            jObject["map"] = _gameMapManager.GetSelectedMap()?.MapName;
+            jObject["round_id"] = RoundId;
+            // Corvax-Queue-Start
+            //jObject["players"] = Cfg.GetCVar(CCVars.AdminsCountInReportedPlayerCount)
+            //    ? _playerManager.PlayerCount
+            //    : _playerManager.PlayerCount - _adminManager.ActiveAdmins.Count();
+            jObject["players"] = players;
+            // Corvax-Queue-End
+            jObject["soft_max_players"] = Cfg.GetCVar(CCVars.SoftMaxPlayers);
+            jObject["panic_bunker"] = Cfg.GetCVar(CCVars.PanicBunkerEnabled);
+            jObject["run_level"] = (int) RunLevel;
+            if (preset != null)
+                jObject["preset"] = (Decoy == null) ? Loc.GetString(preset.ModeTitle) : Loc.GetString(Decoy.ModeTitle);
+            if (RunLevel >= GameRunLevel.InRound)
+            {
+                jObject["round_start_time"] = _roundStartDateTime.ToString("o");
+            }
+        }
+    }
+}
diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/ServerGameTicker.cs
similarity index 78%
rename from Content.Server/GameTicking/GameTicker.cs
rename to Content.Server/GameTicking/ServerGameTicker.cs
index 457a5eb210..1711af8f62 100644
--- a/Content.Server/GameTicking/GameTicker.cs
+++ b/Content.Server/GameTicking/ServerGameTicker.cs
@@ -1,5 +1,4 @@
 using Content.Corvax.Interfaces.Shared; // Corvax-Sponsors
-using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
 using Content.Server.Chat.Managers;
 using Content.Server.Chat.Systems;
@@ -11,19 +10,14 @@ using Content.Server.Players.PlayTimeTracking;
 using Content.Server.Preferences.Managers;
 using Content.Server.ServerUpdates;
 using Content.Server.Station.Systems;
-using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.GameTicking;
-using Content.Shared.Mind;
-using Content.Shared.Roles;
+using Content.Shared.Station.Systems;
 using Robust.Server;
 using Robust.Server.GameStates;
-using Robust.Shared.Audio.Systems;
 using Robust.Shared.Console;
 using Robust.Shared.EntitySerialization.Systems;
 using Robust.Shared.Map;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 #if EXCEPTION_TOLERANCE
 using Robust.Shared.Exceptions;
@@ -31,39 +25,30 @@ using Robust.Shared.Exceptions;
 
 namespace Content.Server.GameTicking
 {
-    public sealed partial class GameTicker : SharedGameTicker
+    public sealed partial class ServerGameTicker : GameTicker
     {
-        [Dependency] private IAdminLogManager _adminLogger = default!;
         [Dependency] private IBanManager _banManager = default!;
         [Dependency] private IBaseServer _baseServer = default!;
         [Dependency] private IChatManager _chatManager = default!;
         [Dependency] private IConsoleHost _consoleHost = default!;
         [Dependency] private IGameMapManager _gameMapManager = default!;
-        [Dependency] private IGameTiming _gameTiming = default!;
         [Dependency] private ILogManager _logManager = default!;
-        [Dependency] private IRobustRandom _robustRandom = default!;
 #if EXCEPTION_TOLERANCE
         [Dependency] private IRuntimeLog _runtimeLog = default!;
 #endif
         [Dependency] private IServerPreferencesManager _prefsManager = default!;
         [Dependency] private IServerDbManager _db = default!;
         [Dependency] private ChatSystem _chatSystem = default!;
-        [Dependency] private MapLoaderSystem _loader = default!;
-        [Dependency] private SharedMapSystem _map = default!;
         [Dependency] private GhostSystem _ghost = default!;
+        [Dependency] private MapLoaderSystem _loader = default!;
         [Dependency] private GhostGoLobbySystem _ghostGoLobby = default!; // Corvax-GoLobby
-        [Dependency] private SharedMindSystem _mind = default!;
         [Dependency] private PlayTimeTrackingSystem _playTimeTrackings = default!;
         [Dependency] private PvsOverrideSystem _pvsOverride = default!;
-        [Dependency] private ServerUpdateManager _serverUpdates = default!;
-        [Dependency] private SharedAudioSystem _audio = default!;
-        [Dependency] private StationJobsSystem _stationJobs = default!;
-        [Dependency] private StationSpawningSystem _stationSpawning = default!;
-        [Dependency] private SharedTransformSystem _transform = default!;
-        [Dependency] private UserDbDataManager _userDb = default!;
-        [Dependency] private MetaDataSystem _metaData = default!;
-        [Dependency] private SharedRoleSystem _roles = default!;
         [Dependency] private ServerDbEntryManager _dbEntryManager = default!;
+        [Dependency] private ServerUpdateManager _serverUpdates = default!;
+        [Dependency] private ServerStationJobsSystem _stationJobs = default!;
+        [Dependency] private StationSpawningSystem _stationSpawning = default!;
+        [Dependency] private UserDbDataManager _userDb = default!;
         private ISharedSponsorsManager? _sponsors; // Corvax-Sponsors
 
         [ViewVariables] private bool _initialized;
@@ -71,8 +56,6 @@ namespace Content.Server.GameTicking
 
         [ViewVariables] public MapId DefaultMap { get; private set; }
 
-        private ISawmill _sawmill = default!;
-
         private bool _randomizeCharacters;
 
         public override void Initialize()
@@ -84,11 +67,9 @@ namespace Content.Server.GameTicking
             DebugTools.Assert(!_initialized);
             DebugTools.Assert(!_postInitialized);
 
-            _sawmill = _logManager.GetSawmill("ticker");
+            // TODO: Move replays to their own bespoke system so we don't need two sawmills, or allow for name overrides for specific logs
             _sawmillReplays = _logManager.GetSawmill("ticker.replays");
 
-            Subs.CVar(_cfg, CCVars.ICRandomCharacters, e => _randomizeCharacters = e, true);
-
             // Initialize the other parts of the game ticker.
             InitializeStatusShell();
             InitializeCVars();
@@ -138,7 +119,7 @@ namespace Content.Server.GameTicking
 
         public static int GetRoundId(IEntitySystemManager esm)
         {
-            return esm.GetEntitySystemOrNull<GameTicker>()?.RoundId ?? 0;
+            return esm.GetEntitySystemOrNull<ServerGameTicker>()?.RoundId ?? 0;
         }
     }
 }
diff --git a/Content.Server/Ghost/GhostCommand.cs b/Content.Server/Ghost/GhostCommand.cs
index 81f278a73c..7420e1a1a8 100644
--- a/Content.Server/Ghost/GhostCommand.cs
+++ b/Content.Server/Ghost/GhostCommand.cs
@@ -25,7 +25,7 @@ namespace Content.Server.Ghost
                 return;
             }
 
-            var gameTicker = _entities.System<GameTicker>();
+            var gameTicker = _entities.System<ServerGameTicker>();
             if (!gameTicker.PlayerGameStatuses.TryGetValue(player.UserId, out var playerStatus) ||
                 playerStatus is not PlayerGameStatus.JoinedGame)
             {
diff --git a/Content.Server/Ghost/GhostFollowEntityCommand.cs b/Content.Server/Ghost/GhostFollowEntityCommand.cs
deleted file mode 100644
index c86aa5c41d..0000000000
--- a/Content.Server/Ghost/GhostFollowEntityCommand.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Content.Shared.Administration;
-using Robust.Shared.Console;
-
-namespace Content.Server.Ghost;
-
-[AnyCommand]
-internal sealed partial class GhostFollowEntityCommand : LocalizedEntityCommands
-{
-    public const string CommandName = "ghost_follow_entity";
-
-    [Dependency] private GhostSystem _ghost = null!;
-
-    public override string Command => CommandName;
-
-    public override void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        if (args.Length != 1 || shell.Player is not { } player)
-            return;
-
-        var target = args[0];
-        if (!NetEntity.TryParse(target, out var targetEnt))
-            return;
-
-        _ghost.GhostWarpRequest(player, targetEnt);
-    }
-}
diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
index d7c9e21c66..a507059d04 100644
--- a/Content.Server/Ghost/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -16,6 +16,7 @@ using Content.Shared.Eye;
 using Content.Shared.FixedPoint;
 using Content.Shared.Follower;
 using Content.Shared.Follower.Components;
+using Content.Shared.GameTicking;
 using Content.Shared.Ghost.Components;
 using Content.Shared.Ghost.Systems;
 using Content.Shared.GhostTypes;
@@ -65,7 +66,7 @@ namespace Content.Server.Ghost
         [Dependency] private IConfigurationManager _configurationManager = default!;
         [Dependency] private IChatManager _chatManager = default!;
         [Dependency] private SharedMindSystem _mind = default!;
-        [Dependency] private GameTicker _gameTicker = default!;
+        [Dependency] private ServerGameTicker _gameTicker = default!;
         [Dependency] private DamageableSystem _damageable = default!;
         [Dependency] private SharedPopupSystem _popup = default!;
         [Dependency] private IRobustRandom _random = default!;
@@ -104,7 +105,7 @@ namespace Content.Server.Ghost
             SubscribeLocalEvent<GhostComponent, ToggleGhostHearingActionEvent>(OnGhostHearingAction);
             SubscribeLocalEvent<GhostComponent, InsertIntoEntityStorageAttemptEvent>(OnEntityStorageInsertAttempt);
 
-            SubscribeLocalEvent<RoundEndTextAppendEvent>(_ => MakeVisible(true));
+            SubscribeLocalEvent<RoundEndMessageEvent>(_ => MakeVisible(true));
             SubscribeLocalEvent<ToggleGhostVisibilityToAllEvent>(OnToggleGhostVisibilityToAll);
 
             SubscribeLocalEvent<GhostComponent, GetVisMaskEvent>(OnGhostVis);
@@ -177,7 +178,7 @@ namespace Content.Server.Ghost
             }
 
             _eye.RefreshVisibilityMask(uid);
-            var time = _gameTiming.RealTime;
+            var time = GameTiming.RealTime;
             component.TimeOfDeath = time;
 
             Dirty(uid, component);
@@ -269,38 +270,33 @@ namespace Content.Server.Ghost
 
         private void OnGhostWarpsRequest(GhostWarpsRequestEvent msg, EntitySessionEventArgs args)
         {
-            if (!CanGhostWarp(args.SenderSession, out var entity))
+            if (!CanGhostWarp(args.SenderSession, out var player))
             {
                 Log.Warning($"User {args.SenderSession.Name} sent a {nameof(GhostWarpsRequestEvent)} without being a ghost.");
                 return;
             }
 
-            var response = new GhostWarpsResponseEvent(GetPlayerWarps(entity).Concat(GetLocationWarps()).ToList());
+            var response = new GhostWarpsResponseEvent(GetPlayerWarps(player).Concat(GetLocationWarps()).ToList());
             RaiseNetworkEvent(response, args.SenderSession.Channel);
         }
 
-        public void GhostWarpRequest(ICommonSession player, NetEntity target)
-        {
-            if (!CanGhostWarp(player, out var attached))
-            {
-                Log.Warning($"User {player.Name} tried to warp to {target} without being a ghost.");
-                return;
-            }
-
-            var realTarget = GetEntity(target);
-
-            if (!Exists(realTarget))
-            {
-                Log.Warning($"User {player.Name} tried to warp to an invalid entity id: {target}");
-                return;
-            }
-
-            WarpTo(attached, realTarget);
-        }
-
         private void OnGhostWarpToTargetRequest(GhostWarpToTargetRequestEvent msg, EntitySessionEventArgs args)
         {
-            GhostWarpRequest(args.SenderSession, msg.Target);
+            if (!CanGhostWarp(args.SenderSession, out var player))
+            {
+                Log.Warning($"User {args.SenderSession.Name} tried to warp to {msg.Target} without being a ghost.");
+                return;
+            }
+
+            var target = GetEntity(msg.Target);
+
+            if (!Exists(target))
+            {
+                Log.Warning($"User {args.SenderSession.Name} tried to warp to an invalid entity id: {msg.Target}");
+                return;
+            }
+
+            WarpTo(player, target);
         }
 
         /// <summary>
@@ -308,7 +304,7 @@ namespace Content.Server.Ghost
         /// </summary>
         private void OnGhostnadoRequest(GhostnadoRequestEvent msg, EntitySessionEventArgs args)
         {
-            if (!CanGhostWarp(args.SenderSession, out var uid))
+            if (!CanGhostWarp(args.SenderSession, out var player))
             {
                 Log.Warning($"User {args.SenderSession.Name} tried to ghostnado without being a ghost.");
                 return;
@@ -318,25 +314,24 @@ namespace Content.Server.Ghost
                 return;
 
             // If there is a ghostnado happening you almost definitely wanna join it, so we automatically follow instead of just warping.
-            _followerSystem.StartFollowingEntity(uid, target);
+            _followerSystem.StartFollowingEntity(player, target);
         }
-
         /// <summary>
         /// Request to warp to a random player with at least one ghost follower.
         /// </summary>
         private void OnWarpToRandomFollowedRequest(WarpToRandomFollowedRequestEvent msg, EntitySessionEventArgs args)
         {
-            if (!CanGhostWarp(args.SenderSession, out var uid))
+            if (!CanGhostWarp(args.SenderSession, out var player))
             {
                 Log.Warning($"User {args.SenderSession.Name} tried to warp to a random player with at least one ghost follower without being a ghost.");
                 return;
             }
 
-            var following = _followerQuery.CompOrNull(uid)?.Following;
+            var following = _followerQuery.CompOrNull(player)?.Following;
             if (_followerSystem.GetRandomGhostFollowed(except:following) is not {} target)
                 return;
 
-            _followerSystem.StartFollowingEntity(uid, target);
+            _followerSystem.StartFollowingEntity(player, target);
         }
 
         /// <summary>
@@ -344,13 +339,13 @@ namespace Content.Server.Ghost
         /// </summary>
         private void OnWarpToRandomRequest(WarpToRandomRequestEvent msg, EntitySessionEventArgs args)
         {
-            if (!CanGhostWarp(args.SenderSession, out var uid))
+            if (!CanGhostWarp(args.SenderSession, out var player))
             {
                 Log.Warning($"User {args.SenderSession.Name} tried to warp to a random player without being a ghost.");
                 return;
             }
 
-            var following = _followerQuery.CompOrNull(uid)?.Following;
+            var following = _followerQuery.CompOrNull(player)?.Following;
             // select player warps cuz no one wants to warp to places.
             if (GetPlayerWarps(following).ToArray() is not {} warps)
                 return;
@@ -358,11 +353,10 @@ namespace Content.Server.Ghost
                 return;
             var warp = _random.Pick(warps);
 
-            var realTarget = GetEntity(warp.Entity);
-            _followerSystem.StartFollowingEntity(uid, realTarget);
+            var target = GetEntity(warp.Entity);
+            _followerSystem.StartFollowingEntity(player, target);
         }
 
-
         private void WarpTo(EntityUid uid, EntityUid target)
         {
             _adminLog.Add(LogType.GhostWarp, $"{ToPrettyString(uid)} ghost warped to {ToPrettyString(target)}");
@@ -476,16 +470,8 @@ namespace Content.Server.Ghost
             if (spawnPosition?.IsValid(EntityManager) != true)
                 return false;
 
-            var mapUid = _transformSystem.GetMap(spawnPosition.Value);
-            var gridUid = spawnPosition?.EntityId;
-            // Test if the map is being deleted
-            if (mapUid == null || TerminatingOrDeleted(mapUid.Value))
-                return false;
-            // Test if the grid is being deleted
-            if (gridUid != null && TerminatingOrDeleted(gridUid.Value))
-                return false;
-
-            return true;
+            // Test if the parent is being deleted
+            return !TerminatingOrDeleted(spawnPosition.Value.EntityId);
         }
 
         public EntityUid? SpawnGhost(Entity<MindComponent?> mind, EntityCoordinates? spawnPosition = null,
@@ -495,22 +481,21 @@ namespace Content.Server.Ghost
                 return null;
 
             // Test if the map or grid is being deleted
-            if (!IsValidSpawnPosition(spawnPosition))
-                spawnPosition = null;
-
-            // If it's bad, look for a valid point to spawn
-            spawnPosition ??= _gameTicker.GetObserverSpawnPoint();
-
-            // Make sure the new point is valid too
-            if (!IsValidSpawnPosition(spawnPosition))
+            if (spawnPosition == null || !IsValidSpawnPosition(spawnPosition))
             {
-                Log.Warning($"No spawn valid ghost spawn position found for {mind.Comp.CharacterName}"
-                    + $" \"{ToPrettyString(mind)}\"");
-                _minds.TransferTo(mind.Owner, null, createGhost: false, mind: mind.Comp);
-                return null;
+                // If it's bad, look for a valid point to spawn
+                spawnPosition = _gameTicker.GetObserverSpawnPoint();
+
+                // Make sure the new point is valid too
+                if (!IsValidSpawnPosition(spawnPosition))
+                {
+                    Log.Error($"Fallback spawn position: {spawnPosition} provided for {mind.Comp.CharacterName} {ToPrettyString(mind)} was not valid.");
+                    _minds.TransferTo(mind.Owner, null, createGhost: false, mind: mind.Comp);
+                    return null;
+                }
             }
 
-            var ghost = SpawnAtPosition(GameTicker.ObserverPrototypeName, spawnPosition.Value);
+            var ghost = SpawnAtPosition(ServerGameTicker.ObserverPrototypeName, spawnPosition.Value);
             var ghostComponent = Comp<GhostComponent>(ghost);
 
             if (TryComp<GhostSpriteStateComponent>(ghost, out var state))  // If more TryComps are added this should be turned into an event
diff --git a/Content.Server/Ghost/Roles/Components/GhostRoleRaffleComponent.cs b/Content.Server/Ghost/Roles/Components/GhostRoleRaffleComponent.cs
index ac518685e9..e894f28fa8 100644
--- a/Content.Server/Ghost/Roles/Components/GhostRoleRaffleComponent.cs
+++ b/Content.Server/Ghost/Roles/Components/GhostRoleRaffleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Ghost.Roles.Raffles;
+using Content.Server.Ghost.Roles.Raffles;
 using Robust.Shared.Player;
 
 namespace Content.Server.Ghost.Roles.Components;
diff --git a/Content.Server/Ghost/Roles/Components/TakeGhostRoleEvent.cs b/Content.Server/Ghost/Roles/Components/TakeGhostRoleEvent.cs
index 16d46871fe..971a083724 100644
--- a/Content.Server/Ghost/Roles/Components/TakeGhostRoleEvent.cs
+++ b/Content.Server/Ghost/Roles/Components/TakeGhostRoleEvent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Player;
+using Robust.Shared.Player;
 
 namespace Content.Server.Ghost.Roles.Components;
 
diff --git a/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs b/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs
index 944c4f81b4..0138f211e5 100644
--- a/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs
+++ b/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.Ghost.Roles.Components;
 using Content.Shared.Administration;
 using Content.Shared.Mind.Components;
diff --git a/Content.Server/Ghost/Roles/Raffles/GhostRoleRaffleConfig.cs b/Content.Server/Ghost/Roles/Raffles/GhostRoleRaffleConfig.cs
index 052704df25..6e8feac144 100644
--- a/Content.Server/Ghost/Roles/Raffles/GhostRoleRaffleConfig.cs
+++ b/Content.Server/Ghost/Roles/Raffles/GhostRoleRaffleConfig.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Ghost.Roles.Raffles;
+using Content.Shared.Ghost.Roles.Raffles;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Ghost.Roles.Raffles;
diff --git a/Content.Server/Ghost/Roles/Raffles/GhostRoleRaffleDeciderPrototype.cs b/Content.Server/Ghost/Roles/Raffles/GhostRoleRaffleDeciderPrototype.cs
index 73edb6dd85..31a96bac31 100644
--- a/Content.Server/Ghost/Roles/Raffles/GhostRoleRaffleDeciderPrototype.cs
+++ b/Content.Server/Ghost/Roles/Raffles/GhostRoleRaffleDeciderPrototype.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Ghost.Roles.Raffles;
 
diff --git a/Content.Server/Ghost/Roles/Raffles/IGhostRoleRaffleDecider.cs b/Content.Server/Ghost/Roles/Raffles/IGhostRoleRaffleDecider.cs
index bdd2bf046d..4fd98b5fd9 100644
--- a/Content.Server/Ghost/Roles/Raffles/IGhostRoleRaffleDecider.cs
+++ b/Content.Server/Ghost/Roles/Raffles/IGhostRoleRaffleDecider.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Player;
+using Robust.Shared.Player;
 
 namespace Content.Server.Ghost.Roles.Raffles;
 
diff --git a/Content.Server/Ghost/Roles/Raffles/RngGhostRoleRaffleDecider.cs b/Content.Server/Ghost/Roles/Raffles/RngGhostRoleRaffleDecider.cs
index b91d359935..59993c668a 100644
--- a/Content.Server/Ghost/Roles/Raffles/RngGhostRoleRaffleDecider.cs
+++ b/Content.Server/Ghost/Roles/Raffles/RngGhostRoleRaffleDecider.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using JetBrains.Annotations;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
diff --git a/Content.Server/Ghost/Roles/UI/MakeGhostRoleEui.cs b/Content.Server/Ghost/Roles/UI/MakeGhostRoleEui.cs
index c2dce9c563..22ed603129 100644
--- a/Content.Server/Ghost/Roles/UI/MakeGhostRoleEui.cs
+++ b/Content.Server/Ghost/Roles/UI/MakeGhostRoleEui.cs
@@ -1,4 +1,4 @@
-using Content.Server.EUI;
+using Content.Server.EUI;
 using Content.Shared.Eui;
 using Content.Shared.Ghost.Roles;
 
diff --git a/Content.Server/Gibbing/Systems/GibOnRoundEndSystem.cs b/Content.Server/Gibbing/Systems/GibOnRoundEndSystem.cs
index 34d32ad269..747af842c6 100644
--- a/Content.Server/Gibbing/Systems/GibOnRoundEndSystem.cs
+++ b/Content.Server/Gibbing/Systems/GibOnRoundEndSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.GameTicking;
+using Content.Shared.GameTicking;
 using Content.Shared.Gibbing.Components;
 using Content.Shared.Mind;
 using Content.Shared.Objectives.Systems;
diff --git a/Content.Server/GlobalUsings.cs b/Content.Server/GlobalUsings.cs
index b2869444f4..02ea460537 100644
--- a/Content.Server/GlobalUsings.cs
+++ b/Content.Server/GlobalUsings.cs
@@ -1,4 +1,4 @@
-// Global usings for Content.Server
+// Global usings for Content.Server
 
 global using System;
 global using System.Collections.Generic;
diff --git a/Content.Server/Holiday/Christmas/LimitedItemGiverSystem.cs b/Content.Server/Holiday/Christmas/LimitedItemGiverSystem.cs
index d4db504290..82b1f4fdfe 100644
--- a/Content.Server/Holiday/Christmas/LimitedItemGiverSystem.cs
+++ b/Content.Server/Holiday/Christmas/LimitedItemGiverSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Hands.Systems;
+using Content.Server.Hands.Systems;
 using Content.Server.Popups;
 using Content.Shared.Interaction;
 using Content.Shared.Storage;
diff --git a/Content.Server/Holiday/Christmas/SantaComponent.cs b/Content.Server/Holiday/Christmas/SantaComponent.cs
index a0ce54b66d..e8c28d38b2 100644
--- a/Content.Server/Holiday/Christmas/SantaComponent.cs
+++ b/Content.Server/Holiday/Christmas/SantaComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Holiday.Christmas;
+namespace Content.Server.Holiday.Christmas;
 
 /// <summary>
 /// This is used as a marker component, allows them to see gift contents.
diff --git a/Content.Server/Holiday/HolidaySystem.cs b/Content.Server/Holiday/HolidaySystem.cs
index bafc821138..7fd70476dc 100644
--- a/Content.Server/Holiday/HolidaySystem.cs
+++ b/Content.Server/Holiday/HolidaySystem.cs
@@ -2,6 +2,7 @@ using System.Linq;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
 using Content.Shared.CCVar;
+using Content.Shared.GameTicking;
 using Content.Shared.Holiday;
 using Robust.Shared.Configuration;
 
@@ -87,7 +88,8 @@ namespace Content.Server.Holiday
 
         private void OnRunLevelChanged(GameRunLevelChangedEvent eventArgs)
         {
-            if (!_enabled) return;
+            if (!_enabled)
+                return;
 
             switch (eventArgs.New)
             {
diff --git a/Content.Server/IP/IPAddressExt.cs b/Content.Server/IP/IPAddressExt.cs
index 8c514e96b9..86f004e01f 100644
--- a/Content.Server/IP/IPAddressExt.cs
+++ b/Content.Server/IP/IPAddressExt.cs
@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Net;
diff --git a/Content.Server/Implants/ChameleonControllerSystem.cs b/Content.Server/Implants/ChameleonControllerSystem.cs
index 4bf9939150..9bbd3bd3f6 100644
--- a/Content.Server/Implants/ChameleonControllerSystem.cs
+++ b/Content.Server/Implants/ChameleonControllerSystem.cs
@@ -8,8 +8,8 @@ using Content.Shared.Inventory;
 using Content.Shared.Preferences;
 using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Roles;
-using Content.Shared.Station;
-using Content.Shared.Timing;
+using Content.Shared.Station.Systems;
+using Content.Shared.Timing.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
@@ -18,7 +18,7 @@ namespace Content.Server.Implants;
 public sealed partial class ChameleonControllerSystem : SharedChameleonControllerSystem
 {
     [Dependency] private InventorySystem _inventory = default!;
-    [Dependency] private SharedStationSpawningSystem _stationSpawningSystem = default!;
+    [Dependency] private StationSpawningSystem _stationSpawningSystem = default!;
     [Dependency] private ChameleonClothingSystem _chameleonClothingSystem = default!;
     [Dependency] private IServerPreferencesManager _preferences = default!;
     [Dependency] private UseDelaySystem _delay = default!;
diff --git a/Content.Server/Implants/RadioImplantSystem.cs b/Content.Server/Implants/RadioImplantSystem.cs
index 2a4f31fb9d..a7b176fe59 100644
--- a/Content.Server/Implants/RadioImplantSystem.cs
+++ b/Content.Server/Implants/RadioImplantSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Implants;
+using Content.Shared.Implants;
 using Content.Shared.Implants.Components;
 using Content.Shared.Radio.Components;
 
diff --git a/Content.Server/Inventory/InventoryCommand.cs b/Content.Server/Inventory/InventoryCommand.cs
index 2a7bcab909..ccc74ae695 100644
--- a/Content.Server/Inventory/InventoryCommand.cs
+++ b/Content.Server/Inventory/InventoryCommand.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.Inventory;
diff --git a/Content.Server/Item/ItemSystem.cs b/Content.Server/Item/ItemSystem.cs
index aa0240e93f..86f6f98fb1 100644
--- a/Content.Server/Item/ItemSystem.cs
+++ b/Content.Server/Item/ItemSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Item;
+using Content.Shared.Item;
 
 namespace Content.Server.Item;
 
diff --git a/Content.Server/Jobs/AddImplantSpecial.cs b/Content.Server/Jobs/AddImplantSpecial.cs
index 3967a08d9e..e71009bddb 100644
--- a/Content.Server/Jobs/AddImplantSpecial.cs
+++ b/Content.Server/Jobs/AddImplantSpecial.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Implants;
+using Content.Shared.Implants;
 using Content.Shared.Roles;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/Jobs/ApplyStatusEffectSpecial.cs b/Content.Server/Jobs/ApplyStatusEffectSpecial.cs
index b06ce114ba..e6b9fc0b85 100644
--- a/Content.Server/Jobs/ApplyStatusEffectSpecial.cs
+++ b/Content.Server/Jobs/ApplyStatusEffectSpecial.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Roles;
+using Content.Shared.Roles;
 using Content.Shared.StatusEffectNew;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/KillTracking/KillTrackerComponent.cs b/Content.Server/KillTracking/KillTrackerComponent.cs
index a81a4bdf9b..48cd7fe89d 100644
--- a/Content.Server/KillTracking/KillTrackerComponent.cs
+++ b/Content.Server/KillTracking/KillTrackerComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.FixedPoint;
+using Content.Shared.FixedPoint;
 using Content.Shared.Mobs;
 using Robust.Shared.Network;
 
diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index 204194d40f..ab9cc981d9 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -99,7 +99,8 @@ namespace Content.Server.Kitchen.EntitySystems
             SubscribeLocalEvent<ActiveMicrowaveComponent, EntRemovedFromContainerMessage>(OnActiveMicrowaveRemove);
 
             SubscribeLocalEvent<ActivelyMicrowavedComponent, OnConstructionTemperatureEvent>(OnConstructionTemp);
-            SubscribeLocalEvent<ActivelyMicrowavedComponent, SolutionRelayEvent<ReactionAttemptEvent>>(OnReactionAttempt);
+            SubscribeLocalEvent<ActivelyMicrowavedComponent, SolutionRelayEvent<ReactionAttemptEvent>>(OnReactionAttemptRelay);
+            SubscribeLocalEvent<ActivelyMicrowavedComponent, ReactionAttemptEvent>(OnReactionAttempt);
 
             SubscribeLocalEvent<FoodRecipeProviderComponent, GetSecretRecipesEvent>(OnGetSecretRecipes);
         }
@@ -144,9 +145,14 @@ namespace Content.Server.Kitchen.EntitySystems
             args.Result = HandleResult.False;
         }
 
+        private void OnReactionAttemptRelay(Entity<ActivelyMicrowavedComponent> ent, ref SolutionRelayEvent<ReactionAttemptEvent> args)
+        {
+            OnReactionAttempt(ent, ref args.Event);
+        }
+
         // Stop reagents from reacting if they are currently reserved for a microwave recipe.
         // For example Egg would cook into EggCooked, causing it to not being removed once we are done microwaving.
-        private void OnReactionAttempt(Entity<ActivelyMicrowavedComponent> ent, ref SolutionRelayEvent<ReactionAttemptEvent> args)
+        private void OnReactionAttempt(Entity<ActivelyMicrowavedComponent> ent, ref ReactionAttemptEvent args)
         {
             if (!TryComp<ActiveMicrowaveComponent>(ent.Comp.Microwave, out var activeMicrowaveComp))
                 return;
@@ -158,9 +164,9 @@ namespace Content.Server.Kitchen.EntitySystems
 
             foreach (var reagent in recipeReagents)
             {
-                if (args.Event.Reaction.Reactants.ContainsKey(reagent))
+                if (args.Reaction.Reactants.ContainsKey(reagent))
                 {
-                    args.Event.Cancelled = true;
+                    args.Cancelled = true;
                     return;
                 }
             }
diff --git a/Content.Server/Light/Components/LightBehaviourComponent.cs b/Content.Server/Light/Components/LightBehaviourComponent.cs
index 430c692c3a..b556ac038e 100644
--- a/Content.Server/Light/Components/LightBehaviourComponent.cs
+++ b/Content.Server/Light/Components/LightBehaviourComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Light.Components;
+using Content.Shared.Light.Components;
 
 namespace Content.Server.Light.Components
 {
diff --git a/Content.Server/Light/Components/LitOnPoweredComponent.cs b/Content.Server/Light/Components/LitOnPoweredComponent.cs
index c744b0b91f..8d11a06b0f 100644
--- a/Content.Server/Light/Components/LitOnPoweredComponent.cs
+++ b/Content.Server/Light/Components/LitOnPoweredComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Light.EntitySystems;
+using Content.Server.Light.EntitySystems;
 
 namespace Content.Server.Light.Components
 {
diff --git a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
index fce66ee6f2..0b5f661f50 100644
--- a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
@@ -22,7 +22,7 @@ public sealed partial class EmergencyLightSystem : SharedEmergencyLightSystem
     [Dependency] private BatterySystem _battery = default!;
     [Dependency] private PointLightSystem _pointLight = default!;
     [Dependency] private SharedAppearanceSystem _appearance = default!;
-    [Dependency] private StationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs b/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs
index 8acfe0ac76..eb6022006f 100644
--- a/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs
+++ b/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.Light.Components;
-using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Power;
 
@@ -8,28 +7,29 @@ namespace Content.Server.Light.EntitySystems
     public sealed partial class LitOnPoweredSystem : EntitySystem
     {
         [Dependency] private SharedPointLightSystem _lights = default!;
+        [Dependency] private PowerReceiverSystem _powerReceiver = default!;
 
         public override void Initialize()
         {
             base.Initialize();
+            SubscribeLocalEvent<LitOnPoweredComponent, MapInitEvent>(OnMapInit);
             SubscribeLocalEvent<LitOnPoweredComponent, PowerChangedEvent>(OnPowerChanged);
             SubscribeLocalEvent<LitOnPoweredComponent, PowerNetBatterySupplyEvent>(OnPowerSupply);
         }
 
+        private void OnMapInit(EntityUid uid, LitOnPoweredComponent component, MapInitEvent args)
+        {
+            _lights.SetEnabled(uid, _powerReceiver.IsPowered(uid));
+        }
+
         private void OnPowerChanged(EntityUid uid, LitOnPoweredComponent component, ref PowerChangedEvent args)
         {
-            if (_lights.TryGetLight(uid, out var light))
-            {
-                _lights.SetEnabled(uid, args.Powered, light);
-            }
+            _lights.SetEnabled(uid, args.Powered);
         }
 
         private void OnPowerSupply(EntityUid uid, LitOnPoweredComponent component, ref PowerNetBatterySupplyEvent args)
         {
-            if (_lights.TryGetLight(uid, out var light))
-            {
-                _lights.SetEnabled(uid, args.Supply, light);
-            }
+            _lights.SetEnabled(uid, args.Supply);
         }
     }
 }
diff --git a/Content.Server/Magic/MagicSystem.cs b/Content.Server/Magic/MagicSystem.cs
index b66680afd7..c012591b5d 100644
--- a/Content.Server/Magic/MagicSystem.cs
+++ b/Content.Server/Magic/MagicSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Chat.Systems;
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Rules.Components;
+using Content.Shared.GameTicking.Rules.Components;
 using Content.Shared.Magic;
 using Content.Shared.Magic.Events;
 using Content.Shared.Mind;
@@ -12,18 +13,13 @@ namespace Content.Server.Magic;
 public sealed partial class MagicSystem : SharedMagicSystem
 {
     [Dependency] private ChatSystem _chat = default!;
-    [Dependency] private GameTicker _gameTicker = default!;
+    [Dependency] private ServerGameTicker _gameTicker = default!;
     [Dependency] private TagSystem _tag = default!;
     [Dependency] private SharedMindSystem _mind = default!;
 
     private static readonly ProtoId<TagPrototype> InvalidForSurvivorAntagTag = "InvalidForSurvivorAntag";
     private static readonly EntProtoId SurvivorGameRule = "Survivor";
 
-    public override void Initialize()
-    {
-        base.Initialize();
-    }
-
     public override void OnVoidApplause(VoidApplauseSpellEvent ev)
     {
         base.OnVoidApplause(ev);
diff --git a/Content.Server/MapText/MapTextComponent.cs b/Content.Server/MapText/MapTextComponent.cs
index 2af9583484..acad3dc85b 100644
--- a/Content.Server/MapText/MapTextComponent.cs
+++ b/Content.Server/MapText/MapTextComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.MapText;
+using Content.Shared.MapText;
 
 namespace Content.Server.MapText;
 
diff --git a/Content.Server/MapText/MapTextSystem.cs b/Content.Server/MapText/MapTextSystem.cs
index da55fa36e5..eb87e66efa 100644
--- a/Content.Server/MapText/MapTextSystem.cs
+++ b/Content.Server/MapText/MapTextSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.MapText;
+using Content.Shared.MapText;
 using Robust.Shared.GameStates;
 
 namespace Content.Server.MapText;
diff --git a/Content.Server/Mapping/MappingCommand.cs b/Content.Server/Mapping/MappingCommand.cs
index d41d395c33..e5c945483f 100644
--- a/Content.Server/Mapping/MappingCommand.cs
+++ b/Content.Server/Mapping/MappingCommand.cs
@@ -146,7 +146,7 @@ namespace Content.Server.Mapping
 
             // map successfully created. run misc helpful mapping commands
             if (player.AttachedEntity is { Valid: true } playerEntity &&
-                (EntityManager.GetComponent<MetaDataComponent>(playerEntity).EntityPrototype is not { } proto || proto != GameTicker.AdminObserverPrototypeName))
+                (EntityManager.GetComponent<MetaDataComponent>(playerEntity).EntityPrototype is not { } proto || proto != ServerGameTicker.AdminObserverPrototypeName))
             {
                 shell.ExecuteCommand("aghost");
             }
diff --git a/Content.Server/Maps/GameMapManager.cs b/Content.Server/Maps/GameMapManager.cs
index fd31c91844..5e15f51e15 100644
--- a/Content.Server/Maps/GameMapManager.cs
+++ b/Content.Server/Maps/GameMapManager.cs
@@ -102,14 +102,14 @@ public sealed partial class GameMapManager : IGameMapManager
 
     public IEnumerable<GameMapPrototype> AllVotableMaps()
     {
-        var poolPrototype = _entityManager.System<GameTicker>().Preset?.MapPool ??
+        var poolPrototype = _entityManager.System<ServerGameTicker>().Preset?.MapPool ??
                    _configurationManager.GetCVar(CCVars.GameMapPool);
 
-        if (_prototypeManager.TryIndex<GameMapPoolPrototype>(poolPrototype, out var pool))
+        if (_prototypeManager.TryIndex(poolPrototype, out var pool))
         {
             foreach (var map in pool.Maps)
             {
-                if (!_prototypeManager.TryIndex<GameMapPrototype>(map, out var mapProto))
+                if (!_prototypeManager.TryIndex(map, out var mapProto))
                 {
                     _log.Error($"Couldn't index map {map} in pool {poolPrototype}");
                     continue;
@@ -194,7 +194,7 @@ public sealed partial class GameMapManager : IGameMapManager
         return map.MaxPlayers >= _playerManager.PlayerCount &&
                map.MinPlayers <= _playerManager.PlayerCount &&
                map.Conditions.All(x => x.Check(map)) &&
-               _entityManager.System<GameTicker>().IsMapEligible(map);
+               _entityManager.System<ServerGameTicker>().IsMapEligible(map);
     }
 
     private bool TryLookupMap(string gameMap, [NotNullWhen(true)] out GameMapPrototype? map)
diff --git a/Content.Server/Maps/MapMigrationSystem.cs b/Content.Server/Maps/MapMigrationSystem.cs
index fdaa58709f..eebf2b391f 100644
--- a/Content.Server/Maps/MapMigrationSystem.cs
+++ b/Content.Server/Maps/MapMigrationSystem.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using Robust.Shared.ContentPack;
diff --git a/Content.Server/Maps/TileGridSplitSystem.cs b/Content.Server/Maps/TileGridSplitSystem.cs
index 82c1b815c2..ad9eb31c0d 100644
--- a/Content.Server/Maps/TileGridSplitSystem.cs
+++ b/Content.Server/Maps/TileGridSplitSystem.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Shared.Maps;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
diff --git a/Content.Server/MassMedia/Components/NewsWriterComponent.cs b/Content.Server/MassMedia/Components/NewsWriterComponent.cs
index fcd1250e8b..d65ca9939b 100644
--- a/Content.Server/MassMedia/Components/NewsWriterComponent.cs
+++ b/Content.Server/MassMedia/Components/NewsWriterComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.MassMedia.Systems;
+using Content.Server.MassMedia.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
diff --git a/Content.Server/MassMedia/Systems/NewsSystem.cs b/Content.Server/MassMedia/Systems/NewsSystem.cs
index e0c27105ff..5fde3c8541 100644
--- a/Content.Server/MassMedia/Systems/NewsSystem.cs
+++ b/Content.Server/MassMedia/Systems/NewsSystem.cs
@@ -40,8 +40,8 @@ public sealed partial class NewsSystem : SharedNewsSystem
     [Dependency] private CartridgeLoaderSystem _cartridgeLoaderSystem = default!;
     [Dependency] private SharedAudioSystem _audio = default!;
     [Dependency] private PopupSystem _popup = default!;
-    [Dependency] private StationSystem _station = default!;
-    [Dependency] private GameTicker _ticker = default!;
+    [Dependency] private ServerStationSystem _station = default!;
+    [Dependency] private ServerGameTicker _ticker = default!;
     [Dependency] private IChatManager _chatManager = default!;
     [Dependency] private DiscordWebhook _discord = default!;
     [Dependency] private IConfigurationManager _cfg = default!;
diff --git a/Content.Server/Materials/MaterialStorageSystem.cs b/Content.Server/Materials/MaterialStorageSystem.cs
index 8160b8277a..86df5a6e28 100644
--- a/Content.Server/Materials/MaterialStorageSystem.cs
+++ b/Content.Server/Materials/MaterialStorageSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Materials;
diff --git a/Content.Server/Mech/Components/MechAirComponent.cs b/Content.Server/Mech/Components/MechAirComponent.cs
index d312e1b739..1792820468 100644
--- a/Content.Server/Mech/Components/MechAirComponent.cs
+++ b/Content.Server/Mech/Components/MechAirComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Atmos;
+using Content.Server.Atmos;
 using Content.Shared.Atmos;
 
 namespace Content.Server.Mech.Components;
diff --git a/Content.Server/Mech/Equipment/Components/MechGrabberComponent.cs b/Content.Server/Mech/Equipment/Components/MechGrabberComponent.cs
index f4b3a985bf..a47953a87d 100644
--- a/Content.Server/Mech/Equipment/Components/MechGrabberComponent.cs
+++ b/Content.Server/Mech/Equipment/Components/MechGrabberComponent.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using System.Threading;
 using Content.Shared.DoAfter;
 using Robust.Shared.Audio;
diff --git a/Content.Server/Medical/Components/CryoPodAirComponent.cs b/Content.Server/Medical/Components/CryoPodAirComponent.cs
index 72a10b391e..bc26dce6bb 100644
--- a/Content.Server/Medical/Components/CryoPodAirComponent.cs
+++ b/Content.Server/Medical/Components/CryoPodAirComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Atmos;
+using Content.Server.Atmos;
 using Content.Shared.Atmos;
 
 namespace Content.Server.Medical.Components;
diff --git a/Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleComponent.cs b/Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleComponent.cs
index c2d7124194..91bfb02d51 100644
--- a/Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleComponent.cs
+++ b/Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Medical.SuitSensor;
+using Content.Shared.Medical.SuitSensors;
 
 namespace Content.Server.Medical.CrewMonitoring;
 
diff --git a/Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs b/Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs
index 6399250475..d3e6fb77e0 100644
--- a/Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs
+++ b/Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs
@@ -1,12 +1,8 @@
 using System.Linq;
-using Content.Server.DeviceNetwork;
-using Content.Server.DeviceNetwork.Systems;
-using Content.Shared.PowerCell;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.Medical.CrewMonitoring;
-using Content.Shared.Medical.SuitSensor;
 using Content.Shared.Pinpointer;
+using Content.Shared.PowerCell;
 using Robust.Server.GameObjects;
 
 namespace Content.Server.Medical.CrewMonitoring;
@@ -20,7 +16,6 @@ public sealed partial class CrewMonitoringConsoleSystem : EntitySystem
     {
         base.Initialize();
         SubscribeLocalEvent<CrewMonitoringConsoleComponent, ComponentRemove>(OnRemove);
-        SubscribeLocalEvent<CrewMonitoringConsoleComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
         SubscribeLocalEvent<CrewMonitoringConsoleComponent, BoundUIOpenedEvent>(OnUIOpened);
     }
 
@@ -29,22 +24,11 @@ public sealed partial class CrewMonitoringConsoleSystem : EntitySystem
         component.ConnectedSensors.Clear();
     }
 
-    private void OnPacketReceived(EntityUid uid, CrewMonitoringConsoleComponent component, DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnSuitSensorBroadcast(Entity<CrewMonitoringConsoleComponent> ent, ref DeviceNetworkPacketEvent<BroadcastSuitSensorStatePayload> args)
     {
-        var payload = args.Data;
-
-        // Check command
-        if (!payload.TryGetValue(DeviceNetworkConstants.Command, out string? command))
-            return;
-
-        if (command != DeviceNetworkConstants.CmdUpdatedState)
-            return;
-
-        if (!payload.TryGetValue(SuitSensorConstants.NET_STATUS_COLLECTION, out Dictionary<string, SuitSensorStatus>? sensorStatus))
-            return;
-
-        component.ConnectedSensors = sensorStatus;
-        UpdateUserInterface(uid, component);
+        ent.Comp.ConnectedSensors = args.Data.SensorStatus;
+        UpdateUserInterface(ent, ent.Comp);
     }
 
     private void OnUIOpened(EntityUid uid, CrewMonitoringConsoleComponent component, BoundUIOpenedEvent args)
diff --git a/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerComponent.cs b/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerComponent.cs
index 7eeafb49c6..67fc01dd8f 100644
--- a/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerComponent.cs
+++ b/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerComponent.cs
@@ -1,5 +1,4 @@
-using Content.Shared.Medical.SuitSensor;
-using Robust.Shared.Map;
+using Content.Shared.Medical.SuitSensors;
 
 namespace Content.Server.Medical.CrewMonitoring;
 
diff --git a/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs b/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs
index 87e9fb48d4..5b87771c4a 100644
--- a/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs
+++ b/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs
@@ -1,16 +1,14 @@
 using Content.Server.DeviceNetwork.Systems;
-using Content.Server.Medical.SuitSensors;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
-using Content.Shared.Medical.SuitSensor;
 using Robust.Shared.Timing;
 using Content.Shared.DeviceNetwork.Components;
+using Content.Shared.Medical.CrewMonitoring;
+using Content.Shared.Medical.SuitSensors;
 
 namespace Content.Server.Medical.CrewMonitoring;
 
 public sealed partial class CrewMonitoringServerSystem : EntitySystem
 {
-    [Dependency] private SuitSensorSystem _sensors = default!;
     [Dependency] private IGameTiming _gameTiming = default!;
     [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!;
     [Dependency] private SingletonDeviceNetServerSystem _singletonServerSystem = default!;
@@ -22,7 +20,6 @@ public sealed partial class CrewMonitoringServerSystem : EntitySystem
     {
         base.Initialize();
         SubscribeLocalEvent<CrewMonitoringServerComponent, ComponentRemove>(OnRemove);
-        SubscribeLocalEvent<CrewMonitoringServerComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
         SubscribeLocalEvent<CrewMonitoringServerComponent, DeviceNetServerDisconnectedEvent>(OnDisconnected);
     }
 
@@ -51,14 +48,12 @@ public sealed partial class CrewMonitoringServerSystem : EntitySystem
     /// <summary>
     /// Adds or updates a sensor status entry if the received package is a sensor status update
     /// </summary>
-    private void OnPacketReceived(EntityUid uid, CrewMonitoringServerComponent component, DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnSensorStatus(Entity<CrewMonitoringServerComponent> ent, ref DeviceNetworkPacketEvent<SuitSensorStatusPayload> args)
     {
-        var sensorStatus = _sensors.PacketToSuitSensor(args.Data);
-        if (sensorStatus == null)
-            return;
-
-        sensorStatus.Timestamp = _gameTiming.CurTime;
-        component.SensorStatus[args.SenderAddress] = sensorStatus;
+        var sensorData = args.Data.Data;
+        sensorData.Timestamp = _gameTiming.CurTime;
+        ent.Comp.SensorStatus[args.SenderAddress] = sensorData;
     }
 
     /// <summary>
@@ -93,13 +88,12 @@ public sealed partial class CrewMonitoringServerSystem : EntitySystem
         if (!Resolve(uid, ref serverComponent, ref device))
             return;
 
-        var payload = new NetworkPayload()
+        var payload = new BroadcastSuitSensorStatePayload
         {
-            [DeviceNetworkConstants.Command] = DeviceNetworkConstants.CmdUpdatedState,
-            [SuitSensorConstants.NET_STATUS_COLLECTION] = serverComponent.SensorStatus
+            SensorStatus = serverComponent.SensorStatus,
         };
 
-        _deviceNetworkSystem.QueuePacket(uid, null, payload, device: device);
+        _deviceNetworkSystem.SendPacket((uid, device), null, ref payload);
     }
 
     /// <summary>
diff --git a/Content.Server/Medical/InsideCryoPodSystem.cs b/Content.Server/Medical/InsideCryoPodSystem.cs
index f04bb3cc40..651ce6b1d1 100644
--- a/Content.Server/Medical/InsideCryoPodSystem.cs
+++ b/Content.Server/Medical/InsideCryoPodSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Body.Systems;
+using Content.Server.Body.Systems;
 using Content.Server.Medical.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Medical.Cryogenics;
diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
index 2ae1ce7cca..68f05b00dd 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
@@ -46,9 +46,6 @@ public sealed partial class SuitSensorSystem : SharedSuitSensorSystem
                 sensor.ConnectedServer = address;
             }
 
-            // Send it to the connected server
-            var payload = SuitSensorToPacket(status);
-
             // Clear the connected server if its address isn't on the network
             if (!_deviceNetworkSystem.IsAddressPresent(device.DeviceNetId, sensor.ConnectedServer))
             {
@@ -56,7 +53,11 @@ public sealed partial class SuitSensorSystem : SharedSuitSensorSystem
                 continue;
             }
 
-            _deviceNetworkSystem.QueuePacket(uid, sensor.ConnectedServer, payload, device: device);
+            var payload = new SuitSensorStatusPayload
+            {
+                Data = status.Value,
+            };
+            _deviceNetworkSystem.SendPacket((uid, device), sensor.ConnectedServer, ref payload);
         }
     }
 }
diff --git a/Content.Server/Mind/Commands/MindInfoCommand.cs b/Content.Server/Mind/Commands/MindInfoCommand.cs
index d0c8b3cc9c..86e03e31bc 100644
--- a/Content.Server/Mind/Commands/MindInfoCommand.cs
+++ b/Content.Server/Mind/Commands/MindInfoCommand.cs
@@ -1,4 +1,4 @@
-using System.Text;
+using System.Text;
 using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.Mind;
diff --git a/Content.Server/Mind/MindSystem.cs b/Content.Server/Mind/MindSystem.cs
index be5dd86563..fec212ac02 100644
--- a/Content.Server/Mind/MindSystem.cs
+++ b/Content.Server/Mind/MindSystem.cs
@@ -12,26 +12,20 @@ using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
 using System.Diagnostics.CodeAnalysis;
+using Content.Shared.GameTicking;
 
 namespace Content.Server.Mind;
 
 public sealed partial class MindSystem : SharedMindSystem
 {
-    [Dependency] private GameTicker _gameTicker = default!;
+    [Dependency] private ServerGameTicker _gameTicker = default!;
     [Dependency] private IAdminLogManager _adminLogger = default!;
     [Dependency] private IPlayerManager _players = default!;
     [Dependency] private GhostSystem _ghosts = default!;
     [Dependency] private SharedTransformSystem _transform = default!;
     [Dependency] private PvsOverrideSystem _pvsOverride = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<MindContainerComponent, EntityTerminatingEvent>(OnMindContainerTerminating);
-        SubscribeLocalEvent<MindComponent, ComponentShutdown>(OnMindShutdown);
-    }
-
+    [SubscribeLocalEvent]
     private void OnMindShutdown(EntityUid uid, MindComponent mind, ComponentShutdown args)
     {
         if (mind.UserId is {} user)
@@ -48,6 +42,8 @@ public sealed partial class MindSystem : SharedMindSystem
         mind.OwnedEntity = null;
     }
 
+    // TODO: This should not run on EntityTerminatingEvent, instead we should detach the mind and then queue transferring it.
+    [SubscribeLocalEvent]
     private void OnMindContainerTerminating(EntityUid uid, MindContainerComponent component, ref EntityTerminatingEvent args)
     {
         if (!TryGetMind(uid, out var mindId, out var mind, component))
@@ -56,8 +52,7 @@ public sealed partial class MindSystem : SharedMindSystem
         // If the player is currently visiting some other entity, simply attach to that entity.
         if (mind.VisitingEntity is {Valid: true} visiting
             && visiting != uid
-            && !Deleted(visiting)
-            && !Terminating(visiting))
+            && !TerminatingOrDeleted(visiting))
         {
             TransferTo(mindId, visiting, mind: mind);
             if (TryComp(visiting, out GhostComponent? ghostComp))
@@ -76,8 +71,7 @@ public sealed partial class MindSystem : SharedMindSystem
             // Log these to make sure they're not causing the GameTicker round restart bugs...
             Log.Debug($"Entity \"{ToPrettyString(uid)}\" for {mind.CharacterName} was deleted, spawned \"{ToPrettyString(ghost)}\".");
         else
-            // This should be an error, if it didn't cause tests to start erroring when they delete a player.
-            Log.Warning($"Entity \"{ToPrettyString(uid)}\" for {mind.CharacterName} was deleted, and no applicable spawn location is available.");
+            Log.Error($"Entity \"{ToPrettyString(uid)}\" for {mind.CharacterName} was deleted, and no applicable spawn location is available.");
     }
 
     public override bool TryGetMind(NetUserId user, [NotNullWhen(true)] out EntityUid? mindId, [NotNullWhen(true)] out MindComponent? mind)
@@ -180,7 +174,7 @@ public sealed partial class MindSystem : SharedMindSystem
         MindContainerComponent? component = null;
         var alreadyAttached = false;
 
-        if (entity != null)
+        if (entity != null && !TerminatingOrDeleted(entity))
         {
             component = EnsureComp<MindContainerComponent>(entity.Value);
 
@@ -210,7 +204,7 @@ public sealed partial class MindSystem : SharedMindSystem
                 ? _transform.ToMapCoordinates(_gameTicker.GetObserverSpawnPoint())
                 : _transform.GetMapCoordinates(mind.OwnedEntity.Value);
 
-            entity = Spawn(GameTicker.ObserverPrototypeName, position);
+            entity = Spawn(ServerGameTicker.ObserverPrototypeName, position);
             component = EnsureComp<MindContainerComponent>(entity.Value);
             var ghostComponent = Comp<GhostComponent>(entity.Value);
             _ghosts.SetCanReturnToBody((entity.Value, ghostComponent), false);
diff --git a/Content.Server/Mind/Toolshed/MindCommand.cs b/Content.Server/Mind/Toolshed/MindCommand.cs
index 5f82029dc0..1ee68e5cb1 100644
--- a/Content.Server/Mind/Toolshed/MindCommand.cs
+++ b/Content.Server/Mind/Toolshed/MindCommand.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mind;
+using Content.Shared.Mind;
 using Robust.Shared.Player;
 using Robust.Shared.Toolshed;
 using Robust.Shared.Toolshed.Errors;
diff --git a/Content.Server/Mind/TransferMindOnGibSystem.cs b/Content.Server/Mind/TransferMindOnGibSystem.cs
index 8eb3eb9274..7b62624dec 100644
--- a/Content.Server/Mind/TransferMindOnGibSystem.cs
+++ b/Content.Server/Mind/TransferMindOnGibSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Gibbing;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
diff --git a/Content.Server/Mobs/CritMobActionsSystem.cs b/Content.Server/Mobs/CritMobActionsSystem.cs
index e07ba82f66..23aed314fe 100644
--- a/Content.Server/Mobs/CritMobActionsSystem.cs
+++ b/Content.Server/Mobs/CritMobActionsSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.Chat.Systems;
 using Content.Server.Popups;
 using Content.Shared.Chat;
diff --git a/Content.Server/MouseRotator/MouseRotatorSystem.cs b/Content.Server/MouseRotator/MouseRotatorSystem.cs
index c73b677494..5ad335c8a1 100644
--- a/Content.Server/MouseRotator/MouseRotatorSystem.cs
+++ b/Content.Server/MouseRotator/MouseRotatorSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.MouseRotator;
+using Content.Shared.MouseRotator;
 
 namespace Content.Server.MouseRotator;
 
diff --git a/Content.Server/NPC/Commands/AddNPCCommand.cs b/Content.Server/NPC/Commands/AddNPCCommand.cs
index 9e53153832..f208aef7f3 100644
--- a/Content.Server/NPC/Commands/AddNPCCommand.cs
+++ b/Content.Server/NPC/Commands/AddNPCCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.NPC.HTN;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
diff --git a/Content.Server/NPC/Components/NPCRetaliationComponent.cs b/Content.Server/NPC/Components/NPCRetaliationComponent.cs
index c0bf54d76e..15155d0e4d 100644
--- a/Content.Server/NPC/Components/NPCRetaliationComponent.cs
+++ b/Content.Server/NPC/Components/NPCRetaliationComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.NPC.Systems;
+using Content.Server.NPC.Systems;
 
 namespace Content.Server.NPC.Components;
 
diff --git a/Content.Server/NPC/HTN/Preconditions/InContainerPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/InContainerPrecondition.cs
index aa0ad98ede..f9c6edab56 100644
--- a/Content.Server/NPC/HTN/Preconditions/InContainerPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/InContainerPrecondition.cs
@@ -1,4 +1,4 @@
-using Robust.Server.Containers;
+using Robust.Server.Containers;
 
 namespace Content.Server.NPC.HTN.Preconditions;
 
diff --git a/Content.Server/NPC/HTN/Preconditions/IsEmaggedPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/IsEmaggedPrecondition.cs
index fe76968f34..3bc97deb07 100644
--- a/Content.Server/NPC/HTN/Preconditions/IsEmaggedPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/IsEmaggedPrecondition.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Emag.Systems;
+using Content.Shared.Emag.Systems;
 
 namespace Content.Server.NPC.HTN.Preconditions;
 
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs
index 8a0733a08e..b367c0acf0 100644
--- a/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.NPC.HTN.Preconditions.Math;
+namespace Content.Server.NPC.HTN.Preconditions.Math;
 
 /// <summary>
 /// Checks if there is a bool value for the specified <see cref="KeyBoolEqualsPrecondition.Key"/>
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs
index 91ad9d78a4..d8e363bc7f 100644
--- a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.NPC.HTN.Preconditions.Math;
+namespace Content.Server.NPC.HTN.Preconditions.Math;
 
 /// <summary>
 /// Checks if there is a float value for the specified <see cref="KeyFloatEqualsPrecondition.Key"/>
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs
index 368a0a9ad7..02af5a151a 100644
--- a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.NPC.HTN.Preconditions.Math;
+namespace Content.Server.NPC.HTN.Preconditions.Math;
 
 /// <summary>
 /// Checks if there is a float value for the specified <see cref="KeyFloatGreaterPrecondition.Key"/>
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs
index a4a6d705c9..a22209fa8a 100644
--- a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.NPC.HTN.Preconditions.Math;
+namespace Content.Server.NPC.HTN.Preconditions.Math;
 
 /// <summary>
 /// Checks if there is a float value for the specified <see cref="KeyFloatGreaterPrecondition.Key"/>
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/ContainerOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/ContainerOperator.cs
index f47da75808..3ad0e4108f 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/ContainerOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/ContainerOperator.cs
@@ -1,4 +1,4 @@
-using Robust.Server.Containers;
+using Robust.Server.Containers;
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat;
 
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/EscapeOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/EscapeOperator.cs
index ed1d0c5975..b20541a158 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/EscapeOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/EscapeOperator.cs
@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using Content.Server.NPC.Components;
 using Content.Server.Storage.EntitySystems;
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs
index 8e815c6487..84cf8f0470 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs
@@ -1,4 +1,4 @@
-using Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions;
+using Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions;
 using Content.Shared.CombatMode;
 using Content.Shared.Weapons.Melee;
 
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs
index c2ae7d43ea..2708ec401a 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs
@@ -1,7 +1,7 @@
 using Content.Server.Interaction;
 using Content.Shared.CombatMode;
 using Content.Shared.DoAfter;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Systems;
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions;
 
@@ -69,7 +69,7 @@ public sealed partial class InteractWithOperator : HTNOperator
         }
 
 
-        if (_entManager.TryGetComponent<UseDelayComponent>(owner, out var useDelay) && _entManager.System<UseDelaySystem>().IsDelayed((owner, useDelay)) ||
+        if (_entManager.System<UseDelaySystem>().IsDelayed(owner) ||
             !blackboard.TryGetValue<EntityUid>(TargetKey, out var moveTarget, _entManager) ||
             !_entManager.TryGetComponent<TransformComponent>(moveTarget, out var targetXform))
         {
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs
index d97b050554..c83936d127 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs
@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math;
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs
index 2de42bf7f8..5e7c80c7d2 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs
@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using Robust.Shared.Random;
 
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PlaySoundOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PlaySoundOperator.cs
index 57cc2e91e4..22db408f6e 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PlaySoundOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PlaySoundOperator.cs
@@ -1,4 +1,4 @@
-using Robust.Server.Audio;
+using Robust.Server.Audio;
 using Robust.Shared.Audio;
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators;
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs
index 58fae7ea03..9f398969b6 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs
@@ -1,4 +1,4 @@
-using Content.Server.Chat.Systems;
+using Content.Server.Chat.Systems;
 using Content.Shared.Chat;
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators;
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs
index 06ea0f4e66..a634778cd2 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific;
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific;
 
 /// <summary>
 /// Raises an <see cref="HTNRaisedEvent"/> on the <see cref="NPCBlackboard.Owner">owner</see>. The event will contain
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index 17554beabf..65b7e6337a 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -175,7 +175,7 @@ public sealed partial class NPCUtilitySystem : EntitySystem
 
                 // only eat when hungry or if it will eat anything
                 if (TryComp<SatiationComponent>(owner, out var satiation) &&
-                    _satiation.IsValueInRange((owner, satiation), SatiationSystem.Hunger, below: foodValueConsideration.HungerThreshold) &&
+                    _satiation.IsValueInRange((owner, satiation), SatiationSystem.Hunger, above: foodValueConsideration.HungerThreshold) &&
                     avoidBadFood)
                     return 0f;
 
@@ -197,7 +197,7 @@ public sealed partial class NPCUtilitySystem : EntitySystem
 
                 // only drink when thirsty
                 if (TryComp<SatiationComponent>(owner, out var satiation) &&
-                    _satiation.IsValueInRange((owner, satiation), SatiationSystem.Thirst, below: drinkValueConsideration.ThirstThreshold))
+                    _satiation.IsValueInRange((owner, satiation), SatiationSystem.Thirst, above: drinkValueConsideration.ThirstThreshold))
                     return 0f;
 
                 // no janicow don't drink the blood puddle
diff --git a/Content.Server/NameIdentifier/NameIdentifierSystem.cs b/Content.Server/NameIdentifier/NameIdentifierSystem.cs
index a9a6dfed7e..a2fd5060f0 100644
--- a/Content.Server/NameIdentifier/NameIdentifierSystem.cs
+++ b/Content.Server/NameIdentifier/NameIdentifierSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.GameTicking;
+using Content.Shared.GameTicking;
 using Content.Shared.NameIdentifier;
 using Content.Shared.NameModifier.EntitySystems;
 using Robust.Shared.Collections;
diff --git a/Content.Server/Ninja/Systems/StunProviderSystem.cs b/Content.Server/Ninja/Systems/StunProviderSystem.cs
index 18d91eac1d..ddb62a3580 100644
--- a/Content.Server/Ninja/Systems/StunProviderSystem.cs
+++ b/Content.Server/Ninja/Systems/StunProviderSystem.cs
@@ -6,7 +6,8 @@ using Content.Shared.Ninja.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Power.EntitySystems;
 using Content.Shared.Stunnable;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
 
diff --git a/Content.Server/Nuke/Commands/SendNukeCodesCommand.cs b/Content.Server/Nuke/Commands/SendNukeCodesCommand.cs
index b4cbf3519b..8d08e03138 100644
--- a/Content.Server/Nuke/Commands/SendNukeCodesCommand.cs
+++ b/Content.Server/Nuke/Commands/SendNukeCodesCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.Station.Components;
 using Robust.Shared.Console;
diff --git a/Content.Server/Nuke/NukeCodePaperSystem.cs b/Content.Server/Nuke/NukeCodePaperSystem.cs
index e85066b1e6..d3e00f1363 100644
--- a/Content.Server/Nuke/NukeCodePaperSystem.cs
+++ b/Content.Server/Nuke/NukeCodePaperSystem.cs
@@ -14,7 +14,7 @@ namespace Content.Server.Nuke
     {
         [Dependency] private IRobustRandom _random = default!;
         [Dependency] private ChatSystem _chatSystem = default!;
-        [Dependency] private StationSystem _station = default!;
+        [Dependency] private ServerStationSystem _station = default!;
         [Dependency] private PaperSystem _paper = default!;
         [Dependency] private FaxSystem _faxSystem = default!;
 
diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs
index 1dba04507f..67c2fa99fb 100644
--- a/Content.Server/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -40,7 +40,7 @@ public sealed partial class NukeSystem : EntitySystem
     [Dependency] private SharedDoAfterSystem _doAfter = default!;
     [Dependency] private SharedTransformSystem _transform = default!;
     [Dependency] private SharedMapSystem _map = default!;
-    [Dependency] private StationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
     [Dependency] private UserInterfaceSystem _ui = default!;
     [Dependency] private AppearanceSystem _appearance = default!;
     [Dependency] private TurfSystem _turf = default!;
diff --git a/Content.Server/NukeOps/WarDeclaratorComponent.cs b/Content.Server/NukeOps/WarDeclaratorComponent.cs
index 462d2b1681..3ffb2af91b 100644
--- a/Content.Server/NukeOps/WarDeclaratorComponent.cs
+++ b/Content.Server/NukeOps/WarDeclaratorComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameTicking.Rules;
+using Content.Server.GameTicking.Rules;
 using Content.Shared.NukeOps;
 using Robust.Shared.Audio;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
@@ -9,7 +9,7 @@ namespace Content.Server.NukeOps;
 /// Used with NukeOps game rule to send war declaration announcement
 /// </summary>
 [RegisterComponent, AutoGenerateComponentPause]
-[Access(typeof(WarDeclaratorSystem), typeof(NukeopsRuleSystem))]
+[Access(typeof(WarDeclaratorSystem), typeof(ServerNukeopsRuleSystem))]
 public sealed partial class WarDeclaratorComponent : Component
 {
     /// <summary>
diff --git a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
index ddd64d9b3f..c8cfed434d 100644
--- a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
@@ -149,7 +149,7 @@ public sealed partial class AnimalHusbandrySystem : EntitySystem
         if (_failedAttempts.Contains(uid))
             return false;
 
-        if (Resolve(uid, ref component, false) && component.Gestating)
+        if (!Resolve(uid, ref component, false) || component.Gestating)
             return false;
 
         if (HasComp<InfantComponent>(uid))
@@ -160,12 +160,9 @@ public sealed partial class AnimalHusbandrySystem : EntitySystem
 
         // If no satiations, no limit to reproduction
         if (!TryComp<SatiationComponent>(uid, out var satiation))
-        {
             return true;
-        }
 
-        // Check minimum hunger requirement
-        if (component!.MinHungerThreshold is { } minHunger)
+        if (component.MinHungerThreshold is { } minHunger)
         {
             if (!satiation.Has(SatiationSystem.Hunger) ||
                 _satiation.IsValueInRange((uid, satiation), SatiationSystem.Hunger, below: minHunger))
diff --git a/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs b/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs
index b3988cfa8f..9340fa169a 100644
--- a/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Nutrition.Components;
 using Content.Server.Power.EntitySystems;
diff --git a/Content.Server/Objectives/Commands/AddObjectiveCommand.cs b/Content.Server/Objectives/Commands/AddObjectiveCommand.cs
index 859e5cd638..4679555100 100644
--- a/Content.Server/Objectives/Commands/AddObjectiveCommand.cs
+++ b/Content.Server/Objectives/Commands/AddObjectiveCommand.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.Mind;
diff --git a/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs b/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs
index 4033134e21..5dd1dc58ab 100644
--- a/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs
+++ b/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.Mind;
 using Content.Shared.Objectives.Systems;
diff --git a/Content.Server/Objectives/Components/FreeObjectiveComponent.cs b/Content.Server/Objectives/Components/FreeObjectiveComponent.cs
index ae5070ddf7..22aec314ce 100644
--- a/Content.Server/Objectives/Components/FreeObjectiveComponent.cs
+++ b/Content.Server/Objectives/Components/FreeObjectiveComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Objectives.Components;
+namespace Content.Server.Objectives.Components;
 
 /// <summary>
 ///     A free greentext, that's it.
diff --git a/Content.Server/Objectives/Components/HijackShuttleConditionComponent.cs b/Content.Server/Objectives/Components/HijackShuttleConditionComponent.cs
index 2f07086af6..733a4ddbf2 100644
--- a/Content.Server/Objectives/Components/HijackShuttleConditionComponent.cs
+++ b/Content.Server/Objectives/Components/HijackShuttleConditionComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Objectives.Systems;
+using Content.Server.Objectives.Systems;
 
 namespace Content.Server.Objectives.Components;
 
diff --git a/Content.Server/Objectives/ObjectivesSystem.cs b/Content.Server/Objectives/ObjectivesSystem.cs
index f01b2cc30b..44db00da87 100644
--- a/Content.Server/Objectives/ObjectivesSystem.cs
+++ b/Content.Server/Objectives/ObjectivesSystem.cs
@@ -13,6 +13,7 @@ using System.Linq;
 using System.Text;
 using Content.Server.Objectives.Commands;
 using Content.Shared.CCVar;
+using Content.Shared.GameTicking;
 using Content.Shared.Prototypes;
 using Content.Shared.Roles.Jobs;
 using Robust.Server.Player;
@@ -37,8 +38,6 @@ public sealed partial class ObjectivesSystem : SharedObjectivesSystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<RoundEndTextAppendEvent>(OnRoundEndText);
-
         Subs.CVar(_cfg, CCVars.GameShowGreentext, value => _showGreentext = value, true);
 
         ProtoMan.PrototypesReloaded += CreateCompletions;
@@ -54,7 +53,8 @@ public sealed partial class ObjectivesSystem : SharedObjectivesSystem
     /// <summary>
     /// Adds objective text for each game rule's players on round end.
     /// </summary>
-    private void OnRoundEndText(RoundEndTextAppendEvent ev)
+    [SubscribeLocalEvent]
+    private void OnRoundEndText(ref RoundEndTextAppendEvent ev)
     {
         // go through each gamerule getting data for the roundend summary.
         var summaries = new Dictionary<string, Dictionary<string, List<(EntityUid, string)>>>();
diff --git a/Content.Server/Objectives/Systems/FreeObjectiveSystem.cs b/Content.Server/Objectives/Systems/FreeObjectiveSystem.cs
index 41172b8c50..bb7a567064 100644
--- a/Content.Server/Objectives/Systems/FreeObjectiveSystem.cs
+++ b/Content.Server/Objectives/Systems/FreeObjectiveSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Objectives.Components;
+using Content.Server.Objectives.Components;
 using Content.Shared.Objectives.Components;
 
 namespace Content.Server.Objectives.Systems;
diff --git a/Content.Server/Objectives/Systems/HijackShuttleConditionSystem.cs b/Content.Server/Objectives/Systems/HijackShuttleConditionSystem.cs
index 753c064446..1a3914bb0f 100644
--- a/Content.Server/Objectives/Systems/HijackShuttleConditionSystem.cs
+++ b/Content.Server/Objectives/Systems/HijackShuttleConditionSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Objectives.Components;
+using Content.Server.Objectives.Components;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Systems;
 using Content.Shared.Cuffs.Components;
diff --git a/Content.Server/Objectives/Systems/MultipleTraitorsRequirementSystem.cs b/Content.Server/Objectives/Systems/MultipleTraitorsRequirementSystem.cs
index f5fbe9cd4b..845ab2f0df 100644
--- a/Content.Server/Objectives/Systems/MultipleTraitorsRequirementSystem.cs
+++ b/Content.Server/Objectives/Systems/MultipleTraitorsRequirementSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.GameTicking.Rules;
 using Content.Server.Objectives.Components;
+using Content.Shared.GameTicking.Rules;
 using Content.Shared.Objectives.Components;
 
 namespace Content.Server.Objectives.Systems;
diff --git a/Content.Server/Objectives/Systems/ObjectiveLimitSystem.cs b/Content.Server/Objectives/Systems/ObjectiveLimitSystem.cs
index 034af91c00..63aabcd77b 100644
--- a/Content.Server/Objectives/Systems/ObjectiveLimitSystem.cs
+++ b/Content.Server/Objectives/Systems/ObjectiveLimitSystem.cs
@@ -1,8 +1,10 @@
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Objectives.Components;
+using Content.Shared.GameTicking.Rules.Components;
 using Content.Shared.Mind;
 using Content.Shared.Objectives.Components;
 
+namespace Content.Server.Objectives.Systems;
+
 public sealed partial class ObjectiveLimitSystem : EntitySystem
 {
     public override void Initialize()
diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs
index 23c3b1923f..a425d96b15 100644
--- a/Content.Server/PDA/PdaSystem.cs
+++ b/Content.Server/PDA/PdaSystem.cs
@@ -1,13 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Access.Systems;
-using Content.Server.CartridgeLoader;
 using Content.Server.Chat.Managers;
 using Content.Server.Instruments;
 using Content.Server.PDA.Ringer;
 using Content.Server.Station.Systems;
 using Content.Server.Store.Systems;
-using Content.Server.Traitor.Uplink;
 using Content.Shared.Access.Components;
 using Content.Shared.AlertLevel;
 using Content.Shared.CartridgeLoader;
@@ -35,7 +33,7 @@ namespace Content.Server.PDA
         [Dependency] private CartridgeLoaderSystem _cartridgeLoader = default!;
         [Dependency] private InstrumentSystem _instrument = default!;
         [Dependency] private RingerSystem _ringer = default!;
-        [Dependency] private StationSystem _station = default!;
+        [Dependency] private ServerStationSystem _station = default!;
         [Dependency] private StoreSystem _store = default!;
         [Dependency] private IChatManager _chatManager = default!;
         [Dependency] private UserInterfaceSystem _ui = default!;
@@ -133,13 +131,6 @@ namespace Content.Server.PDA
             UpdatePdaUi(uid, pda);
         }
 
-        public void SetOwner(EntityUid uid, PdaComponent pda, EntityUid owner, string ownerName)
-        {
-            pda.OwnerName = ownerName;
-            pda.PdaOwner = owner;
-            UpdatePdaUi(uid, pda);
-        }
-
         private void OnStationRenamed(StationRenamedEvent ev)
         {
             UpdateAllPdaUisOnStation();
@@ -343,7 +334,7 @@ namespace Content.Server.PDA
 
             if (TryComp(uid, out DeviceNetworkComponent? deviceNetworkComponent))
             {
-                address = deviceNetworkComponent?.Address;
+                address = deviceNetworkComponent.Address;
             }
 
             return address;
diff --git a/Content.Server/Physics/Components/ChasingWalkComponent.cs b/Content.Server/Physics/Components/ChasingWalkComponent.cs
index a4517b12dc..79bc37905e 100644
--- a/Content.Server/Physics/Components/ChasingWalkComponent.cs
+++ b/Content.Server/Physics/Components/ChasingWalkComponent.cs
@@ -1,5 +1,4 @@
-
-using Content.Server.Administration.Systems;
+using Content.Server.EntityEffects.Effects.Smite;
 using Content.Server.Physics.Controllers;
 using Content.Server.Weapons.Ranged.Systems;
 using Robust.Shared.Prototypes;
@@ -10,7 +9,7 @@ namespace Content.Server.Physics.Components;
 /// <summary>
 /// A component which makes its entity chasing entity with selected component.
 /// </summary>
-[RegisterComponent, Access(typeof(ChasingWalkSystem), typeof(AdminVerbSystem), typeof(GunSystem)), AutoGenerateComponentPause]
+[RegisterComponent, Access(typeof(ChasingWalkSystem), typeof(HomingRodEntityEffectSystem), typeof(GunSystem)), AutoGenerateComponentPause]
 public sealed partial class ChasingWalkComponent : Component
 {
     /// <summary>
diff --git a/Content.Server/Pinpointer/StationMapSystem.cs b/Content.Server/Pinpointer/StationMapSystem.cs
index 54180533a9..1d37befcdf 100644
--- a/Content.Server/Pinpointer/StationMapSystem.cs
+++ b/Content.Server/Pinpointer/StationMapSystem.cs
@@ -1,9 +1,9 @@
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Rules;
-using Content.Server.GameTicking.Rules.Components;
+using Content.Server.Station.Systems;
+using Content.Shared.GameTicking.Rules;
+using Content.Shared.GameTicking.Rules.Components;
 using Content.Shared.PowerCell;
 using Content.Shared.Pinpointer;
-using Content.Shared.Station;
 using Robust.Server.GameObjects;
 
 namespace Content.Server.Pinpointer;
@@ -12,9 +12,9 @@ public sealed partial class StationMapSystem : EntitySystem
 {
     [Dependency] private UserInterfaceSystem _ui = default!;
     [Dependency] private PowerCellSystem _cell = default!;
-    [Dependency] private SharedStationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
     [Dependency] private SharedTransformSystem _xform = default!;
-    [Dependency] private GameTicker _gameTicker = default!;
+    [Dependency] private ServerGameTicker _gameTicker = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Server/Placement/PlacementLoggerSystem.cs b/Content.Server/Placement/PlacementLoggerSystem.cs
index dc094f1ed3..635c70763a 100644
--- a/Content.Server/Placement/PlacementLoggerSystem.cs
+++ b/Content.Server/Placement/PlacementLoggerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration.Logs;
+using Content.Server.Administration.Logs;
 using Content.Shared.Database;
 using Robust.Shared.Map;
 using Robust.Shared.Placement;
diff --git a/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs b/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs
index 54a6a901fe..3673211d19 100644
--- a/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs
+++ b/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Content.Server.Database;
diff --git a/Content.Server/Players/JobWhitelist/JobWhitelistSystem.cs b/Content.Server/Players/JobWhitelist/JobWhitelistSystem.cs
index 4910b17a16..301172b41f 100644
--- a/Content.Server/Players/JobWhitelist/JobWhitelistSystem.cs
+++ b/Content.Server/Players/JobWhitelist/JobWhitelistSystem.cs
@@ -1,4 +1,4 @@
-using System.Collections.Immutable;
+using System.Collections.Immutable;
 using Content.Server.GameTicking.Events;
 using Content.Server.Station.Events;
 using Content.Shared.CCVar;
diff --git a/Content.Server/Players/PlayerSystem.cs b/Content.Server/Players/PlayerSystem.cs
index 9b7f63a688..fdf08ff82d 100644
--- a/Content.Server/Players/PlayerSystem.cs
+++ b/Content.Server/Players/PlayerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Players;
+using Content.Shared.Players;
 using Robust.Shared.Player;
 
 namespace Content.Server.Players;
diff --git a/Content.Server/Players/RateLimiting/PlayerRateLimitManager.cs b/Content.Server/Players/RateLimiting/PlayerRateLimitManager.cs
index 53d347cc5b..c4c80b0edd 100644
--- a/Content.Server/Players/RateLimiting/PlayerRateLimitManager.cs
+++ b/Content.Server/Players/RateLimiting/PlayerRateLimitManager.cs
@@ -1,4 +1,4 @@
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 using Content.Server.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.Players.RateLimiting;
diff --git a/Content.Server/Players/Whitelist/WhitelistManager.cs b/Content.Server/Players/Whitelist/WhitelistManager.cs
index e7618d114a..b299e04c6f 100644
--- a/Content.Server/Players/Whitelist/WhitelistManager.cs
+++ b/Content.Server/Players/Whitelist/WhitelistManager.cs
@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using Content.Server.Database;
 using Robust.Shared.Network;
diff --git a/Content.Server/Pointing/Components/PointingArrowAngeringComponent.cs b/Content.Server/Pointing/Components/PointingArrowAngeringComponent.cs
index 446be1b119..c88ffb905c 100644
--- a/Content.Server/Pointing/Components/PointingArrowAngeringComponent.cs
+++ b/Content.Server/Pointing/Components/PointingArrowAngeringComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Pointing.Components;
+namespace Content.Server.Pointing.Components;
 
 /// <summary>
 /// Causes pointing arrows to go mode and murder this entity.
diff --git a/Content.Server/Polymorph/Toolshed/PolymorphCommand.cs b/Content.Server/Polymorph/Toolshed/PolymorphCommand.cs
index fd5f96e263..35295c6be4 100644
--- a/Content.Server/Polymorph/Toolshed/PolymorphCommand.cs
+++ b/Content.Server/Polymorph/Toolshed/PolymorphCommand.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Administration;
 using Content.Server.Polymorph.Systems;
 using Content.Shared.Administration;
diff --git a/Content.Server/Polymorph/Toolshed/UnpolymorphCommand.cs b/Content.Server/Polymorph/Toolshed/UnpolymorphCommand.cs
index 54ebf1b577..9e28bc0648 100644
--- a/Content.Server/Polymorph/Toolshed/UnpolymorphCommand.cs
+++ b/Content.Server/Polymorph/Toolshed/UnpolymorphCommand.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Administration;
 using Content.Server.Polymorph.Systems;
 using Content.Shared.Administration;
diff --git a/Content.Server/Popups/PopupSystem.cs b/Content.Server/Popups/PopupSystem.cs
index e798e9a536..c03080be14 100644
--- a/Content.Server/Popups/PopupSystem.cs
+++ b/Content.Server/Popups/PopupSystem.cs
@@ -14,7 +14,7 @@ public sealed partial class PopupSystem : SharedPopupSystem
 
     public override void PopupCursor(string? message, EntityUid? recipient, PopupType type = PopupType.Small)
     {
-        if (message == null)
+        if (string.IsNullOrWhiteSpace(message))
             return;
 
         if (TryComp(recipient, out ActorComponent? actor))
@@ -23,7 +23,7 @@ public sealed partial class PopupSystem : SharedPopupSystem
 
     public override void PopupCursor(string? message, ICommonSession recipient, PopupType type = PopupType.Small)
     {
-        if (message == null)
+        if (string.IsNullOrWhiteSpace(message))
             return;
 
         RaiseNetworkEvent(new PopupCursorEvent(message, type, Timing.CurTick), recipient);
@@ -31,7 +31,7 @@ public sealed partial class PopupSystem : SharedPopupSystem
 
     public override void PopupCursor(string? message, Filter filter, bool recordReplay, PopupType type = PopupType.Small)
     {
-        if (message == null)
+        if (string.IsNullOrWhiteSpace(message))
             return;
 
         RaiseNetworkEvent(new PopupCursorEvent(message, type, Timing.CurTick), filter, recordReplay);
@@ -39,7 +39,7 @@ public sealed partial class PopupSystem : SharedPopupSystem
 
     public override void PopupCoordinates(string? message, EntityCoordinates coordinates, PopupType type = PopupType.Small, int predictionKey = 0)
     {
-        if (message == null)
+        if (string.IsNullOrWhiteSpace(message))
             return;
 
         var mapPos = _transform.ToMapCoordinates(coordinates);
@@ -49,7 +49,7 @@ public sealed partial class PopupSystem : SharedPopupSystem
 
     public override void PopupCoordinates(string? message, EntityCoordinates coordinates, EntityUid? recipient, PopupType type = PopupType.Small, int predictionKey = 0)
     {
-        if (message == null)
+        if (string.IsNullOrWhiteSpace(message))
             return;
 
         if (TryComp(recipient, out ActorComponent? actor))
@@ -58,7 +58,7 @@ public sealed partial class PopupSystem : SharedPopupSystem
 
     public override void PopupCoordinates(string? message, EntityCoordinates coordinates, ICommonSession recipient, PopupType type = PopupType.Small, int predictionKey = 0)
     {
-        if (message == null)
+        if (string.IsNullOrWhiteSpace(message))
             return;
 
         RaiseNetworkEvent(new PopupCoordinatesEvent(message, type, Timing.CurTick, GetNetCoordinates(coordinates), predictionKey), recipient);
@@ -66,7 +66,7 @@ public sealed partial class PopupSystem : SharedPopupSystem
 
     public override void PopupCoordinates(string? message, EntityCoordinates coordinates, Filter filter, bool recordReplay, PopupType type = PopupType.Small, int predictionKey = 0)
     {
-        if (message == null)
+        if (string.IsNullOrWhiteSpace(message))
             return;
 
         RaiseNetworkEvent(new PopupCoordinatesEvent(message, type, Timing.CurTick, GetNetCoordinates(coordinates), predictionKey), filter, recordReplay);
@@ -74,7 +74,7 @@ public sealed partial class PopupSystem : SharedPopupSystem
 
     public override void PopupEntity(string? message, EntityUid uid, PopupType type = PopupType.Small)
     {
-        if (message == null)
+        if (string.IsNullOrWhiteSpace(message))
             return;
 
         var filter = Filter.Empty().AddPlayersByPvs(uid, entityManager: EntityManager, playerMan: _player, cfgMan: _cfg);
@@ -83,7 +83,7 @@ public sealed partial class PopupSystem : SharedPopupSystem
 
     public override void PopupEntity(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
     {
-        if (message == null)
+        if (string.IsNullOrWhiteSpace(message))
             return;
 
         if (TryComp(recipient, out ActorComponent? actor))
@@ -92,7 +92,7 @@ public sealed partial class PopupSystem : SharedPopupSystem
 
     public override void PopupEntity(string? message, EntityUid uid, ICommonSession recipient, PopupType type = PopupType.Small)
     {
-        if (message == null)
+        if (string.IsNullOrWhiteSpace(message))
             return;
 
         RaiseNetworkEvent(new PopupEntityEvent(message, type, Timing.CurTick, GetNetEntity(uid)), recipient);
@@ -100,7 +100,7 @@ public sealed partial class PopupSystem : SharedPopupSystem
 
     public override void PopupEntity(string? message, EntityUid uid, Filter filter, bool recordReplay, PopupType type = PopupType.Small)
     {
-        if (message == null)
+        if (string.IsNullOrWhiteSpace(message))
             return;
 
         RaiseNetworkEvent(new PopupEntityEvent(message, type, Timing.CurTick, GetNetEntity(uid)), filter, recordReplay);
diff --git a/Content.Server/Power/Commands/PowerStatCommand.cs b/Content.Server/Power/Commands/PowerStatCommand.cs
index dd14557a63..8843bbcc71 100644
--- a/Content.Server/Power/Commands/PowerStatCommand.cs
+++ b/Content.Server/Power/Commands/PowerStatCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
diff --git a/Content.Server/Power/Commands/PowerValidateCommand.cs b/Content.Server/Power/Commands/PowerValidateCommand.cs
index e01dd3e65f..e449b93607 100644
--- a/Content.Server/Power/Commands/PowerValidateCommand.cs
+++ b/Content.Server/Power/Commands/PowerValidateCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
diff --git a/Content.Server/Power/Components/BaseNetConnectorComponent.cs b/Content.Server/Power/Components/BaseNetConnectorComponent.cs
index bf8e3d7704..2c5e4a66fa 100644
--- a/Content.Server/Power/Components/BaseNetConnectorComponent.cs
+++ b/Content.Server/Power/Components/BaseNetConnectorComponent.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.NodeGroups;
diff --git a/Content.Server/Power/Components/BatteryChargerComponent.cs b/Content.Server/Power/Components/BatteryChargerComponent.cs
index 7f3dd39524..906830b9c2 100644
--- a/Content.Server/Power/Components/BatteryChargerComponent.cs
+++ b/Content.Server/Power/Components/BatteryChargerComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Power.NodeGroups;
+using Content.Server.Power.NodeGroups;
 using Content.Shared.Power.Components;
 
 namespace Content.Server.Power.Components
diff --git a/Content.Server/Power/Components/BatteryDischargerComponent.cs b/Content.Server/Power/Components/BatteryDischargerComponent.cs
index c716338546..c287fcaacd 100644
--- a/Content.Server/Power/Components/BatteryDischargerComponent.cs
+++ b/Content.Server/Power/Components/BatteryDischargerComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Power.NodeGroups;
+using Content.Server.Power.NodeGroups;
 
 namespace Content.Server.Power.Components
 {
diff --git a/Content.Server/Power/Components/BatteryInterfaceComponent.cs b/Content.Server/Power/Components/BatteryInterfaceComponent.cs
index b97b09eda0..467326b3b3 100644
--- a/Content.Server/Power/Components/BatteryInterfaceComponent.cs
+++ b/Content.Server/Power/Components/BatteryInterfaceComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Power.EntitySystems;
+using Content.Server.Power.EntitySystems;
 using Content.Shared.Power;
 
 namespace Content.Server.Power.Components;
diff --git a/Content.Server/Power/Components/CableVisComponent.cs b/Content.Server/Power/Components/CableVisComponent.cs
index 51d68b99fd..abdf37699b 100644
--- a/Content.Server/Power/Components/CableVisComponent.cs
+++ b/Content.Server/Power/Components/CableVisComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Power.Components
+namespace Content.Server.Power.Components
 {
     [RegisterComponent]
     public sealed partial class CableVisComponent : Component
diff --git a/Content.Server/Power/Components/ExtensionCableProviderComponent.cs b/Content.Server/Power/Components/ExtensionCableProviderComponent.cs
index a0bfc75f80..0ec531c8a1 100644
--- a/Content.Server/Power/Components/ExtensionCableProviderComponent.cs
+++ b/Content.Server/Power/Components/ExtensionCableProviderComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Power.EntitySystems;
+using Content.Server.Power.EntitySystems;
 
 namespace Content.Server.Power.Components
 {
diff --git a/Content.Server/Power/Components/ExtensionCableReceiverComponent.cs b/Content.Server/Power/Components/ExtensionCableReceiverComponent.cs
index a4fbdaceac..9229f1fe22 100644
--- a/Content.Server/Power/Components/ExtensionCableReceiverComponent.cs
+++ b/Content.Server/Power/Components/ExtensionCableReceiverComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Power.EntitySystems;
+using Content.Server.Power.EntitySystems;
 
 namespace Content.Server.Power.Components
 {
diff --git a/Content.Server/Power/Components/PowerChargeComponent.cs b/Content.Server/Power/Components/PowerChargeComponent.cs
index 03c6e8e2bc..b729c48c18 100644
--- a/Content.Server/Power/Components/PowerChargeComponent.cs
+++ b/Content.Server/Power/Components/PowerChargeComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Power.EntitySystems;
+using Content.Server.Power.EntitySystems;
 using Content.Shared.Power;
 
 namespace Content.Server.Power.Components;
diff --git a/Content.Server/Power/Components/PowerConsumerBatteryChargerComponent.cs b/Content.Server/Power/Components/PowerConsumerBatteryChargerComponent.cs
index 13a295809e..58f09ae980 100644
--- a/Content.Server/Power/Components/PowerConsumerBatteryChargerComponent.cs
+++ b/Content.Server/Power/Components/PowerConsumerBatteryChargerComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Power.Components;
+namespace Content.Server.Power.Components;
 
 /// <summary>
 /// Used to charge a battery with <see cref="PowerConsumerComponent"/>
diff --git a/Content.Server/Power/Components/PowerNetworkBatteryComponent.cs b/Content.Server/Power/Components/PowerNetworkBatteryComponent.cs
index fcef03903b..840538589f 100644
--- a/Content.Server/Power/Components/PowerNetworkBatteryComponent.cs
+++ b/Content.Server/Power/Components/PowerNetworkBatteryComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Power.Pow3r;
+using Content.Server.Power.Pow3r;
 using Content.Shared.Guidebook;
 
 namespace Content.Server.Power.Components
diff --git a/Content.Server/Power/Components/SpawnOnBatteryFullComponent.cs b/Content.Server/Power/Components/SpawnOnBatteryFullComponent.cs
index f21eaec82e..d23d68e8bc 100644
--- a/Content.Server/Power/Components/SpawnOnBatteryFullComponent.cs
+++ b/Content.Server/Power/Components/SpawnOnBatteryFullComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.EntityTable.EntitySelectors;
+using Content.Shared.EntityTable.EntitySelectors;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Power.Components;
diff --git a/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs b/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs
index 5c9cac3749..5d7560fd47 100644
--- a/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs
+++ b/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration.Logs;
+using Content.Server.Administration.Logs;
 using Content.Server.Power.Components;
 using Content.Shared.Database;
 using Content.Shared.Power;
diff --git a/Content.Server/Power/EntitySystems/PowerChargeSystem.cs b/Content.Server/Power/EntitySystems/PowerChargeSystem.cs
index 0ba03c41cf..3b05d2ca90 100644
--- a/Content.Server/Power/EntitySystems/PowerChargeSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerChargeSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration.Logs;
+using Content.Server.Administration.Logs;
 using Content.Server.Audio;
 using Content.Server.Power.Components;
 using Content.Shared.Database;
diff --git a/Content.Server/Power/EntitySystems/PowerConsumerBatteryChargerSystem.cs b/Content.Server/Power/EntitySystems/PowerConsumerBatteryChargerSystem.cs
index ee46772f11..e7b6d17bdd 100644
--- a/Content.Server/Power/EntitySystems/PowerConsumerBatteryChargerSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerConsumerBatteryChargerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Power.Components;
+using Content.Server.Power.Components;
 using Content.Shared.Power.Components;
 
 namespace Content.Server.Power.EntitySystems;
diff --git a/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs b/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
index 76d3e24aad..ce5dbedb49 100644
--- a/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
@@ -239,7 +239,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
 
     private void OnPowerGridCheckStarted(ref GameRuleStartedEvent ev)
     {
-        if (!TryComp<PowerGridCheckRuleComponent>(ev.RuleEntity, out var rule))
+        if (!TryComp<PowerGridCheckRuleComponent>(ev.Rule, out var rule))
             return;
 
         var query = AllEntityQuery<PowerMonitoringConsoleComponent, TransformComponent>();
@@ -255,7 +255,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
 
     private void OnPowerGridCheckEnded(ref GameRuleEndedEvent ev)
     {
-        if (!TryComp<PowerGridCheckRuleComponent>(ev.RuleEntity, out var rule))
+        if (!TryComp<PowerGridCheckRuleComponent>(ev.Rule, out var rule))
             return;
 
         var query = AllEntityQuery<PowerMonitoringConsoleComponent, TransformComponent>();
diff --git a/Content.Server/Power/EntitySystems/SpawnOnBatteryFullSystem.cs b/Content.Server/Power/EntitySystems/SpawnOnBatteryFullSystem.cs
index aba63298aa..98e4404af5 100644
--- a/Content.Server/Power/EntitySystems/SpawnOnBatteryFullSystem.cs
+++ b/Content.Server/Power/EntitySystems/SpawnOnBatteryFullSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Power.Components;
+using Content.Server.Power.Components;
 using Content.Shared.EntityTable;
 using Content.Shared.EntityTable.EntitySelectors;
 using Content.Shared.Power;
diff --git a/Content.Server/Power/Events/PowerPulseEvent.cs b/Content.Server/Power/Events/PowerPulseEvent.cs
index 23afc52dd1..f5025401e3 100644
--- a/Content.Server/Power/Events/PowerPulseEvent.cs
+++ b/Content.Server/Power/Events/PowerPulseEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Power.Events;
+namespace Content.Server.Power.Events;
 
 /// <summary>
 ///     Invoked on a target entity, when it was pulsed with an energy.
diff --git a/Content.Server/Power/Generation/Teg/TegCirculatorComponent.cs b/Content.Server/Power/Generation/Teg/TegCirculatorComponent.cs
index 95f3b919f2..9d646a929a 100644
--- a/Content.Server/Power/Generation/Teg/TegCirculatorComponent.cs
+++ b/Content.Server/Power/Generation/Teg/TegCirculatorComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos;
+using Content.Shared.Atmos;
 
 namespace Content.Server.Power.Generation.Teg;
 
diff --git a/Content.Server/Power/Generation/Teg/TegGeneratorComponent.cs b/Content.Server/Power/Generation/Teg/TegGeneratorComponent.cs
index 1551078a88..6713316fea 100644
--- a/Content.Server/Power/Generation/Teg/TegGeneratorComponent.cs
+++ b/Content.Server/Power/Generation/Teg/TegGeneratorComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Power.Generation.Teg;
+namespace Content.Server.Power.Generation.Teg;
 
 /// <summary>
 /// The centerpiece for the thermo-electric generator (TEG).
diff --git a/Content.Server/Power/Generation/Teg/TegNodeGroup.cs b/Content.Server/Power/Generation/Teg/TegNodeGroup.cs
index d105663553..67061fc3de 100644
--- a/Content.Server/Power/Generation/Teg/TegNodeGroup.cs
+++ b/Content.Server/Power/Generation/Teg/TegNodeGroup.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Server.NodeContainer.Nodes;
diff --git a/Content.Server/Power/Generation/Teg/TegSensorData.cs b/Content.Server/Power/Generation/Teg/TegSensorData.cs
deleted file mode 100644
index f994b5762c..0000000000
--- a/Content.Server/Power/Generation/Teg/TegSensorData.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Content.Server.Power.Components;
-
-namespace Content.Server.Power.Generation.Teg;
-
-/// <summary>
-/// Sensor data reported by the <see cref="TegGeneratorComponent"/> when queried over the device network.
-/// </summary>
-/// <seealso cref="TegSystem"/>
-public sealed class TegSensorData
-{
-    /// <summary>
-    /// Information for the A-side circulator.
-    /// </summary>
-    public Circulator CirculatorA;
-
-    /// <summary>
-    /// Information for the B-side circulator.
-    /// </summary>
-    public Circulator CirculatorB;
-
-    /// <summary>
-    /// The amount of energy (Joules) generated by the TEG last atmos tick.
-    /// </summary>
-    /// <seealso cref="TegGeneratorComponent.LastGeneration"/>
-    public float LastGeneration;
-
-    /// <summary>
-    /// Ramping position for the TEG power generation.
-    /// </summary>
-    /// <seealso cref="TegGeneratorComponent.RampPosition"/>
-    public float RampPosition;
-
-    /// <summary>
-    /// Power (Watts) actually being supplied by the TEG to connected power network.
-    /// </summary>
-    /// <seealso cref="PowerSupplierComponent.CurrentSupply"/>
-    public float PowerOutput;
-
-    /// <summary>
-    /// Information for a single TEG circulator.
-    /// </summary>
-    /// <param name="InletPressure">Pressure measured at the circulator's input pipe</param>
-    /// <param name="OutletPressure">Pressure measured at the circulator's output pipe</param>
-    /// <param name="InletTemperature">Temperature measured at the circulator's input pipe</param>
-    /// <param name="OutletTemperature">Temperature measured at the circulator's output pipe</param>
-    public record struct Circulator(
-        float InletPressure,
-        float OutletPressure,
-        float InletTemperature,
-        float OutletTemperature);
-}
-
diff --git a/Content.Server/Power/Generation/Teg/TegSystem.cs b/Content.Server/Power/Generation/Teg/TegSystem.cs
index d1e18875bf..3367ac70e8 100644
--- a/Content.Server/Power/Generation/Teg/TegSystem.cs
+++ b/Content.Server/Power/Generation/Teg/TegSystem.cs
@@ -1,11 +1,10 @@
-using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.Audio;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.NodeContainer.Nodes;
 using Content.Server.Power.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.Examine;
 using Content.Shared.NodeContainer;
@@ -43,7 +42,7 @@ namespace Content.Server.Power.Generation.Teg;
 /// <seealso cref="TegGeneratorComponent"/>
 /// <seealso cref="TegCirculatorComponent"/>
 /// <seealso cref="TegNodeGroup"/>
-/// <seealso cref="TegSensorData"/>
+/// <seealso cref="TegSensorPayload"/>
 public sealed partial class TegSystem : EntitySystem
 {
     /// <summary>
@@ -61,11 +60,6 @@ public sealed partial class TegSystem : EntitySystem
     /// </summary>
     private const string NodeNameOutlet = "outlet";
 
-    /// <summary>
-    /// Device network command to have the TEG output a <see cref="TegSensorData"/> object for its last statistics.
-    /// </summary>
-    public const string DeviceNetworkCommandSyncData = "teg_sync_data";
-
     [Dependency] private AmbientSoundSystem _ambientSound = default!;
     [Dependency] private AppearanceSystem _appearance = default!;
     [Dependency] private AtmosphereSystem _atmosphere = default!;
@@ -80,7 +74,6 @@ public sealed partial class TegSystem : EntitySystem
 
         SubscribeLocalEvent<TegGeneratorComponent, AtmosDeviceUpdateEvent>(GeneratorUpdate);
         SubscribeLocalEvent<TegGeneratorComponent, PowerChangedEvent>(GeneratorPowerChange);
-        SubscribeLocalEvent<TegGeneratorComponent, DeviceNetworkPacketEvent>(DeviceNetworkPacketReceived);
 
         SubscribeLocalEvent<TegGeneratorComponent, ExaminedEvent>(GeneratorExamined);
     }
@@ -361,46 +354,32 @@ public sealed partial class TegSystem : EntitySystem
         return (inlet, outlet);
     }
 
-    private void DeviceNetworkPacketReceived(
-        EntityUid uid,
-        TegGeneratorComponent component,
-        DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnSyncPayload(Entity<TegGeneratorComponent> ent, ref DeviceNetworkPacketEvent<TegSensorSyncPayload> args)
     {
-        if (!args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? cmd))
+        var group = GetNodeGroup(ent.Owner);
+        if (group is not { IsFullyBuilt: true })
             return;
 
-        switch (cmd)
+        var supplier = Comp<PowerSupplierComponent>(ent);
+
+        var dataPayload = new TegSensorPayload
         {
-            case DeviceNetworkCommandSyncData:
-                var group = GetNodeGroup(uid);
-                if (group is not { IsFullyBuilt: true })
-                    return;
+            CirculatorA = GetCirculatorSensorData(group.CirculatorA!.Owner),
+            CirculatorB = GetCirculatorSensorData(group.CirculatorB!.Owner),
+            LastGeneration = ent.Comp.LastGeneration,
+            PowerOutput = supplier.CurrentSupply,
+            RampPosition = ent.Comp.RampPosition,
+        };
 
-                var supplier = Comp<PowerSupplierComponent>(uid);
-
-                var payload = new NetworkPayload
-                {
-                    [DeviceNetworkConstants.Command] = DeviceNetworkCommandSyncData,
-                    [DeviceNetworkCommandSyncData] = new TegSensorData
-                    {
-                        CirculatorA = GetCirculatorSensorData(group.CirculatorA!.Owner),
-                        CirculatorB = GetCirculatorSensorData(group.CirculatorB!.Owner),
-                        LastGeneration = component.LastGeneration,
-                        PowerOutput = supplier.CurrentSupply,
-                        RampPosition = component.RampPosition
-                    }
-                };
-
-                _deviceNetwork.QueuePacket(uid, args.SenderAddress, payload);
-                break;
-        }
+        _deviceNetwork.SendPacket(ent.Owner, args.SenderAddress, ref dataPayload);
     }
 
-    private TegSensorData.Circulator GetCirculatorSensorData(EntityUid circulator)
+    private Circulator GetCirculatorSensorData(EntityUid circulator)
     {
         var (inlet, outlet) = GetPipes(circulator);
 
-        return new TegSensorData.Circulator(
+        return new Circulator(
             inlet.Air.Pressure,
             outlet.Air.Pressure,
             inlet.Air.Temperature,
diff --git a/Content.Server/Power/Generator/ChemicalFuelGeneratorDirectSourceComponent.cs b/Content.Server/Power/Generator/ChemicalFuelGeneratorDirectSourceComponent.cs
index 2e8be84822..ef7a7dafcd 100644
--- a/Content.Server/Power/Generator/ChemicalFuelGeneratorDirectSourceComponent.cs
+++ b/Content.Server/Power/Generator/ChemicalFuelGeneratorDirectSourceComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Power.Generator;
+namespace Content.Server.Power.Generator;
 
 /// <summary>
 /// This is used for stuff that can directly be shoved into a generator.
diff --git a/Content.Server/Power/Generator/GasPowerReceiverComponent.cs b/Content.Server/Power/Generator/GasPowerReceiverComponent.cs
index 4d26f28185..3792e632a6 100644
--- a/Content.Server/Power/Generator/GasPowerReceiverComponent.cs
+++ b/Content.Server/Power/Generator/GasPowerReceiverComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos;
+using Content.Shared.Atmos;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.Power.Generator;
diff --git a/Content.Server/Power/Generator/GasPowerReceiverSystem.cs b/Content.Server/Power/Generator/GasPowerReceiverSystem.cs
index 4251e6f991..48a7bc8c35 100644
--- a/Content.Server/Power/Generator/GasPowerReceiverSystem.cs
+++ b/Content.Server/Power/Generator/GasPowerReceiverSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.Nodes;
 using Content.Shared.Atmos;
diff --git a/Content.Server/Power/Generator/GeneratorExhaustGasSystem.cs b/Content.Server/Power/Generator/GeneratorExhaustGasSystem.cs
index 6c2ce2f09e..94baa20ab3 100644
--- a/Content.Server/Power/Generator/GeneratorExhaustGasSystem.cs
+++ b/Content.Server/Power/Generator/GeneratorExhaustGasSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Atmos;
+using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Power.Generator;
diff --git a/Content.Server/Power/Generator/GeneratorSystem.cs b/Content.Server/Power/Generator/GeneratorSystem.cs
index bc152cf683..bd216b1a6f 100644
--- a/Content.Server/Power/Generator/GeneratorSystem.cs
+++ b/Content.Server/Power/Generator/GeneratorSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Audio;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Materials;
diff --git a/Content.Server/Power/Generator/PortableGeneratorSystem.cs b/Content.Server/Power/Generator/PortableGeneratorSystem.cs
index 5cfa884000..3532e08fda 100644
--- a/Content.Server/Power/Generator/PortableGeneratorSystem.cs
+++ b/Content.Server/Power/Generator/PortableGeneratorSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.DoAfter;
+using Content.Server.DoAfter;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
diff --git a/Content.Server/Power/Generator/PowerSwitchableSystem.cs b/Content.Server/Power/Generator/PowerSwitchableSystem.cs
index 81b6654985..50e1ade71d 100644
--- a/Content.Server/Power/Generator/PowerSwitchableSystem.cs
+++ b/Content.Server/Power/Generator/PowerSwitchableSystem.cs
@@ -1,11 +1,12 @@
-using Content.Server.NodeContainer.EntitySystems;
+using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.Nodes;
 using Content.Shared.NodeContainer;
 using Content.Shared.Power;
 using Content.Shared.Power.Generator;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.Power.Generator;
diff --git a/Content.Server/Power/NodeGroups/BasePowerNet.cs b/Content.Server/Power/NodeGroups/BasePowerNet.cs
index 15ed2630d4..180e46ed27 100644
--- a/Content.Server/Power/NodeGroups/BasePowerNet.cs
+++ b/Content.Server/Power/NodeGroups/BasePowerNet.cs
@@ -1,4 +1,4 @@
-using Content.Server.NodeContainer.Nodes;
+using Content.Server.NodeContainer.Nodes;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Power.Pow3r;
diff --git a/Content.Server/Power/NodeGroups/IBasePowerNet.cs b/Content.Server/Power/NodeGroups/IBasePowerNet.cs
index 98f19a693e..a770a1a2ba 100644
--- a/Content.Server/Power/NodeGroups/IBasePowerNet.cs
+++ b/Content.Server/Power/NodeGroups/IBasePowerNet.cs
@@ -1,4 +1,4 @@
-using Content.Server.Power.Components;
+using Content.Server.Power.Components;
 using Content.Server.Power.Pow3r;
 
 namespace Content.Server.Power.NodeGroups
diff --git a/Content.Server/Power/Pow3r/PowerSolverShared.cs b/Content.Server/Power/Pow3r/PowerSolverShared.cs
index 2e48e484d1..53355bce5c 100644
--- a/Content.Server/Power/Pow3r/PowerSolverShared.cs
+++ b/Content.Server/Power/Pow3r/PowerSolverShared.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Power.Pow3r
+namespace Content.Server.Power.Pow3r
 {
     public static class PowerSolverShared
     {
diff --git a/Content.Server/PowerSink/PowerSinkComponent.cs b/Content.Server/PowerSink/PowerSinkComponent.cs
index d600875e4a..b27d21a71c 100644
--- a/Content.Server/PowerSink/PowerSinkComponent.cs
+++ b/Content.Server/PowerSink/PowerSinkComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Audio;
+using Robust.Shared.Audio;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.PowerSink
diff --git a/Content.Server/PowerSink/PowerSinkSystem.cs b/Content.Server/PowerSink/PowerSinkSystem.cs
index 0213d6926e..6ac4daec65 100644
--- a/Content.Server/PowerSink/PowerSinkSystem.cs
+++ b/Content.Server/PowerSink/PowerSinkSystem.cs
@@ -31,7 +31,7 @@ namespace Content.Server.PowerSink
         [Dependency] private ChatSystem _chat = default!;
         [Dependency] private ExplosionSystem _explosionSystem = default!;
         [Dependency] private SharedAudioSystem _audio = default!;
-        [Dependency] private StationSystem _station = default!;
+        [Dependency] private ServerStationSystem _station = default!;
         [Dependency] private BatterySystem _battery = default!;
 
         public override void Initialize()
diff --git a/Content.Server/Procedural/DungeonSystem.cs b/Content.Server/Procedural/DungeonSystem.cs
index 4f59df5fd9..77de45baf0 100644
--- a/Content.Server/Procedural/DungeonSystem.cs
+++ b/Content.Server/Procedural/DungeonSystem.cs
@@ -6,6 +6,7 @@ using Content.Server.GameTicking.Events;
 using Content.Shared.CCVar;
 using Content.Shared.Construction.EntitySystems;
 using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Events;
 using Content.Shared.Maps;
 using Content.Shared.Physics;
 using Content.Shared.Procedural;
diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index 87b9c167ea..bdfd8c96ea 100644
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -59,17 +59,21 @@ public sealed partial class ProjectileSystem : SharedProjectileSystem
             damageRequired = FixedPoint2.Max(damageRequired, FixedPoint2.Zero);
         }
 
-        if (_damageableSystem.TryChangeDamage((target, damageableComponent), ev.Damage, out var damage, component.IgnoreResistances, origin: component.Shooter)
-            && Exists(component.Shooter))
+        if (_damageableSystem.TryChangeDamage((target, damageableComponent), ev.Damage, out var damage, component.IgnoreResistances, origin: component.Shooter))
         {
             if (!Deleted(target))
             {
                 _color.RaiseEffect(Color.Red, new List<EntityUid> { target }, Filter.Pvs(target, entityManager: EntityManager));
             }
 
+            var shotByString = Exists(component.Shooter)
+                ? $"{ToPrettyString(component.Shooter!.Value):user}"
+                : "a now deleted entity (grenade?)";
+
             _adminLogger.Add(LogType.BulletHit,
                 LogImpact.Medium,
-                $"Projectile {ToPrettyString(uid):projectile} shot by {ToPrettyString(component.Shooter!.Value):user} hit {otherName:target} and dealt {damage:damage} damage");
+                $"Projectile {ToPrettyString(uid):projectile} shot by {shotByString} hit {otherName:target} and dealt {damage:damage} damage");
+
 
             component.ProjectileSpent = !TryPenetrate((uid, component), damage, damageRequired);
         }
diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs
index 33c18af42d..f3677433cf 100644
--- a/Content.Server/Radio/EntitySystems/RadioSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs
@@ -1,7 +1,5 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Chat.Managers;
 using Content.Server.Chat.Systems;
-using Content.Server.Ghost;
 using Content.Server.Power.Components;
 using Content.Shared.Chat;
 using Content.Shared.Database;
@@ -26,8 +24,6 @@ public sealed partial class RadioSystem : SharedRadioSystem
     [Dependency] private IAdminLogManager _adminLogger = default!;
     [Dependency] private IRobustRandom _random = default!;
     [Dependency] private ChatSystem _chat = default!;
-    [Dependency] private IChatManager _chatManager = default!;
-    [Dependency] private GhostSystem _ghost = default!;
     [Dependency] private EntityQuery<TelecomExemptComponent> _exemptQuery = default!;
 
     // set used to prevent radio feedback loops.
@@ -51,25 +47,8 @@ public sealed partial class RadioSystem : SharedRadioSystem
 
     private void OnIntrinsicReceive(EntityUid uid, IntrinsicRadioReceiverComponent component, ref RadioReceiveEvent args)
     {
-        if (!TryComp(uid, out ActorComponent? actor))
-            return;
-
-        var msg = args.ChatMsg;
-        if (_ghost.CanGhostWarp(actor.PlayerSession, out _))
-        {
-            msg = new MsgChatMessage
-            {
-                Message = new ChatMessage(args.ChatMsg.Message)
-                {
-                    WrappedMessage = _chatManager.PrependFollowButtonIfAppropriate(
-                        args.ChatMsg.Message.WrappedMessage,
-                        args.MessageSource,
-                        actor.PlayerSession.Channel),
-                },
-            };
-        }
-
-        _netMan.ServerSendMessage(msg, actor.PlayerSession.Channel);
+        if (TryComp(uid, out ActorComponent? actor))
+            _netMan.ServerSendMessage(args.ChatMsg, actor.PlayerSession.Channel);
     }
 
     /// <inheritdoc/>
@@ -83,7 +62,7 @@ public sealed partial class RadioSystem : SharedRadioSystem
         RaiseLocalEvent(messageSource, evt);
 
         var name = evt.VoiceName;
-        name = FormattedMessage.EscapeText(name);
+        name = _chat.ChatNameLinks ? $"[textlink=\"{FormattedMessage.EscapeStringParameter(name)}\" entity=\"{GetNetEntity(messageSource)}\" color=\"{channel.Color.ToHex()}\"]" : FormattedMessage.EscapeText(name);
 
         SpeechVerbPrototype speech;
         if (evt.SpeechVerb != null && ProtoMan.Resolve(evt.SpeechVerb, out var evntProto))
diff --git a/Content.Server/RandomAppearance/RandomAppearanceSystem.cs b/Content.Server/RandomAppearance/RandomAppearanceSystem.cs
index 467befe2c6..e8ff4718fc 100644
--- a/Content.Server/RandomAppearance/RandomAppearanceSystem.cs
+++ b/Content.Server/RandomAppearance/RandomAppearanceSystem.cs
@@ -1,4 +1,4 @@
-using Robust.Server.GameObjects;
+using Robust.Server.GameObjects;
 using Robust.Shared.Random;
 
 namespace Content.Server.RandomAppearance;
diff --git a/Content.Server/RandomMetadata/RandomMetadataSystem.cs b/Content.Server/RandomMetadata/RandomMetadataSystem.cs
index 40e61cd668..b70d7316b8 100644
--- a/Content.Server/RandomMetadata/RandomMetadataSystem.cs
+++ b/Content.Server/RandomMetadata/RandomMetadataSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Dataset;
+using Content.Shared.Dataset;
 using Content.Shared.Random.Helpers;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/RequiresGrid/RequiresGridComponent.cs b/Content.Server/RequiresGrid/RequiresGridComponent.cs
index 0e956c9ad9..de7dedc21e 100644
--- a/Content.Server/RequiresGrid/RequiresGridComponent.cs
+++ b/Content.Server/RequiresGrid/RequiresGridComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.RequiresGrid;
+namespace Content.Server.RequiresGrid;
 
 /// <summary>
 /// Destroys an entity when they no longer are part of a Grid
diff --git a/Content.Server/RequiresGrid/RequiresGridSystem.cs b/Content.Server/RequiresGrid/RequiresGridSystem.cs
index f612a4b19a..c07924509d 100644
--- a/Content.Server/RequiresGrid/RequiresGridSystem.cs
+++ b/Content.Server/RequiresGrid/RequiresGridSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Destructible;
+using Content.Server.Destructible;
 
 namespace Content.Server.RequiresGrid;
 
diff --git a/Content.Server/Research/TechnologyDisk/Components/DiskConsoleComponent.cs b/Content.Server/Research/TechnologyDisk/Components/DiskConsoleComponent.cs
index e474f77c7a..ec27f2e6c9 100644
--- a/Content.Server/Research/TechnologyDisk/Components/DiskConsoleComponent.cs
+++ b/Content.Server/Research/TechnologyDisk/Components/DiskConsoleComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Audio;
+using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Research.TechnologyDisk.Components;
diff --git a/Content.Server/Research/TechnologyDisk/Components/DiskConsolePrintingComponent.cs b/Content.Server/Research/TechnologyDisk/Components/DiskConsolePrintingComponent.cs
index ab3b7ef9bb..ed9e96ba5e 100644
--- a/Content.Server/Research/TechnologyDisk/Components/DiskConsolePrintingComponent.cs
+++ b/Content.Server/Research/TechnologyDisk/Components/DiskConsolePrintingComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Research.TechnologyDisk.Components;
+namespace Content.Server.Research.TechnologyDisk.Components;
 
 [RegisterComponent]
 public sealed partial class DiskConsolePrintingComponent : Component
diff --git a/Content.Server/Respawn/SpecialRespawnSystem.cs b/Content.Server/Respawn/SpecialRespawnSystem.cs
index 9ba5dea3ee..671600da47 100644
--- a/Content.Server/Respawn/SpecialRespawnSystem.cs
+++ b/Content.Server/Respawn/SpecialRespawnSystem.cs
@@ -3,6 +3,7 @@ using Content.Server.Atmos.EntitySystems;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
 using Content.Shared.Database;
+using Content.Shared.GameTicking;
 using Content.Shared.Maps;
 using Content.Shared.Physics;
 using Content.Shared.Respawn;
diff --git a/Content.Server/Revenant/EntitySystems/CorporealSystem.cs b/Content.Server/Revenant/EntitySystems/CorporealSystem.cs
index e9dc405b53..444c904537 100644
--- a/Content.Server/Revenant/EntitySystems/CorporealSystem.cs
+++ b/Content.Server/Revenant/EntitySystems/CorporealSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.GameTicking;
 using Content.Shared.Eye;
+using Content.Shared.GameTicking;
 using Content.Shared.Revenant.Components;
 using Content.Shared.Revenant.EntitySystems;
 using Robust.Server.GameObjects;
@@ -9,7 +10,7 @@ namespace Content.Server.Revenant.EntitySystems;
 public sealed partial class CorporealSystem : SharedCorporealSystem
 {
     [Dependency] private VisibilitySystem _visibilitySystem = default!;
-    [Dependency] private GameTicker _ticker = default!;
+    [Dependency] private ServerGameTicker _ticker = default!;
 
     public override void OnStartup(EntityUid uid, CorporealComponent component, ComponentStartup args)
     {
diff --git a/Content.Server/Revenant/EntitySystems/RevenantOverloadedLightsSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantOverloadedLightsSystem.cs
index ec3bdb2a3a..1930c059ba 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantOverloadedLightsSystem.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantOverloadedLightsSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Beam;
+using Content.Server.Beam;
 using Content.Shared.Revenant.Components;
 using Content.Shared.Revenant.EntitySystems;
 
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
index e6dae76609..383c9221e6 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
@@ -8,6 +8,7 @@ using Content.Shared.DoAfter;
 using Content.Shared.Examine;
 using Content.Shared.Eye;
 using Content.Shared.FixedPoint;
+using Content.Shared.GameTicking;
 using Content.Shared.Interaction;
 using Content.Shared.Maps;
 using Content.Shared.Mobs.Systems;
@@ -31,7 +32,7 @@ public sealed partial class RevenantSystem : EntitySystem
     [Dependency] private AtmosphereSystem _atmosphere = default!;
     [Dependency] private DamageableSystem _damage = default!;
     [Dependency] private EntityLookupSystem _lookup = default!;
-    [Dependency] private GameTicker _ticker = default!;
+    [Dependency] private ServerGameTicker _ticker = default!;
     [Dependency] private MobStateSystem _mobState = default!;
     [Dependency] private PhysicsSystem _physics = default!;
     [Dependency] private SharedDoAfterSystem _doAfter = default!;
@@ -54,7 +55,7 @@ public sealed partial class RevenantSystem : EntitySystem
         SubscribeLocalEvent<RevenantComponent, ExaminedEvent>(OnExamine);
         SubscribeLocalEvent<RevenantComponent, StatusEffectAddedEvent>(OnStatusAdded);
         SubscribeLocalEvent<RevenantComponent, StatusEffectEndedEvent>(OnStatusEnded);
-        SubscribeLocalEvent<RoundEndTextAppendEvent>(_ => MakeVisible(true));
+        SubscribeLocalEvent<RoundEndMessageEvent>(_ => MakeVisible(true));
 
         SubscribeLocalEvent<RevenantComponent, GetVisMaskEvent>(OnRevenantGetVis);
 
diff --git a/Content.Server/Robotics/Systems/RoboticsConsoleSystem.cs b/Content.Server/Robotics/Systems/RoboticsConsoleSystem.cs
index 0a7b26ceac..16d26deec2 100644
--- a/Content.Server/Robotics/Systems/RoboticsConsoleSystem.cs
+++ b/Content.Server/Robotics/Systems/RoboticsConsoleSystem.cs
@@ -3,7 +3,6 @@ using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Radio.EntitySystems;
 using Content.Shared.Lock;
 using Content.Shared.Database;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.Robotics;
 using Content.Shared.Robotics.Components;
 using Content.Shared.Robotics.Systems;
@@ -33,7 +32,6 @@ public sealed partial class RoboticsConsoleSystem : SharedRoboticsConsoleSystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<RoboticsConsoleComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
         Subs.BuiEvents<RoboticsConsoleComponent>(RoboticsConsoleUiKey.Key, subs =>
         {
             subs.Event<BoundUIOpenedEvent>(OnOpened);
@@ -70,20 +68,12 @@ public sealed partial class RoboticsConsoleSystem : SharedRoboticsConsoleSystem
         }
     }
 
-    private void OnPacketReceived(Entity<RoboticsConsoleComponent> ent, ref DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnPacketReceived(Entity<RoboticsConsoleComponent> ent, ref DeviceNetworkPacketEvent<RoboticsCyborgDataPayload> args)
     {
-        var payload = args.Data;
-        if (!payload.TryGetValue(DeviceNetworkConstants.Command, out string? command))
-            return;
-        if (command != DeviceNetworkConstants.CmdUpdatedState)
-            return;
-
-        if (!payload.TryGetValue(RoboticsConsoleConstants.NET_CYBORG_DATA, out CyborgControlData? data))
-            return;
-
-        var real = data.Value;
-        real.Timeout = _timing.CurTime + ent.Comp.Timeout;
-        ent.Comp.Cyborgs[args.SenderAddress] = real;
+        var data = args.Data.Data;
+        data.Timeout = _timing.CurTime + ent.Comp.Timeout;
+        ent.Comp.Cyborgs[args.SenderAddress] = data;
 
         UpdateUserInterface(ent);
     }
@@ -104,12 +94,9 @@ public sealed partial class RoboticsConsoleSystem : SharedRoboticsConsoleSystem
         if (!ent.Comp.Cyborgs.TryGetValue(args.Address, out var data))
             return;
 
-        var payload = new NetworkPayload()
-        {
-            [DeviceNetworkConstants.Command] = RoboticsConsoleConstants.NET_DISABLE_COMMAND
-        };
+        var payload = new RoboticsCyborgDisablePayload();
+        _deviceNetwork.SendPacket(ent.Owner, args.Address, ref payload);
 
-        _deviceNetwork.QueuePacket(ent, args.Address, payload);
         _adminLogger.Add(LogType.Action, LogImpact.High, $"{ToPrettyString(args.Actor):user} disabled borg {data.Name} with address {args.Address}");
     }
 
@@ -128,12 +115,8 @@ public sealed partial class RoboticsConsoleSystem : SharedRoboticsConsoleSystem
         if (!ent.Comp.Cyborgs.Remove(args.Address, out var data))
             return;
 
-        var payload = new NetworkPayload()
-        {
-            [DeviceNetworkConstants.Command] = RoboticsConsoleConstants.NET_DESTROY_COMMAND
-        };
-
-        _deviceNetwork.QueuePacket(ent, args.Address, payload);
+        var payload = new RoboticsCyborgDestroyPayload();
+        _deviceNetwork.SendPacket(ent.Owner, args.Address, ref payload);
 
         var message = Loc.GetString(ent.Comp.DestroyMessage, ("name", data.Name));
         _radio.SendRadioMessage(ent, message, ent.Comp.RadioChannel, ent);
diff --git a/Content.Server/Roles/AddRoleCommand.cs b/Content.Server/Roles/AddRoleCommand.cs
index 3a1b214007..506ad0b9c8 100644
--- a/Content.Server/Roles/AddRoleCommand.cs
+++ b/Content.Server/Roles/AddRoleCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.Roles.Jobs;
 using Content.Shared.Administration;
 using Content.Shared.Players;
diff --git a/Content.Server/Roles/Jobs/JobSystem.cs b/Content.Server/Roles/Jobs/JobSystem.cs
index 3d8c6d3447..03c65db65b 100644
--- a/Content.Server/Roles/Jobs/JobSystem.cs
+++ b/Content.Server/Roles/Jobs/JobSystem.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using Content.Server.Chat.Managers;
 using Content.Shared.Mind;
 using Content.Shared.Roles;
diff --git a/Content.Server/Roles/ListRolesCommand.cs b/Content.Server/Roles/ListRolesCommand.cs
index 4e5cf15b13..c5b446e4e1 100644
--- a/Content.Server/Roles/ListRolesCommand.cs
+++ b/Content.Server/Roles/ListRolesCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.Roles;
 using Robust.Shared.Console;
diff --git a/Content.Server/Roles/RemoveRoleCommand.cs b/Content.Server/Roles/RemoveRoleCommand.cs
index 91914e2fca..bfab3ba9fd 100644
--- a/Content.Server/Roles/RemoveRoleCommand.cs
+++ b/Content.Server/Roles/RemoveRoleCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.Players;
 using Content.Shared.Roles;
diff --git a/Content.Server/Roles/RoleBriefingSystem.cs b/Content.Server/Roles/RoleBriefingSystem.cs
index 12e0a6fb14..ed1474b4e1 100644
--- a/Content.Server/Roles/RoleBriefingSystem.cs
+++ b/Content.Server/Roles/RoleBriefingSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Roles;
 using Content.Shared.Roles.Components;
 
 namespace Content.Server.Roles;
diff --git a/Content.Server/Roles/RoleSystem.cs b/Content.Server/Roles/RoleSystem.cs
index a15414ee27..69b105f466 100644
--- a/Content.Server/Roles/RoleSystem.cs
+++ b/Content.Server/Roles/RoleSystem.cs
@@ -85,42 +85,3 @@ public sealed partial class RoleSystem : SharedRoleSystem
         }
     }
 }
-
-/// <summary>
-/// Event raised on the mind to get its briefing.
-/// Handlers can either replace or append to the briefing, whichever is more appropriate.
-/// </summary>
-[ByRefEvent]
-public sealed class GetBriefingEvent
-{
-    /// <summary>
-    /// The text that will be shown on the Character Screen
-    /// </summary>
-    public string? Briefing;
-
-    /// <summary>
-    /// The Mind to whose Mind Role Entities the briefing is sent to
-    /// </summary>
-    public Entity<MindComponent> Mind;
-
-    public GetBriefingEvent(string? briefing = null)
-    {
-        Briefing = briefing;
-    }
-
-    /// <summary>
-    /// If there is no briefing, sets it to the string.
-    /// If there is a briefing, adds a new line to separate it from the appended string.
-    /// </summary>
-    public void Append(string text)
-    {
-        if (Briefing == null)
-        {
-            Briefing = text;
-        }
-        else
-        {
-            Briefing += "\n" + text;
-        }
-    }
-}
diff --git a/Content.Server/RoundEnd/RoundEndSystem.cs b/Content.Server/RoundEnd/RoundEndSystem.cs
index 4b52edff01..98b5761a4d 100644
--- a/Content.Server/RoundEnd/RoundEndSystem.cs
+++ b/Content.Server/RoundEnd/RoundEndSystem.cs
@@ -6,12 +6,10 @@ using Content.Server.Chat.Managers;
 using Content.Server.Chat.Systems;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.GameTicking;
-using Content.Server.Screens.Components;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Systems;
 using Content.Shared.Database;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.GameTicking;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -19,6 +17,7 @@ using Robust.Shared.Configuration;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
 using Content.Shared.DeviceNetwork.Components;
+using Content.Shared.RoundEnd;
 using Content.Shared.Station.Components;
 using Timer = Robust.Shared.Timing.Timer;
 
@@ -35,11 +34,11 @@ namespace Content.Server.RoundEnd
         [Dependency] private IChatManager _chatManager = default!;
         [Dependency] private IGameTiming _gameTiming = default!;
         [Dependency] private ChatSystem _chatSystem = default!;
-        [Dependency] private GameTicker _gameTicker = default!;
+        [Dependency] private ServerGameTicker _gameTicker = default!;
         [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!;
         [Dependency] private EmergencyShuttleSystem _shuttle = default!;
         [Dependency] private SharedAudioSystem _audio = default!;
-        [Dependency] private StationSystem _stationSystem = default!;
+        [Dependency] private ServerStationSystem _stationSystem = default!;
 
         public TimeSpan DefaultCooldownDuration { get; set; } = TimeSpan.FromSeconds(30);
 
@@ -99,7 +98,7 @@ namespace Content.Server.RoundEnd
         }
 
         /// <summary>
-        ///     Attempts to get the MapUid of the station using <see cref="StationSystem.GetLargestGrid"/>
+        ///     Attempts to get the MapUid of the station using <see cref="ServerStationSystem.GetLargestGrid"/>
         /// </summary>
         public EntityUid? GetStation()
         {
@@ -225,16 +224,16 @@ namespace Content.Server.RoundEnd
             var shuttle = _shuttle.GetShuttle();
             if (shuttle != null && TryComp<DeviceNetworkComponent>(shuttle, out var net))
             {
-                var payload = new NetworkPayload
+                var payload = new ScreenShuttlePayload
                 {
-                    [ShuttleTimerMasks.ShuttleMap] = shuttle,
-                    [ShuttleTimerMasks.SourceMap] = GetCentcomm(),
-                    [ShuttleTimerMasks.DestMap] = GetStation(),
-                    [ShuttleTimerMasks.ShuttleTime] = countdownTime,
-                    [ShuttleTimerMasks.SourceTime] = countdownTime + TimeSpan.FromSeconds(_shuttle.TransitTime + _cfg.GetCVar(CCVars.EmergencyShuttleDockTime)),
-                    [ShuttleTimerMasks.DestTime] = countdownTime,
+                    Shuttle = shuttle,
+                    SourceMap = GetCentcomm(),
+                    DestinationMap = GetStation(),
+                    ShuttleTime = countdownTime,
+                    SourceTime = countdownTime + TimeSpan.FromSeconds(_shuttle.TransitTime + _cfg.GetCVar(CCVars.EmergencyShuttleDockTime)),
+                    DestinationTime = countdownTime,
                 };
-                _deviceNetworkSystem.QueuePacket(shuttle.Value, null, payload, net.TransmitFrequency);
+                _deviceNetworkSystem.SendPacket(shuttle.Value, null, ref payload, net.TransmitFrequency);
             }
         }
 
@@ -273,16 +272,16 @@ namespace Content.Server.RoundEnd
             var shuttle = _shuttle.GetShuttle();
             if (shuttle != null && TryComp<DeviceNetworkComponent>(shuttle, out var net))
             {
-                var payload = new NetworkPayload
+                var payload = new ScreenShuttlePayload
                 {
-                    [ShuttleTimerMasks.ShuttleMap] = shuttle,
-                    [ShuttleTimerMasks.SourceMap] = GetCentcomm(),
-                    [ShuttleTimerMasks.DestMap] = GetStation(),
-                    [ShuttleTimerMasks.ShuttleTime] = zero,
-                    [ShuttleTimerMasks.SourceTime] = zero,
-                    [ShuttleTimerMasks.DestTime] = zero,
+                    Shuttle = shuttle,
+                    SourceMap = GetCentcomm(),
+                    DestinationMap = GetStation(),
+                    ShuttleTime = zero,
+                    SourceTime = zero,
+                    DestinationTime = zero,
                 };
-                _deviceNetworkSystem.QueuePacket(shuttle.Value, null, payload, net.TransmitFrequency);
+                _deviceNetworkSystem.SendPacket(shuttle.Value, null, ref payload, net.TransmitFrequency);
             }
         }
 
@@ -397,22 +396,4 @@ namespace Content.Server.RoundEnd
     {
         public static RoundEndSystemChangedEvent Default { get; } = new();
     }
-
-    public enum RoundEndBehavior : byte
-    {
-        /// <summary>
-        /// Instantly end round
-        /// </summary>
-        InstantEnd,
-
-        /// <summary>
-        /// Call shuttle with custom announcement
-        /// </summary>
-        ShuttleCall,
-
-        /// <summary>
-        /// Do nothing
-        /// </summary>
-        Nothing
-    }
 }
diff --git a/Content.Server/Salvage/JobBoard/SalvageJobBoardSystem.cs b/Content.Server/Salvage/JobBoard/SalvageJobBoardSystem.cs
index f2e19d8d63..c37107c77f 100644
--- a/Content.Server/Salvage/JobBoard/SalvageJobBoardSystem.cs
+++ b/Content.Server/Salvage/JobBoard/SalvageJobBoardSystem.cs
@@ -26,7 +26,7 @@ public sealed partial class SalvageJobBoardSystem : EntitySystem
     [Dependency] private LabelSystem _label = default!;
     [Dependency] private PaperSystem _paper = default!;
     [Dependency] private RadioSystem _radio = default!;
-    [Dependency] private StationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
     [Dependency] private UserInterfaceSystem _ui = default!;
 
     /// <summary>
diff --git a/Content.Server/Salvage/SalvageSystem.cs b/Content.Server/Salvage/SalvageSystem.cs
index 06171637a8..520b98b93e 100644
--- a/Content.Server/Salvage/SalvageSystem.cs
+++ b/Content.Server/Salvage/SalvageSystem.cs
@@ -38,7 +38,7 @@ namespace Content.Server.Salvage
         [Dependency] private SharedMapSystem _mapSystem = default!;
         [Dependency] private ShuttleSystem _shuttle = default!;
         [Dependency] private ShuttleConsoleSystem _shuttleConsoles = default!;
-        [Dependency] private StationSystem _station = default!;
+        [Dependency] private ServerStationSystem _station = default!;
         [Dependency] private UserInterfaceSystem _ui = default!;
         [Dependency] private EntityQuery<MapGridComponent> _gridQuery = default!;
 
diff --git a/Content.Server/Sandbox/SandboxSystem.cs b/Content.Server/Sandbox/SandboxSystem.cs
index 1cc4f58d9e..63cba9948e 100644
--- a/Content.Server/Sandbox/SandboxSystem.cs
+++ b/Content.Server/Sandbox/SandboxSystem.cs
@@ -1,8 +1,10 @@
+using System.Linq;
 using Content.Server.GameTicking;
 using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Containers.ItemSlots;
+using Content.Shared.GameTicking;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Inventory;
@@ -15,7 +17,6 @@ using Robust.Server.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using System.Linq;
 
 namespace Content.Server.Sandbox
 {
@@ -28,7 +29,7 @@ namespace Content.Server.Sandbox
         [Dependency] private SharedAccessSystem _access = default!;
         [Dependency] private InventorySystem _inventory = default!;
         [Dependency] private ItemSlotsSystem _slots = default!;
-        [Dependency] private GameTicker _ticker = default!;
+        [Dependency] private ServerGameTicker _ticker = default!;
         [Dependency] private SharedHandsSystem _handsSystem = default!;
 
         private bool _isSandboxEnabled;
diff --git a/Content.Server/Screens/Systems/ScreenSystem.cs b/Content.Server/Screens/Systems/ScreenSystem.cs
index 2a30472543..c15d180edd 100644
--- a/Content.Server/Screens/Systems/ScreenSystem.cs
+++ b/Content.Server/Screens/Systems/ScreenSystem.cs
@@ -1,7 +1,8 @@
 using Content.Shared.TextScreen;
 using Content.Server.Screens.Components;
-using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.DeviceNetwork.Events;
+using Content.Shared.RoundEnd;
+using Content.Shared.Screens;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Screens.Systems;
@@ -14,24 +15,13 @@ public sealed partial class ScreenSystem : EntitySystem
     [Dependency] private IGameTiming _gameTiming = default!;
     [Dependency] private SharedAppearanceSystem _appearanceSystem = default!;
 
-    /// <summary>
-    /// Calls either a normal screen text update or shuttle timer update based on the presence of
-    /// <see cref="ShuttleTimerMasks.ShuttleMap"/> in <see cref="args.Data"/>
-    /// </summary>
-    [SubscribeLocalEvent]
-    private void OnPacketReceived(Entity<ScreenComponent> ent, ref DeviceNetworkPacketEvent args)
-    {
-        if (args.Data.TryGetValue(ShuttleTimerMasks.ShuttleMap, out _))
-            ShuttleTimer(ent, args);
-        else
-            ScreenText(ent, args);
-    }
-
     /// <summary>
     /// Send a text update to every screen on the same MapUid as the originating comms console.
     /// </summary>
-    private void ScreenText(Entity<ScreenComponent> ent, DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnScreenText(Entity<ScreenComponent> ent, ref DeviceNetworkPacketEvent<ScreenTextPayload> args)
     {
+        var text = args.Data.Text;
         // don't allow text updates if there's an active timer
         // (and just check here so the server doesn't have to track them)
         if (_appearanceSystem.TryGetData(ent, TextScreenVisuals.TargetTime, out TimeSpan target)
@@ -41,17 +31,15 @@ public sealed partial class ScreenSystem : EntitySystem
         var screenMap = Transform(ent).MapUid;
         var argsMap = Transform(args.Sender).MapUid;
 
-        if (screenMap != null
-            && argsMap != null
-            && screenMap == argsMap
-            && args.Data.TryGetValue(ScreenMasks.Text, out string? text)
-            && text != null
-            )
-        {
-            _appearanceSystem.SetData(ent, TextScreenVisuals.DefaultText, text);
-            _appearanceSystem.SetData(ent, TextScreenVisuals.ScreenText, text);
-            _appearanceSystem.SetData(ent, TextScreenVisuals.ScreenTextTime, _gameTiming.CurTime);
-        }
+        if (screenMap == null
+            || argsMap == null
+            || screenMap != argsMap
+            || text == null)
+            return;
+
+        _appearanceSystem.SetData(ent, TextScreenVisuals.DefaultText, text);
+        _appearanceSystem.SetData(ent, TextScreenVisuals.ScreenText, text);
+        _appearanceSystem.SetData(ent, TextScreenVisuals.ScreenTextTime, _gameTiming.CurTime);
     }
 
     /// <summary>
@@ -62,49 +50,46 @@ public sealed partial class ScreenSystem : EntitySystem
     /// Subnets are the shuttle, source, and dest. Source/dest change each jump.
     /// This is required to send different timers to the shuttle/terminal/station.
     /// </summary>
-    private void ShuttleTimer(Entity<ScreenComponent> ent, DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnShuttleTimer(Entity<ScreenComponent> ent, ref DeviceNetworkPacketEvent<ScreenShuttlePayload> args)
     {
+        var payload = args.Data;
         var timerXform = Transform(ent);
 
         // no false positives.
         if (timerXform.MapUid == null)
             return;
 
-        string key;
-        args.Data.TryGetValue(ShuttleTimerMasks.ShuttleMap, out EntityUid? shuttleMap);
-        args.Data.TryGetValue(ShuttleTimerMasks.SourceMap, out EntityUid? source);
-        args.Data.TryGetValue(ShuttleTimerMasks.DestMap, out EntityUid? dest);
-        args.Data.TryGetValue(ShuttleTimerMasks.Docked, out bool docked);
-        string text = docked ? ShuttleTimerMasks.ETD : ShuttleTimerMasks.ETA;
+        string? text = null;
+        TimeSpan time;
 
         switch (timerXform.MapUid)
         {
-            // sometimes the timer transforms on FTL shuttles have a hyperspace mapuid, so matching by grid works as a fallback.
-            case var local when local == shuttleMap || timerXform.GridUid == shuttleMap:
-                key = ShuttleTimerMasks.ShuttleTime;
+            // sometimes the timer transforms on FTL shuttles have a hyperspace mapent, so matching by grid works as a fallback.
+            case var local when local == payload.Shuttle || timerXform.GridUid == payload.Shuttle:
+                time = payload.ShuttleTime;
                 break;
-            case var origin when origin == source:
-                key = ShuttleTimerMasks.SourceTime;
+            case var origin when origin == payload.SourceMap:
+                time = payload.SourceTime;
                 break;
-            case var remote when remote == dest:
-                key = ShuttleTimerMasks.DestTime;
+            case var remote when remote == payload.DestinationMap:
+                time = payload.DestinationTime;
                 text = ShuttleTimerMasks.ETA;
                 break;
             default:
                 return;
         }
 
-        if (!args.Data.TryGetValue(key, out TimeSpan duration))
-            return;
+        if (payload.OverrideText != null)
+            text = payload.OverrideText;
 
-        if (args.Data.TryGetValue(ScreenMasks.Text, out string? label) && label != null)
-            text = label;
-
-        _appearanceSystem.SetData(ent, TextScreenVisuals.ScreenText, text);
-        _appearanceSystem.SetData(ent, TextScreenVisuals.TargetTime, _gameTiming.CurTime + duration);
+        _appearanceSystem.SetData(ent, TextScreenVisuals.TargetTime, _gameTiming.CurTime + time);
         _appearanceSystem.SetData(ent, TextScreenVisuals.ScreenTextTime, _gameTiming.CurTime);
 
-        if (args.Data.TryGetValue(ScreenMasks.Color, out Color color))
-            _appearanceSystem.SetData(ent, TextScreenVisuals.Color, color);
+        if (text != null)
+            _appearanceSystem.SetData(ent, TextScreenVisuals.ScreenText, text);
+
+        if (payload.OverrideColor != null)
+            _appearanceSystem.SetData(ent, TextScreenVisuals.Color, payload.OverrideColor);
     }
 }
diff --git a/Content.Server/SensorMonitoring/BatterySensorComponent.cs b/Content.Server/SensorMonitoring/BatterySensorComponent.cs
index a5a48ddc91..6825f0cb0b 100644
--- a/Content.Server/SensorMonitoring/BatterySensorComponent.cs
+++ b/Content.Server/SensorMonitoring/BatterySensorComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Power.Components;
+using Content.Server.Power.Components;
 using Content.Shared.Power.Components;
 
 namespace Content.Server.SensorMonitoring;
@@ -14,20 +14,3 @@ public sealed partial class BatterySensorComponent : Component
 {
 }
 
-/// <summary>
-/// Device network data sent by a <see cref="BatterySensorComponent"/>.
-/// </summary>
-/// <param name="Charge">The current energy charge of the battery, in joules (J).</param>
-/// <param name="MaxCharge">The maximum energy capacity of the battery, in joules (J).</param>
-/// <param name="Receiving">The current amount of power being received by the battery, in watts (W).</param>
-/// <param name="MaxReceiving">The maximum amount of power that can be received by the battery, in watts (W).</param>
-/// <param name="Supplying">The current amount of power being supplied by the battery, in watts (W).</param>
-/// <param name="MaxSupplying">The maximum amount of power that can be received by the battery, in watts (W).</param>
-public sealed record BatterySensorData(
-    float Charge,
-    float MaxCharge,
-    float Receiving,
-    float MaxReceiving,
-    float Supplying,
-    float MaxSupplying
-);
diff --git a/Content.Server/SensorMonitoring/BatterySensorSystem.cs b/Content.Server/SensorMonitoring/BatterySensorSystem.cs
index 12db2764fa..feb943e0af 100644
--- a/Content.Server/SensorMonitoring/BatterySensorSystem.cs
+++ b/Content.Server/SensorMonitoring/BatterySensorSystem.cs
@@ -1,50 +1,35 @@
-using Content.Server.DeviceNetwork.Systems;
+using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Power.Components;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.Power.Components;
 using Content.Shared.Power.EntitySystems;
+using Content.Shared.SensorMonitoring;
 
 namespace Content.Server.SensorMonitoring;
 
 public sealed partial class BatterySensorSystem : EntitySystem
 {
-    public const string DeviceNetworkCommandSyncData = "bat_sync_data";
-
     [Dependency] private DeviceNetworkSystem _deviceNetwork = default!;
     [Dependency] private SharedBatterySystem _battery = default!;
 
-    public override void Initialize()
+    [SubscribeLocalEvent]
+    private void OnSensorRequest(Entity<BatterySensorComponent> ent, ref DeviceNetworkPacketEvent<BatterySensorSyncPayload> args)
     {
-        SubscribeLocalEvent<BatterySensorComponent, DeviceNetworkPacketEvent>(PacketReceived);
-    }
+        var battery = Comp<BatteryComponent>(ent);
+        var currentCharge = _battery.GetCharge((ent.Owner, battery));
+        var netBattery = Comp<PowerNetworkBatteryComponent>(ent);
 
-    private void PacketReceived(EntityUid uid, BatterySensorComponent component, DeviceNetworkPacketEvent args)
-    {
-        if (!args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? cmd))
-            return;
-
-        switch (cmd)
+        var dataPayload = new BatterySensorDataPayload
         {
-            case DeviceNetworkCommandSyncData:
-                var battery = Comp<BatteryComponent>(uid);
-                var currentCharge = _battery.GetCharge((uid, battery));
-                var netBattery = Comp<PowerNetworkBatteryComponent>(uid);
+            Data = new BatterySensorData(
+                currentCharge,
+                battery.MaxCharge,
+                netBattery.CurrentReceiving,
+                netBattery.MaxChargeRate,
+                netBattery.CurrentSupply,
+                netBattery.MaxSupply),
+        };
 
-                var payload = new NetworkPayload
-                {
-                    [DeviceNetworkConstants.Command] = DeviceNetworkCommandSyncData,
-                    [DeviceNetworkCommandSyncData] = new BatterySensorData(
-                        currentCharge,
-                        battery.MaxCharge,
-                        netBattery.CurrentReceiving,
-                        netBattery.MaxChargeRate,
-                        netBattery.CurrentSupply,
-                        netBattery.MaxSupply)
-                };
-
-                _deviceNetwork.QueuePacket(uid, args.SenderAddress, payload);
-                break;
-        }
+        _deviceNetwork.SendPacket(ent.Owner, args.SenderAddress, ref dataPayload);
     }
 }
diff --git a/Content.Server/SensorMonitoring/SensorMonitoringConsoleComponent.cs b/Content.Server/SensorMonitoring/SensorMonitoringConsoleComponent.cs
index b5a954f166..3bf7c065ab 100644
--- a/Content.Server/SensorMonitoring/SensorMonitoringConsoleComponent.cs
+++ b/Content.Server/SensorMonitoring/SensorMonitoringConsoleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.SensorMonitoring;
+using Content.Shared.SensorMonitoring;
 using Robust.Server.Player;
 using Robust.Shared.Collections;
 using Robust.Shared.Player;
diff --git a/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.UI.cs b/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.UI.cs
index a562abd926..b6de5d3846 100644
--- a/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.UI.cs
+++ b/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.UI.cs
@@ -1,4 +1,4 @@
-using Content.Shared.SensorMonitoring;
+using Content.Shared.SensorMonitoring;
 using Robust.Shared.Collections;
 using ConsoleUIState = Content.Shared.SensorMonitoring.SensorMonitoringConsoleBoundInterfaceState;
 using Content.Shared.DeviceNetwork.Components;
diff --git a/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.cs b/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.cs
index de33473616..eac6d62e89 100644
--- a/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.cs
+++ b/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.cs
@@ -1,5 +1,5 @@
-using Content.Server.Atmos.Monitor.Components;
-using Content.Server.Atmos.Monitor.Systems;
+using Content.Server.Atmos.Monitor.Components;
+using Content.Server.Atmos.Monitor.Payloads;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Power.Generation.Teg;
 using Content.Shared.Atmos.Components;
@@ -10,6 +10,7 @@ using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.DeviceNetwork.Systems;
+using Content.Shared.Power.Generation.Teg;
 using Content.Shared.SensorMonitoring;
 using Robust.Server.GameObjects;
 using Robust.Shared.Timing;
@@ -41,7 +42,6 @@ public sealed partial class SensorMonitoringConsoleSystem : EntitySystem
 
         SubscribeLocalEvent<SensorMonitoringConsoleComponent, DeviceListUpdateEvent>(DeviceListUpdated);
         SubscribeLocalEvent<SensorMonitoringConsoleComponent, ComponentStartup>(ConsoleStartup);
-        SubscribeLocalEvent<SensorMonitoringConsoleComponent, DeviceNetworkPacketEvent>(DevicePacketReceived);
         SubscribeLocalEvent<SensorMonitoringConsoleComponent, AtmosDeviceUpdateEvent>(AtmosUpdate);
     }
 
@@ -143,99 +143,86 @@ public sealed partial class SensorMonitoringConsoleSystem : EntitySystem
         return SensorDeviceType.Unknown;
     }
 
-    private void DevicePacketReceived(EntityUid uid, SensorMonitoringConsoleComponent component,
-        DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnTegReceived(Entity<SensorMonitoringConsoleComponent> ent, ref DeviceNetworkPacketEvent<TegSensorPayload> args)
     {
-        if (!component.Sensors.TryGetValue(args.Sender, out var sensorData))
+        var payload = args.Data;
+        if (!ent.Comp.Sensors.TryGetValue(args.Sender, out var sensorData))
             return;
 
-        if (!args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? command))
+        // @formatter:off
+        WriteSample(ent, sensorData, "teg_last_generated", SensorUnit.EnergyJ, payload.LastGeneration);
+        WriteSample(ent, sensorData, "teg_power",          SensorUnit.PowerW,  payload.PowerOutput);
+        if (ent.Comp.DebugStreams)
+            WriteSample(ent, sensorData, "teg_ramp_pos", SensorUnit.PowerW, payload.RampPosition);
+
+        WriteSample(ent, sensorData, "teg_circ_a_in_pressure",     SensorUnit.PressureKpa,  payload.CirculatorA.InletPressure);
+        WriteSample(ent, sensorData, "teg_circ_a_in_temperature",  SensorUnit.TemperatureK, payload.CirculatorA.InletTemperature);
+        WriteSample(ent, sensorData, "teg_circ_a_out_pressure",    SensorUnit.PressureKpa,  payload.CirculatorA.OutletPressure);
+        WriteSample(ent, sensorData, "teg_circ_a_out_temperature", SensorUnit.TemperatureK, payload.CirculatorA.OutletTemperature);
+
+        WriteSample(ent, sensorData, "teg_circ_b_in_pressure",     SensorUnit.PressureKpa,  payload.CirculatorB.InletPressure);
+        WriteSample(ent, sensorData, "teg_circ_b_in_temperature",  SensorUnit.TemperatureK, payload.CirculatorB.InletTemperature);
+        WriteSample(ent, sensorData, "teg_circ_b_out_pressure",    SensorUnit.PressureKpa,  payload.CirculatorB.OutletPressure);
+        WriteSample(ent, sensorData, "teg_circ_b_out_temperature", SensorUnit.TemperatureK, payload.CirculatorB.OutletTemperature);
+        // @formatter:on
+    }
+
+    [SubscribeLocalEvent]
+    private void OnAtmosSensorReceived(Entity<SensorMonitoringConsoleComponent> ent, ref DeviceNetworkPacketEvent<AtmosMonitorDataPayload> args)
+    {
+        var payload = args.Data.Data;
+        if (!ent.Comp.Sensors.TryGetValue(args.Sender, out var sensorData))
             return;
 
-        switch (sensorData.DeviceType)
-        {
-            case SensorDeviceType.Teg:
-                if (command != TegSystem.DeviceNetworkCommandSyncData)
-                    return;
+        // @formatter:off
+        WriteSample(ent, sensorData, "atmo_pressure",    SensorUnit.PressureKpa,  payload.Pressure);
+        WriteSample(ent, sensorData, "atmo_temperature", SensorUnit.TemperatureK, payload.Temperature);
+        // @formatter:on
+    }
 
-                if (!args.Data.TryGetValue(TegSystem.DeviceNetworkCommandSyncData, out TegSensorData? tegData))
-                    return;
+    [SubscribeLocalEvent]
+    private void OnThermoMachineReceived(Entity<SensorMonitoringConsoleComponent> ent, ref DeviceNetworkPacketEvent<GasThermoMachineDataPayload> args)
+    {
+        var payload = args.Data;
+        if (!ent.Comp.Sensors.TryGetValue(args.Sender, out var sensorData))
+            return;
 
-                // @formatter:off
-                WriteSample(component, sensorData, "teg_last_generated", SensorUnit.EnergyJ, tegData.LastGeneration);
-                WriteSample(component, sensorData, "teg_power",          SensorUnit.PowerW,  tegData.PowerOutput);
-                if (component.DebugStreams)
-                    WriteSample(component, sensorData, "teg_ramp_pos", SensorUnit.PowerW, tegData.RampPosition);
+        // @formatter:off
+        WriteSample(ent, sensorData, "abs_energy_delta", SensorUnit.EnergyJ, MathF.Abs(payload.EnergyDelta));
+        // @formatter:on
+    }
 
-                WriteSample(component, sensorData, "teg_circ_a_in_pressure",     SensorUnit.PressureKpa,  tegData.CirculatorA.InletPressure);
-                WriteSample(component, sensorData, "teg_circ_a_in_temperature",  SensorUnit.TemperatureK, tegData.CirculatorA.InletTemperature);
-                WriteSample(component, sensorData, "teg_circ_a_out_pressure",    SensorUnit.PressureKpa,  tegData.CirculatorA.OutletPressure);
-                WriteSample(component, sensorData, "teg_circ_a_out_temperature", SensorUnit.TemperatureK, tegData.CirculatorA.OutletTemperature);
+    [SubscribeLocalEvent]
+    private void OnVolumePipeReceived(Entity<SensorMonitoringConsoleComponent> ent, ref DeviceNetworkPacketEvent<GasVolumePumpDataPayload> args)
+    {
+        var payload = args.Data;
+        if (!ent.Comp.Sensors.TryGetValue(args.Sender, out var sensorData))
+            return;
 
-                WriteSample(component, sensorData, "teg_circ_b_in_pressure",     SensorUnit.PressureKpa,  tegData.CirculatorB.InletPressure);
-                WriteSample(component, sensorData, "teg_circ_b_in_temperature",  SensorUnit.TemperatureK, tegData.CirculatorB.InletTemperature);
-                WriteSample(component, sensorData, "teg_circ_b_out_pressure",    SensorUnit.PressureKpa,  tegData.CirculatorB.OutletPressure);
-                WriteSample(component, sensorData, "teg_circ_b_out_temperature", SensorUnit.TemperatureK, tegData.CirculatorB.OutletTemperature);
-                // @formatter:on
-                break;
+        // @formatter:off
+        WriteSample(ent, sensorData, "moles_transferred", SensorUnit.Moles, payload.LastMolesTransferred);
+        // @formatter:on
+    }
 
-            case SensorDeviceType.AtmosSensor:
-                if (command != AtmosDeviceNetworkSystem.SyncData)
-                    return;
+    [SubscribeLocalEvent]
+    private void OnBatteryReceived(Entity<SensorMonitoringConsoleComponent> ent, ref DeviceNetworkPacketEvent<BatterySensorDataPayload> args)
+    {
+        if (!ent.Comp.Sensors.TryGetValue(args.Sender, out var sensorData))
+            return;
 
-                if (!args.Data.TryGetValue(AtmosDeviceNetworkSystem.SyncData, out AtmosSensorData? atmosData))
-                    return;
+        var batteryData = args.Data.Data;
 
-                // @formatter:off
-                WriteSample(component, sensorData, "atmo_pressure",    SensorUnit.PressureKpa,    atmosData.Pressure);
-                WriteSample(component, sensorData, "atmo_temperature", SensorUnit.TemperatureK, atmosData.Temperature);
-                // @formatter:on
-                break;
+        // @formatter:off
+        WriteSample(ent, sensorData, "charge",        SensorUnit.EnergyJ, batteryData.Charge);
+        WriteSample(ent, sensorData, "charge_max",    SensorUnit.EnergyJ, batteryData.MaxCharge);
 
-            case SensorDeviceType.ThermoMachine:
-                if (command != AtmosDeviceNetworkSystem.SyncData)
-                    return;
+        WriteSample(ent, sensorData, "receiving",     SensorUnit.PowerW,  batteryData.Receiving);
+        WriteSample(ent, sensorData, "receiving_max", SensorUnit.PowerW,  batteryData.MaxReceiving);
 
-                if (!args.Data.TryGetValue(AtmosDeviceNetworkSystem.SyncData, out GasThermoMachineData? thermoData))
-                    return;
-
-                // @formatter:off
-                WriteSample(component, sensorData, "abs_energy_delta", SensorUnit.EnergyJ, MathF.Abs(thermoData.EnergyDelta));
-                // @formatter:on
-                break;
-
-            case SensorDeviceType.VolumePump:
-                if (command != AtmosDeviceNetworkSystem.SyncData)
-                    return;
-
-                if (!args.Data.TryGetValue(AtmosDeviceNetworkSystem.SyncData, out GasVolumePumpData? volumePumpData))
-                    return;
-
-                // @formatter:off
-                WriteSample(component, sensorData, "moles_transferred", SensorUnit.Moles, volumePumpData.LastMolesTransferred);
-                // @formatter:on
-                break;
-
-            case SensorDeviceType.Battery:
-                if (command != BatterySensorSystem.DeviceNetworkCommandSyncData)
-                    return;
-
-                if (!args.Data.TryGetValue(BatterySensorSystem.DeviceNetworkCommandSyncData, out BatterySensorData? batteryData))
-                    return;
-
-                // @formatter:off
-                WriteSample(component, sensorData, "charge",        SensorUnit.EnergyJ, batteryData.Charge);
-                WriteSample(component, sensorData, "charge_max",    SensorUnit.EnergyJ, batteryData.MaxCharge);
-
-                WriteSample(component, sensorData, "receiving",     SensorUnit.PowerW,  batteryData.Receiving);
-                WriteSample(component, sensorData, "receiving_max", SensorUnit.PowerW,  batteryData.MaxReceiving);
-
-                WriteSample(component, sensorData, "supplying",     SensorUnit.PowerW,  batteryData.Supplying);
-                WriteSample(component, sensorData, "supplying_max", SensorUnit.PowerW,  batteryData.MaxSupplying);
-                // @formatter:on
-
-                break;
-        }
+        WriteSample(ent, sensorData, "supplying",     SensorUnit.PowerW,  batteryData.Supplying);
+        WriteSample(ent, sensorData, "supplying_max", SensorUnit.PowerW,  batteryData.MaxSupplying);
+        // @formatter:on
     }
 
     private void WriteSample(
@@ -267,32 +254,22 @@ public sealed partial class SensorMonitoringConsoleSystem : EntitySystem
         foreach (var (ent, data) in comp.Sensors)
         {
             // Send network requests for new data!
-            NetworkPayload payload;
+            INetworkPayload payload;
             switch (data.DeviceType)
             {
                 case SensorDeviceType.Teg:
-                    payload = new NetworkPayload
-                    {
-                        [DeviceNetworkConstants.Command] = TegSystem.DeviceNetworkCommandSyncData
-                    };
-                    break;
-
                 case SensorDeviceType.AtmosSensor:
                 case SensorDeviceType.ThermoMachine:
                 case SensorDeviceType.VolumePump:
-                    payload = new NetworkPayload
-                    {
-                        [DeviceNetworkConstants.Command] = AtmosDeviceNetworkSystem.SyncData
-                    };
+                    payload = new AtmosSyncPayload();
                     break;
-
                 default:
                     // Unknown device type, don't do anything.
                     continue;
             }
 
             var address = _deviceNetworkQuery.GetComponent(ent);
-            _deviceNetwork.QueuePacket(uid, address.Address, payload);
+            _deviceNetwork.SendPacket(uid, address.Address, ref payload);
         }
     }
 
@@ -301,23 +278,19 @@ public sealed partial class SensorMonitoringConsoleSystem : EntitySystem
         foreach (var (ent, data) in comp.Sensors)
         {
             // Send network requests for new data!
-            NetworkPayload payload;
+            INetworkPayload payload;
             switch (data.DeviceType)
             {
                 case SensorDeviceType.Battery:
-                    payload = new NetworkPayload
-                    {
-                        [DeviceNetworkConstants.Command] = BatterySensorSystem.DeviceNetworkCommandSyncData
-                    };
+                    payload = new BatterySensorSyncPayload();
                     break;
-
                 default:
                     // Unknown device type, don't do anything.
                     continue;
             }
 
             var address = _deviceNetworkQuery.GetComponent(ent);
-            _deviceNetwork.QueuePacket(uid, address.Address, payload);
+            _deviceNetwork.SendPacket(uid, address.Address, ref payload);
         }
     }
 }
diff --git a/Content.Server/ServerInfo/ServerInfoManager.cs b/Content.Server/ServerInfo/ServerInfoManager.cs
index 6cd839c97e..38c79821e1 100644
--- a/Content.Server/ServerInfo/ServerInfoManager.cs
+++ b/Content.Server/ServerInfo/ServerInfoManager.cs
@@ -1,4 +1,4 @@
-using System.Text.Json.Nodes;
+using System.Text.Json.Nodes;
 using Content.Shared.CCVar;
 using Robust.Server.ServerStatus;
 using Robust.Shared.Configuration;
diff --git a/Content.Server/ServerUpdates/ServerUpdateManager.cs b/Content.Server/ServerUpdates/ServerUpdateManager.cs
index cd6f1dfa0f..ed3e270712 100644
--- a/Content.Server/ServerUpdates/ServerUpdateManager.cs
+++ b/Content.Server/ServerUpdates/ServerUpdateManager.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Chat.Managers;
 using Content.Shared.CCVar;
 using Robust.Server;
diff --git a/Content.Server/Shuttles/Components/GridSpawnComponent.cs b/Content.Server/Shuttles/Components/GridSpawnComponent.cs
index c74613f5eb..94ca55dc38 100644
--- a/Content.Server/Shuttles/Components/GridSpawnComponent.cs
+++ b/Content.Server/Shuttles/Components/GridSpawnComponent.cs
@@ -111,8 +111,6 @@ public sealed partial class GridSpawnGroup : IGridSpawnGroup
     public int MaxCount { get; set; } = 1;
     public ComponentRegistry AddComponents { get; set; } = new();
     public bool Hide { get; set; } = false;
-    public bool NameGrid { get; set; } = true;
+    public bool NameGrid { get; set; } = false;
     public bool StationGrid { get; set; } = true;
 }
-
-
diff --git a/Content.Server/Shuttles/Components/ShuttleComponent.cs b/Content.Server/Shuttles/Components/ShuttleComponent.cs
deleted file mode 100644
index 12123de69a..0000000000
--- a/Content.Server/Shuttles/Components/ShuttleComponent.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System.Numerics;
-
-namespace Content.Server.Shuttles.Components
-{
-    [RegisterComponent]
-    public sealed partial class ShuttleComponent : Component
-    {
-        [ViewVariables]
-        public bool Enabled = true;
-
-        [ViewVariables]
-        public Vector2[] CenterOfThrust = new Vector2[4];
-
-        /// <summary>
-        /// Thrust gets multiplied by this value if it's for braking.
-        /// </summary>
-        public const float BrakeCoefficient = 1.5f;
-
-        /// <summary>
-        /// Maximum velocity.
-        /// </summary>
-        [DataField]
-        public float BaseMaxLinearVelocity = 60f;
-
-        public const float MaxAngularVelocity = 4f;
-
-        /// <summary>
-        /// The cached thrust available for each cardinal direction
-        /// </summary>
-        [ViewVariables]
-        public readonly float[] LinearThrust = new float[4];
-
-        /// <summary>
-        /// The thrusters contributing to each direction for impulse.
-        /// </summary>
-        // No touchy
-        public readonly List<EntityUid>[] LinearThrusters = new List<EntityUid>[]
-        {
-            new(),
-            new(),
-            new(),
-            new(),
-        };
-
-        /// <summary>
-        /// The thrusters contributing to the angular impulse of the shuttle.
-        /// </summary>
-        public readonly List<EntityUid> AngularThrusters = new();
-
-        [ViewVariables]
-        public float AngularThrust = 0f;
-
-        /// <summary>
-        /// A bitmask of all the directions we are considered thrusting.
-        /// </summary>
-        [ViewVariables]
-        public DirectionFlag ThrustDirections = DirectionFlag.None;
-
-        /// <summary>
-        /// Base damping modifier applied to the shuttle's physics component when not in FTL.
-        /// </summary>
-        [DataField]
-        public float BodyModifier = 0.25f;
-
-        /// <summary>
-        /// Final Damping Modifier for a shuttle.
-        /// This value is set to 0 during FTL. And to BodyModifier when not in FTL.
-        /// </summary>
-        [DataField]
-        public float DampingModifier;
-
-        /// <summary>
-        /// Optional override for the FTL cooldown for this shuttle.
-        /// If not null, then the value will be used instead of the shuttle.cooldown CCVar.
-        /// </summary>
-        [DataField]
-        public TimeSpan? FTLCooldownOverride = null;
-    }
-}
diff --git a/Content.Server/Shuttles/Components/StationAnchorComponent.cs b/Content.Server/Shuttles/Components/StationAnchorComponent.cs
index c971ed921c..673b36ba99 100644
--- a/Content.Server/Shuttles/Components/StationAnchorComponent.cs
+++ b/Content.Server/Shuttles/Components/StationAnchorComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Shuttles.Systems;
+using Content.Server.Shuttles.Systems;
 
 namespace Content.Server.Shuttles.Components;
 
diff --git a/Content.Server/Shuttles/Components/StationEmergencyShuttleComponent.cs b/Content.Server/Shuttles/Components/StationEmergencyShuttleComponent.cs
index cfb667e1f0..11ff43f8fe 100644
--- a/Content.Server/Shuttles/Components/StationEmergencyShuttleComponent.cs
+++ b/Content.Server/Shuttles/Components/StationEmergencyShuttleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Shuttles.Systems;
+using Content.Server.Shuttles.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.Serialization.TypeSerializers.Implementations;
 using Robust.Shared.Utility;
diff --git a/Content.Server/Shuttles/Events/DockEvent.cs b/Content.Server/Shuttles/Events/DockEvent.cs
index 3b9ed46741..9de6c70ad5 100644
--- a/Content.Server/Shuttles/Events/DockEvent.cs
+++ b/Content.Server/Shuttles/Events/DockEvent.cs
@@ -12,4 +12,4 @@ public sealed class DockEvent : EntityEventArgs
 
     public EntityUid GridAUid = default!;
     public EntityUid GridBUid = default!;
-}
\ No newline at end of file
+}
diff --git a/Content.Server/Shuttles/Events/ShuttleConsoleFTLStartEvent.cs b/Content.Server/Shuttles/Events/ShuttleConsoleFTLStartEvent.cs
index cfa6d4157d..87ed8df9b1 100644
--- a/Content.Server/Shuttles/Events/ShuttleConsoleFTLStartEvent.cs
+++ b/Content.Server/Shuttles/Events/ShuttleConsoleFTLStartEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Shuttles.Events;
+namespace Content.Server.Shuttles.Events;
 
 /// <summary>
 /// Raised when shuttle console approved FTL
diff --git a/Content.Server/Shuttles/Events/UndockEvent.cs b/Content.Server/Shuttles/Events/UndockEvent.cs
index 41df647aab..b16df1db1d 100644
--- a/Content.Server/Shuttles/Events/UndockEvent.cs
+++ b/Content.Server/Shuttles/Events/UndockEvent.cs
@@ -12,4 +12,4 @@ public sealed class UndockEvent : EntityEventArgs
 
     public EntityUid GridAUid = default!;
     public EntityUid GridBUid = default!;
-}
\ No newline at end of file
+}
diff --git a/Content.Server/Shuttles/Systems/DockingSignalControlSystem.cs b/Content.Server/Shuttles/Systems/DockingSignalControlSystem.cs
index 483778d201..e8fcaa1dbe 100644
--- a/Content.Server/Shuttles/Systems/DockingSignalControlSystem.cs
+++ b/Content.Server/Shuttles/Systems/DockingSignalControlSystem.cs
@@ -18,11 +18,11 @@ public sealed partial class DockingSignalControlSystem : EntitySystem
 
     private void OnDocked(Entity<DockingSignalControlComponent> ent, ref DockEvent args)
     {
-        _deviceLinkSystem.SendSignal(ent, ent.Comp.DockStatusSignalPort, signal: true);
+        _deviceLinkSystem.SendSignal(ent.Owner, ent.Comp.DockStatusSignalPort, signal: true);
     }
 
     private void OnUndocked(Entity<DockingSignalControlComponent> ent, ref UndockEvent args)
     {
-        _deviceLinkSystem.SendSignal(ent, ent.Comp.DockStatusSignalPort, signal: false);
+        _deviceLinkSystem.SendSignal(ent.Owner, ent.Comp.DockStatusSignalPort, signal: false);
     }
 }
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
index d982b67f69..5c315e8d5f 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
@@ -1,5 +1,4 @@
 using System.Threading;
-using Content.Server.Screens.Components;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
 using Content.Shared.Access;
@@ -9,6 +8,7 @@ using Content.Shared.Emag.Systems;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.Popups;
+using Content.Shared.RoundEnd;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Events;
@@ -29,11 +29,6 @@ namespace Content.Server.Shuttles.Systems;
 /// </summary>
 public sealed partial class EmergencyShuttleSystem
 {
-    /// <summary>
-    /// Has the emergency shuttle arrived?
-    /// </summary>
-    public bool EmergencyShuttleArrived { get; private set; }
-
     public bool EarlyLaunchAuthorized { get; private set; }
 
     /// <summary>
@@ -386,17 +381,17 @@ public sealed partial class EmergencyShuttleSystem
         var shuttle = GetShuttle();
         if (shuttle != null && TryComp<DeviceNetworkComponent>(shuttle, out var net))
         {
-            var payload = new NetworkPayload
+            var payload = new ScreenShuttlePayload
             {
-                [ShuttleTimerMasks.ShuttleMap] = shuttle,
-                [ShuttleTimerMasks.SourceMap] = _roundEnd.GetStation(),
-                [ShuttleTimerMasks.DestMap] = _roundEnd.GetCentcomm(),
-                [ShuttleTimerMasks.ShuttleTime] = time,
-                [ShuttleTimerMasks.SourceTime] = time,
-                [ShuttleTimerMasks.DestTime] = time + TimeSpan.FromSeconds(TransitTime),
-                [ShuttleTimerMasks.Docked] = true
+                Shuttle = shuttle,
+                SourceMap = _roundEnd.GetStation(),
+                DestinationMap = _roundEnd.GetCentcomm(),
+                ShuttleTime = time,
+                SourceTime = time,
+                DestinationTime = time + TimeSpan.FromSeconds(TransitTime),
+                Docked = true,
             };
-            _deviceNetworkSystem.QueuePacket(shuttle.Value, null, payload, net.TransmitFrequency);
+            _deviceNetworkSystem.SendPacket(shuttle.Value, null, ref payload, net.TransmitFrequency);
         }
 
         return true;
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
index e0cd4a155f..05309ff14a 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
@@ -19,10 +19,11 @@ using Content.Server.Station.Systems;
 using Content.Shared.Access.Systems;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Events;
 using Content.Shared.Localizations;
+using Content.Shared.RoundEnd;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Events;
 using Content.Shared.Shuttles.Systems;
@@ -56,7 +57,7 @@ public sealed partial class EmergencyShuttleSystem : SharedEmergencyShuttleSyste
     [Dependency] private CommunicationsConsoleSystem _commsConsole = default!;
     [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!;
     [Dependency] private DockingSystem _dock = default!;
-    [Dependency] private GameTicker _ticker = default!;
+    [Dependency] private ServerGameTicker _ticker = default!;
     [Dependency] private IdCardSystem _idSystem = default!;
     [Dependency] private NavMapSystem _navMap = default!;
     [Dependency] private MapLoaderSystem _loader = default!;
@@ -64,7 +65,7 @@ public sealed partial class EmergencyShuttleSystem : SharedEmergencyShuttleSyste
     [Dependency] private RoundEndSystem _roundEnd = default!;
     [Dependency] private SharedAudioSystem _audio = default!;
     [Dependency] private ShuttleSystem _shuttle = default!;
-    [Dependency] private StationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
     [Dependency] private TransformSystem _transformSystem = default!;
     [Dependency] private UserInterfaceSystem _uiSystem = default!;
 
@@ -119,15 +120,6 @@ public sealed partial class EmergencyShuttleSystem : SharedEmergencyShuttleSyste
         component.MapEntity = null;
     }
 
-    /// <summary>
-    ///     Attempts to get the EntityUid of the emergency shuttle
-    /// </summary>
-    public EntityUid? GetShuttle()
-    {
-        AllEntityQuery<EmergencyShuttleComponent>().MoveNext(out var shuttle, out _);
-        return shuttle;
-    }
-
     private void SetEmergencyShuttleEnabled(bool value)
     {
         if (_emergencyShuttleEnabled == value)
@@ -210,16 +202,16 @@ public sealed partial class EmergencyShuttleSystem : SharedEmergencyShuttleSyste
 
         if (TryComp<DeviceNetworkComponent>(uid, out var netComp))
         {
-            var payload = new NetworkPayload
+            var payload = new ScreenShuttlePayload
             {
-                [ShuttleTimerMasks.ShuttleMap] = uid,
-                [ShuttleTimerMasks.SourceMap] = args.FromMapUid,
-                [ShuttleTimerMasks.DestMap] = _transformSystem.GetMap(args.TargetCoordinates),
-                [ShuttleTimerMasks.ShuttleTime] = ftlTime,
-                [ShuttleTimerMasks.SourceTime] = ftlTime,
-                [ShuttleTimerMasks.DestTime] = ftlTime
+                Shuttle = uid,
+                SourceMap = args.FromMapUid,
+                DestinationMap = _transformSystem.GetMap(args.TargetCoordinates),
+                ShuttleTime = ftlTime,
+                SourceTime = ftlTime,
+                DestinationTime = ftlTime,
             };
-            _deviceNetworkSystem.QueuePacket(uid, null, payload, netComp.TransmitFrequency);
+            _deviceNetworkSystem.SendPacket(uid, null, ref payload, netComp.TransmitFrequency);
         }
     }
 
@@ -232,27 +224,27 @@ public sealed partial class EmergencyShuttleSystem : SharedEmergencyShuttleSyste
         var shuttle = args.Entity;
         if (TryComp<DeviceNetworkComponent>(shuttle, out var net))
         {
-            var payload = new NetworkPayload
+            var payload = new ScreenShuttlePayload
             {
-                [ShuttleTimerMasks.ShuttleMap] = shuttle,
-                [ShuttleTimerMasks.SourceMap] = _roundEnd.GetCentcomm(),
-                [ShuttleTimerMasks.DestMap] = _roundEnd.GetStation(),
-                [ShuttleTimerMasks.ShuttleTime] = countdownTime,
-                [ShuttleTimerMasks.SourceTime] = countdownTime,
-                [ShuttleTimerMasks.DestTime] = countdownTime,
+                Shuttle = shuttle,
+                SourceMap = _roundEnd.GetCentcomm(),
+                DestinationMap = _roundEnd.GetStation(),
+                ShuttleTime = countdownTime,
+                SourceTime = countdownTime,
+                DestinationTime = countdownTime,
             };
 
             // by popular request
             // https://discord.com/channels/310555209753690112/770682801607278632/1189989482234126356
             if (_random.Next(1000) == 0)
             {
-                payload.Add(ScreenMasks.Text, ShuttleTimerMasks.Kill);
-                payload.Add(ScreenMasks.Color, Color.Red);
+                payload.OverrideText = ShuttleTimerMasks.Kill;
+                payload.OverrideColor = Color.Red;
             }
             else
-                payload.Add(ScreenMasks.Text, ShuttleTimerMasks.Bye);
+                payload.OverrideText = ShuttleTimerMasks.Bye;
 
-            _deviceNetworkSystem.QueuePacket(shuttle, null, payload, net.TransmitFrequency);
+            _deviceNetworkSystem.SendPacket(shuttle, null, ref payload, net.TransmitFrequency);
         }
     }
 
@@ -377,17 +369,17 @@ public sealed partial class EmergencyShuttleSystem : SharedEmergencyShuttleSyste
         var time = TimeSpan.FromSeconds(_consoleAccumulator);
         if (TryComp<DeviceNetworkComponent>(shuttle, out var netComp))
         {
-            var payload = new NetworkPayload
+            var payload = new ScreenShuttlePayload
             {
-                [ShuttleTimerMasks.ShuttleMap] = shuttle,
-                [ShuttleTimerMasks.SourceMap] = targetXform.MapUid,
-                [ShuttleTimerMasks.DestMap] = _roundEnd.GetCentcomm(),
-                [ShuttleTimerMasks.ShuttleTime] = time,
-                [ShuttleTimerMasks.SourceTime] = time,
-                [ShuttleTimerMasks.DestTime] = time + TimeSpan.FromSeconds(TransitTime),
-                [ShuttleTimerMasks.Docked] = true,
+                Shuttle = shuttle,
+                SourceMap = targetXform.MapUid,
+                DestinationMap = _roundEnd.GetCentcomm(),
+                ShuttleTime = time,
+                SourceTime = time,
+                DestinationTime = time + TimeSpan.FromSeconds(TransitTime),
+                Docked = true,
             };
-            _deviceNetworkSystem.QueuePacket(shuttle.Value, null, payload, netComp.TransmitFrequency);
+            _deviceNetworkSystem.SendPacket(shuttle.Value, null, ref payload, netComp.TransmitFrequency);
         }
 
         // Play announcement audio.
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ServerArrivalsSystem.cs
similarity index 66%
rename from Content.Server/Shuttles/Systems/ArrivalsSystem.cs
rename to Content.Server/Shuttles/Systems/ServerArrivalsSystem.cs
index 4820b0946f..51e8a1b3e4 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ServerArrivalsSystem.cs
@@ -1,33 +1,30 @@
 using System.Linq;
 using System.Numerics;
 using Content.Server.Administration;
-using Content.Server.Antag;
 using Content.Server.Chat.Managers;
 using Content.Server.DeviceNetwork.Systems;
-using Content.Server.GameTicking;
-using Content.Server.GameTicking.Events;
 using Content.Server.Parallax;
-using Content.Server.Screens.Components;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
-using Content.Server.Spawners.Components;
-using Content.Server.Spawners.EntitySystems;
 using Content.Server.Station.Events;
-using Content.Server.Station.Systems;
 using Content.Shared.Administration;
+using Content.Shared.Antag;
 using Content.Shared.CCVar;
 using Content.Shared.Damage.Components;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Events;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Components;
 using Content.Shared.Parallax.Biomes;
+using Content.Shared.RoundEnd;
 using Content.Shared.Salvage;
 using Content.Shared.Shuttles.Components;
+using Content.Shared.Shuttles.Systems;
+using Content.Shared.Spawners.Components;
+using Content.Shared.Station.Systems;
 using Content.Shared.Tiles;
 using Robust.Shared.Collections;
-using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.EntitySerialization.Systems;
 using Robust.Shared.Map;
@@ -35,47 +32,29 @@ using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Spawners;
-using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Shuttles.Systems;
 
-/// <summary>
-/// If enabled spawns players on a separate arrivals station before they can transfer to the main station.
-/// </summary>
-public sealed partial class ArrivalsSystem : EntitySystem
+/// <inheritdoc/>
+public sealed partial class ServerArrivalsSystem : ArrivalsSystem
 {
     [Dependency] private IChatManager _chat = default!;
-    [Dependency] private IConfigurationManager _cfgManager = default!;
     [Dependency] private IConsoleHost _console = default!;
-    [Dependency] private IGameTiming _timing = default!;
-    [Dependency] private IRobustRandom _random = default!;
     [Dependency] private ActorSystem _actor = default!;
+    [Dependency] private AntagSelectionSystem _antag = default!;
     [Dependency] private BiomeSystem _biomes = default!;
     [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!;
-    [Dependency] private GameTicker _ticker = default!;
     [Dependency] private MapLoaderSystem _loader = default!;
     [Dependency] private MetaDataSystem _metaData = default!;
+    [Dependency] private ShuttleSystem _shuttles = default!;
     [Dependency] private SharedMapSystem _mapSystem = default!;
     [Dependency] private SharedTransformSystem _transform = default!;
-    [Dependency] private ShuttleSystem _shuttles = default!;
-    [Dependency] private StationSpawningSystem _stationSpawning = default!;
     [Dependency] private StationSystem _station = default!;
-    [Dependency] private AntagSelectionSystem _antag = default!;
 
-    [Dependency] private EntityQuery<PendingClockInComponent> _pendingQuery = default!;
-    [Dependency] private EntityQuery<ArrivalsBlacklistComponent> _blacklistQuery = default!;
-    [Dependency] private EntityQuery<MobStateComponent> _mobQuery = default!;
-
-    /// <summary>
-    /// If enabled then spawns players on an alternate map so they can take a shuttle to the station.
-    /// </summary>
-    public bool Enabled { get; private set; }
-
-    /// <summary>
-    /// Flags if all players spawning at the departure terminal have godmode until they leave the terminal.
-    /// </summary>
-    public bool ArrivalsGodmode { get; private set; }
+    [Dependency] private EntityQuery<PendingClockInComponent> _pendingQuery;
+    [Dependency] private EntityQuery<ArrivalsBlacklistComponent> _blacklistQuery;
+    [Dependency] private EntityQuery<MobStateComponent> _mobQuery;
 
     /// <summary>
     ///     The first arrival is a little early, to save everyone 10s
@@ -93,396 +72,18 @@ public sealed partial class ArrivalsSystem : EntitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<PlayerSpawningEvent>(HandlePlayerSpawning, before: new []{ typeof(SpawnPointSystem)}, after: new [] { typeof(ContainerSpawnPointSystem)});
-
-        SubscribeLocalEvent<StationArrivalsComponent, StationPostInitEvent>(OnStationPostInit);
-
-        SubscribeLocalEvent<ArrivalsShuttleComponent, ComponentStartup>(OnShuttleStartup);
-        SubscribeLocalEvent<ArrivalsShuttleComponent, FTLTagEvent>(OnShuttleTag);
-
-        SubscribeLocalEvent<RoundStartingEvent>(OnRoundStarting);
-        SubscribeLocalEvent<ArrivalsShuttleComponent, FTLStartedEvent>(OnArrivalsFTL);
-        SubscribeLocalEvent<ArrivalsShuttleComponent, FTLCompletedEvent>(OnArrivalsDocked);
-
-        SubscribeLocalEvent<PlayerSpawnCompleteEvent>(SendDirections);
-
-        // Don't invoke immediately as it will get set in the natural course of things.
-        Enabled = _cfgManager.GetCVar(CCVars.ArrivalsShuttles);
-        ArrivalsGodmode = _cfgManager.GetCVar(CCVars.GodmodeArrivals);
-
-        _cfgManager.OnValueChanged(CCVars.ArrivalsShuttles, SetArrivals);
-        _cfgManager.OnValueChanged(CCVars.GodmodeArrivals, b => ArrivalsGodmode = b);
+        Cfg.OnValueChanged(CCVars.ArrivalsShuttles, SetArrivals);
 
         // Command so admins can set these for funsies
         _console.RegisterCommand("arrivals", ArrivalsCommand, ArrivalsCompletion);
     }
 
-    private void OnShuttleTag(EntityUid uid, ArrivalsShuttleComponent component, ref FTLTagEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        // Just saves mappers forgetting. (v2 boogaloo)
-        args.Handled = true;
-        args.Tag = "DockArrivals";
-    }
-
-    private CompletionResult ArrivalsCompletion(IConsoleShell shell, string[] args)
-    {
-        if (args.Length != 1)
-            return CompletionResult.Empty;
-
-        return new CompletionResult(new CompletionOption[]
-        {
-            // Enables and disable are separate comms in case you don't want to accidentally toggle it, compared to
-            // returns which doesn't have an immediate effect
-            new("enable", Loc.GetString("cmd-arrivals-enable-hint")),
-            new("disable", Loc.GetString("cmd-arrivals-disable-hint")),
-            new("returns", Loc.GetString("cmd-arrivals-returns-hint")),
-            new ("force", Loc.GetString("cmd-arrivals-force-hint"))
-        }, "Option");
-    }
-
-    [AdminCommand(AdminFlags.Fun)]
-    private void ArrivalsCommand(IConsoleShell shell, string argstr, string[] args)
-    {
-        if (args.Length != 1)
-        {
-            shell.WriteError(Loc.GetString("cmd-arrivals-invalid"));
-            return;
-        }
-
-        switch (args[0])
-        {
-            case "enable":
-                _cfgManager.SetCVar(CCVars.ArrivalsShuttles, true);
-                break;
-            case "disable":
-                _cfgManager.SetCVar(CCVars.ArrivalsShuttles, false);
-                break;
-            case "returns":
-                var existing = _cfgManager.GetCVar(CCVars.ArrivalsReturns);
-                _cfgManager.SetCVar(CCVars.ArrivalsReturns, !existing);
-                shell.WriteLine(Loc.GetString("cmd-arrivals-returns", ("value", !existing)));
-                break;
-            case "force":
-                var query = AllEntityQuery<PendingClockInComponent, TransformComponent>();
-                var spawnPoints = EntityQuery<SpawnPointComponent, TransformComponent>().ToList();
-
-                TryGetArrivals(out var arrivalsUid);
-
-                while (query.MoveNext(out var uid, out _, out var pendingXform))
-                {
-                    _random.Shuffle(spawnPoints);
-
-                    foreach (var (point, xform) in spawnPoints)
-                    {
-                        if (point.SpawnType != SpawnPointType.LateJoin || xform.GridUid == arrivalsUid)
-                            continue;
-
-                        _transform.SetCoordinates(uid, pendingXform, xform.Coordinates);
-                        break;
-                    }
-
-                    RemCompDeferred<AutoOrientComponent>(uid);
-                    RemCompDeferred<PendingClockInComponent>(uid);
-                    shell.WriteLine(Loc.GetString("cmd-arrivals-forced", ("uid", ToPrettyString(uid))));
-                }
-                break;
-            default:
-                shell.WriteError(Loc.GetString($"cmd-arrivals-invalid"));
-                break;
-        }
-    }
-
-    /// <summary>
-    ///     First sends shuttle timer data, then kicks people off the shuttle if it isn't leaving the arrivals terminal
-    /// </summary>
-    private void OnArrivalsFTL(EntityUid shuttleUid, ArrivalsShuttleComponent component, ref FTLStartedEvent args)
-    {
-        if (!TryGetArrivals(out EntityUid arrivals))
-            return;
-
-        if (TryComp<DeviceNetworkComponent>(shuttleUid, out var netComp))
-        {
-            TryComp<FTLComponent>(shuttleUid, out var ftlComp);
-            var ftlTime = TimeSpan.FromSeconds(ftlComp?.TravelTime ?? _shuttles.DefaultTravelTime);
-
-            var payload = new NetworkPayload
-            {
-                [ShuttleTimerMasks.ShuttleMap] = shuttleUid,
-                [ShuttleTimerMasks.ShuttleTime] = ftlTime
-            };
-
-            // unfortunate levels of spaghetti due to roundstart arrivals ftl behavior
-            EntityUid? sourceMap;
-            var arrivalsDelay = _cfgManager.GetCVar(CCVars.ArrivalsCooldown);
-
-            if (component.FirstRun)
-            {
-                var station = _station.GetLargestGrid(component.Station);
-                sourceMap = station == null ? null : Transform(station.Value)?.MapUid;
-                arrivalsDelay += RoundStartFTLDuration;
-                component.FirstRun = false;
-                payload.Add(ShuttleTimerMasks.DestMap, Transform(args.TargetCoordinates.EntityId).MapUid);
-                payload.Add(ShuttleTimerMasks.DestTime, ftlTime);
-            }
-            else
-                sourceMap = args.FromMapUid;
-
-            payload.Add(ShuttleTimerMasks.SourceMap, sourceMap);
-            payload.Add(ShuttleTimerMasks.SourceTime, ftlTime + TimeSpan.FromSeconds(arrivalsDelay));
-
-            _deviceNetworkSystem.QueuePacket(shuttleUid, null, payload, netComp.TransmitFrequency);
-        }
-
-        // Don't do anything here when leaving arrivals.
-        var arrivalsMapUid = Transform(arrivals).MapUid;
-        if (args.FromMapUid == arrivalsMapUid)
-            return;
-
-        // Any mob then yeet them off the shuttle.
-        if (!_cfgManager.GetCVar(CCVars.ArrivalsReturns) && args.FromMapUid != null)
-            DumpChildren(shuttleUid, ref args);
-
-        var pendingQuery = AllEntityQuery<PendingClockInComponent, TransformComponent>();
-
-        // We're heading from the station back to arrivals (if leaving arrivals, would have returned above).
-        // Process everyone who holds a PendingClockInComponent
-        // Note, due to way DumpChildren works, anyone who doesn't have a PendingClockInComponent gets left in space
-        // and will not warp. This is intended behavior.
-        while (pendingQuery.MoveNext(out var pUid, out _, out var xform))
-        {
-            if (xform.GridUid == shuttleUid)
-            {
-                // Warp all players who are still on this shuttle to a spawn point. This doesn't let them return to
-                // arrivals. It also ensures noobs, slow players or AFK players safely leave the shuttle.
-                TryTeleportToMapSpawn(pUid, component.Station, xform);
-            }
-
-            // Players who have remained at arrivals keep their warp coupon (PendingClockInComponent) for now.
-            if (xform.MapUid == arrivalsMapUid)
-                continue;
-
-            // The player has successfully left arrivals and is also not on the shuttle. Remove their warp coupon.
-            RemCompDeferred<PendingClockInComponent>(pUid);
-            RemCompDeferred<AutoOrientComponent>(pUid);
-
-            if (ArrivalsGodmode)
-                RemCompDeferred<GodmodeComponent>(pUid);
-
-            if (_actor.TryGetSession(pUid, out var session) && session is not null)
-                _antag.TryMakeLateJoinAntag(session);
-        }
-    }
-
-    private void OnArrivalsDocked(EntityUid uid, ArrivalsShuttleComponent component, ref FTLCompletedEvent args)
-    {
-        var dockTime = component.NextTransfer - _timing.CurTime + TimeSpan.FromSeconds(_shuttles.DefaultStartupTime);
-
-        if (TryComp<DeviceNetworkComponent>(uid, out var netComp))
-        {
-            var payload = new NetworkPayload
-            {
-                [ShuttleTimerMasks.ShuttleMap] = uid,
-                [ShuttleTimerMasks.ShuttleTime] = dockTime,
-                [ShuttleTimerMasks.SourceMap] = args.MapUid,
-                [ShuttleTimerMasks.SourceTime] = dockTime,
-                [ShuttleTimerMasks.Docked] = true
-            };
-            _deviceNetworkSystem.QueuePacket(uid, null, payload, netComp.TransmitFrequency);
-        }
-    }
-
-    private void DumpChildren(EntityUid uid, ref FTLStartedEvent args)
-    {
-        var toDump = new List<Entity<TransformComponent>>();
-        FindDumpChildren(uid, toDump);
-        foreach (var (ent, xform) in toDump)
-        {
-            var rotation = xform.LocalRotation;
-            _transform.SetCoordinates(ent, new EntityCoordinates(args.FromMapUid!.Value, Vector2.Transform(xform.LocalPosition, args.FTLFrom)));
-            _transform.SetWorldRotation(ent, args.FromRotation + rotation);
-            if (_actor.TryGetSession(ent, out var session))
-            {
-                _chat.DispatchServerMessage(session!, Loc.GetString("latejoin-arrivals-dumped-from-shuttle"));
-            }
-        }
-    }
-
-    private void FindDumpChildren(EntityUid uid, List<Entity<TransformComponent>> toDump)
-    {
-        if (_pendingQuery.HasComponent(uid))
-            return;
-
-        var xform = Transform(uid);
-
-        if (_mobQuery.HasComponent(uid) || _blacklistQuery.HasComponent(uid))
-        {
-            toDump.Add((uid, xform));
-            return;
-        }
-
-        var children = xform.ChildEnumerator;
-        while (children.MoveNext(out var child))
-        {
-            FindDumpChildren(child, toDump);
-        }
-    }
-
-    public void HandlePlayerSpawning(PlayerSpawningEvent ev)
-    {
-        if (ev.SpawnResult != null)
-            return;
-
-        // We use arrivals as the default spawn so don't check for job prio.
-
-        // Only works on latejoin even if enabled.
-        if (!Enabled || _ticker.RunLevel != GameRunLevel.InRound)
-            return;
-
-        if (!HasComp<StationArrivalsComponent>(ev.Station))
-            return;
-
-        TryGetArrivals(out var arrivals);
-
-        if (!TryComp(arrivals, out TransformComponent? arrivalsXform))
-            return;
-
-        var mapId = arrivalsXform.MapID;
-
-        var points = EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
-        var possiblePositions = new List<EntityCoordinates>();
-        while (points.MoveNext(out var uid, out var spawnPoint, out var xform))
-        {
-            if (spawnPoint.SpawnType != SpawnPointType.LateJoin || xform.MapID != mapId)
-                continue;
-
-            possiblePositions.Add(xform.Coordinates);
-        }
-
-        if (possiblePositions.Count <= 0)
-            return;
-
-        var spawnLoc = _random.Pick(possiblePositions);
-        ev.SpawnResult = _stationSpawning.SpawnPlayerMob(
-            spawnLoc,
-            ev.Job,
-            ev.HumanoidCharacterProfile,
-            ev.Station);
-
-        EnsureComp<PendingClockInComponent>(ev.SpawnResult.Value);
-        EnsureComp<AutoOrientComponent>(ev.SpawnResult.Value);
-
-        // If you're forced to spawn, you're invincible until you leave wherever you were forced to spawn.
-        if (ArrivalsGodmode)
-            EnsureComp<GodmodeComponent>(ev.SpawnResult.Value);
-    }
-
-    private void SendDirections(PlayerSpawnCompleteEvent ev)
-    {
-        if (!Enabled || !ev.LateJoin || ev.Silent || !_pendingQuery.HasComp(ev.Mob))
-            return;
-
-        var arrival = NextShuttleArrival();
-
-        var message = arrival is not null
-            ? Loc.GetString("latejoin-arrivals-direction-time", ("time", $"{arrival:mm\\:ss}"))
-            : Loc.GetString("latejoin-arrivals-direction");
-
-        _chat.DispatchServerMessage(ev.Player, message);
-    }
-
-    private bool TryTeleportToMapSpawn(EntityUid player, EntityUid stationId, TransformComponent? transform = null)
-    {
-        if (!Resolve(player, ref transform))
-            return false;
-
-        var points = EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
-        var possiblePositions = new ValueList<EntityCoordinates>(32);
-
-        // Find a spawnpoint on the same map as the player is already docked with now.
-        while (points.MoveNext(out var uid, out var spawnPoint, out var xform))
-        {
-            if (spawnPoint.SpawnType == SpawnPointType.LateJoin &&
-                _station.GetOwningStation(uid, xform) == stationId)
-            {
-                // Add to list of possible spawn locations
-                possiblePositions.Add(xform.Coordinates);
-            }
-        }
-
-        if (possiblePositions.Count > 0)
-        {
-            // Move the player to a random late-join spawnpoint.
-            _transform.SetCoordinates(player, transform, _random.Pick(possiblePositions));
-            if (_actor.TryGetSession(player, out var session))
-            {
-                _chat.DispatchServerMessage(session!, Loc.GetString("latejoin-arrivals-teleport-to-spawn"));
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    private void OnShuttleStartup(EntityUid uid, ArrivalsShuttleComponent component, ComponentStartup args)
-    {
-        EnsureComp<PreventPilotComponent>(uid);
-    }
-
-    private bool TryGetArrivals(out EntityUid uid)
-    {
-        var arrivalsQuery = EntityQueryEnumerator<ArrivalsSourceComponent>();
-
-        while (arrivalsQuery.MoveNext(out uid, out _))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    /// Check if an entity is on the arrivals grid.
-    /// </summary>
-    /// <param name="entity">Entity to check.</param>
-    /// <returns>True if the entity is on the arrivals grid. Returns false if not on arrivals, or there is no arrivals grid.</returns>
-    public bool IsOnArrivals(Entity<TransformComponent?> entity)
-    {
-        if (!Resolve(entity, ref entity.Comp))
-            return false;
-
-        if (!TryGetArrivals(out var arrivals))
-            return false;
-
-        var arrivalsGridUid = Transform(arrivals).GridUid;
-        if (!arrivalsGridUid.HasValue)
-            return false;
-
-        return entity.Comp.GridUid == Transform(arrivals).GridUid;
-    }
-
-    public TimeSpan? NextShuttleArrival()
-    {
-        var query = EntityQueryEnumerator<ArrivalsShuttleComponent>();
-        var time = TimeSpan.MaxValue;
-        while (query.MoveNext(out var uid, out var comp))
-        {
-            if (comp.NextArrivalsTime < time)
-                time = comp.NextArrivalsTime;
-        }
-
-        var duration = _timing.CurTime;
-        return (time < duration) ? null : time - duration;
-    }
-
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
 
         var query = EntityQueryEnumerator<ArrivalsShuttleComponent, ShuttleComponent, TransformComponent>();
-        var curTime = _timing.CurTime;
+        var curTime = Timing.CurTime;
         TryGetArrivals(out var arrivals);
 
         if (TryComp(arrivals, out TransformComponent? arrivalsXform))
@@ -500,7 +101,7 @@ public sealed partial class ArrivalsSystem : EntitySystem
                     if (arrivals.IsValid())
                         _shuttles.FTLToDock(uid, shuttle, arrivals);
 
-                    comp.NextArrivalsTime = _timing.CurTime + TimeSpan.FromSeconds(tripTime);
+                    comp.NextArrivalsTime = Timing.CurTime + TimeSpan.FromSeconds(tripTime);
                 }
                 // Go to station
                 else
@@ -512,27 +113,18 @@ public sealed partial class ArrivalsSystem : EntitySystem
 
                     // The ArrivalsCooldown includes the trip there, so we only need to add the time taken for
                     // the trip back.
-                    comp.NextArrivalsTime = _timing.CurTime + TimeSpan.FromSeconds(
-                        _cfgManager.GetCVar(CCVars.ArrivalsCooldown) + tripTime);
+                    comp.NextArrivalsTime = Timing.CurTime + TimeSpan.FromSeconds(
+                        Cfg.GetCVar(CCVars.ArrivalsCooldown) + tripTime);
                 }
 
-                comp.NextTransfer += TimeSpan.FromSeconds(_cfgManager.GetCVar(CCVars.ArrivalsCooldown));
+                comp.NextTransfer += TimeSpan.FromSeconds(Cfg.GetCVar(CCVars.ArrivalsCooldown));
             }
         }
     }
 
-    private void OnRoundStarting(RoundStartingEvent ev)
-    {
-        // Setup arrivals station
-        if (!Enabled)
-            return;
-
-        SetupArrivalsStation();
-    }
-
     private void SetupArrivalsStation()
     {
-        var path = new ResPath(_cfgManager.GetCVar(CCVars.ArrivalsMap));
+        var path = new ResPath(Cfg.GetCVar(CCVars.ArrivalsMap));
         _mapSystem.CreateMap(out var mapId, runMapInit: false);
         var mapUid = _mapSystem.GetMap(mapId);
 
@@ -546,9 +138,9 @@ public sealed partial class ArrivalsSystem : EntitySystem
         EnsureComp<PreventPilotComponent>(grid.Value);
 
         // Setup planet arrivals if relevant
-        if (_cfgManager.GetCVar(CCVars.ArrivalsPlanet))
+        if (Cfg.GetCVar(CCVars.ArrivalsPlanet))
         {
-            var template = _random.Pick(_arrivalsBiomeOptions);
+            var template = Random.Pick(_arrivalsBiomeOptions);
             _biomes.EnsurePlanet(mapUid, ProtoMan.Index(template));
             var restricted = new RestrictedRangeComponent
             {
@@ -600,15 +192,6 @@ public sealed partial class ArrivalsSystem : EntitySystem
         }
     }
 
-    private void OnStationPostInit(EntityUid uid, StationArrivalsComponent component, ref StationPostInitEvent args)
-    {
-        if (!Enabled)
-            return;
-
-        // If it's a latespawn station then this will fail but that's okey
-        SetupShuttle(uid, component);
-    }
-
     private void SetupShuttle(EntityUid uid, StationArrivalsComponent component)
     {
         if (!Deleted(component.Shuttle))
@@ -626,11 +209,297 @@ public sealed partial class ArrivalsSystem : EntitySystem
             arrivalsComp.Station = uid;
             EnsureComp<ProtectedGridComponent>(uid);
             _shuttles.FTLToDock(component.Shuttle, shuttleComp, arrivals, hyperspaceTime: RoundStartFTLDuration);
-            arrivalsComp.NextTransfer = _timing.CurTime + TimeSpan.FromSeconds(_cfgManager.GetCVar(CCVars.ArrivalsCooldown));
+            arrivalsComp.NextTransfer = Timing.CurTime + TimeSpan.FromSeconds(Cfg.GetCVar(CCVars.ArrivalsCooldown));
         }
 
         // Don't start the arrivals shuttle immediately docked so power has a time to stabilise?
         var timer = AddComp<TimedDespawnComponent>(dummpMapEntity);
         timer.Lifetime = 15f;
     }
+
+    [SubscribeLocalEvent]
+    private void OnRoundStarting(RoundStartingEvent ev)
+    {
+        // Setup arrivals station
+        if (!Enabled)
+            return;
+
+        SetupArrivalsStation();
+    }
+
+    [SubscribeLocalEvent]
+    private void OnStationPostInit(EntityUid uid, StationArrivalsComponent component, ref StationPostInitEvent args)
+    {
+        if (!Enabled)
+            return;
+
+        // If it's a latespawn station then this will fail but that's okey
+        SetupShuttle(uid, component);
+    }
+
+    /// <summary>
+    ///     First sends shuttle timer data, then kicks people off the shuttle if it isn't leaving the arrivals terminal
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnArrivalsFTL(EntityUid shuttleUid, ArrivalsShuttleComponent component, ref FTLStartedEvent args)
+    {
+        if (!TryGetArrivals(out EntityUid arrivals))
+            return;
+
+        if (TryComp<DeviceNetworkComponent>(shuttleUid, out var netComp))
+        {
+            TryComp<FTLComponent>(shuttleUid, out var ftlComp);
+            var ftlTime = TimeSpan.FromSeconds(ftlComp?.TravelTime ?? _shuttles.DefaultTravelTime);
+
+            var payload = new ScreenShuttlePayload
+            {
+                Shuttle = shuttleUid,
+                ShuttleTime = ftlTime,
+            };
+
+            // unfortunate levels of spaghetti due to roundstart arrivals ftl behavior
+            EntityUid? sourceMap;
+            var arrivalsDelay = Cfg.GetCVar(CCVars.ArrivalsCooldown);
+
+            if (component.FirstRun)
+            {
+                var station = _station.GetLargestGrid(component.Station);
+                sourceMap = station == null ? null : Transform(station.Value).MapUid;
+                arrivalsDelay += RoundStartFTLDuration;
+                component.FirstRun = false;
+                payload.DestinationMap = Transform(args.TargetCoordinates.EntityId).MapUid;
+                payload.DestinationTime = ftlTime;
+            }
+            else
+                sourceMap = args.FromMapUid;
+
+            payload.SourceMap = sourceMap;
+            payload.SourceTime = ftlTime + TimeSpan.FromSeconds(arrivalsDelay);
+
+            _deviceNetworkSystem.SendPacket(shuttleUid, null, ref payload, netComp.TransmitFrequency);
+        }
+
+        // Don't do anything here when leaving arrivals.
+        var arrivalsMapUid = Transform(arrivals).MapUid;
+        if (args.FromMapUid == arrivalsMapUid)
+            return;
+
+        // Any mob then yeet them off the shuttle.
+        if (!Cfg.GetCVar(CCVars.ArrivalsReturns) && args.FromMapUid != null)
+            DumpChildren(shuttleUid, ref args);
+
+        var pendingQuery = AllEntityQuery<PendingClockInComponent, TransformComponent>();
+
+        // We're heading from the station back to arrivals (if leaving arrivals, would have returned above).
+        // Process everyone who holds a PendingClockInComponent
+        // Note, due to way DumpChildren works, anyone who doesn't have a PendingClockInComponent gets left in space
+        // and will not warp. This is intended behavior.
+        while (pendingQuery.MoveNext(out var pUid, out _, out var xform))
+        {
+            if (xform.GridUid == shuttleUid)
+            {
+                // Warp all players who are still on this shuttle to a spawn point. This doesn't let them return to
+                // arrivals. It also ensures noobs, slow players or AFK players safely leave the shuttle.
+                TryTeleportToMapSpawn(pUid, component.Station, xform);
+            }
+
+            // Players who have remained at arrivals keep their warp coupon (PendingClockInComponent) for now.
+            if (xform.MapUid == arrivalsMapUid)
+                continue;
+
+            // The player has successfully left arrivals and is also not on the shuttle. Remove their warp coupon.
+            RemCompDeferred<PendingClockInComponent>(pUid);
+            RemCompDeferred<AutoOrientComponent>(pUid);
+
+            if (ArrivalsGodmode)
+                RemCompDeferred<GodmodeComponent>(pUid);
+
+            if (_actor.TryGetSession(pUid, out var session) && session is not null)
+                _antag.TryMakeLateJoinAntag(session);
+        }
+    }
+
+    [SubscribeLocalEvent]
+    private void OnArrivalsDocked(EntityUid uid, ArrivalsShuttleComponent component, ref FTLCompletedEvent args)
+    {
+        var dockTime = component.NextTransfer - Timing.CurTime + TimeSpan.FromSeconds(_shuttles.DefaultStartupTime);
+
+        if (TryComp<DeviceNetworkComponent>(uid, out var netComp))
+        {
+            var payload = new ScreenShuttlePayload
+            {
+                Shuttle = uid,
+                ShuttleTime = dockTime,
+                SourceMap = args.MapUid,
+                SourceTime = dockTime,
+                Docked = true,
+            };
+            _deviceNetworkSystem.SendPacket(uid, null, ref payload, netComp.TransmitFrequency);
+        }
+    }
+
+    private void DumpChildren(EntityUid uid, ref FTLStartedEvent args)
+    {
+        var toDump = new List<Entity<TransformComponent>>();
+        FindDumpChildren(uid, toDump);
+        foreach (var (ent, xform) in toDump)
+        {
+            var rotation = xform.LocalRotation;
+            _transform.SetCoordinates(ent, new EntityCoordinates(args.FromMapUid!.Value, Vector2.Transform(xform.LocalPosition, args.FTLFrom)));
+            _transform.SetWorldRotation(ent, args.FromRotation + rotation);
+            if (_actor.TryGetSession(ent, out var session))
+            {
+                _chat.DispatchServerMessage(session!, Loc.GetString("latejoin-arrivals-dumped-from-shuttle"));
+            }
+        }
+    }
+
+
+    private void FindDumpChildren(EntityUid uid, List<Entity<TransformComponent>> toDump)
+    {
+        if (_pendingQuery.HasComponent(uid))
+            return;
+
+        var xform = Transform(uid);
+
+        if (_mobQuery.HasComponent(uid) || _blacklistQuery.HasComponent(uid))
+        {
+            toDump.Add((uid, xform));
+            return;
+        }
+
+        var children = xform.ChildEnumerator;
+        while (children.MoveNext(out var child))
+        {
+            FindDumpChildren(child, toDump);
+        }
+    }
+
+    [SubscribeLocalEvent]
+    private void OnShuttleTag(EntityUid uid, ArrivalsShuttleComponent component, ref FTLTagEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        // Just saves mappers forgetting. (v2 boogaloo)
+        args.Handled = true;
+        args.Tag = "DockArrivals";
+    }
+
+    [SubscribeLocalEvent]
+    private void SendDirections(PlayerSpawnCompleteEvent ev)
+    {
+        if (!Enabled || !ev.LateJoin || ev.Silent || !_pendingQuery.HasComp(ev.Mob))
+            return;
+
+        var arrival = NextShuttleArrival();
+
+        var message = arrival is not null
+            ? Loc.GetString("latejoin-arrivals-direction-time", ("time", $"{arrival:mm\\:ss}"))
+            : Loc.GetString("latejoin-arrivals-direction");
+
+        _chat.DispatchServerMessage(ev.Player, message);
+    }
+
+    private bool TryTeleportToMapSpawn(EntityUid player, EntityUid stationId, TransformComponent? transform = null)
+    {
+        if (!Resolve(player, ref transform))
+            return false;
+
+        var points = EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
+        var possiblePositions = new ValueList<EntityCoordinates>(32);
+
+        // Find a spawnpoint on the same map as the player is already docked with now.
+        while (points.MoveNext(out var uid, out var spawnPoint, out var xform))
+        {
+            if (spawnPoint.SpawnType == SpawnPointType.LateJoin &&
+                _station.GetOwningStation(uid, xform) == stationId)
+            {
+                // Add to list of possible spawn locations
+                possiblePositions.Add(xform.Coordinates);
+            }
+        }
+
+        if (possiblePositions.Count > 0)
+        {
+            // Move the player to a random late-join spawnpoint.
+            _transform.SetCoordinates(player, transform, Random.Pick(possiblePositions));
+            if (_actor.TryGetSession(player, out var session))
+            {
+                _chat.DispatchServerMessage(session!, Loc.GetString("latejoin-arrivals-teleport-to-spawn"));
+            }
+            return true;
+        }
+
+        return false;
+    }
+
+    [AdminCommand(AdminFlags.Fun)]
+    private void ArrivalsCommand(IConsoleShell shell, string argstr, string[] args)
+    {
+        if (args.Length != 1)
+        {
+            shell.WriteError(Loc.GetString("cmd-arrivals-invalid"));
+            return;
+        }
+
+        switch (args[0])
+        {
+            case "enable":
+                Cfg.SetCVar(CCVars.ArrivalsShuttles, true);
+                break;
+            case "disable":
+                Cfg.SetCVar(CCVars.ArrivalsShuttles, false);
+                break;
+            case "returns":
+                var existing = Cfg.GetCVar(CCVars.ArrivalsReturns);
+                Cfg.SetCVar(CCVars.ArrivalsReturns, !existing);
+                shell.WriteLine(Loc.GetString("cmd-arrivals-returns", ("value", !existing)));
+                break;
+            case "force":
+                var query = AllEntityQuery<PendingClockInComponent, TransformComponent>();
+                var spawnPoints = EntityQuery<SpawnPointComponent, TransformComponent>().ToList();
+
+                TryGetArrivals(out var arrivalsUid);
+
+                while (query.MoveNext(out var uid, out _, out var pendingXform))
+                {
+                    Random.Shuffle(spawnPoints);
+
+                    foreach (var (point, xform) in spawnPoints)
+                    {
+                        if (point.SpawnType != SpawnPointType.LateJoin || xform.GridUid == arrivalsUid)
+                            continue;
+
+                        _transform.SetCoordinates(uid, pendingXform, xform.Coordinates);
+                        break;
+                    }
+
+                    RemCompDeferred<AutoOrientComponent>(uid);
+                    RemCompDeferred<PendingClockInComponent>(uid);
+                    shell.WriteLine(Loc.GetString("cmd-arrivals-forced", ("uid", ToPrettyString(uid))));
+                }
+                break;
+            default:
+                shell.WriteError(Loc.GetString($"cmd-arrivals-invalid"));
+                break;
+        }
+    }
+
+    private CompletionResult ArrivalsCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length != 1)
+            return CompletionResult.Empty;
+
+        return new CompletionResult(new CompletionOption[]
+        {
+            // Enables and disable are separate comms in case you don't want to accidentally toggle it, compared to
+            // returns which doesn't have an immediate effect
+            new("enable", Loc.GetString("cmd-arrivals-enable-hint")),
+            new("disable", Loc.GetString("cmd-arrivals-disable-hint")),
+            new("returns", Loc.GetString("cmd-arrivals-returns-hint")),
+            new ("force", Loc.GetString("cmd-arrivals-force-hint"))
+        },
+            "Option");
+    }
 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
index d9ac71cc87..df62c8927b 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
@@ -1,5 +1,6 @@
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
+using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Events;
 using Content.Shared.Shuttles.UI.MapObjects;
 using Robust.Shared.Map;
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
index 1933c71cf3..d89533892a 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
@@ -32,7 +32,7 @@ public sealed partial class ShuttleConsoleSystem : SharedShuttleConsoleSystem
     [Dependency] private SharedPopupSystem _popup = default!;
     [Dependency] private SharedTransformSystem _transform = default!;
     [Dependency] private ShuttleSystem _shuttle = default!;
-    [Dependency] private StationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
     [Dependency] private TagSystem _tags = default!;
     [Dependency] private UserInterfaceSystem _ui = default!;
     [Dependency] private SharedContentEyeSystem _eyeSystem = default!;
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
index df9ac8c551..6b90d7dce6 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
@@ -1,4 +1,3 @@
-using Content.Server.Shuttles.Components;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Audio;
 using Content.Shared.CCVar;
@@ -6,7 +5,6 @@ using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.Maps;
 using Content.Shared.Physics;
-using Content.Shared.Projectiles;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
@@ -18,6 +16,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using System.Numerics;
 using Content.Shared.Damage.Components;
+using Content.Shared.Shuttles.Components;
 
 namespace Content.Server.Shuttles.Systems;
 
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
index 965636ec39..1216b8cd74 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -2,7 +2,6 @@ using Content.Server.Administration.Logs;
 using Content.Server.Buckle.Systems;
 using Content.Server.Parallax;
 using Content.Server.Procedural;
-using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
 using Content.Server.Station.Systems;
 using Content.Server.Stunnable;
@@ -10,8 +9,10 @@ using Content.Shared.Buckle.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Gibbing;
 using Content.Shared.Light.Components;
+using Content.Shared.Maps;
 using Content.Shared.Movement.Events;
 using Content.Shared.Salvage;
+using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Systems;
 using Content.Shared.Throwing;
 using JetBrains.Annotations;
@@ -26,7 +27,6 @@ using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
-using Content.Shared.Maps;
 
 namespace Content.Server.Shuttles.Systems;
 
@@ -53,7 +53,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
     [Dependency] private SharedTransformSystem _transform = default!;
     [Dependency] private SharedSalvageSystem _salvage = default!;
     [Dependency] private ShuttleConsoleSystem _console = default!;
-    [Dependency] private StationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
     [Dependency] private StunSystem _stuns = default!;
     [Dependency] private ThrowingSystem _throwing = default!;
     [Dependency] private ThrusterSystem _thruster = default!;
diff --git a/Content.Server/Shuttles/Systems/StationAnchorSystem.cs b/Content.Server/Shuttles/Systems/StationAnchorSystem.cs
index e12c4075d4..6253423910 100644
--- a/Content.Server/Shuttles/Systems/StationAnchorSystem.cs
+++ b/Content.Server/Shuttles/Systems/StationAnchorSystem.cs
@@ -1,8 +1,9 @@
-using Content.Server.Popups;
+using Content.Server.Popups;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Shuttles.Components;
 using Content.Shared.Construction.Components;
 using Content.Shared.Popups;
+using Content.Shared.Shuttles.Components;
 
 namespace Content.Server.Shuttles.Systems;
 
diff --git a/Content.Server/Silicons/Borgs/BorgSwitchableTypeSystem.cs b/Content.Server/Silicons/Borgs/BorgSwitchableTypeSystem.cs
index 3e74a8fb9d..ae12da6be5 100644
--- a/Content.Server/Silicons/Borgs/BorgSwitchableTypeSystem.cs
+++ b/Content.Server/Silicons/Borgs/BorgSwitchableTypeSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Inventory;
+using Content.Server.Inventory;
 using Content.Shared.Inventory;
 using Content.Shared.Radio.Components;
 using Content.Shared.Silicons.Borgs;
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
index d181c7e228..35a1a78caf 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
@@ -1,4 +1,3 @@
-using Content.Shared.DeviceNetwork;
 using Content.Shared.Damage.Components;
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs;
@@ -16,11 +15,6 @@ namespace Content.Server.Silicons.Borgs;
 /// <inheritdoc/>
 public sealed partial class BorgSystem
 {
-    private void InitializeTransponder()
-    {
-        SubscribeLocalEvent<BorgTransponderComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
-    }
-
     public void UpdateTransponder(float frameTime)
     {
         var now = _timing.CurTime;
@@ -52,12 +46,11 @@ public sealed partial class BorgSystem
                 hasBrain,
                 canDisable);
 
-            var payload = new NetworkPayload()
+            var payload = new RoboticsCyborgDataPayload
             {
-                [DeviceNetworkConstants.Command] = DeviceNetworkConstants.CmdUpdatedState,
-                [RoboticsConsoleConstants.NET_CYBORG_DATA] = data
+                Data = data,
             };
-            _deviceNetwork.QueuePacket(uid, null, payload, device: device);
+            _deviceNetwork.SendPacket((uid, device), null, ref payload);
 
             comp.NextBroadcast = now + comp.BroadcastDelay;
         }
@@ -81,16 +74,16 @@ public sealed partial class BorgSystem
         _container.Remove(brain, ent.Comp2.BrainContainer);
     }
 
-    private void OnPacketReceived(Entity<BorgTransponderComponent> ent, ref DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnDisable(Entity<BorgTransponderComponent> ent, ref DeviceNetworkPacketEvent<RoboticsCyborgDisablePayload> args)
     {
-        var payload = args.Data;
-        if (!payload.TryGetValue(DeviceNetworkConstants.Command, out string? command))
-            return;
+        Disable(ent);
+    }
 
-        if (command == RoboticsConsoleConstants.NET_DISABLE_COMMAND)
-            Disable(ent);
-        else if (command == RoboticsConsoleConstants.NET_DESTROY_COMMAND)
-            Destroy(ent.Owner);
+    [SubscribeLocalEvent]
+    private void OnDestroy(Entity<BorgTransponderComponent> ent, ref DeviceNetworkPacketEvent<RoboticsCyborgDestroyPayload> args)
+    {
+        Destroy(ent.AsNullable());
     }
 
     private void Disable(Entity<BorgTransponderComponent, BorgChassisComponent?> ent)
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs
index 16e5b3e281..c5af1f12a8 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.cs
@@ -36,14 +36,6 @@ public sealed partial class BorgSystem : SharedBorgSystem
 
     public static readonly ProtoId<JobPrototype> BorgJobId = "Borg";
 
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        InitializeTransponder();
-    }
-
     public override bool CanPlayerBeBorged(ICommonSession session)
     {
         if (_banManager.GetJobBans(session.UserId)?.Contains(BorgJobId) == true)
diff --git a/Content.Server/Silicons/Bots/HugBotSystem.cs b/Content.Server/Silicons/Bots/HugBotSystem.cs
index e69412c0b9..3ed05df8fc 100644
--- a/Content.Server/Silicons/Bots/HugBotSystem.cs
+++ b/Content.Server/Silicons/Bots/HugBotSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific;
+using Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific;
 using Content.Shared.Silicons.Bots;
 using Robust.Shared.Timing;
 
diff --git a/Content.Server/Silicons/Bots/RecentlyHuggedByHugBotComponent.cs b/Content.Server/Silicons/Bots/RecentlyHuggedByHugBotComponent.cs
index c6c7d47e8d..2cc6c4d4be 100644
--- a/Content.Server/Silicons/Bots/RecentlyHuggedByHugBotComponent.cs
+++ b/Content.Server/Silicons/Bots/RecentlyHuggedByHugBotComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Silicons.Bots;
+using Content.Shared.Silicons.Bots;
 
 namespace Content.Server.Silicons.Bots;
 
diff --git a/Content.Server/Silicons/Laws/IonLawLocalizationSystem.cs b/Content.Server/Silicons/Laws/IonLawLocalizationSystem.cs
index 5ea3468a3c..c4ae2152ca 100644
--- a/Content.Server/Silicons/Laws/IonLawLocalizationSystem.cs
+++ b/Content.Server/Silicons/Laws/IonLawLocalizationSystem.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Silicons.Laws;
+namespace Content.Server.Silicons.Laws;
 
 public sealed partial class IonLawLocalizationSystem : EntitySystem
 {
diff --git a/Content.Server/Silicons/Laws/IonLawSystem.cs b/Content.Server/Silicons/Laws/IonLawSystem.cs
index b657d21b06..0b5e3944e1 100644
--- a/Content.Server/Silicons/Laws/IonLawSystem.cs
+++ b/Content.Server/Silicons/Laws/IonLawSystem.cs
@@ -1,10 +1,10 @@
-using Content.Shared.Dataset;
+using Content.Shared.Dataset;
 using Content.Shared.Silicons.Laws;
-using Content.Shared.Station;
 using Content.Shared.StationRecords;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using System.Linq;
+using Content.Server.Station.Systems;
 using Content.Shared.StationRecords.Components;
 using Content.Shared.StationRecords.Systems;
 
@@ -16,7 +16,7 @@ namespace Content.Server.Silicons.Laws;
 public sealed partial class IonLawSystem : EntitySystem
 {
     [Dependency] private IRobustRandom _random = default!;
-    [Dependency] private SharedStationSystem _stationSystem = default!;
+    [Dependency] private ServerStationSystem _stationSystem = default!;
     [Dependency] private StationRecordsSystem _stationRecordsSystem = default!;
 
     private ISawmill _sawmill = default!;
diff --git a/Content.Server/Silicons/Laws/SiliconLawSystem.cs b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
index 739577804f..31a4d511e3 100644
--- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs
+++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
@@ -31,7 +31,7 @@ public sealed partial class SiliconLawSystem : SharedSiliconLawSystem
     [Dependency] private IChatManager _chatManager = default!;
     [Dependency] private SharedMindSystem _mind = default!;
     [Dependency] private SharedRoleSystem _roles = default!;
-    [Dependency] private StationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
     [Dependency] private UserInterfaceSystem _userInterface = default!;
     [Dependency] private EmagSystem _emag = default!;
     [Dependency] private ISharedAdminLogManager _adminLogger = default!;
diff --git a/Content.Server/Silicons/StationAi/StationAiSystem.cs b/Content.Server/Silicons/StationAi/StationAiSystem.cs
index 3e2efa0189..871d320c27 100644
--- a/Content.Server/Silicons/StationAi/StationAiSystem.cs
+++ b/Content.Server/Silicons/StationAi/StationAiSystem.cs
@@ -7,8 +7,6 @@ using Content.Server.Ghost.Roles.Components;
 using Content.Server.Mind;
 using Content.Server.Power.Components;
 using Content.Server.Roles;
-using Content.Server.Spawners.Components;
-using Content.Server.Spawners.EntitySystems;
 using Content.Server.Station.Systems;
 using Content.Shared.Alert;
 using Content.Shared.Chat.Prototypes;
@@ -27,6 +25,8 @@ using Content.Shared.Power.Components;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Roles;
 using Content.Shared.Silicons.StationAi;
+using Content.Shared.Spawners.Components;
+using Content.Shared.Spawners.EntitySystems;
 using Content.Shared.Speech.Components;
 using Content.Shared.StationAi;
 using Content.Shared.Turrets;
@@ -55,8 +55,8 @@ public sealed partial class StationAiSystem : SharedStationAiSystem
     [Dependency] private SharedBatterySystem _battery = default!;
     [Dependency] private DamageableSystem _damageable = default!;
     [Dependency] private SharedPopupSystem _popups = default!;
-    [Dependency] private StationSystem _station = default!;
-    [Dependency] private StationJobsSystem _stationJobs = default!;
+    [Dependency] private ServerStationSystem _station = default!;
+    [Dependency] private ServerStationJobsSystem _stationJobs = default!;
     [Dependency] private MobStateSystem _mobState = default!;
     [Dependency] private SharedAppearanceSystem _appearance = default!;
 
diff --git a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
index b0f7014358..65b0c43636 100644
--- a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
@@ -272,6 +272,7 @@ namespace Content.Server.Singularity.EntitySystems
             else if (component.SetTypePorts.TryGetValue(args.Port, out var boltType))
             {
                 component.BoltType = boltType;
+                Dirty(uid, component);
             }
         }
     }
diff --git a/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs b/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs
index 3218a561f4..c30c966181 100644
--- a/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs
@@ -1,7 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Atmos.Components;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
@@ -12,7 +11,7 @@ using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Radiation.Events;
 using Content.Shared.Singularity.Components;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Timing;
 
@@ -71,7 +70,7 @@ public sealed partial class RadiationCollectorSystem : EntitySystem
         if (!args.Complex)
             return;
 
-        if (TryComp(uid, out UseDelayComponent? useDelay) && !_useDelay.TryResetDelay((uid, useDelay), true))
+        if (!_useDelay.TryResetDelay(uid, true))
             return;
 
         ToggleCollector(uid, args.User, component);
diff --git a/Content.Server/SmartFridge/SmartFridgeSystem.cs b/Content.Server/SmartFridge/SmartFridgeSystem.cs
index 0112e4607d..bef675586f 100644
--- a/Content.Server/SmartFridge/SmartFridgeSystem.cs
+++ b/Content.Server/SmartFridge/SmartFridgeSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.SmartFridge;
+using Content.Shared.SmartFridge;
 
 namespace Content.Server.SmartFridge;
 
diff --git a/Content.Server/Spawners/Components/AntagGridSpawnPointComponent.cs b/Content.Server/Spawners/Components/AntagGridSpawnPointComponent.cs
index 2f817fb023..fccefd7a8c 100644
--- a/Content.Server/Spawners/Components/AntagGridSpawnPointComponent.cs
+++ b/Content.Server/Spawners/Components/AntagGridSpawnPointComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameTicking.Rules;
+using Content.Server.GameTicking.Rules;
 using Content.Shared.Antag;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs b/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
index c6f4871b7e..0805c5c393 100644
--- a/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
@@ -1,32 +1,35 @@
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Spawners.Components
+namespace Content.Server.Spawners.Components;
+
+/// <summary>
+/// A spawner that rolls to spawn from of a list of entities on <see cref="MapInitEvent"/> and <see cref="GameRuleStartedEvent"/>.
+/// </summary>
+/// <remarks>
+/// For non-trivial lists of prototypes, consider using <see cref="EntityTableSpawnerComponent"/> and an <see cref="EntityTableSelector"/> instead.
+/// </remarks>
+[RegisterComponent, EntityCategory("Spawner")]
+[Virtual]
+public partial class ConditionalSpawnerComponent : Component
 {
-    [RegisterComponent, EntityCategory("Spawner")]
-    [Virtual]
-    public partial class ConditionalSpawnerComponent : Component
-    {
-        /// <summary>
-        /// A list of entities, one of which can spawn in after calling Spawn()
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField]
-        public List<EntProtoId> Prototypes { get; set; } = new();
+    /// <summary>
+    /// A list of entities, one of which can spawn on a spawn roll when calling <see cref="ConditionalSpawnerSystem.Spawn"/>.
+    /// </summary>
+    [DataField]
+    public List<EntProtoId> Prototypes { get; set; } = new();
 
-        /// <summary>
-        /// A list of game rules.
-        /// If at least one of them was launched in the game,
-        /// an attempt will occur to spawn one of the objects in the Prototypes list
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField]
-        public List<EntProtoId> GameRules = new();
+    /// <summary>
+    /// A list of game rules - starting any of them causes a spawn roll.
+    /// </summary>
+    /// <remarks>
+    /// Currently unused, should be marked obsolete if not removed outright.
+    /// </remarks>
+    [DataField]
+    public List<EntProtoId> GameRules = new();
 
-        /// <summary>
-        /// Chance of spawning an entity
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField]
-        public float Chance { get; set; } = 1.0f;
-    }
+    /// <summary>
+    /// Chance of spawning an entity on each spawn roll.
+    /// </summary>
+    [DataField]
+    public float Chance { get; set; } = 1.0f;
 }
diff --git a/Content.Server/Spawners/Components/EntityTableSpawnerComponent.cs b/Content.Server/Spawners/Components/EntityTableSpawnerComponent.cs
index 73af805039..250831102d 100644
--- a/Content.Server/Spawners/Components/EntityTableSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/EntityTableSpawnerComponent.cs
@@ -4,6 +4,9 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Server.Spawners.Components;
 
+/// <summary>
+/// A spawner that randomly spawns entities according to an <see cref="EntityTableSelector"/>.
+/// </summary>
 [RegisterComponent, EntityCategory("Spawner"), Access(typeof(ConditionalSpawnerSystem))]
 public sealed partial class EntityTableSpawnerComponent : Component
 {
@@ -14,8 +17,11 @@ public sealed partial class EntityTableSpawnerComponent : Component
     public EntityTableSelector Table = default!;
 
     /// <summary>
-    /// Scatter of entity spawn coordinates
+    /// Maximum distance in meters to scatter spawned entities from the spawner.
     /// </summary>
+    /// <remarks>
+    /// Spawned entities are created in a disk this size around the spawner.
+    /// </remarks>
     [DataField]
     public float Offset = 0.2f;
 
diff --git a/Content.Server/Spawners/Components/RandomSpawnerComponent.cs b/Content.Server/Spawners/Components/RandomSpawnerComponent.cs
index ec1b3249a9..8760dbaf40 100644
--- a/Content.Server/Spawners/Components/RandomSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/RandomSpawnerComponent.cs
@@ -1,38 +1,44 @@
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Spawners.Components
+namespace Content.Server.Spawners.Components;
+
+/// <summary>
+/// An extended <see cref="ConditionalSpawnerComponent"/> with optional rare prototypes and more configurable spawn behavior.
+/// </summary>
+/// <remarks>
+/// For non-trivial lists of prototypes, consider using <see cref="EntityTableSpawnerComponent"/> and an <see cref="EntityTableSelector"/> instead.
+/// </remarks>
+[RegisterComponent, EntityCategory("Spawner")]
+public sealed partial class RandomSpawnerComponent : ConditionalSpawnerComponent
 {
-    [RegisterComponent, EntityCategory("Spawner")]
-    public sealed partial class RandomSpawnerComponent : ConditionalSpawnerComponent
-    {
-        /// <summary>
-        /// A list of rarer entities that can spawn with the RareChance
-        /// instead of one of the entities in the Prototypes list.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField]
-        public List<EntProtoId> RarePrototypes { get; set; } = new();
+    /// <summary>
+    /// A list of rare entities to spawn.
+    /// </summary>
+    /// <remarks>
+    /// On a successful spawn roll, with <see cref="RareChance"/> probability,
+    /// an entity from this list is spawned (vs. the normal Prototypes list).
+    /// </summary>
+    [DataField]
+    public List<EntProtoId> RarePrototypes { get; set; } = new();
 
-        /// <summary>
-        /// The chance that a rare prototype may spawn instead of a common prototype
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField]
-        public float RareChance { get; set; } = 0.05f;
+    /// <summary>
+    /// The chance that a rare prototype may spawn instead of a common prototype.
+    /// </summary>
+    [DataField]
+    public float RareChance { get; set; } = 0.05f;
 
-        /// <summary>
-        /// Scatter of entity spawn coordinates
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField]
-        public float Offset { get; set; } = 0.2f;
+    /// <summary>
+    /// Maximum distance in meters to scatter spawned entities from the spawner.
+    /// </summary>
+    /// <remarks>
+    /// Spawned entities are created in a disk this size around the spawner.
+    /// </remarks>
+    [DataField]
+    public float Offset { get; set; } = 0.2f;
 
-        /// <summary>
-        /// A variable meaning whether the spawn will
-        /// be able to be used again or whether
-        /// it will be destroyed after the first use
-        /// </summary>
-        [DataField]
-        public bool DeleteSpawnerAfterSpawn = true;
-    }
+    /// <summary>
+    /// If true, the spawner is deleted on <see cref="MapInitEvent"/>.
+    /// </summary>
+    [DataField]
+    public bool DeleteSpawnerAfterSpawn = true;
 }
diff --git a/Content.Server/Spawners/Components/TimedSpawnerComponent.cs b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
index 8494a1a2fb..a96060f74b 100644
--- a/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
diff --git a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
index 70a26aac57..07cbf27dd3 100644
--- a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
@@ -15,10 +15,16 @@ namespace Content.Server.Spawners.EntitySystems;
 // TODO: This whole system is a mess. A lot of this should be marked obsolete.
 // TODO: It should probably use interfaces with entity tables *if* more than one component is needed.
 // TODO: Remove the TransformSystem Dependency when engine SpawnAtPosition EntityCoordinates override is fixed.
+/// <summary>
+/// A system for spawning random or conditional entities, either on initializing spawner entities, or on adding GameRules.
+/// </summary>
+/// <seealso cref="ConditionalSpawnerComponent"/>
+/// <seealso cref="RandomSpawnerComponent"/>
+/// <seealso cref="EntityTableSpawnerComponent"/>
 public sealed partial class ConditionalSpawnerSystem : EntitySystem
 {
     [Dependency] private IRobustRandom _robustRandom = default!;
-    [Dependency] private GameTicker _ticker = default!;
+    [Dependency] private ServerGameTicker _ticker = default!;
     [Dependency] private EntityTableSystem _entityTable = default!;
     [Dependency] private StackSystem _stack = default!;
     [Dependency] private TransformSystem _xform = default!;
@@ -55,9 +61,12 @@ public sealed partial class ConditionalSpawnerSystem : EntitySystem
         }
     }
 
-    public void RuleStarted(EntityUid uid, ConditionalSpawnerComponent component, GameRuleStartedEvent obj)
+    public void RuleStarted(EntityUid uid, ConditionalSpawnerComponent component, GameRuleStartedEvent args)
     {
-        if (component.GameRules.Contains(obj.RuleId))
+        if (args.RuleId is not { } id)
+            return;
+
+        if (component.GameRules.Contains(id))
             Spawn(uid, component);
     }
 
@@ -113,7 +122,7 @@ public sealed partial class ConditionalSpawnerSystem : EntitySystem
         var coordinates = GetRandomOffset(coords, component.Offset);
         var rotation = _xform.GetWorldRotation(xform);
 
-        Spawn(_robustRandom.Pick(component.Prototypes), coordinates, rotation: rotation);
+        Spawn(proto, coordinates, rotation: rotation);
     }
 
     private void Spawn(Entity<EntityTableSpawnerComponent> ent)
diff --git a/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs b/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs
index 3ab654746a..fa1dedd152 100644
--- a/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs
@@ -1,4 +1,4 @@
-using System.Text;
+using System.Text;
 using Content.Server.Destructible;
 using Content.Shared.FixedPoint;
 using Content.Shared.Speech.Components;
diff --git a/Content.Server/Station/Commands/BankCommand.cs b/Content.Server/Station/Commands/BankCommand.cs
index c24cacdffb..c9a0988ae6 100644
--- a/Content.Server/Station/Commands/BankCommand.cs
+++ b/Content.Server/Station/Commands/BankCommand.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Administration;
 using Content.Server.Cargo.Systems;
 using Content.Shared.Administration;
diff --git a/Content.Server/Station/Commands/JobsCommand.cs b/Content.Server/Station/Commands/JobsCommand.cs
index c971a1cac3..3a21074516 100644
--- a/Content.Server/Station/Commands/JobsCommand.cs
+++ b/Content.Server/Station/Commands/JobsCommand.cs
@@ -13,12 +13,12 @@ namespace Content.Server.Station.Commands;
 [ToolshedCommand, AdminCommand(AdminFlags.VarEdit)]
 public sealed class JobsCommand : ToolshedCommand
 {
-    private StationJobsSystem? _jobs;
+    private ServerStationJobsSystem? _jobs;
 
     [CommandImplementation("jobs")]
     public IEnumerable<JobSlotRef> Jobs([PipedArgument] EntityUid station)
     {
-        _jobs ??= GetSys<StationJobsSystem>();
+        _jobs ??= GetSys<ServerStationJobsSystem>();
 
         foreach (var (job, _) in _jobs.GetJobs(station))
         {
@@ -33,7 +33,7 @@ public sealed class JobsCommand : ToolshedCommand
     [CommandImplementation("job")]
     public JobSlotRef Job([PipedArgument] EntityUid station, ProtoId<JobPrototype> job)
     {
-        _jobs ??= GetSys<StationJobsSystem>();
+        _jobs ??= GetSys<ServerStationJobsSystem>();
 
         return new JobSlotRef(job.Id, station, _jobs, EntityManager);
     }
@@ -53,7 +53,7 @@ public sealed class JobsCommand : ToolshedCommand
     [CommandImplementation("adjust")]
     public JobSlotRef Adjust([PipedArgument] JobSlotRef @ref, int by)
     {
-        _jobs ??= GetSys<StationJobsSystem>();
+        _jobs ??= GetSys<ServerStationJobsSystem>();
         _jobs.TryAdjustJobSlot(@ref.Station, @ref.Job, by, true, true);
         return @ref;
     }
@@ -66,7 +66,7 @@ public sealed class JobsCommand : ToolshedCommand
     [CommandImplementation("set")]
     public JobSlotRef Set([PipedArgument] JobSlotRef @ref, int by)
     {
-        _jobs ??= GetSys<StationJobsSystem>();
+        _jobs ??= GetSys<ServerStationJobsSystem>();
         _jobs.TrySetJobSlot(@ref.Station, @ref.Job, by, true);
         return @ref;
     }
@@ -78,7 +78,7 @@ public sealed class JobsCommand : ToolshedCommand
     [CommandImplementation("amount")]
     public int Amount([PipedArgument] JobSlotRef @ref)
     {
-        _jobs ??= GetSys<StationJobsSystem>();
+        _jobs ??= GetSys<ServerStationJobsSystem>();
         _jobs.TryGetJobSlot(@ref.Station, @ref.Job, out var slots);
         return slots ?? 0;
     }
@@ -89,7 +89,7 @@ public sealed class JobsCommand : ToolshedCommand
 }
 
 // Used for Toolshed queries.
-public readonly record struct JobSlotRef(string Job, EntityUid Station, StationJobsSystem Jobs, IEntityManager EntityManager)
+public readonly record struct JobSlotRef(string Job, EntityUid Station, ServerStationJobsSystem Jobs, IEntityManager EntityManager)
 {
     public override string ToString()
     {
diff --git a/Content.Server/Station/Commands/StationCommand.cs b/Content.Server/Station/Commands/StationCommand.cs
index f9dcb83d93..b3acb07d06 100644
--- a/Content.Server/Station/Commands/StationCommand.cs
+++ b/Content.Server/Station/Commands/StationCommand.cs
@@ -15,13 +15,13 @@ namespace Content.Server.Station.Commands;
 [ToolshedCommand, AdminCommand(AdminFlags.Admin)]
 public sealed class StationsCommand : ToolshedCommand
 {
-    private StationSystem? _station;
+    private ServerStationSystem? _station;
     private CargoSystem? _cargo;
 
     [CommandImplementation("list")]
     public IEnumerable<EntityUid> List()
     {
-        _station ??= GetSys<StationSystem>();
+        _station ??= GetSys<ServerStationSystem>();
 
         return _station.GetStationsSet();
     }
@@ -29,7 +29,7 @@ public sealed class StationsCommand : ToolshedCommand
     [CommandImplementation("get")]
     public EntityUid Get(IInvocationContext ctx)
     {
-        _station ??= GetSys<StationSystem>();
+        _station ??= GetSys<ServerStationSystem>();
 
         var set = _station.GetStationsSet();
         if (set.Count > 1 || set.Count == 0)
@@ -45,7 +45,7 @@ public sealed class StationsCommand : ToolshedCommand
     [CommandImplementation("getowningstation")]
     public EntityUid? GetOwningStation([PipedArgument] EntityUid input)
     {
-        _station ??= GetSys<StationSystem>();
+        _station ??= GetSys<ServerStationSystem>();
 
         return _station.GetOwningStation(input);
     }
@@ -53,7 +53,7 @@ public sealed class StationsCommand : ToolshedCommand
     [CommandImplementation("largestgrid")]
     public EntityUid? LargestGrid([PipedArgument] EntityUid input)
     {
-        _station ??= GetSys<StationSystem>();
+        _station ??= GetSys<ServerStationSystem>();
         return _station.GetLargestGrid(input);
     }
 
@@ -81,21 +81,21 @@ public sealed class StationsCommand : ToolshedCommand
     [CommandImplementation("addgrid")]
     public void AddGrid([PipedArgument] EntityUid input, EntityUid grid)
     {
-        _station ??= GetSys<StationSystem>();
+        _station ??= GetSys<ServerStationSystem>();
         _station.AddGridToStation(input, grid);
     }
 
     [CommandImplementation("rmgrid")]
     public void RmGrid([PipedArgument] EntityUid input, EntityUid grid)
     {
-        _station ??= GetSys<StationSystem>();
+        _station ??= GetSys<ServerStationSystem>();
         _station.RemoveGridFromStation(input, grid);
     }
 
     [CommandImplementation("rename")]
     public void Rename([PipedArgument] EntityUid input, string name)
     {
-        _station ??= GetSys<StationSystem>();
+        _station ??= GetSys<ServerStationSystem>();
         _station.RenameStation(input, name);
     }
 
diff --git a/Content.Server/Station/Components/StationNameSetupComponent.cs b/Content.Server/Station/Components/StationNameSetupComponent.cs
index 7af44eee62..d75e459cd9 100644
--- a/Content.Server/Station/Components/StationNameSetupComponent.cs
+++ b/Content.Server/Station/Components/StationNameSetupComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Maps.NameGenerators;
+using Content.Server.Maps.NameGenerators;
 
 namespace Content.Server.Station.Components;
 
diff --git a/Content.Server/Station/Components/StationVariationHasRunComponent.cs b/Content.Server/Station/Components/StationVariationHasRunComponent.cs
index 65c794f3fc..f1bdabe5b9 100644
--- a/Content.Server/Station/Components/StationVariationHasRunComponent.cs
+++ b/Content.Server/Station/Components/StationVariationHasRunComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameTicking.Rules;
+using Content.Server.GameTicking.Rules;
 
 namespace Content.Server.Station.Components;
 
diff --git a/Content.Server/Station/Events/StationJobsGetCandidatesEvent.cs b/Content.Server/Station/Events/StationJobsGetCandidatesEvent.cs
index 58d860b1e1..34200d8f31 100644
--- a/Content.Server/Station/Events/StationJobsGetCandidatesEvent.cs
+++ b/Content.Server/Station/Events/StationJobsGetCandidatesEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Roles;
+using Content.Shared.Roles;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs b/Content.Server/Station/Systems/ServerStationJobsSystem.Roundstart.cs
similarity index 99%
rename from Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
rename to Content.Server/Station/Systems/ServerStationJobsSystem.Roundstart.cs
index b0c015f154..df72bf86cd 100644
--- a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
+++ b/Content.Server/Station/Systems/ServerStationJobsSystem.Roundstart.cs
@@ -1,8 +1,8 @@
 using System.Linq;
 using Content.Server.Administration.Managers;
-using Content.Server.Antag;
 using Content.Server.Station.Components;
 using Content.Server.Station.Events;
+using Content.Shared.Antag;
 using Content.Shared.CCVar;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
@@ -16,7 +16,7 @@ using Robust.Shared.Utility;
 namespace Content.Server.Station.Systems;
 
 // Contains code for round-start spawning.
-public sealed partial class StationJobsSystem
+public sealed partial class ServerStationJobsSystem
 {
     [Dependency] private IBanManager _banManager = default!;
     [Dependency] private SharedJobSystem _jobs = default!;
diff --git a/Content.Server/Station/Systems/StationJobsSystem.cs b/Content.Server/Station/Systems/ServerStationJobsSystem.cs
similarity index 93%
rename from Content.Server/Station/Systems/StationJobsSystem.cs
rename to Content.Server/Station/Systems/ServerStationJobsSystem.cs
index daeca7dce3..c7e6083ec7 100644
--- a/Content.Server/Station/Systems/StationJobsSystem.cs
+++ b/Content.Server/Station/Systems/ServerStationJobsSystem.cs
@@ -1,14 +1,13 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.GameTicking;
-using Content.Server.Station.Components;
 using Content.Server.Station.Events;
 using Content.Shared.CCVar;
-using Content.Shared.FixedPoint;
 using Content.Shared.GameTicking;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Content.Shared.Station.Components;
+using Content.Shared.Station.Systems;
 using JetBrains.Annotations;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
@@ -19,16 +18,14 @@ using Robust.Shared.Random;
 
 namespace Content.Server.Station.Systems;
 
-/// <summary>
-/// Manages job slots for stations.
-/// </summary>
+/// <inheritdoc/>
 [PublicAPI]
-public sealed partial class StationJobsSystem : EntitySystem
+public sealed partial class ServerStationJobsSystem : StationJobsSystem
 {
     [Dependency] private IConfigurationManager _configurationManager = default!;
     [Dependency] private IPlayerManager _player = default!;
     [Dependency] private IRobustRandom _random = default!;
-    [Dependency] private GameTicker _gameTicker = default!;
+    [Dependency] private ServerGameTicker _gameTicker = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -91,7 +88,7 @@ public sealed partial class StationJobsSystem : EntitySystem
 
     #region Public API
 
-    /// <inheritdoc cref="TryAssignJob(Robust.Shared.GameObjects.EntityUid,string,NetUserId,Content.Server.Station.Components.StationJobsComponent?)"/>
+    /// <inheritdoc cref="TryAssignJob(Robust.Shared.GameObjects.EntityUid,string,NetUserId,Shared.Station.Components.StationJobsComponent?)"/>
     /// <param name="station">Station to assign a job on.</param>
     /// <param name="job">Job to assign.</param>
     /// <param name="netUserId">The net user ID of the player we're assigning this job to.</param>
@@ -123,15 +120,14 @@ public sealed partial class StationJobsSystem : EntitySystem
         return true;
     }
 
-    /// <inheritdoc cref="TryAdjustJobSlot(Robust.Shared.GameObjects.EntityUid,string,int,bool,bool,Content.Server.Station.Components.StationJobsComponent?)"/>
+    /// <inheritdoc cref="TryAdjustJobSlot(Robust.Shared.GameObjects.EntityUid,string,int,bool,bool,StationJobsComponent?)"/>
     /// <param name="station">Station to adjust the job slot on.</param>
     /// <param name="job">Job to adjust.</param>
     /// <param name="amount">Amount to adjust by.</param>
     /// <param name="createSlot">Whether or not it should create the slot if it doesn't exist.</param>
     /// <param name="clamp">Whether or not to clamp to zero if you'd remove more jobs than are available.</param>
     /// <param name="stationJobs">Resolve pattern, station jobs component of the station.</param>
-    public bool TryAdjustJobSlot(EntityUid station, JobPrototype job, int amount, bool createSlot = false, bool clamp = false,
-        StationJobsComponent? stationJobs = null)
+    public bool TryAdjustJobSlot(EntityUid station, JobPrototype job, int amount, bool createSlot = false, bool clamp = false, StationJobsComponent? stationJobs = null)
     {
         return TryAdjustJobSlot(station, job.ID, amount, createSlot, clamp, stationJobs);
     }
@@ -219,15 +215,14 @@ public sealed partial class StationJobsSystem : EntitySystem
         return jobsComponent.PlayerJobs.Remove(userId);
     }
 
-    /// <inheritdoc cref="TrySetJobSlot(Robust.Shared.GameObjects.EntityUid,string,int,bool,Content.Server.Station.Components.StationJobsComponent?)"/>
+    /// <inheritdoc cref="TrySetJobSlot(Robust.Shared.GameObjects.EntityUid,string,int,bool,StationJobsComponent?)"/>
     /// <param name="station">Station to adjust the job slot on.</param>
     /// <param name="jobPrototype">Job prototype to adjust.</param>
     /// <param name="amount">Amount to set to.</param>
     /// <param name="createSlot">Whether or not it should create the slot if it doesn't exist.</param>
     /// <param name="stationJobs">Resolve pattern, station jobs component of the station.</param>
     /// <returns></returns>
-    public bool TrySetJobSlot(EntityUid station, JobPrototype jobPrototype, int amount, bool createSlot = false,
-        StationJobsComponent? stationJobs = null)
+    public bool TrySetJobSlot(EntityUid station, JobPrototype jobPrototype, int amount, bool createSlot = false, StationJobsComponent? stationJobs = null)
     {
         return TrySetJobSlot(station, jobPrototype.ID, amount, createSlot, stationJobs);
     }
@@ -273,7 +268,7 @@ public sealed partial class StationJobsSystem : EntitySystem
         }
     }
 
-    /// <inheritdoc cref="MakeJobUnlimited(Robust.Shared.GameObjects.EntityUid,string,Content.Server.Station.Components.StationJobsComponent?)"/>
+    /// <inheritdoc cref="MakeJobUnlimited(EntityUid,string,StationJobsComponent?)"/>
     /// <param name="station">Station to make a job unlimited on.</param>
     /// <param name="job">Job to make unlimited.</param>
     /// <param name="stationJobs">Resolve pattern, station jobs component of the station.</param>
@@ -303,7 +298,7 @@ public sealed partial class StationJobsSystem : EntitySystem
         UpdateJobsAvailable();
     }
 
-    /// <inheritdoc cref="IsJobUnlimited(Robust.Shared.GameObjects.EntityUid,string,Content.Server.Station.Components.StationJobsComponent?)"/>
+    /// <inheritdoc cref="IsJobUnlimited(EntityUid,string,StationJobsComponent?)"/>
     /// <param name="station">Station to check.</param>
     /// <param name="job">Job to check.</param>
     /// <param name="stationJobs">Resolve pattern, station jobs component of the station.</param>
@@ -328,11 +323,7 @@ public sealed partial class StationJobsSystem : EntitySystem
         return stationJobs.JobList.TryGetValue(jobPrototypeId, out var job) && job == null;
     }
 
-    /// <inheritdoc cref="TryGetJobSlot(Robust.Shared.GameObjects.EntityUid,string,out System.Nullable{uint},Content.Server.Station.Components.StationJobsComponent?)"/>
-    /// <param name="station">Station to get slot info from.</param>
-    /// <param name="job">Job to get slot info for.</param>
-    /// <param name="slots">The number of slots remaining. Null if infinite.</param>
-    /// <param name="stationJobs">Resolve pattern, station jobs component of the station.</param>
+    /// <inheritdoc cref="TryGetJobSlot(EntityUid,string,out int?,StationJobsComponent?)"/>
     public bool TryGetJobSlot(EntityUid station, JobPrototype job, out int? slots, StationJobsComponent? stationJobs = null)
     {
         return TryGetJobSlot(station, job.ID, out slots, stationJobs);
@@ -506,7 +497,8 @@ public sealed partial class StationJobsSystem : EntitySystem
             var list = comp.JobList.ToDictionary(x => x.Key, x => x.Value);
             jobs.Add(netStation, list);
             stationNames.Add(netStation, Name(station));
-            jobWeights.Add(netStation, TryComp<StationDataComponent>(station, out var stationData)
+            jobWeights.Add(netStation,
+                TryComp<StationDataComponent>(station, out var stationData)
                 ? stationData.JobWeights
                 : null);
         }
diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/ServerStationSystem.cs
similarity index 79%
rename from Content.Server/Station/Systems/StationSystem.cs
rename to Content.Server/Station/Systems/ServerStationSystem.cs
index cd2e5d0313..05fc8bf52c 100644
--- a/Content.Server/Station/Systems/StationSystem.cs
+++ b/Content.Server/Station/Systems/ServerStationSystem.cs
@@ -1,8 +1,11 @@
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.Chat.Systems;
 using Content.Server.GameTicking;
-using Content.Server.Station.Components;
 using Content.Server.Station.Events;
+using Content.Shared.GameTicking;
 using Content.Shared.Station;
 using Content.Shared.Station.Components;
 using JetBrains.Annotations;
@@ -22,13 +25,12 @@ namespace Content.Server.Station.Systems;
 /// For jobs, look at StationJobSystem. For spawning, look at StationSpawningSystem.
 /// </summary>
 [PublicAPI]
-public sealed partial class StationSystem : SharedStationSystem
+public sealed partial class ServerStationSystem : Shared.Station.Systems.StationSystem
 {
     [Dependency] private IPlayerManager _player = default!;
+    [Dependency] private AtmosphereSystem _atmos = default!;
     [Dependency] private ChatSystem _chatSystem = default!;
-    [Dependency] private MetaDataSystem _metaData = default!;
     [Dependency] private PvsOverrideSystem _pvsOverride = default!;
-    [Dependency] private EntityQuery<MapGridComponent> _gridQuery = default!;
 
     private ISawmill _sawmill = default!;
 
@@ -234,7 +236,7 @@ public sealed partial class StationSystem : SharedStationSystem
             throw new ArgumentException("Tried to use a non-station entity as a station!", nameof(station));
 
         if (!string.IsNullOrEmpty(name))
-            _metaData.SetEntityName(mapGrid, name);
+            Meta.SetEntityName(mapGrid, name);
 
         var stationMember = EnsureComp<StationMemberComponent>(mapGrid);
         stationMember.Station = station;
@@ -285,7 +287,7 @@ public sealed partial class StationSystem : SharedStationSystem
             throw new ArgumentException("Tried to use a non-station entity as a station!", nameof(station));
 
         var oldName = metaData.EntityName;
-        _metaData.SetEntityName(station, name, metaData);
+        Meta.SetEntityName(station, name, metaData);
 
         if (loud)
         {
@@ -308,6 +310,104 @@ public sealed partial class StationSystem : SharedStationSystem
 
         QueueDel(station);
     }
+
+    /// <inheritdoc/>
+    public override bool TryFindRandomTileOnStation(Entity<StationDataComponent> station,
+        out Vector2i tile,
+        [NotNullWhen(true)] out Entity<MapGridComponent>? targetGrid,
+        out EntityCoordinates targetCoords,
+        int numAttempts = 10)
+    {
+        tile = default;
+        targetCoords = EntityCoordinates.Invalid;
+        targetGrid = null;
+
+        // Weight grid choice by tilecount
+        var totalTiles = 0;
+        var grids = new List<(Entity<MapGridComponent> Entity, int Count, List<TileRef> Tiles)>();
+        foreach (var possibleTarget in station.Comp.Grids)
+        {
+            if (!GridQuery.TryComp(possibleTarget, out var comp))
+                continue;
+
+            // Get the tile count for the given grid.
+            var tileCount = Map.GetFilledTileCount((possibleTarget, comp));
+
+            // Just to be sure, no empty elements.
+            if (tileCount > 0)
+            {
+                grids.Add(((possibleTarget, comp), tileCount, new()));
+                totalTiles += tileCount;
+            }
+        }
+
+        if (grids.Count == 0)
+            return false;
+
+        for (var i = 0; i < numAttempts; i++)
+        {
+            // Find random tile within list.
+            var nextTileIndex = Random.Next(totalTiles);
+            TileRef? randomTileRef = null;
+            var startIndex = 0;
+            for (int j = 0; j < grids.Count; j++)
+            {
+                var grid = grids[j];
+                // If the index is in this particular grid, find it and remove the tile to prevent selecting it twice.
+                if (nextTileIndex >= startIndex + grid.Count)
+                {
+                    startIndex += grid.Count;
+                    continue;
+                }
+
+                targetGrid = grid.Entity;
+
+                // Empty list: hasn't been queried yet - get our tiles.
+                if (grid.Tiles.Count <= 0)
+                {
+                    grid.Tiles = Map.GetAllTiles(targetGrid.Value, targetGrid.Value.Comp).ToList();
+
+                    // Actual list count doesn't match expected count (a bug - return failure).
+                    Debug.Assert(grid.Tiles.Count == grid.Count);
+                    if (grid.Tiles.Count != grid.Count)
+                        return false;
+                }
+
+                var ourTileIndex = nextTileIndex - startIndex;
+                randomTileRef = grid.Tiles[ourTileIndex];
+                grid.Tiles.RemoveSwap(ourTileIndex);
+                grid.Count--;
+                totalTiles--;
+
+                // Empty list, remove element
+                if (grid.Tiles.Count <= 0)
+                    grids.RemoveSwap(j);
+
+                break;
+            }
+
+            // Out of valid tiles, return early.
+            if (randomTileRef is not { } tileRef)
+                return false;
+
+            // Could not find a grid...
+            if (targetGrid == null)
+                continue;
+
+            // Invalid tile, try again.
+            if (_atmos.IsTileSpace(targetGrid.Value.Owner, Transform(targetGrid.Value).MapUid, tileRef.GridIndices)
+                || _atmos.IsTileAirBlockedCached(targetGrid.Value.Owner, tileRef.GridIndices))
+            {
+                continue;
+            }
+
+            targetCoords = Map.GridTileToLocal(targetGrid.Value, targetGrid.Value, tileRef.GridIndices);
+            tile = tileRef.GridIndices;
+            return true;
+        }
+
+        return false;
+    }
 }
 
 /// <summary>
diff --git a/Content.Server/Station/Systems/StationBiomeSystem.cs b/Content.Server/Station/Systems/StationBiomeSystem.cs
index 29d6a1af25..0d2a879892 100644
--- a/Content.Server/Station/Systems/StationBiomeSystem.cs
+++ b/Content.Server/Station/Systems/StationBiomeSystem.cs
@@ -7,7 +7,7 @@ namespace Content.Server.Station.Systems;
 public sealed partial class StationBiomeSystem : EntitySystem
 {
     [Dependency] private BiomeSystem _biome = default!;
-    [Dependency] private StationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
     [Dependency] private SharedMapSystem _map = default!;
 
     public override void Initialize()
diff --git a/Content.Server/Station/Systems/StationNameSystem.cs b/Content.Server/Station/Systems/StationNameSystem.cs
index c64d036a85..0ee7bbd969 100644
--- a/Content.Server/Station/Systems/StationNameSystem.cs
+++ b/Content.Server/Station/Systems/StationNameSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Station.Components;
+using Content.Server.Station.Components;
 using Content.Shared.Station.Components;
 
 namespace Content.Server.Station.Systems;
@@ -8,7 +8,7 @@ namespace Content.Server.Station.Systems;
 /// </summary>
 public sealed partial class StationNameSystem : EntitySystem
 {
-    [Dependency] private StationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
diff --git a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
index e88a333ead..93e1a6e87c 100644
--- a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
+++ b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
@@ -1,11 +1,11 @@
 using System.Linq;
 using Content.Server.Administration;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Rules;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Administration;
 using Content.Shared.EntityTable;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
@@ -30,10 +30,9 @@ namespace Content.Server.StationEvents
             component.TimeUntilNextEvent = RobustRandom.NextFloat(component.MinimumTimeUntilFirstEvent, component.MinimumTimeUntilFirstEvent + component.MaximumSpanUntilFirstEvent);
         }
 
-        protected override void Ended(EntityUid uid, BasicStationEventSchedulerComponent component, GameRuleComponent gameRule,
-            GameRuleEndedEvent args)
+        protected override void Ended(Entity<BasicStationEventSchedulerComponent> rule, ref GameRuleEndedEvent args)
         {
-            component.TimeUntilNextEvent = component.MinimumTimeUntilFirstEvent;
+            rule.Comp.TimeUntilNextEvent = rule.Comp.MinimumTimeUntilFirstEvent;
         }
 
 
@@ -47,7 +46,7 @@ namespace Content.Server.StationEvents
             var query = EntityQueryEnumerator<BasicStationEventSchedulerComponent, GameRuleComponent>();
             while (query.MoveNext(out var uid, out var eventScheduler, out var gameRule))
             {
-                if (!GameTicker.IsGameRuleActive(uid, gameRule))
+                if (!GameTicker.IsGameRuleActive((uid, gameRule)))
                     continue;
 
                 if (eventScheduler.TimeUntilNextEvent > 0)
@@ -86,7 +85,7 @@ namespace Content.Server.StationEvents
         /// </summary>
         /// <remarks>
         ///     This isn't perfect. Code path eventually goes into <see cref="EventManagerSystem.CanRun"/>, which requires
-        ///     state from <see cref="GameTicker"/>. As a result, you should probably just run this locally and not doing
+        ///     state from <see cref="ServerGameTicker"/>. As a result, you should probably just run this locally and not doing
         ///     a real round (it won't pollute the state, but it will get contaminated by previously ran events in the actual round)
         ///     and things like `MaxOccurrences` and `ReoccurrenceDelay` won't be respected.
         ///
diff --git a/Content.Server/StationEvents/Components/AlertLevelInterceptionRuleComponent.cs b/Content.Server/StationEvents/Components/AlertLevelInterceptionRuleComponent.cs
index 92066ac4bf..b8cefb8e73 100644
--- a/Content.Server/StationEvents/Components/AlertLevelInterceptionRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/AlertLevelInterceptionRuleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.StationEvents.Events;
+using Content.Server.StationEvents.Events;
 using Content.Shared.AlertLevel;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/StationEvents/Components/BluespaceLockerRuleComponent.cs b/Content.Server/StationEvents/Components/BluespaceLockerRuleComponent.cs
index 1ea59e3b9d..403be453e4 100644
--- a/Content.Server/StationEvents/Components/BluespaceLockerRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/BluespaceLockerRuleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.StationEvents.Events;
+using Content.Server.StationEvents.Events;
 
 namespace Content.Server.StationEvents.Components;
 
diff --git a/Content.Server/StationEvents/Components/CargoGiftsRuleComponent.cs b/Content.Server/StationEvents/Components/CargoGiftsRuleComponent.cs
index 01d67f61cf..71d6d4281c 100644
--- a/Content.Server/StationEvents/Components/CargoGiftsRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/CargoGiftsRuleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.StationEvents.Events;
+using Content.Server.StationEvents.Events;
 using Content.Shared.Cargo.Prototypes;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/StationEvents/Components/FalseAlarmRuleComponent.cs b/Content.Server/StationEvents/Components/FalseAlarmRuleComponent.cs
index b58884b750..92ae6a1ec6 100644
--- a/Content.Server/StationEvents/Components/FalseAlarmRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/FalseAlarmRuleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.StationEvents.Events;
+using Content.Server.StationEvents.Events;
 
 namespace Content.Server.StationEvents.Components;
 
diff --git a/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs b/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs
index 22164b9c9c..61ced84812 100644
--- a/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.StationEvents.Events;
+using Content.Server.StationEvents.Events;
 using Content.Shared.Atmos;
 using Robust.Shared.Map;
 
diff --git a/Content.Server/StationEvents/Components/KudzuGrowthRuleComponent.cs b/Content.Server/StationEvents/Components/KudzuGrowthRuleComponent.cs
index a075598863..fec6418480 100644
--- a/Content.Server/StationEvents/Components/KudzuGrowthRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/KudzuGrowthRuleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.StationEvents.Events;
+using Content.Server.StationEvents.Events;
 
 namespace Content.Server.StationEvents.Components;
 
diff --git a/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs b/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs
index 1cde2ac8fa..f3d5d79cba 100644
--- a/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs
+++ b/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.StationEvents.Events;
+using Content.Server.StationEvents.Events;
 using Content.Shared.Destructible.Thresholds;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
@@ -11,6 +11,12 @@ public sealed partial class MeteorSwarmComponent : Component
     [DataField, AutoPausedField]
     public TimeSpan NextWaveTime;
 
+    /// <summary>
+    /// Grid which this game rule is targeting.
+    /// </summary>
+    [DataField]
+    public EntityUid? TargetGrid;
+
     /// <summary>
     /// We'll send a specific amount of waves of meteors towards the station per ending rather than using a timer.
     /// </summary>
diff --git a/Content.Server/StationEvents/Components/VentClogRuleComponent.cs b/Content.Server/StationEvents/Components/VentClogRuleComponent.cs
index d51c48b4ae..db353342b6 100644
--- a/Content.Server/StationEvents/Components/VentClogRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/VentClogRuleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.StationEvents.Events;
+using Content.Server.StationEvents.Events;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/StationEvents/Components/VentCritterSpawnLocationComponent.cs b/Content.Server/StationEvents/Components/VentCritterSpawnLocationComponent.cs
index 7fed97cbcf..900cae73bc 100644
--- a/Content.Server/StationEvents/Components/VentCritterSpawnLocationComponent.cs
+++ b/Content.Server/StationEvents/Components/VentCritterSpawnLocationComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.StationEvents.Events;
+using Content.Server.StationEvents.Events;
 
 namespace Content.Server.StationEvents.Components;
 
diff --git a/Content.Server/StationEvents/Components/VentCrittersRuleComponent.cs b/Content.Server/StationEvents/Components/VentCrittersRuleComponent.cs
index f280468fc3..4c4ab5bf97 100644
--- a/Content.Server/StationEvents/Components/VentCrittersRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/VentCrittersRuleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.StationEvents.Events;
+using Content.Server.StationEvents.Events;
 using Content.Shared.Storage;
 
 namespace Content.Server.StationEvents.Components;
diff --git a/Content.Server/StationEvents/Components/VentHordeRuleComponent.cs b/Content.Server/StationEvents/Components/VentHordeRuleComponent.cs
index b4a7b49e6c..d983ecd226 100644
--- a/Content.Server/StationEvents/Components/VentHordeRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/VentHordeRuleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.StationEvents.Events;
+using Content.Server.StationEvents.Events;
 using Content.Shared.EntityTable.EntitySelectors;
 
 namespace Content.Server.StationEvents.Components;
diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs
index 8531ebbb91..e7f2a1921b 100644
--- a/Content.Server/StationEvents/EventManagerSystem.cs
+++ b/Content.Server/StationEvents/EventManagerSystem.cs
@@ -9,6 +9,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Content.Shared.EntityTable.EntitySelectors;
 using Content.Shared.EntityTable;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.StationEvents;
 
@@ -18,7 +19,7 @@ public sealed partial class EventManagerSystem : EntitySystem
     [Dependency] private IPlayerManager _playerManager = default!;
     [Dependency] private IRobustRandom _random = default!;
     [Dependency] private EntityTableSystem _entityTable = default!;
-    [Dependency] public GameTicker GameTicker = default!;
+    [Dependency] private ServerGameTicker _gameTicker = default!;
     [Dependency] private RoundEndSystem _roundEnd = default!;
 
     public bool EventsEnabled { get; private set; }
@@ -67,7 +68,7 @@ public sealed partial class EventManagerSystem : EntitySystem
             return;
         }
 
-        GameTicker.AddGameRule(randomLimitedEvent);
+        _gameTicker.AddGameRule(randomLimitedEvent);
     }
 
     /// <summary>
@@ -105,7 +106,7 @@ public sealed partial class EventManagerSystem : EntitySystem
         playerCount ??= _playerManager.PlayerCount;
 
         // playerCount does a lock so we'll just keep the variable here
-        currentTime ??= GameTicker.RoundDuration();
+        currentTime ??= _gameTicker.RoundDuration();
 
         var totalWeight = 0f;
 
@@ -158,11 +159,11 @@ public sealed partial class EventManagerSystem : EntitySystem
         playerCount ??= _playerManager.PlayerCount;
 
         // playerCount does a lock so we'll just keep the variable here
-        currentTime ??= GameTicker.RoundDuration();
+        currentTime ??= _gameTicker.RoundDuration();
 
         foreach (var eventid in selectedEvents)
         {
-            if (GameTicker.IsIgnored(eventid))
+            if (_gameTicker.IsIgnored(eventid))
                 continue;
 
             if (!ProtoMan.Resolve(eventid, out var eventproto))
@@ -250,7 +251,7 @@ public sealed partial class EventManagerSystem : EntitySystem
         var playerCount = playerCountOverride ?? _playerManager.PlayerCount;
 
         // playerCount does a lock so we'll just keep the variable here
-        var currentTime = currentTimeOverride ?? GameTicker.RoundDuration();
+        var currentTime = currentTimeOverride ?? _gameTicker.RoundDuration();
 
         var result = new Dictionary<EntityPrototype, StationEventComponent>();
 
@@ -294,59 +295,36 @@ public sealed partial class EventManagerSystem : EntitySystem
         return allEvents;
     }
 
-    private int GetOccurrences(EntityPrototype stationEvent)
-    {
-        return GetOccurrences(stationEvent.ID);
-    }
-
-    private int GetOccurrences(string stationEvent)
-    {
-        return GameTicker.AllPreviousGameRules.Count(p => p.Item2 == stationEvent);
-    }
-
-    public TimeSpan TimeSinceLastEvent(EntityPrototype stationEvent)
-    {
-        foreach (var (time, rule) in GameTicker.AllPreviousGameRules.Reverse())
-        {
-            if (rule == stationEvent.ID)
-                return time;
-        }
-
-        return TimeSpan.Zero;
-    }
-
+    // TODO: WRITE A TEST TO ENSURE THAT IF A EVENT HAS MAX OCCURRENCES, THAT IT WILL PROPERLY CANCEL ONLY WHEN THEY'RE HIT
     private bool CanRun(EntityPrototype prototype, StationEventComponent stationEvent, int playerCount, TimeSpan currentTime)
     {
-        if (GameTicker.IsGameRuleActive(prototype.ID))
-            return false;
-
-        if (stationEvent.MaxOccurrences.HasValue && GetOccurrences(prototype) >= stationEvent.MaxOccurrences.Value)
-        {
-            return false;
-        }
-
+        // Do the really simple comparisons BEFORE we create an IEnumerable for GameRules :V
         if (playerCount < stationEvent.MinimumPlayers)
-        {
             return false;
-        }
 
         if (currentTime != TimeSpan.Zero && currentTime.TotalMinutes < stationEvent.EarliestStart)
-        {
             return false;
+
+        // Slightly slower if we don't care about MaxOccurrences, but that's not a huge issue in the context of the event scheduler.
+        var count = 0;
+        var lastRun = TimeSpan.Zero;
+        var ruleQuery = EntityQueryEnumerator<GameRuleComponent, MetaDataComponent>();
+        while (ruleQuery.MoveNext(out var rule, out var meta))
+        {
+            if (meta.EntityPrototype?.Name != prototype.ID)
+                continue;
+
+            count++;
+            if (lastRun < rule.ActivatedAt)
+                lastRun = rule.ActivatedAt;
         }
 
-        var lastRun = TimeSinceLastEvent(prototype);
-        if (lastRun != TimeSpan.Zero && currentTime.TotalMinutes <
-            stationEvent.ReoccurrenceDelay + lastRun.TotalMinutes)
-        {
+        if (stationEvent.MaxOccurrences.HasValue && count >= stationEvent.MaxOccurrences.Value)
             return false;
-        }
 
-        if (_roundEnd.IsRoundEndRequested() && !stationEvent.OccursDuringRoundEnd && !_roundEnd.CanCallOrRecall())
-        {
+        if (lastRun != TimeSpan.Zero && currentTime.TotalMinutes < stationEvent.ReoccurrenceDelay + lastRun.TotalMinutes)
             return false;
-        }
 
-        return true;
+        return !_roundEnd.IsRoundEndRequested() || stationEvent.OccursDuringRoundEnd || _roundEnd.CanCallOrRecall();
     }
 }
diff --git a/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs b/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs
index d1b039bdaa..141d4220a5 100644
--- a/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs
+++ b/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs
@@ -13,15 +13,15 @@ public sealed partial class AlertLevelInterceptionRule : StationEventSystem<Aler
     {
         base.Started(uid, component, gameRule, args);
 
-        if (!TryGetRandomStation(out var chosenStation))
+        if (!Station.TryGetRandomStation(out var chosenStation))
             return;
 
-        if (!_alertLevel.TryGetLevel(chosenStation.Value, out var level)
-            || !_alertLevel.TryGetDefaultLevel(chosenStation.Value, out var defaultLevel)
+        if (!_alertLevel.TryGetLevel(chosenStation.Value.Owner, out var level)
+            || !_alertLevel.TryGetDefaultLevel(chosenStation.Value.Owner, out var defaultLevel)
             || level != defaultLevel)
             return;
 
-        _alertLevel.SetLevel(chosenStation.Value,
+        _alertLevel.SetLevel(chosenStation.Value.Owner,
             component.AlertLevel,
             force: true);
     }
diff --git a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
index d0719fbd35..5e4d32f64a 100644
--- a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
+++ b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
@@ -1,4 +1,4 @@
-using Content.Server.Anomaly;
+using Content.Server.Anomaly;
 using Content.Server.StationEvents.Components;
 using Content.Shared.GameTicking.Components;
 using Content.Shared.Station.Components;
@@ -25,13 +25,13 @@ public sealed partial class AnomalySpawnRule : StationEventSystem<AnomalySpawnRu
     {
         base.Started(uid, component, gameRule, args);
 
-        if (!TryGetRandomStation(out var chosenStation))
+        if (!Station.TryGetRandomStation(out var chosenStation))
             return;
 
         if (!TryComp<StationDataComponent>(chosenStation, out var stationData))
             return;
 
-        var grid = StationSystem.GetLargestGrid((chosenStation.Value, stationData));
+        var grid = Station.GetLargestGrid((chosenStation.Value, stationData));
 
         if (grid is null)
             return;
diff --git a/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs b/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
index 99ac50656c..a3b19d7e42 100644
--- a/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
+++ b/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
@@ -1,5 +1,5 @@
 using Content.Server.StationEvents.Components;
-using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Random;
 
 namespace Content.Server.StationEvents.Events;
@@ -25,7 +25,7 @@ public sealed partial class BluespaceArtifactRule : StationEventSystem<Bluespace
         var amountToSpawn = 1;
         for (var i = 0; i < amountToSpawn; i++)
         {
-            if (!TryFindRandomTile(out _, out _, out _, out var coords))
+            if (!Station.TryFindRandomTile(out _, out _, out _, out var coords))
                 return;
 
             Spawn(component.ArtifactSpawnerPrototype, coords);
diff --git a/Content.Server/StationEvents/Events/BreakerFlipRule.cs b/Content.Server/StationEvents/Events/BreakerFlipRule.cs
index 64ba47964c..f3bc5cd628 100644
--- a/Content.Server/StationEvents/Events/BreakerFlipRule.cs
+++ b/Content.Server/StationEvents/Events/BreakerFlipRule.cs
@@ -30,14 +30,14 @@ public sealed partial class BreakerFlipRule : StationEventSystem<BreakerFlipRule
     {
         base.Started(uid, component, gameRule, args);
 
-        if (!TryGetRandomStation(out var chosenStation, uid => _whitelist.IsWhitelistFailOrNull(component.Blacklist, uid)))
+        if (!Station.TryGetRandomStation(out var chosenStation, uid => _whitelist.IsWhitelistFailOrNull(component.Blacklist, uid)))
             return;
 
         var stationApcs = new List<Entity<ApcComponent>>();
         var query = EntityQueryEnumerator<ApcComponent, TransformComponent>();
         while (query.MoveNext(out var apcUid, out var apc, out var xform))
         {
-            if (apc.MainBreakerEnabled && CompOrNull<StationMemberComponent>(xform.GridUid)?.Station == chosenStation)
+            if (apc.MainBreakerEnabled && CompOrNull<StationMemberComponent>(xform.GridUid)?.Station == chosenStation.Value.Owner)
             {
                 stationApcs.Add((apcUid, apc));
             }
diff --git a/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs b/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs
index 1844df7fd1..bb740312d7 100644
--- a/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs
+++ b/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs
@@ -1,9 +1,7 @@
 using System.Linq;
-using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Server.StationEvents.Components;
-using Content.Shared.GameTicking.Components;
-using Content.Shared.Roles;
+using Content.Shared.GameTicking.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Random;
 
@@ -12,13 +10,13 @@ namespace Content.Server.StationEvents.Events;
 [UsedImplicitly]
 public sealed partial class BureaucraticErrorRule : StationEventSystem<BureaucraticErrorRuleComponent>
 {
-    [Dependency] private StationJobsSystem _stationJobs = default!;
+    [Dependency] private ServerStationJobsSystem _stationJobs = default!;
 
     protected override void Started(EntityUid uid, BureaucraticErrorRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
         base.Started(uid, component, gameRule, args);
 
-        if (!TryGetRandomStation(out var chosenStation, HasComp<StationJobsComponent>))
+        if (!Station.TryGetRandomStation(out var chosenStation, HasComp<Shared.Station.Components.StationJobsComponent>))
             return;
 
         var jobList = _stationJobs.GetJobs(chosenStation.Value).Keys.ToList();
diff --git a/Content.Server/StationEvents/Events/CargoGiftsRule.cs b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
index ca6019d806..8a4992fbd5 100644
--- a/Content.Server/StationEvents/Events/CargoGiftsRule.cs
+++ b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
@@ -13,18 +13,21 @@ public sealed partial class CargoGiftsRule : StationEventSystem<CargoGiftsRuleCo
 {
     [Dependency] private CargoSystem _cargoSystem = default!;
     [Dependency] private IPrototypeManager _prototypeManager = default!;
-    [Dependency] private GameTicker _ticker = default!;
+    [Dependency] private ServerGameTicker _ticker = default!;
 
-    protected override void Added(EntityUid uid, CargoGiftsRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
+    protected override void Added(Entity<CargoGiftsRuleComponent, GameRuleComponent> rule, ref GameRuleAddedEvent args)
     {
-        if (!TryComp<StationEventComponent>(uid, out var stationEvent))
+        if (!TryComp<StationEventComponent>(rule, out var stationEvent))
             return;
 
-        var str = Loc.GetString(component.Announce,
-            ("sender", Loc.GetString(component.Sender)), ("description", Loc.GetString(component.Description)), ("dest", Loc.GetString(component.Dest)));
+        // TODO: One must question, why we're saving it to this component and forcing each system to TryComp twice instead of just calling a method other than "Added"
+        // TODO: Also realistically this should be called on "Started" not added...
+        // TODO: Second PR energy...
+        var str = Loc.GetString(rule.Comp1.Announce,
+            ("sender", Loc.GetString(rule.Comp1.Sender)), ("description", Loc.GetString(rule.Comp1.Description)), ("dest", Loc.GetString(rule.Comp1.Dest)));
         stationEvent.StartAnnouncement = str;
 
-        base.Added(uid, component, gameRule, args);
+        base.Added(rule, ref args);
     }
 
     /// <summary>
@@ -43,7 +46,7 @@ public sealed partial class CargoGiftsRule : StationEventSystem<CargoGiftsRuleCo
 
         component.TimeUntilNextGifts += 30f;
 
-        if (!TryGetRandomStation(out var station, HasComp<StationCargoOrderDatabaseComponent>) ||
+        if (!Station.TryGetRandomStation(out var station, HasComp<StationCargoOrderDatabaseComponent>) ||
                 !TryComp<StationDataComponent>(station, out var stationData))
             return;
 
@@ -81,7 +84,68 @@ public sealed partial class CargoGiftsRule : StationEventSystem<CargoGiftsRuleCo
         if (component.Gifts.Count == 0)
         {
             // We're done here!
-            _ticker.EndGameRule(uid, gameRule);
+            /* ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⣼⣿⣿⣦⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣴⣶⣾⣿⣿⣿⣿⣷⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⠂⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣶⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣤⣤⣀⠀⢠⣶⣦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⣀⣀⣤⣤⣤⣤⣴⣶⣶⣶⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⣷⣤⣤⣴⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣄⣄⣀⣀⠀⠀⠘⣿⣿⣿⣿⣿⠛⠉⡙⢿⣿⣿⣿⣿⣷⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣦⣴⣟⣿⣿⣿⣿⣿⡧⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠉⠉⠉⠉⠉⠉⠉⠁⠈⠈⣿⣿⣿⣿⣿⣿⣿⡿⣿⣿⠇⠀⠀⢈⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣏⣉⣿⣿⣿⣿⣿⣿⣏⢈⣙⡻⣿⣿⣿⣿⣿⣿⡁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠛⠉⠈⠁⠘⠻⠿⢶⣶⣾⣷⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⡿⠃⠀⠀⠀⠀⠀⠀⢀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣧⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠙⠛⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⢿⣿⣿⣿⣄⢿⣿⡄⠀⠀⠀⠀⠀⠀⣼⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣤⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢿⣿⣿⣿⣬⢻⣿⣄⠀⠀⠀⢀⣼⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠻⣷⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠸⣿⣿⣿⣿⣗⣻⣿⣷⣆⣠⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣯⣟⡿⣛⣿⣿⣿⣿⣿⣿⣿⠿⢿⣿⣄⣸⣿⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⡟⠛⢿⣿⣿⣿⣿⣿⣿⣿⣿⣏⣠⣼⣿⣿⣿⣿⣿⣿⣿⣿⣿⡧⠈⢙⣛⣛⣿⣿⣿⣿⡿⢿⣿⣇⣄⣃⡀⠙⣿⣿⣿⣷⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠸⣿⣿⣿⣿⣦⠘⡿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣾⣿⣿⣿⣿⣿⣿⣿⣿⣾⡋⠛⠛⠛⠛⠷⣿⣿⣿⣿⣿⣆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢿⣿⣿⣿⣿⣧⢞⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣯⣁⣀⠀⣩⣿⣿⣿⠓⠚⠿⠛⠋⠀⣼⣿⣟⣻⣿⣿⣧⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣈⣿⣿⣿⣿⣿⣿⣿⣽⣿⣿⣿⣿⣿⣿⣿⡿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠛⠿⠿⣿⣿⣿⣿⣿⣿⣿⣦⣤⣤⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⣷⣶⣤⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠟⠋⠀⠈⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣶⣴⣿⡿⠟⠉⠈⠉⠉⠉⠛⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣶⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠻⣿⣿⣿⣿⣿⣿⣿⣿⣿⠇⠀⠀⠀⠀⠀⠸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⣿⣶⣤⣤⣤⣡⣀⣠⣬⣿⣿⡏⠀⠙⠻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣦⣤⣀⡀⠀⠀⢀⣠⣴⣶⣶⣶⣦⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠛⠿⠟⠛⠋⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣄⠉⠙⠛⢛⣿⠋⠛⢋⣼⣿⠇⠀⠀⠀⠀⠉⠻⢿⣿⣿⣿⣿⣿⣿⣿⣷⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣄⣀⣀⣀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣧⡴⣾⣿⡟⠀⠀⠀⠀⠀⠀⠀⠀⠈⢉⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⣷⣄⡈⢻⣿⡀⣘⣿⣇⠀⠀⠀⠀⠀⠀⣀⣴⣾⣿⣿⣿⣿⣿⣿⣟⣿⣿⣇⠀⠉⠉⠙⠻⢿⣿⣿⣿⣿⣿⠿⠟⠉⠉
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠐⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡛⠿⠿⠿⠿⠿⢿⣿⣄⣀⣠⣤⣶⣿⣿⣿⣿⣿⣿⣿⠿⠛⠉⠿⠿⠿⠟⠀⠀⠀⠀⠀⠀⠀⠉⠋⠁⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⣄⣠⣒⣤⣼⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠛⠟⣻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⠀⠀⠈⠉⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣀⠀⠀⣾⣿⣿⣿⡋⠉⠀⠙⢿⡿⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣴⣾⣿⣿⣿⣿⣿⡿⢿⣿⣯⣽⣿⣿⣿⣿⣿⣿⣿⣿⠀⢀⣿⣿⣿⣿⣷⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣾⣿⣿⡿⠿⠿⠛⢻⣿⣧⣶⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣂⣾⣿⣿⡿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣀⣀⣠⣤⣶⣿⣿⣿⣿⣿⣵⣿⣿⠖⣿⣿⣿⣿⣛⣿⣿⣿⣜⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣱⣿⣿⣿⡆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣿⣿⠛⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣏⣹⣿⣿⣿⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⠻⠛⠉⠉⠁⠀⢀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⢿⣿⣿⣿⣿⣿⢻⣿⣿⣿⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣟⡽⣿⣿⣿⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣾⣿⣿⣿⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⣿⣿⣿⣿⣿⣿⣿⠃⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣿⡟⠀⠀⠀⠸⣿⣿⣿⣿⡟⠈⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢹⣿⣿⣿⣿⣿⡇⠀⠀⠀⠀⢻⣿⣿⣿⠁⠀⢹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠛⢿⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⣿⣿⣿⣿⡟⠀⠀⠀⠀⣠⡾⣿⣿⠃⠀⠀⠀⢻⣿⣿⣿⣿⣿⣿⣿⠫⠔⠠⣀⣸⣿⠇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣹⣿⣿⡿⢌⠀⣀⠀⠸⠏⢁⣿⣯⠀⠀⠀⠀⠀⠻⣿⣿⣿⣿⣿⣧⢋⠄⣐⢠⣿⣿⡆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣽⣿⣿⣿⣿⣿⣿⣿⣆⠀⣼⣿⠃⠀⠀⠀⠀⠀⢀⣹⣿⣿⣿⣿⣿⣜⣮⣿⣿⣿⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣽⣿⣿⣿⣿⣏⠙⢿⣿⣷⣿⡏⠀⠀⠀⢀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠟⣿⣿⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⣿⣿⣿⡇⠙⠃⢸⣿⣿⠟⠀⠀⠀⢀⣾⣿⣿⣿⣿⣿⣿⡛⠻⣿⣿⣿⣾⣿⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣼⣿⣿⣿⣿⣧⣄⡀⣸⣿⣯⣄⠀⠀⠀⠉⣿⣿⣿⣿⣿⣿⣿⣿⠡⢸⣿⣿⣾⣿⠟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢰⣿⣿⣿⣿⣿⣿⣿⣷⣿⣿⣿⣿⠀⠀⠀⠀⢿⣿⣿⣿⣿⣿⣿⣥⣂⠩⣿⣿⠟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⣿⣿⣿⣿⣿⣯⣝⣋⣭⣾⣿⡿⠀⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣶⣿⡏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢰⣿⣿⣿⣿⣿⣿⣿⣿⣿⢻⣿⠃⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⢏⠛⡛⠍⠡⣤⣿⡏⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⠎⡐⠁⢈⣴⣿⡿⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⡏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠸⣿⣿⣿⣞⠀⠓⣬⣿⡿⠁⠀⠀⠀⠀⠀⠀⠈⣿⣿⣿⣿⣿⣿⣿⡟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⢃⠂⢡⣿⡿⠁⠀⠀⠀⠀⠀⠀⠀⢰⣿⣿⣿⣿⣿⣿⡟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⠂⡜⣾⣿⠁⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣿⣿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⢚⠻⣿⡟⠀⠀⠀⠀⠀⠀⠀⠀⢰⣿⣿⣿⣿⣿⣿⣧⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⠣⣽⣿⡇⠀⠀⠀⠀⠀⠀⠀⢀⣿⣿⣿⣿⣿⣿⣾⢻⣷⣦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣿⣿⢧⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⠎⢂⣿⡏⠀⠀⠀⠀⠀⠀⠀⠀⠈⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣶⣤⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⣀⣼⣿⠇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠙⠻⢿⣿⣿⣿⣿⣿⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣼⣿⣿⢻⣿⣿⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⢣⣾⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣾⣿⣿⣿⣿⣿⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣾⣿⣿⣿⣿⣿⣿⡆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣿⣿⣿⣿⣿⠿⣿⡟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀*/
+            _ticker.EndGameRule((uid, gameRule));
         }
     }
 
diff --git a/Content.Server/StationEvents/Events/ClericalErrorRule.cs b/Content.Server/StationEvents/Events/ClericalErrorRule.cs
index 01572abdf2..2d9210e82b 100644
--- a/Content.Server/StationEvents/Events/ClericalErrorRule.cs
+++ b/Content.Server/StationEvents/Events/ClericalErrorRule.cs
@@ -15,7 +15,7 @@ public sealed partial class ClericalErrorRule : StationEventSystem<ClericalError
     {
         base.Started(uid, component, gameRule, args);
 
-        if (!TryGetRandomStation(out var chosenStation))
+        if (!Station.TryGetRandomStation(out var chosenStation))
             return;
 
         if (!TryComp<StationRecordsComponent>(chosenStation, out var stationRecords))
diff --git a/Content.Server/StationEvents/Events/FalseAlarmRule.cs b/Content.Server/StationEvents/Events/FalseAlarmRule.cs
index 1730ceecd9..fcd86c6b92 100644
--- a/Content.Server/StationEvents/Events/FalseAlarmRule.cs
+++ b/Content.Server/StationEvents/Events/FalseAlarmRule.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.StationEvents.Components;
 using Content.Shared.GameTicking.Components;
 using JetBrains.Annotations;
diff --git a/Content.Server/StationEvents/Events/GasLeakRule.cs b/Content.Server/StationEvents/Events/GasLeakRule.cs
index 29251ee394..a9bd716012 100644
--- a/Content.Server/StationEvents/Events/GasLeakRule.cs
+++ b/Content.Server/StationEvents/Events/GasLeakRule.cs
@@ -1,5 +1,4 @@
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Shared.GameTicking.Components;
 using Robust.Shared.Audio;
@@ -21,8 +20,9 @@ namespace Content.Server.StationEvents.Events
                 return;
 
             // Essentially we'll pick out a target amount of gas to leak, then a rate to leak it at, then work out the duration from there.
-            if (TryFindRandomTile(out component.TargetTile, out var target, out component.TargetGrid, out component.TargetCoords))
+            if (Station.TryFindRandomTile(out component.TargetTile, out var target, out var grid, out component.TargetCoords))
             {
+                component.TargetGrid = grid.Value;
                 component.TargetStation = target.Value;
                 component.FoundTile = true;
 
@@ -62,28 +62,28 @@ namespace Content.Server.StationEvents.Events
             environment?.AdjustMoles(component.LeakGas, component.LeakCooldown * component.MolesPerSecond);
         }
 
-        protected override void Ended(EntityUid uid, GasLeakRuleComponent component, GameRuleComponent gameRule, GameRuleEndedEvent args)
+        protected override void Ended(Entity<GasLeakRuleComponent> rule, ref GameRuleEndedEvent args)
         {
-            base.Ended(uid, component, gameRule, args);
-            Spark(uid, component);
+            base.Ended(rule, ref args);
+            Spark(rule);
         }
 
-        private void Spark(EntityUid uid, GasLeakRuleComponent component)
+        private void Spark(Entity<GasLeakRuleComponent> rule)
         {
-            if (RobustRandom.NextFloat() <= component.SparkChance)
+            if (RobustRandom.NextFloat() <= rule.Comp.SparkChance)
             {
-                if (!component.FoundTile ||
-                    component.TargetGrid == default ||
-                    (!Exists(component.TargetGrid) ? EntityLifeStage.Deleted : MetaData(component.TargetGrid).EntityLifeStage) >= EntityLifeStage.Deleted ||
-                    !_atmosphere.IsSimulatedGrid(component.TargetGrid))
+                if (!rule.Comp.FoundTile ||
+                    rule.Comp.TargetGrid == default ||
+                    (!Exists(rule.Comp.TargetGrid) ? EntityLifeStage.Deleted : MetaData(rule.Comp.TargetGrid).EntityLifeStage) >= EntityLifeStage.Deleted ||
+                    !_atmosphere.IsSimulatedGrid(rule.Comp.TargetGrid))
                 {
                     return;
                 }
 
                 // Don't want it to be so obnoxious as to instantly murder anyone in the area but enough that
                 // it COULD start potentially start a bigger fire.
-                _atmosphere.HotspotExpose(component.TargetGrid, component.TargetTile, 700f, 50f, null, true);
-                Audio.PlayPvs(new SoundPathSpecifier("/Audio/Effects/sparks4.ogg"), component.TargetCoords);
+                _atmosphere.HotspotExpose(rule.Comp.TargetGrid, rule.Comp.TargetTile, 700f, 50f, null, true);
+                Audio.PlayPvs(new SoundPathSpecifier("/Audio/Effects/sparks4.ogg"), rule.Comp.TargetCoords);
             }
         }
     }
diff --git a/Content.Server/StationEvents/Events/GreytideVirusRule.cs b/Content.Server/StationEvents/Events/GreytideVirusRule.cs
index 39ea7c7ae3..2bd16123b2 100644
--- a/Content.Server/StationEvents/Events/GreytideVirusRule.cs
+++ b/Content.Server/StationEvents/Events/GreytideVirusRule.cs
@@ -47,7 +47,7 @@ public sealed partial class GreytideVirusRule : StationEventSystem<GreytideVirus
         if (virusComp.Severity == null)
             return;
 
-        if (!TryGetRandomStation(out var chosenStation))
+        if (!Station.TryGetRandomStation(out var chosenStation))
             return;
 
         // pick random access groups
@@ -68,7 +68,7 @@ public sealed partial class GreytideVirusRule : StationEventSystem<GreytideVirus
                 continue;
 
             // make sure not to hit CentCom or other maps
-            if (CompOrNull<StationMemberComponent>(xform.GridUid)?.Station != chosenStation)
+            if (CompOrNull<StationMemberComponent>(xform.GridUid)?.Station != chosenStation.Value.Owner)
                 continue;
 
             // check access
@@ -90,7 +90,7 @@ public sealed partial class GreytideVirusRule : StationEventSystem<GreytideVirus
                 continue;
 
             // make sure not to hit CentCom or other maps
-            if (CompOrNull<StationMemberComponent>(xform.GridUid)?.Station != chosenStation)
+            if (CompOrNull<StationMemberComponent>(xform.GridUid)?.Station != chosenStation.Value.Owner)
                 continue;
 
             // use the access reader from the door electronics if they exist
diff --git a/Content.Server/StationEvents/Events/ImmovableRodRule.cs b/Content.Server/StationEvents/Events/ImmovableRodRule.cs
index 47d39da0a8..a5c8650b24 100644
--- a/Content.Server/StationEvents/Events/ImmovableRodRule.cs
+++ b/Content.Server/StationEvents/Events/ImmovableRodRule.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using System.Numerics;
 using Content.Server.ImmovableRod;
 using Content.Server.StationEvents.Components;
@@ -5,8 +6,7 @@ using Content.Server.Weapons.Ranged.Systems;
 using Content.Shared.GameTicking.Components;
 using Content.Shared.Storage;
 using Robust.Shared.Prototypes;
-using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
-using System.Linq;
+using Robust.Shared.Spawners;
 
 namespace Content.Server.StationEvents.Events;
 
@@ -27,7 +27,7 @@ public sealed partial class ImmovableRodRule : StationEventSystem<ImmovableRodRu
         if (proto.TryComp<ImmovableRodComponent>(out var rod, EntityManager.ComponentFactory) &&
             proto.TryComp<TimedDespawnComponent>(out var despawn, EntityManager.ComponentFactory))
         {
-            if (!TryFindRandomTile(out _, out _, out _, out var targetCoords))
+            if (!Station.TryFindRandomTile(out _, out _, out _, out var targetCoords))
                 return;
 
             var speed = RobustRandom.NextFloat(rod.MinSpeed, rod.MaxSpeed);
diff --git a/Content.Server/StationEvents/Events/IonStormRule.cs b/Content.Server/StationEvents/Events/IonStormRule.cs
index cb46ec579a..fdc4c29e8b 100644
--- a/Content.Server/StationEvents/Events/IonStormRule.cs
+++ b/Content.Server/StationEvents/Events/IonStormRule.cs
@@ -14,14 +14,14 @@ public sealed partial class IonStormRule : StationEventSystem<IonStormRuleCompon
     {
         base.Started(uid, comp, gameRule, args);
 
-        if (!TryGetRandomStation(out var chosenStation))
+        if (!Station.TryGetRandomStation(out var chosenStation))
             return;
 
         var query = EntityQueryEnumerator<SiliconLawBoundComponent, TransformComponent, IonStormTargetComponent>();
         while (query.MoveNext(out var ent, out var lawBound, out var xform, out var target))
         {
             // only affect law holders on the station
-            if (CompOrNull<StationMemberComponent>(xform.GridUid)?.Station != chosenStation)
+            if (CompOrNull<StationMemberComponent>(xform.GridUid)?.Station != chosenStation.Value.Owner)
                 continue;
 
             _ionStorm.IonStormTarget((ent, lawBound, target));
diff --git a/Content.Server/StationEvents/Events/KudzuGrowthRule.cs b/Content.Server/StationEvents/Events/KudzuGrowthRule.cs
index a94eaf063b..5b00ad5b0e 100644
--- a/Content.Server/StationEvents/Events/KudzuGrowthRule.cs
+++ b/Content.Server/StationEvents/Events/KudzuGrowthRule.cs
@@ -11,7 +11,7 @@ public sealed partial class KudzuGrowthRule : StationEventSystem<KudzuGrowthRule
         base.Started(uid, component, gameRule, args);
 
         // Pick a place to plant the kudzu.
-        if (!TryFindRandomTile(out var targetTile, out _, out var targetGrid, out var targetCoords))
+        if (!Station.TryFindRandomTile(out var targetTile, out _, out var targetGrid, out var targetCoords))
             return;
         Spawn("Kudzu", targetCoords);
         Sawmill.Info($"Spawning a Kudzu at {targetTile} on {targetGrid}");
diff --git a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
index 8be96ebdcf..81a93a6f56 100644
--- a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
+++ b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
@@ -31,15 +31,15 @@ public sealed partial class MassHallucinationsRule : StationEventSystem<MassHall
         }
     }
 
-    protected override void Ended(EntityUid uid, MassHallucinationsRuleComponent component, GameRuleComponent gameRule, GameRuleEndedEvent args)
+    protected override void Ended(Entity<MassHallucinationsRuleComponent> rule, ref GameRuleEndedEvent args)
     {
-        base.Ended(uid, component, gameRule, args);
+        base.Ended(rule, ref args);
 
-        foreach (var ent in component.AffectedEntities)
+        foreach (var ent in rule.Comp.AffectedEntities)
         {
             RemComp<ParacusiaComponent>(ent);
         }
 
-        component.AffectedEntities.Clear();
+        rule.Comp.AffectedEntities.Clear();
     }
 }
diff --git a/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
index 1d3eebf590..0371a8d46a 100644
--- a/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
+++ b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
@@ -1,15 +1,12 @@
 using System.Numerics;
-using Content.Server.Chat.Systems;
-using Content.Server.GameTicking.Rules;
 using Content.Server.Station.Systems;
 using Content.Server.StationEvents.Components;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules;
 using Content.Shared.Random.Helpers;
-using Robust.Server.Audio;
 using Robust.Shared.Map;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Player;
 using Robust.Shared.Random;
 
 namespace Content.Server.StationEvents.Events;
@@ -17,23 +14,24 @@ namespace Content.Server.StationEvents.Events;
 public sealed partial class MeteorSwarmSystem : GameRuleSystem<MeteorSwarmComponent>
 {
     [Dependency] private SharedPhysicsSystem _physics = default!;
-    [Dependency] private AudioSystem _audio = default!;
-    [Dependency] private ChatSystem _chat = default!;
-    [Dependency] private StationSystem _station = default!;
+    [Dependency] private ServerStationSystem _station = default!;
 
-    protected override void Added(EntityUid uid, MeteorSwarmComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
+    protected override void Added(Entity<MeteorSwarmComponent, GameRuleComponent> rule, ref GameRuleAddedEvent args)
     {
-        base.Added(uid, component, gameRule, args);
+        base.Added(rule, ref args);
+        var stations = _station.GetStations();
+        if (stations.Count == 0)
+            return;
 
-        component.WaveCounter = component.Waves.Next(RobustRandom);
+        var station = RobustRandom.Pick(stations);
+        if (_station.GetLargestGrid(station.AsNullable()) is not { } grid)
+            return;
 
-        // we don't want to send to players who aren't in game (i.e. in the lobby)
-        Filter allPlayersInGame = Filter.Empty().AddWhere(GameTicker.UserHasJoinedGame);
+        rule.Comp1.TargetGrid = grid;
+        rule.Comp1.WaveCounter = rule.Comp1.Waves.Next(RobustRandom);
 
-        if (component.Announcement is { } locId)
-            _chat.DispatchFilteredAnnouncement(allPlayersInGame, Loc.GetString(locId), playSound: false, colorOverride: Color.Gold);
-
-        _audio.PlayGlobal(component.AnnouncementSound, allPlayersInGame, true);
+        if (rule.Comp1.Announcement is { } locId)
+            GameTicker.StationMapAnnouncement(station, locId, rule.Comp1.AnnouncementSound, Color.Gold);
     }
 
     protected override void ActiveTick(EntityUid uid, MeteorSwarmComponent component, GameRuleComponent gameRule, float frameTime)
@@ -41,16 +39,14 @@ public sealed partial class MeteorSwarmSystem : GameRuleSystem<MeteorSwarmCompon
         if (Timing.CurTime < component.NextWaveTime)
             return;
 
+        if (component.TargetGrid is not { } grid)
+        {
+            ForceEndSelf((uid, gameRule));
+            return;
+        }
+
         component.NextWaveTime += TimeSpan.FromSeconds(component.WaveCooldown.Next(RobustRandom));
 
-
-        if (_station.GetStations().Count == 0)
-            return;
-
-        var station = RobustRandom.Pick(_station.GetStations());
-        if (_station.GetLargestGrid(station) is not { } grid)
-            return;
-
         var mapId = Transform(grid).MapID;
         var playableArea = _physics.GetWorldAABB(grid);
 
diff --git a/Content.Server/StationEvents/Events/PowerGridCheckRule.cs b/Content.Server/StationEvents/Events/PowerGridCheckRule.cs
index 95620ca707..7005ca8fe5 100644
--- a/Content.Server/StationEvents/Events/PowerGridCheckRule.cs
+++ b/Content.Server/StationEvents/Events/PowerGridCheckRule.cs
@@ -1,17 +1,13 @@
 using System.Threading;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
-using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
 using Content.Shared.GameTicking.Components;
-using Content.Shared.Station;
 using Content.Shared.Station.Components;
 using JetBrains.Annotations;
-using Robust.Shared.Audio;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
 using Timer = Robust.Shared.Timing.Timer;
-using Robust.Shared.Random;
 
 namespace Content.Server.StationEvents.Events
 {
@@ -19,7 +15,6 @@ namespace Content.Server.StationEvents.Events
     public sealed partial class PowerGridCheckRule : StationEventSystem<PowerGridCheckRuleComponent>
     {
         [Dependency] private ApcSystem _apcSystem = default!;
-        [Dependency] private SharedStationSystem _stationSystem = default!;
 
         public override void Initialize()
         {
@@ -32,12 +27,12 @@ namespace Content.Server.StationEvents.Events
         {
             base.Started(uid, component, gameRule, args);
 
-            if (!TryGetRandomStation(out var chosenStation))
+            if (!Station.TryGetRandomStation(out var chosenStation))
                 return;
 
             component.AffectedStation = chosenStation.Value;
 
-            var largestGrid = _stationSystem.GetLargestGrid(chosenStation.Value);
+            var largestGrid = Station.GetLargestGrid(chosenStation.Value.AsNullable());
 
             if (largestGrid == null)
                 return;
@@ -48,7 +43,7 @@ namespace Content.Server.StationEvents.Events
                 if (!apc.MainBreakerEnabled)
                     continue;
 
-                if (CompOrNull<StationMemberComponent>(transform.GridUid)?.Station != chosenStation)
+                if (CompOrNull<StationMemberComponent>(transform.GridUid)?.Station != chosenStation.Value.Owner)
                     continue;
 
                 if (transform.GridUid != largestGrid.Value)
@@ -103,12 +98,12 @@ namespace Content.Server.StationEvents.Events
             }
 
             var activeRules = AllEntityQuery<PowerGridCheckRuleComponent, ActiveGameRuleComponent>();
-            while (activeRules.MoveNext(out var _entity, out var powerGridRule, out var _activeGameRule))
+            while (activeRules.MoveNext(out _, out var powerGridRule, out _))
             {
                 if (stationMemberComp.Station != powerGridRule.AffectedStation)
                     continue;
 
-                var largestGrid = _stationSystem.GetLargestGrid(powerGridRule.AffectedStation);
+                var largestGrid = Station.GetLargestGrid(powerGridRule.AffectedStation);
 
                 if (largestGrid == null)
                     continue;
@@ -122,11 +117,11 @@ namespace Content.Server.StationEvents.Events
             return null;
         }
 
-        protected override void Ended(EntityUid uid, PowerGridCheckRuleComponent component, GameRuleComponent gameRule, GameRuleEndedEvent args)
+        protected override void Ended(Entity<PowerGridCheckRuleComponent> rule, ref GameRuleEndedEvent args)
         {
-            base.Ended(uid, component, gameRule, args);
+            base.Ended(rule, ref args);
 
-            foreach (var entity in component.Unpowered)
+            foreach (var entity in rule.Comp.Unpowered)
             {
                 if (Deleted(entity))
                     continue;
@@ -139,13 +134,20 @@ namespace Content.Server.StationEvents.Events
             }
 
             // Can't use the default EndAudio
-            component.AnnounceCancelToken?.Cancel();
-            component.AnnounceCancelToken = new CancellationTokenSource();
-            Timer.Spawn(3000, () =>
+            rule.Comp.AnnounceCancelToken?.Cancel();
+
+            // Corvax-Announcements-fix временная заплатка, удалить после реворка https://github.com/space-wizards/space-station-14/issues/46073
+            if (MetaData(rule).EntityLifeStage >= EntityLifeStage.Terminating)
+                return;
+
+            rule.Comp.AnnounceCancelToken = new CancellationTokenSource();
+            Timer.Spawn(3000,
+                () =>
             {
-                Audio.PlayGlobal(component.PowerOnSound, Filter.Broadcast(), true);
-            }, component.AnnounceCancelToken.Token);
-            component.Unpowered.Clear();
+                Audio.PlayGlobal(rule.Comp.PowerOnSound, Filter.Broadcast(), true);
+            },
+                rule.Comp.AnnounceCancelToken.Token);
+            rule.Comp.Unpowered.Clear();
         }
 
         protected override void ActiveTick(EntityUid uid, PowerGridCheckRuleComponent component, GameRuleComponent gameRule, float frameTime)
diff --git a/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs b/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs
index 0b959a98e9..88a25c59f4 100644
--- a/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs
+++ b/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs
@@ -15,7 +15,7 @@ public sealed partial class RandomEntityStorageSpawnRule : StationEventSystem<Ra
     {
         base.Started(uid, comp, gameRule, args);
 
-        if (!TryGetRandomStation(out var station))
+        if (!Station.TryGetRandomStation(out var station))
             return;
 
         var validLockers = new List<(EntityUid, EntityStorageComponent)>();
@@ -24,7 +24,7 @@ public sealed partial class RandomEntityStorageSpawnRule : StationEventSystem<Ra
         var query = EntityQueryEnumerator<EntityStorageComponent, TransformComponent>();
         while (query.MoveNext(out var ent, out var storage, out var xform))
         {
-            if (StationSystem.GetOwningStation(ent, xform) != station)
+            if (Station.GetOwningStation(ent, xform) != station.Value.Owner)
                 continue;
 
             if (!_entityStorage.CanInsert(spawn, ent, storage))
diff --git a/Content.Server/StationEvents/Events/RandomSentienceRule.cs b/Content.Server/StationEvents/Events/RandomSentienceRule.cs
index d580c93b70..b3976790bb 100644
--- a/Content.Server/StationEvents/Events/RandomSentienceRule.cs
+++ b/Content.Server/StationEvents/Events/RandomSentienceRule.cs
@@ -19,14 +19,14 @@ public sealed partial class RandomSentienceRule : StationEventSystem<RandomSenti
 
     protected override void Started(EntityUid uid, RandomSentienceRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
-        if (!TryGetRandomStation(out var station))
+        if (!Station.TryGetRandomStation(out var station))
             return;
 
         var targetList = new List<Entity<SentienceTargetComponent>>();
         var query = EntityQueryEnumerator<SentienceTargetComponent, TransformComponent>();
         while (query.MoveNext(out var targetUid, out var target, out var xform))
         {
-            if (StationSystem.GetOwningStation(targetUid, xform) != station)
+            if (Station.GetOwningStation(targetUid, xform) != station.Value.Owner)
                 continue;
 
             targetList.Add((targetUid, target));
diff --git a/Content.Server/StationEvents/Events/RandomSpawnRule.cs b/Content.Server/StationEvents/Events/RandomSpawnRule.cs
index 210b8cec51..3b44073909 100644
--- a/Content.Server/StationEvents/Events/RandomSpawnRule.cs
+++ b/Content.Server/StationEvents/Events/RandomSpawnRule.cs
@@ -10,7 +10,7 @@ public sealed partial class RandomSpawnRule : StationEventSystem<RandomSpawnRule
     {
         base.Started(uid, comp, gameRule, args);
 
-        if (TryFindRandomTile(out _, out _, out _, out var coords))
+        if (Station.TryFindRandomTile(out _, out _, out _, out var coords))
         {
             Sawmill.Info($"Spawning {comp.Prototype} at {coords}");
             Spawn(comp.Prototype, coords);
diff --git a/Content.Server/StationEvents/Events/SolarFlareRule.cs b/Content.Server/StationEvents/Events/SolarFlareRule.cs
index bab0618835..434a6e3aa7 100644
--- a/Content.Server/StationEvents/Events/SolarFlareRule.cs
+++ b/Content.Server/StationEvents/Events/SolarFlareRule.cs
@@ -62,7 +62,7 @@ public sealed partial class SolarFlareRule : StationEventSystem<SolarFlareRuleCo
         var query = EntityQueryEnumerator<SolarFlareRuleComponent, GameRuleComponent>();
         while (query.MoveNext(out var uid, out var flare, out var gameRule))
         {
-            if (!GameTicker.IsGameRuleActive(uid, gameRule))
+            if (!GameTicker.IsGameRuleActive((uid, gameRule)))
                 continue;
 
             if (!flare.AffectedChannels.Contains(args.Channel.ID))
diff --git a/Content.Server/StationEvents/Events/SpaceSpawnRule.cs b/Content.Server/StationEvents/Events/SpaceSpawnRule.cs
index 5e0027053b..129adf497e 100644
--- a/Content.Server/StationEvents/Events/SpaceSpawnRule.cs
+++ b/Content.Server/StationEvents/Events/SpaceSpawnRule.cs
@@ -1,9 +1,9 @@
 using Content.Server.Antag;
 using Content.Server.StationEvents.Components;
+using Content.Shared.Antag;
 using Content.Shared.GameTicking.Components;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
-using Robust.Shared.Random;
 
 namespace Content.Server.StationEvents.Events;
 
@@ -25,14 +25,14 @@ public sealed partial class SpaceSpawnRule : StationEventSystem<SpaceSpawnRuleCo
     {
         base.Added(uid, comp, gameRule, args);
 
-        if (!TryGetRandomStation(out var station))
+        if (!Station.TryGetRandomStation(out var station))
         {
             ForceEndSelf(uid, gameRule);
             return;
         }
 
         // find a station grid
-        var gridUid = StationSystem.GetLargestGrid(station.Value);
+        var gridUid = Station.GetLargestGrid(station.Value.Owner);
         if (gridUid == null || !TryComp<MapGridComponent>(gridUid, out var grid))
         {
             Sawmill.Warning("Chosen station has no grids, cannot pick location for {ToPrettyString(uid):rule}");
diff --git a/Content.Server/StationEvents/Events/StationEventSystem.cs b/Content.Server/StationEvents/Events/StationEventSystem.cs
index ae5d6ff47a..4712d348ce 100644
--- a/Content.Server/StationEvents/Events/StationEventSystem.cs
+++ b/Content.Server/StationEvents/Events/StationEventSystem.cs
@@ -1,11 +1,10 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Chat.Systems;
-using Content.Server.GameTicking;
-using Content.Server.GameTicking.Rules;
 using Content.Server.Station.Systems;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Database;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
 
@@ -19,7 +18,7 @@ public abstract partial class StationEventSystem<T> : GameRuleSystem<T> where T
     [Dependency] protected IAdminLogManager AdminLogManager = default!;
     [Dependency] protected ChatSystem ChatSystem = default!;
     [Dependency] protected SharedAudioSystem Audio = default!;
-    [Dependency] protected StationSystem StationSystem = default!;
+    [Dependency] protected ServerStationSystem Station = default!;
 
     protected ISawmill Sawmill = default!;
 
@@ -70,14 +69,18 @@ public abstract partial class StationEventSystem<T> : GameRuleSystem<T> where T
     }
 
     /// <inheritdoc/>
-    protected override void Ended(EntityUid uid, T component, GameRuleComponent gameRule, GameRuleEndedEvent args)
+    protected override void Ended(Entity<T> rule, ref GameRuleEndedEvent args)
     {
-        base.Ended(uid, component, gameRule, args);
+        base.Ended(rule, ref args);
 
-        if (!TryComp<StationEventComponent>(uid, out var stationEvent))
+        if (!TryComp<StationEventComponent>(rule, out var stationEvent))
             return;
 
-        AdminLogManager.Add(LogType.EventStopped, $"Event ended: {ToPrettyString(uid)}");
+        AdminLogManager.Add(LogType.EventStopped, $"Event ended: {ToPrettyString(rule)}");
+
+        // Corvax-Announcements-fix временная заплатка, удалить после реворка https://github.com/space-wizards/space-station-14/issues/46073
+        if (MetaData(rule).EntityLifeStage >= EntityLifeStage.Terminating)
+            return;
 
         // we don't want to send to players who aren't in game (i.e. in the lobby)
         Filter allPlayersInGame = Filter.Empty().AddWhere(GameTicker.UserHasJoinedGame);
@@ -100,16 +103,16 @@ public abstract partial class StationEventSystem<T> : GameRuleSystem<T> where T
         var query = EntityQueryEnumerator<StationEventComponent, GameRuleComponent>();
         while (query.MoveNext(out var uid, out var stationEvent, out var ruleData))
         {
-            if (!GameTicker.IsGameRuleAdded(uid, ruleData))
+            if (!GameTicker.IsGameRuleAdded((uid, ruleData)))
                 continue;
 
-            if (!GameTicker.IsGameRuleActive(uid, ruleData) && !HasComp<DelayedStartRuleComponent>(uid))
+            if (!GameTicker.IsGameRuleActive((uid, ruleData)) && !HasComp<DelayedStartRuleComponent>(uid))
             {
-                GameTicker.StartGameRule(uid, ruleData);
+                GameTicker.StartGameRule((uid, ruleData));
             }
-            else if (stationEvent.EndTime != null && Timing.CurTime >= stationEvent.EndTime && GameTicker.IsGameRuleActive(uid, ruleData))
+            else if (stationEvent.EndTime != null && Timing.CurTime >= stationEvent.EndTime && GameTicker.IsGameRuleActive((uid, ruleData)))
             {
-                GameTicker.EndGameRule(uid, ruleData);
+                GameTicker.EndGameRule((uid, ruleData));
             }
         }
     }
diff --git a/Content.Server/StationEvents/Events/VentClogRule.cs b/Content.Server/StationEvents/Events/VentClogRule.cs
index dbd4c53fa9..befdffb994 100644
--- a/Content.Server/StationEvents/Events/VentClogRule.cs
+++ b/Content.Server/StationEvents/Events/VentClogRule.cs
@@ -22,7 +22,7 @@ public sealed partial class VentClogRule : StationEventSystem<VentClogRuleCompon
     {
         base.Started(uid, component, gameRule, args);
 
-        if (!TryGetRandomStation(out var chosenStation))
+        if (!Station.TryGetRandomStation(out var chosenStation))
             return;
 
         // TODO: "safe random" for chems. Right now this includes admin chemicals.
@@ -32,7 +32,7 @@ public sealed partial class VentClogRule : StationEventSystem<VentClogRuleCompon
 
         foreach (var (_, transform) in EntityQuery<GasVentPumpComponent, TransformComponent>())
         {
-            if (CompOrNull<StationMemberComponent>(transform.GridUid)?.Station != chosenStation)
+            if (CompOrNull<StationMemberComponent>(transform.GridUid)?.Station != chosenStation.Value.Owner)
             {
                 continue;
             }
diff --git a/Content.Server/StationEvents/Events/VentCrittersRule.cs b/Content.Server/StationEvents/Events/VentCrittersRule.cs
index 9d75ef5c1e..a6042a481c 100644
--- a/Content.Server/StationEvents/Events/VentCrittersRule.cs
+++ b/Content.Server/StationEvents/Events/VentCrittersRule.cs
@@ -18,7 +18,7 @@ public sealed partial class VentCrittersRule : StationEventSystem<VentCrittersRu
     {
         base.Started(uid, component, gameRule, args);
 
-        if (!TryGetRandomStation(out var station))
+        if (!Station.TryGetRandomStation(out var station))
         {
             return;
         }
@@ -30,7 +30,7 @@ public sealed partial class VentCrittersRule : StationEventSystem<VentCrittersRu
             if (!transform.Anchored)
                 continue;
 
-            if (CompOrNull<StationMemberComponent>(transform.GridUid)?.Station == station)
+            if (CompOrNull<StationMemberComponent>(transform.GridUid)?.Station == station.Value.Owner)
             {
                 validLocations.Add(transform.Coordinates);
                 foreach (var spawn in EntitySpawnCollection.GetSpawns(component.Entries, RobustRandom))
diff --git a/Content.Server/StationEvents/Events/VentHordeRule.cs b/Content.Server/StationEvents/Events/VentHordeRule.cs
index 2bf4b0bcc1..7028f1d918 100644
--- a/Content.Server/StationEvents/Events/VentHordeRule.cs
+++ b/Content.Server/StationEvents/Events/VentHordeRule.cs
@@ -35,7 +35,7 @@ public sealed partial class VentHordeRule : StationEventSystem<VentHordeRuleComp
 
         if (component.ChosenVent is not { } vent)
         {
-            Log.Warning($"Unable to find a valid vent for {args.RuleId}!");
+            Log.Warning($"Unable to find a valid vent for {ToPrettyString(args.Rule)}!");
             ForceEndSelf(uid, gameRule);
             return;
         }
@@ -89,7 +89,7 @@ public sealed partial class VentHordeRule : StationEventSystem<VentHordeRuleComp
     private EntityUid? ChooseVent()
     {
         // Get a station
-        if (!TryGetRandomStation(out var station))
+        if (!Station.TryGetRandomStation(out var station))
         {
             return null;
         }
@@ -107,7 +107,7 @@ public sealed partial class VentHordeRule : StationEventSystem<VentHordeRuleComp
             if (HasComp<VentHordeSpawnerComponent>(uid))
                 continue;
 
-            if (CompOrNull<StationMemberComponent>(transform.GridUid)?.Station == station)
+            if (CompOrNull<StationMemberComponent>(transform.GridUid)?.Station == station.Value.Owner)
             {
                 validLocations.Add(uid);
             }
diff --git a/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs b/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
index b425254d9d..a89d3b0c03 100644
--- a/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
+++ b/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
@@ -2,6 +2,7 @@ using Content.Server.GameTicking;
 using Content.Server.GameTicking.Rules;
 using Content.Server.StationEvents.Components;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules;
 using Robust.Shared.Random;
 
 namespace Content.Server.StationEvents;
@@ -10,7 +11,7 @@ public sealed partial class RampingStationEventSchedulerSystem : GameRuleSystem<
 {
     [Dependency] private IRobustRandom _random = default!;
     [Dependency] private EventManagerSystem _event = default!;
-    [Dependency] private GameTicker _gameTicker = default!;
+    [Dependency] private ServerGameTicker _gameTicker = default!;
 
     /// <summary>
     /// Returns the ChaosModifier which increases as round time increases to a point.
@@ -38,28 +39,20 @@ public sealed partial class RampingStationEventSchedulerSystem : GameRuleSystem<
         PickNextEventTime(uid, component);
     }
 
-    public override void Update(float frameTime)
+    // TODO: GO THROUGH EVERY SINGLE GAME RULE AND JUST CLEAN THIS STUFF UP!!!
+    protected override void ActiveTick(EntityUid entityUid, RampingStationEventSchedulerComponent component, GameRuleComponent gameRuleComponent, float frameTime)
     {
-        base.Update(frameTime);
-
         if (!_event.EventsEnabled)
             return;
 
-        var query = EntityQueryEnumerator<RampingStationEventSchedulerComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var scheduler, out var gameRule))
+        if (component.TimeUntilNextEvent > 0f)
         {
-            if (!GameTicker.IsGameRuleActive(uid, gameRule))
-                continue;
-
-            if (scheduler.TimeUntilNextEvent > 0f)
-            {
-                scheduler.TimeUntilNextEvent -= frameTime;
-                continue;
-            }
-
-            PickNextEventTime(uid, scheduler);
-            _event.RunRandomEvent(scheduler.ScheduledGameRules);
+            component.TimeUntilNextEvent -= frameTime;
+            return;
         }
+
+        PickNextEventTime(entityUid, component);
+        _event.RunRandomEvent(component.ScheduledGameRules);
     }
 
     /// <summary>
diff --git a/Content.Server/StationRecords/GeneralStationRecordConsoleSystem.cs b/Content.Server/StationRecords/GeneralStationRecordConsoleSystem.cs
index b35c106222..bed1ca65b7 100644
--- a/Content.Server/StationRecords/GeneralStationRecordConsoleSystem.cs
+++ b/Content.Server/StationRecords/GeneralStationRecordConsoleSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.StationRecords.Systems;
+using Content.Shared.StationRecords.Systems;
 
 namespace Content.Server.StationRecords;
 
diff --git a/Content.Server/Stealth/StealthSystem.cs b/Content.Server/Stealth/StealthSystem.cs
index 639be77187..b8b1f9b4ec 100644
--- a/Content.Server/Stealth/StealthSystem.cs
+++ b/Content.Server/Stealth/StealthSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Stealth;
+using Content.Shared.Stealth;
 
 namespace Content.Server.Stealth;
 
diff --git a/Content.Server/Storage/Components/BluespaceLockerComponent.cs b/Content.Server/Storage/Components/BluespaceLockerComponent.cs
index 7064c0e857..03b4775193 100644
--- a/Content.Server/Storage/Components/BluespaceLockerComponent.cs
+++ b/Content.Server/Storage/Components/BluespaceLockerComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Storage.Components;
+namespace Content.Server.Storage.Components;
 
 [RegisterComponent]
 public sealed partial class BluespaceLockerComponent : Component
diff --git a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
index 14954f497f..abdd875856 100644
--- a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
+++ b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
@@ -16,8 +16,7 @@ using Robust.Shared.Containers;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Prototypes;
-using Content.Server.Shuttles.Components;
-using Robust.Shared.Physics;
+using Content.Shared.Shuttles.Components;
 
 namespace Content.Server.Storage.EntitySystems;
 
diff --git a/Content.Server/Storage/EntitySystems/ItemMapperSystem.cs b/Content.Server/Storage/EntitySystems/ItemMapperSystem.cs
index 9120e8ae1c..7e740852b1 100644
--- a/Content.Server/Storage/EntitySystems/ItemMapperSystem.cs
+++ b/Content.Server/Storage/EntitySystems/ItemMapperSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Storage.EntitySystems;
+using Content.Shared.Storage.EntitySystems;
 using JetBrains.Annotations;
 
 namespace Content.Server.Storage.EntitySystems
diff --git a/Content.Server/Storage/StorageCommand.cs b/Content.Server/Storage/StorageCommand.cs
index d5855388fa..ea734b4a8a 100644
--- a/Content.Server/Storage/StorageCommand.cs
+++ b/Content.Server/Storage/StorageCommand.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.Item;
diff --git a/Content.Server/Store/StoreRefundComponent.cs b/Content.Server/Store/StoreRefundComponent.cs
index df35afdf53..911cab7e9b 100644
--- a/Content.Server/Store/StoreRefundComponent.cs
+++ b/Content.Server/Store/StoreRefundComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Store.Systems;
+using Content.Server.Store.Systems;
 
 namespace Content.Server.Store.Components;
 
diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs
index b8e92f10bf..3ffaff8b33 100644
--- a/Content.Server/Store/Systems/StoreSystem.cs
+++ b/Content.Server/Store/Systems/StoreSystem.cs
@@ -33,7 +33,7 @@ public sealed partial class StoreSystem : SharedStoreSystem
 
         // Add the bui key if it does not exist already (the check is needed to make sure that we don't overwrite existing InterfaceData).
         if (!UI.HasUi(uid, StoreUiKey.Key))
-            UI.SetUi(uid, StoreUiKey.Key, new InterfaceData("StoreBoundUserInterface"));
+            UI.SetUi(uid, StoreUiKey.Key, new InterfaceData("StoreBoundUserInterface", requireInputValidation: component.InputValidation));
     }
 
     private void OnStartup(EntityUid uid, StoreComponent component, ComponentStartup args)
diff --git a/Content.Server/SurveillanceCamera/Components/SurveillanceCameraRouterComponent.cs b/Content.Server/SurveillanceCamera/Components/SurveillanceCameraRouterComponent.cs
index fc848881e7..bc1fb31c1a 100644
--- a/Content.Server/SurveillanceCamera/Components/SurveillanceCameraRouterComponent.cs
+++ b/Content.Server/SurveillanceCamera/Components/SurveillanceCameraRouterComponent.cs
@@ -8,22 +8,29 @@ public sealed partial class SurveillanceCameraRouterComponent : Component
 {
     [ViewVariables] public bool Active { get; set; }
 
-    // The name of the subnet connected to this router.
-    [DataField("subnetName")]
-    public string SubnetName { get; set; } = string.Empty;
-
+    /// <summary>
+    /// The name of the subnet connected to this router.
+    /// </summary>
+    [ViewVariables]
+    public string SubnetName = string.Empty;
+
+    /// <summary>
+    /// The monitors to route to. This raises an issue related to
+    /// camera monitors disappearing before sending a D/C packet,
+    /// this could probably be refreshed every time a new monitor
+    /// is added or removed from active routing.
+    /// </summary>
     [ViewVariables]
-    // The monitors to route to. This raises an issue related to
-    // camera monitors disappearing before sending a D/C packet,
-    // this could probably be refreshed every time a new monitor
-    // is added or removed from active routing.
     public HashSet<string> MonitorRoutes { get; } = new();
 
+    /// <summary>
+    /// The frequency that talks to this router's subnet.
+    /// </summary>
     [ViewVariables]
-    // The frequency that talks to this router's subnet.
     public uint SubnetFrequency;
+
     [DataField("subnetFrequency")]
-    public ProtoId<DeviceFrequencyPrototype>? SubnetFrequencyId { get; set;  }
+    public ProtoId<DeviceFrequencyPrototype>? SubnetFrequencyId { get; set; }
 
     [DataField("setupAvailableNetworks")]
     public List<ProtoId<DeviceFrequencyPrototype>> AvailableNetworks { get; private set; } = new();
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMapSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMapSystem.cs
index a2417372a2..590a92e7e3 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMapSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMapSystem.cs
@@ -76,6 +76,9 @@ public sealed partial class SurveillanceCameraMapSystem : EntitySystem
         if (gridUid is null)
             return;
 
+        if (deviceNet.ReceiveFrequencyId == null)
+            return;
+
         var netEntity = GetNetEntity(uid);
 
         var mapComp = EnsureComp<SurveillanceCameraMapComponent>(gridUid.Value);
@@ -84,7 +87,7 @@ public sealed partial class SurveillanceCameraMapSystem : EntitySystem
         var localPos = Vector2.Transform(worldPos, gridMatrix);
 
         var address = deviceNet.Address;
-        var subnet = deviceNet.ReceiveFrequencyId ?? string.Empty;
+        var subnet = deviceNet.ReceiveFrequencyId.Value;
         var powered = CompOrNull<ApcPowerReceiverComponent>(uid)?.Powered ?? true;
         var active = comp.Active && powered;
 
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
index 65a15e1a9e..ce3bb5aba0 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
@@ -2,6 +2,7 @@ using System.Linq;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
+using Content.Shared.DeviceNetwork.Systems;
 using Content.Shared.Power;
 using Content.Shared.UserInterface;
 using Content.Shared.SurveillanceCamera;
@@ -16,13 +17,14 @@ public sealed partial class SurveillanceCameraMonitorSystem : EntitySystem
     [Dependency] private SurveillanceCameraSystem _surveillanceCameras = default!;
     [Dependency] private UserInterfaceSystem _userInterface = default!;
     [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!;
+    [Dependency] private DeviceNetworkRouterSystem _deviceNetworkRouter = default!;
 
     public override void Initialize()
     {
+        base.Initialize();
         SubscribeLocalEvent<SurveillanceCameraMonitorComponent, SurveillanceCameraDeactivateEvent>(OnSurveillanceCameraDeactivate);
         SubscribeLocalEvent<SurveillanceCameraMonitorComponent, PowerChangedEvent>(OnPowerChanged);
         SubscribeLocalEvent<SurveillanceCameraMonitorComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<SurveillanceCameraMonitorComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
         SubscribeLocalEvent<SurveillanceCameraMonitorComponent, ComponentStartup>(OnComponentStartup);
         SubscribeLocalEvent<SurveillanceCameraMonitorComponent, AfterActivatableUIOpenEvent>(OnToggleInterface);
         Subs.BuiEvents<SurveillanceCameraMonitorComponent>(SurveillanceCameraMonitorUiKey.Key, subs =>
@@ -93,72 +95,52 @@ public sealed partial class SurveillanceCameraMonitorSystem : EntitySystem
         }
     }
 
-    private void OnPacketReceived(EntityUid uid, SurveillanceCameraMonitorComponent component,
-        DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnCameraConnect(Entity<SurveillanceCameraMonitorComponent> ent, ref DeviceNetworkPacketEvent<SurveillanceCameraConnectPayload> args)
     {
-        if (string.IsNullOrEmpty(args.SenderAddress))
+        var payload = args.Data;
+        if (ent.Comp.NextCameraAddress == payload.SenderAddress)
         {
-            return;
+            if (payload.SenderAddress != null)
+                ent.Comp.ActiveCameraAddress = payload.SenderAddress;
+            TrySwitchCameraByUid(ent, payload.Sender, ent.Comp);
         }
 
-        if (args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? command))
+        ent.Comp.NextCameraAddress = null;
+    }
+
+    [SubscribeLocalEvent]
+    private void OnCameraHeartbeat(Entity<SurveillanceCameraMonitorComponent> ent, ref DeviceNetworkPacketEvent<SurveillanceCameraHeartbeatPayload> args)
+    {
+        if (args.Data.SenderAddress == ent.Comp.ActiveCameraAddress)
         {
-            switch (command)
-            {
-                case SurveillanceCameraSystem.CameraConnectMessage:
-                    if (component.NextCameraAddress == args.SenderAddress)
-                    {
-                        component.ActiveCameraAddress = args.SenderAddress;
-                        TrySwitchCameraByUid(uid, args.Sender, component);
-                    }
-
-                    component.NextCameraAddress = null;
-                    break;
-                case SurveillanceCameraSystem.CameraHeartbeatMessage:
-                    if (args.SenderAddress == component.ActiveCameraAddress)
-                    {
-                        component.LastHeartbeat = 0;
-                    }
-
-                    break;
-                case SurveillanceCameraSystem.CameraDataMessage:
-                {
-                    if (!args.Data.TryGetValue(SurveillanceCameraSystem.CameraNameData, out string? name)
-                        || !args.Data.TryGetValue(SurveillanceCameraSystem.CameraSubnetData, out ProtoId<DeviceFrequencyPrototype>? subnetData)
-                        || !args.Data.TryGetValue(SurveillanceCameraSystem.CameraAddressData, out string? address))
-                    {
-                        return;
-                    }
-
-                    if (component.ActiveSubnet != subnetData && subnetData is { } subnet)
-                    {
-                        DisconnectFromSubnet(uid, subnet);
-                    }
-
-                    if (!component.KnownCameras.ContainsKey(address))
-                    {
-                        component.KnownCameras.Add(address, name);
-                    }
-
-                    UpdateUserInterface(uid, component);
-                    break;
-                }
-                case SurveillanceCameraSystem.CameraSubnetData:
-                {
-                    if (args.Data.TryGetValue(SurveillanceCameraSystem.CameraSubnetData, out ProtoId<DeviceFrequencyPrototype>? subnetValue)
-                        && subnetValue is { } subnet
-                        && !component.KnownSubnets.ContainsKey(subnet))
-                    {
-                        component.KnownSubnets.Add(subnet, args.SenderAddress);
-                    }
-
-                    UpdateUserInterface(uid, component);
-                    break;
-                }
-            }
+            ent.Comp.LastHeartbeat = 0;
         }
     }
 
+    [SubscribeLocalEvent]
+    private void OnCameraData(Entity<SurveillanceCameraMonitorComponent> ent, ref DeviceNetworkPacketEvent<SurveillanceCameraDataPayload> args)
+    {
+        var payload = args.Data;
+        var subnetData = payload.Subnet;
+
+        if (ent.Comp.ActiveSubnet != subnetData)
+        {
+            DisconnectFromSubnet(ent, subnetData);
+        }
+
+        if (payload.SenderAddress != null)
+            ent.Comp.KnownCameras.TryAdd(payload.SenderAddress, payload.Name);
+        UpdateUserInterface(ent, ent.Comp);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnSubnetData(Entity<SurveillanceCameraMonitorComponent> ent, ref DeviceNetworkPacketEvent<SurveillanceCameraSubnetDataPayload> args)
+    {
+        ent.Comp.KnownSubnets.TryAdd(args.Data.TransmitFrequency, args.SenderAddress);
+        UpdateUserInterface(ent, ent.Comp);
+    }
+
     private void OnDisconnectMessage(EntityUid uid, SurveillanceCameraMonitorComponent component,
         SurveillanceCameraDisconnectMessage message)
     {
@@ -169,7 +151,7 @@ public sealed partial class SurveillanceCameraMonitorSystem : EntitySystem
         SurveillanceCameraRefreshCamerasMessage message)
     {
         component.KnownCameras.Clear();
-        RequestActiveSubnetInfo(uid, component);
+        PingCameraNetwork(uid, component);
     }
 
     private void OnRefreshSubnetsMessage(EntityUid uid, SurveillanceCameraMonitorComponent component,
@@ -231,13 +213,9 @@ public sealed partial class SurveillanceCameraMonitorSystem : EntitySystem
             return;
         }
 
-        var payload = new NetworkPayload()
-        {
-            { DeviceNetworkConstants.Command, SurveillanceCameraSystem.CameraHeartbeatMessage },
-            { SurveillanceCameraSystem.CameraAddressData, monitor.ActiveCameraAddress }
-        };
+        var payload = new SurveillanceCameraHeartbeatRequestPayload();
+        _deviceNetworkRouter.SendPacketRouted(uid, ref payload, subnetAddress, monitor.ActiveCameraAddress, ProtoMan.Index(activeSubnet).Frequency);
 
-        _deviceNetworkSystem.QueuePacket(uid, subnetAddress, payload);
         monitor.LastHeartbeatSent = 0;
     }
 
@@ -267,21 +245,18 @@ public sealed partial class SurveillanceCameraMonitorSystem : EntitySystem
         }
 
         monitor.KnownSubnets.Clear();
-        PingCameraNetwork(uid, monitor);
+        PingSubnets(uid, monitor);
     }
 
     private void PingCameraNetwork(EntityUid uid, SurveillanceCameraMonitorComponent? monitor = null)
     {
-        if (!Resolve(uid, ref monitor))
-        {
+        if (!Resolve(uid, ref monitor)
+            || monitor.ActiveSubnet == null
+            || !monitor.KnownSubnets.TryGetValue(monitor.ActiveSubnet.Value, out var subnetData))
             return;
-        }
 
-        var payload = new NetworkPayload()
-        {
-            { DeviceNetworkConstants.Command, SurveillanceCameraSystem.CameraPingMessage }
-        };
-        _deviceNetworkSystem.QueuePacket(uid, null, payload);
+        var payload = new SurveillanceCameraPingPayload { Subnet = monitor.ActiveSubnet };
+        _deviceNetworkRouter.SendPacketRouted(uid, ref payload, null, null, ProtoMan.Index(monitor.ActiveSubnet.Value).Frequency);
     }
 
     private void SetActiveSubnet(EntityUid uid, ProtoId<DeviceFrequencyPrototype> subnet,
@@ -303,20 +278,15 @@ public sealed partial class SurveillanceCameraMonitorSystem : EntitySystem
         ConnectToSubnet(uid, subnet);
     }
 
-    private void RequestActiveSubnetInfo(EntityUid uid, SurveillanceCameraMonitorComponent? monitor = null)
+    private void PingSubnets(EntityUid uid, SurveillanceCameraMonitorComponent? monitor = null)
     {
-        if (!Resolve(uid, ref monitor)
-            || monitor.ActiveSubnet is not { } activeSubnet
-            || !monitor.KnownSubnets.TryGetValue(activeSubnet, out var address))
+        if (!Resolve(uid, ref monitor))
         {
             return;
         }
 
-        var payload = new NetworkPayload()
-        {
-            {DeviceNetworkConstants.Command, SurveillanceCameraSystem.CameraPingSubnetMessage},
-        };
-        _deviceNetworkSystem.QueuePacket(uid, address, payload);
+        var payload = new SurveillanceCameraPingSubnetPayload();
+        _deviceNetworkSystem.SendPacket(uid, null, ref payload);
     }
 
     private void ConnectToSubnet(EntityUid uid, string subnet, SurveillanceCameraMonitorComponent? monitor = null)
@@ -328,13 +298,10 @@ public sealed partial class SurveillanceCameraMonitorSystem : EntitySystem
             return;
         }
 
-        var payload = new NetworkPayload()
-        {
-            {DeviceNetworkConstants.Command, SurveillanceCameraSystem.CameraSubnetConnectMessage},
-        };
-        _deviceNetworkSystem.QueuePacket(uid, address, payload);
+        var payload = new SurveillanceCameraSubnetConnectPayload();
+        _deviceNetworkSystem.SendPacket(uid, address, ref payload);
 
-        RequestActiveSubnetInfo(uid);
+        PingSubnets(uid);
     }
 
     private void DisconnectFromSubnet(EntityUid uid, ProtoId<DeviceFrequencyPrototype> subnet, SurveillanceCameraMonitorComponent? monitor = null)
@@ -345,11 +312,8 @@ public sealed partial class SurveillanceCameraMonitorSystem : EntitySystem
             return;
         }
 
-        var payload = new NetworkPayload()
-        {
-            {DeviceNetworkConstants.Command, SurveillanceCameraSystem.CameraSubnetDisconnectMessage},
-        };
-        _deviceNetworkSystem.QueuePacket(uid, address, payload);
+        var payload = new SurveillanceCameraSubnetDisconnectPayload();
+        _deviceNetworkSystem.SendPacket(uid, address, ref payload);
     }
 
     // Adds a viewer to the camera and the monitor.
@@ -403,6 +367,10 @@ public sealed partial class SurveillanceCameraMonitorSystem : EntitySystem
 
         monitor.ActiveCamera = camera;
 
+        // Reset the heartbeat timers for the new device.
+        monitor.LastHeartbeat = 0;
+        monitor.LastHeartbeatSent = 0;
+
         AddComp<ActiveSurveillanceCameraMonitorComponent>(uid);
 
         UpdateUserInterface(uid, monitor);
@@ -421,6 +389,10 @@ public sealed partial class SurveillanceCameraMonitorSystem : EntitySystem
 
         monitor.ActiveCamera = camera;
 
+        // Reset the heartbeat timers for the new device.
+        monitor.LastHeartbeat = 0;
+        monitor.LastHeartbeatSent = 0;
+
         UpdateUserInterface(uid, monitor);
     }
 
@@ -436,14 +408,9 @@ public sealed partial class SurveillanceCameraMonitorSystem : EntitySystem
             || !monitor.KnownSubnets.TryGetValue(activeSubnet, out var subnetAddress))
             return;
 
-        var payload = new NetworkPayload()
-        {
-            {DeviceNetworkConstants.Command, SurveillanceCameraSystem.CameraConnectMessage},
-            {SurveillanceCameraSystem.CameraAddressData, address}
-        };
-
+        var payload = new SurveillanceCameraConnectRequestPayload();
         monitor.NextCameraAddress = address;
-        _deviceNetworkSystem.QueuePacket(uid, subnetAddress, payload);
+        _deviceNetworkRouter.SendPacketRouted(uid, ref payload, subnetAddress, address, ProtoMan.Index(activeSubnet).Frequency);
     }
 
     // Attempts to switch over the current viewed camera on this monitor
@@ -498,7 +465,12 @@ public sealed partial class SurveillanceCameraMonitorSystem : EntitySystem
             return;
         }
 
-        var state = new SurveillanceCameraMonitorUiState(GetNetEntity(monitor.ActiveCamera), monitor.KnownSubnets.Keys.ToHashSet(), monitor.ActiveCameraAddress, monitor.ActiveSubnet, monitor.KnownCameras);
+        var state = new SurveillanceCameraMonitorUiState(
+            GetNetEntity(monitor.ActiveCamera),
+            monitor.KnownSubnets.Keys.ToHashSet(),
+            monitor.ActiveCameraAddress,
+            monitor.ActiveSubnet,
+            monitor.KnownCameras);
         _userInterface.SetUiState(uid, SurveillanceCameraMonitorUiKey.Key, state);
     }
 }
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs
index ddfcd696db..d082374bc9 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.DeviceNetwork.Systems;
 using Content.Shared.ActionBlocker;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.Power;
 using Content.Shared.SurveillanceCamera;
@@ -15,249 +14,163 @@ public sealed partial class SurveillanceCameraRouterSystem : EntitySystem
     [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!;
     [Dependency] private ActionBlockerSystem _actionBlocker = default!;
     [Dependency] private UserInterfaceSystem _userInterface = default!;
+
+    [Dependency] private EntityQuery<SurveillanceCameraRouterComponent> _query = default!;
+
     public override void Initialize()
     {
-        SubscribeLocalEvent<SurveillanceCameraRouterComponent, ComponentInit>(OnInitialize);
-        SubscribeLocalEvent<SurveillanceCameraRouterComponent, DeviceNetworkPacketEvent>(OnPacketReceive);
+        base.Initialize();
+        SubscribeLocalEvent<SurveillanceCameraRouterComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<SurveillanceCameraRouterComponent, SurveillanceCameraSetupSetNetwork>(OnSetNetwork);
         SubscribeLocalEvent<SurveillanceCameraRouterComponent, GetVerbsEvent<AlternativeVerb>>(AddVerbs);
         SubscribeLocalEvent<SurveillanceCameraRouterComponent, PowerChangedEvent>(OnPowerChanged);
     }
 
-    private void OnInitialize(EntityUid uid, SurveillanceCameraRouterComponent router, ComponentInit args)
+    private void OnMapInit(Entity<SurveillanceCameraRouterComponent> ent, ref MapInitEvent args)
     {
-        if (router.SubnetFrequencyId == null ||
-            !ProtoMan.TryIndex(router.SubnetFrequencyId, out DeviceFrequencyPrototype? subnetFrequency))
+        if (ent.Comp.SubnetFrequencyId == null
+            || !ProtoMan.TryIndex(ent.Comp.SubnetFrequencyId, out var subnetFrequency))
+            return;
+
+        ent.Comp.SubnetFrequency = subnetFrequency.Frequency;
+        ent.Comp.Active = true;
+
+        if (string.IsNullOrEmpty(ent.Comp.SubnetName) && subnetFrequency.Name != null)
+            ent.Comp.SubnetName = Loc.GetString(subnetFrequency.Name);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnSubnetConnect(Entity<SurveillanceCameraRouterComponent> ent, ref DeviceNetworkPacketEvent<SurveillanceCameraSubnetConnectPayload> args)
+    {
+        AddMonitorToRoute(ent.AsNullable(), args.SenderAddress);
+        PingSubnet(ent.AsNullable());
+    }
+
+    [SubscribeLocalEvent]
+    private void OnSubnetDisconnect(Entity<SurveillanceCameraRouterComponent> ent, ref DeviceNetworkPacketEvent<SurveillanceCameraSubnetDisconnectPayload> args)
+    {
+        RemoveMonitorFromRoute(ent.AsNullable(), args.SenderAddress);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnSubnetPing(Entity<SurveillanceCameraRouterComponent> ent, ref DeviceNetworkPacketEvent<SurveillanceCameraPingSubnetPayload> args)
+    {
+        if (ent.Comp.SubnetFrequencyId == null)
+            return;
+
+        var response = new SurveillanceCameraSubnetDataPayload
+        {
+            Subnet = ent.Comp.SubnetName,
+            TransmitFrequency = ent.Comp.SubnetFrequencyId.Value,
+        };
+        _deviceNetworkSystem.SendPacket(ent.Owner, args.SenderAddress, ref response);
+    }
+
+    private void OnPowerChanged(Entity<SurveillanceCameraRouterComponent> ent, ref PowerChangedEvent args)
+    {
+        ent.Comp.MonitorRoutes.Clear();
+        ent.Comp.Active = args.Powered;
+    }
+
+    private void AddVerbs(Entity<SurveillanceCameraRouterComponent> ent, ref GetVerbsEvent<AlternativeVerb> verbs)
+    {
+        if (!_actionBlocker.CanInteract(verbs.User, ent.Owner) || !_actionBlocker.CanComplexInteract(verbs.User))
         {
             return;
         }
 
-        router.SubnetFrequency = subnetFrequency.Frequency;
-        router.Active = true;
-    }
-
-    private void OnPacketReceive(EntityUid uid, SurveillanceCameraRouterComponent router, DeviceNetworkPacketEvent args)
-    {
-        if (!router.Active
-            || string.IsNullOrEmpty(args.SenderAddress)
-            || !args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? command))
-        {
-            return;
-        }
-
-        switch (command)
-        {
-            case SurveillanceCameraSystem.CameraConnectMessage:
-                if (!args.Data.TryGetValue(SurveillanceCameraSystem.CameraAddressData, out string? address))
-                {
-                    return;
-                }
-
-                ConnectCamera(uid, args.SenderAddress, address, router);
-                break;
-            case SurveillanceCameraSystem.CameraHeartbeatMessage:
-                if (!args.Data.TryGetValue(SurveillanceCameraSystem.CameraAddressData, out string? camera))
-                {
-                    return;
-                }
-
-                SendHeartbeat(uid, args.SenderAddress, camera, router);
-                break;
-            case SurveillanceCameraSystem.CameraSubnetConnectMessage:
-                AddMonitorToRoute(uid, args.SenderAddress, router);
-                PingSubnet(uid, router);
-                break;
-            case SurveillanceCameraSystem.CameraSubnetDisconnectMessage:
-                RemoveMonitorFromRoute(uid, args.SenderAddress, router);
-                break;
-            case SurveillanceCameraSystem.CameraPingSubnetMessage:
-                PingSubnet(uid, router);
-                break;
-            case SurveillanceCameraSystem.CameraPingMessage:
-                SubnetPingResponse(uid, args.SenderAddress, router);
-                break;
-            case SurveillanceCameraSystem.CameraDataMessage:
-                SendCameraInfo(uid, args.Data, router);
-                break;
-        }
-    }
-
-    private void OnPowerChanged(EntityUid uid, SurveillanceCameraRouterComponent component, ref PowerChangedEvent args)
-    {
-        component.MonitorRoutes.Clear();
-        component.Active = args.Powered;
-    }
-
-    private void AddVerbs(EntityUid uid, SurveillanceCameraRouterComponent component, GetVerbsEvent<AlternativeVerb> verbs)
-    {
-        if (!_actionBlocker.CanInteract(verbs.User, uid) || !_actionBlocker.CanComplexInteract(verbs.User))
-        {
-            return;
-        }
-
-        if (component.SubnetFrequencyId != null)
+        if (ent.Comp.SubnetFrequencyId != null)
         {
             return;
         }
 
         AlternativeVerb verb = new();
+        var user = verbs.User;
         verb.Text = Loc.GetString("surveillance-camera-setup");
-        verb.Act = () => OpenSetupInterface(uid, verbs.User, component);
+        verb.Act = () => OpenSetupInterface(ent.AsNullable(), user);
         verbs.Verbs.Add(verb);
     }
 
-    private void OnSetNetwork(EntityUid uid, SurveillanceCameraRouterComponent component,
-            SurveillanceCameraSetupSetNetwork args)
+    private void OnSetNetwork(Entity<SurveillanceCameraRouterComponent> ent, ref SurveillanceCameraSetupSetNetwork args)
     {
         if (args.UiKey is not SurveillanceCameraSetupUiKey key
             || key != SurveillanceCameraSetupUiKey.Router)
         {
             return;
         }
-        if (args.Network < 0 || args.Network >= component.AvailableNetworks.Count)
+        if (args.Network < 0 || args.Network >= ent.Comp.AvailableNetworks.Count)
         {
             return;
         }
 
-        if (!ProtoMan.Resolve<DeviceFrequencyPrototype>(component.AvailableNetworks[args.Network],
-                out var frequency))
+        if (!ProtoMan.Resolve(ent.Comp.AvailableNetworks[args.Network], out var frequency))
         {
             return;
         }
 
-        component.SubnetFrequencyId = component.AvailableNetworks[args.Network];
-        component.SubnetFrequency = frequency.Frequency;
-        component.Active = true;
-        UpdateSetupInterface(uid, component);
+        ent.Comp.SubnetFrequencyId = ent.Comp.AvailableNetworks[args.Network];
+        ent.Comp.SubnetFrequency = frequency.Frequency;
+        ent.Comp.Active = true;
+        UpdateSetupInterface(ent.AsNullable());
     }
 
-    private void OpenSetupInterface(EntityUid uid, EntityUid player, SurveillanceCameraRouterComponent? camera = null)
+    private void OpenSetupInterface(Entity<SurveillanceCameraRouterComponent?> ent, EntityUid player)
     {
-        if (!Resolve(uid, ref camera))
+        if (!_query.Resolve(ref ent))
             return;
 
-        if (!_userInterface.TryOpenUi(uid, SurveillanceCameraSetupUiKey.Router, player))
+        if (!_userInterface.TryOpenUi(ent.Owner, SurveillanceCameraSetupUiKey.Router, player))
             return;
 
-        UpdateSetupInterface(uid, camera);
+        UpdateSetupInterface(ent.AsNullable());
     }
 
-    private void UpdateSetupInterface(EntityUid uid, SurveillanceCameraRouterComponent? router = null, DeviceNetworkComponent? deviceNet = null)
+    private void UpdateSetupInterface(Entity<SurveillanceCameraRouterComponent?, DeviceNetworkComponent?> ent)
     {
-        if (!Resolve(uid, ref router, ref deviceNet))
+        if (!_query.Resolve(ent.Owner, ref ent.Comp1) || !Resolve(ent.Owner, ref ent.Comp2))
+            return;
+
+        if (ent.Comp1.AvailableNetworks.Count == 0 || ent.Comp1.SubnetFrequencyId != null)
         {
+            _userInterface.CloseUi(ent.Owner, SurveillanceCameraSetupUiKey.Router);
             return;
         }
 
-        if (router.AvailableNetworks.Count == 0 || router.SubnetFrequencyId != null)
-        {
-            _userInterface.CloseUi(uid, SurveillanceCameraSetupUiKey.Router);
-            return;
-        }
-
-        var state = new SurveillanceCameraSetupBoundUiState(router.SubnetName, deviceNet.ReceiveFrequency ?? 0,
-            router.AvailableNetworks, true, router.SubnetFrequencyId != null);
-        _userInterface.SetUiState(uid, SurveillanceCameraSetupUiKey.Router, state);
-    }
-
-    private void SendHeartbeat(EntityUid uid, string origin, string destination,
-        SurveillanceCameraRouterComponent? router = null)
-    {
-        if (!Resolve(uid, ref router))
-        {
-            return;
-        }
-
-        var payload = new NetworkPayload()
-        {
-            { DeviceNetworkConstants.Command, SurveillanceCameraSystem.CameraHeartbeatMessage },
-            { SurveillanceCameraSystem.CameraAddressData, origin }
-        };
-
-        _deviceNetworkSystem.QueuePacket(uid, destination, payload, router.SubnetFrequency);
-    }
-
-    private void SubnetPingResponse(EntityUid uid, string origin, SurveillanceCameraRouterComponent? router = null)
-    {
-        if (!Resolve(uid, ref router) || router.SubnetFrequencyId == null)
-        {
-            return;
-        }
-
-        var payload = new NetworkPayload()
-        {
-            { DeviceNetworkConstants.Command, SurveillanceCameraSystem.CameraSubnetData },
-            { SurveillanceCameraSystem.CameraSubnetData, router.SubnetFrequencyId }
-        };
-
-        _deviceNetworkSystem.QueuePacket(uid, origin, payload);
-    }
-
-    private void ConnectCamera(EntityUid uid, string origin, string address, SurveillanceCameraRouterComponent? router = null)
-    {
-        if (!Resolve(uid, ref router))
-        {
-            return;
-        }
-
-        var payload = new NetworkPayload()
-        {
-            { DeviceNetworkConstants.Command, SurveillanceCameraSystem.CameraConnectMessage },
-            { SurveillanceCameraSystem.CameraAddressData, origin }
-        };
-
-        _deviceNetworkSystem.QueuePacket(uid, address, payload, router.SubnetFrequency);
+        var state = new SurveillanceCameraSetupBoundUiState(ent.Comp1.SubnetName,
+            ent.Comp2.ReceiveFrequency ?? 0,
+            ent.Comp1.AvailableNetworks,
+            true,
+            ent.Comp1.SubnetFrequencyId != null);
+        _userInterface.SetUiState(ent.Owner, SurveillanceCameraSetupUiKey.Router, state);
     }
 
     // Adds a monitor to the set of routes.
-    private void AddMonitorToRoute(EntityUid uid, string address, SurveillanceCameraRouterComponent? router = null)
+    private void AddMonitorToRoute(Entity<SurveillanceCameraRouterComponent?> ent, string address)
     {
-        if (!Resolve(uid, ref router))
-        {
+        if (!_query.Resolve(ref ent) || ent.Comp == null)
             return;
-        }
 
-        router.MonitorRoutes.Add(address);
+        ent.Comp.MonitorRoutes.Add(address);
     }
 
-    private void RemoveMonitorFromRoute(EntityUid uid, string address, SurveillanceCameraRouterComponent? router = null)
+    private void RemoveMonitorFromRoute(Entity<SurveillanceCameraRouterComponent?> ent, string address)
     {
-        if (!Resolve(uid, ref router))
-        {
+        if (!_query.Resolve(ref ent) || ent.Comp == null)
             return;
-        }
 
-        router.MonitorRoutes.Remove(address);
+        ent.Comp.MonitorRoutes.Remove(address);
     }
 
     // Pings a subnet to get all camera information.
-    private void PingSubnet(EntityUid uid, SurveillanceCameraRouterComponent? router = null)
+    private void PingSubnet(Entity<SurveillanceCameraRouterComponent?> ent)
     {
-        if (!Resolve(uid, ref router))
-        {
+        if (!_query.Resolve(ref ent) || ent.Comp == null)
             return;
-        }
 
-        var payload = new NetworkPayload()
+        var payload = new SurveillanceCameraPingPayload
         {
-            { DeviceNetworkConstants.Command, SurveillanceCameraSystem.CameraPingMessage },
-            { SurveillanceCameraSystem.CameraSubnetData, router.SubnetFrequencyId }
+            Subnet = ent.Comp.SubnetName,
         };
-
-        _deviceNetworkSystem.QueuePacket(uid, null, payload, router.SubnetFrequency);
-    }
-
-    // Sends camera information to all monitors currently interested.
-    private void SendCameraInfo(EntityUid uid, NetworkPayload payload, SurveillanceCameraRouterComponent? router = null)
-    {
-        if (!Resolve(uid, ref router))
-        {
-            return;
-        }
-
-        foreach (var address in router.MonitorRoutes)
-        {
-            _deviceNetworkSystem.QueuePacket(uid, address, payload);
-        }
+        _deviceNetworkSystem.SendPacket(ent.Owner, null, ref payload, ent.Comp.SubnetFrequency);
     }
 }
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.Collide.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.Collide.cs
index b171bdab75..c7d8ce699e 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.Collide.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.Collide.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Physics.Systems;
 
 namespace Content.Server.SurveillanceCamera;
 
-public partial class SurveillanceCameraSystem
+public sealed partial class SurveillanceCameraSystem
 {
     [Dependency] private SharedPhysicsSystem _physics = default!;
     [Dependency] private SharedPowerReceiverSystem _power = default!;
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
index f6118f8c4b..2b1dd89d5e 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
@@ -1,15 +1,14 @@
 using Content.Server.Administration.Logs;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Shared.Database;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.DeviceNetwork.Events;
+using Content.Shared.DeviceNetwork.Systems;
 using Content.Shared.Power;
 using Content.Shared.SurveillanceCamera;
 using Content.Shared.SurveillanceCamera.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
 
 namespace Content.Server.SurveillanceCamera;
 
@@ -17,37 +16,13 @@ public sealed partial class SurveillanceCameraSystem : SharedSurveillanceCameraS
 {
     [Dependency] private ViewSubscriberSystem _viewSubscriberSystem = default!;
     [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!;
+    [Dependency] private DeviceNetworkRouterSystem _deviceNetworkRouter = default!;
     [Dependency] private UserInterfaceSystem _userInterface = default!;
     [Dependency] private IAdminLogManager _adminLogger = default!;
     [Dependency] private SurveillanceCameraMapSystem _cameraMapSystem = default!;
     [Dependency] private SharedAppearanceSystem _appearance = default!;
 
-    // Pings a surveillance camera subnet. All cameras will always respond
-    // with a data message if they are on the same subnet.
-    public const string CameraPingSubnetMessage = "surveillance_camera_ping_subnet";
-
-    // Pings a surveillance camera. Useful to ensure that the camera is still on
-    // before connecting fully.
-    public const string CameraPingMessage = "surveillance_camera_ping";
-
-    // Camera heartbeat. Monitors ping this to ensure that a camera is still able to
-    // be contacted. If this doesn't get sent after some time, the monitor will
-    // automatically disconnect.
-    public const string CameraHeartbeatMessage = "surveillance_camera_heartbeat";
-
-    // Surveillance camera data. This generally should contain nothing
-    // except for the subnet that this camera is on -
-    // this is because of the fact that the PacketEvent already
-    // contains the sender UID, and that this will always be targeted
-    // towards the sender that pinged the camera.
-    public const string CameraDataMessage = "surveillance_camera_data";
-    public const string CameraConnectMessage = "surveillance_camera_connect";
-    public const string CameraSubnetConnectMessage = "surveillance_camera_subnet_connect";
-    public const string CameraSubnetDisconnectMessage = "surveillance_camera_subnet_disconnect";
-
-    public const string CameraAddressData = "surveillance_camera_data_origin";
-    public const string CameraNameData = "surveillance_camera_data_name";
-    public const string CameraSubnetData = "surveillance_camera_data_subnet";
+    [Dependency] private EntityQuery<SurveillanceCameraRouterComponent> _routerQuery = default!;
 
     public const int CameraNameLimit = 32;
 
@@ -57,74 +32,53 @@ public sealed partial class SurveillanceCameraSystem : SharedSurveillanceCameraS
 
         SubscribeLocalEvent<SurveillanceCameraComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<SurveillanceCameraComponent, PowerChangedEvent>(OnPowerChanged);
-        SubscribeLocalEvent<SurveillanceCameraComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
         SubscribeLocalEvent<SurveillanceCameraComponent, SurveillanceCameraSetupSetName>(OnSetName);
         SubscribeLocalEvent<SurveillanceCameraComponent, SurveillanceCameraSetupSetNetwork>(OnSetNetwork);
 
         InitializeCollide();
     }
 
-    private void OnPacketReceived(EntityUid uid, SurveillanceCameraComponent component, DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnConnectRequest(Entity<SurveillanceCameraComponent> ent, ref DeviceNetworkPacketEvent<SurveillanceCameraConnectRequestPayload> args)
     {
-        if (!component.Active)
-        {
+        var payload = args.Data;
+        if (!ent.Comp.Active)
             return;
-        }
 
-        if (!TryComp(uid, out DeviceNetworkComponent? deviceNet))
-        {
+        var responsePayload = new SurveillanceCameraConnectPayload();
+        _deviceNetworkRouter.SendPacketRouted(ent.Owner, ref responsePayload, args.SenderAddress, payload.SenderAddress);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnHeartbeatRequest(Entity<SurveillanceCameraComponent> ent, ref DeviceNetworkPacketEvent<SurveillanceCameraHeartbeatRequestPayload> args)
+    {
+        var payload = args.Data;
+        if (!ent.Comp.Active)
             return;
-        }
 
-        if (args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? command))
+        var responsePayload = new SurveillanceCameraHeartbeatPayload();
+        _deviceNetworkRouter.SendPacketRouted(ent.Owner, ref responsePayload, args.SenderAddress, payload.SenderAddress);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnPing(Entity<SurveillanceCameraComponent> ent, ref DeviceNetworkPacketEvent<SurveillanceCameraPingPayload> args)
+    {
+        var payload = args.Data;
+        if (!ent.Comp.Active)
+            return;
+
+        if (!_routerQuery.TryComp(args.Sender, out var routerComp))
+            return;
+
+        if (routerComp.SubnetName != payload.Subnet)
+            return;
+
+        var name = ent.Comp.UseEntityNameAsCameraId ? MetaData(ent).EntityName : ent.Comp.CameraId;
+        var responsePayload = new SurveillanceCameraDataPayload
         {
-            var payload = new NetworkPayload()
-            {
-                { DeviceNetworkConstants.Command, string.Empty },
-                { CameraAddressData, deviceNet.Address },
-                { CameraNameData, component.UseEntityNameAsCameraId ? MetaData(uid).EntityName : component.CameraId },
-                { CameraSubnetData, null }
-            };
-
-            var dest = string.Empty;
-
-            switch (command)
-            {
-                case CameraConnectMessage:
-                    if (!args.Data.TryGetValue(CameraAddressData, out dest)
-                        || string.IsNullOrEmpty(args.Address))
-                    {
-                        return;
-                    }
-
-                    payload[DeviceNetworkConstants.Command] = CameraConnectMessage;
-                    break;
-                case CameraHeartbeatMessage:
-                    if (!args.Data.TryGetValue(CameraAddressData, out dest)
-                        || string.IsNullOrEmpty(args.Address))
-                    {
-                        return;
-                    }
-
-                    payload[DeviceNetworkConstants.Command] = CameraHeartbeatMessage;
-                    break;
-                case CameraPingMessage:
-                    if (!args.Data.TryGetValue(CameraSubnetData, out ProtoId<DeviceFrequencyPrototype>? subnet))
-                    {
-                        return;
-                    }
-
-                    dest = args.SenderAddress;
-                    payload[CameraSubnetData] = subnet;
-                    payload[DeviceNetworkConstants.Command] = CameraDataMessage;
-                    break;
-            }
-
-            _deviceNetworkSystem.QueuePacket(
-                uid,
-                dest,
-                payload);
-        }
+            Name = name,
+        };
+        _deviceNetworkRouter.SendPacketRouted(ent.Owner, ref responsePayload, args.SenderAddress, payload.SenderAddress);
     }
 
     private void OnPowerChanged(EntityUid camera, SurveillanceCameraComponent component, ref PowerChangedEvent args)
@@ -154,9 +108,9 @@ public sealed partial class SurveillanceCameraSystem : SharedSurveillanceCameraS
         _adminLogger.Add(LogType.Chat, LogImpact.Low, $"{ToPrettyString(args.Actor)} set the name of {ToPrettyString(uid)} to \"{args.Name}.\"");
     }
 
-    private void OnSetNetwork(EntityUid uid, SurveillanceCameraComponent component,
-        SurveillanceCameraSetupSetNetwork args)
+    private void OnSetNetwork(Entity<SurveillanceCameraComponent> ent, ref SurveillanceCameraSetupSetNetwork args)
     {
+        var (uid, component) = ent;
         if (args.UiKey is not SurveillanceCameraSetupUiKey key
             || key != SurveillanceCameraSetupUiKey.Camera)
         {
@@ -167,8 +121,7 @@ public sealed partial class SurveillanceCameraSystem : SharedSurveillanceCameraS
             return;
         }
 
-        if (!ProtoMan.Resolve<DeviceFrequencyPrototype>(component.AvailableNetworks[args.Network],
-                out var frequency))
+        if (!ProtoMan.Resolve(component.AvailableNetworks[args.Network], out var frequency))
         {
             return;
         }
@@ -217,8 +170,11 @@ public sealed partial class SurveillanceCameraSystem : SharedSurveillanceCameraS
         }
 
         var name = camera.UseEntityNameAsCameraId ? MetaData(uid).EntityName : camera.CameraId;
-        var state = new SurveillanceCameraSetupBoundUiState(name, deviceNet.ReceiveFrequency ?? 0,
-            camera.AvailableNetworks, camera.NameSet, camera.NetworkSet);
+        var state = new SurveillanceCameraSetupBoundUiState(name,
+            deviceNet.ReceiveFrequency ?? 0,
+            camera.AvailableNetworks,
+            camera.NameSet,
+            camera.NetworkSet);
         _userInterface.SetUiState(uid, SurveillanceCameraSetupUiKey.Camera, state);
     }
 
diff --git a/Content.Server/Temperature/Components/ChangeTemperatureOnCollideComponent.cs b/Content.Server/Temperature/Components/ChangeTemperatureOnCollideComponent.cs
index 1f57237624..08974ffca4 100644
--- a/Content.Server/Temperature/Components/ChangeTemperatureOnCollideComponent.cs
+++ b/Content.Server/Temperature/Components/ChangeTemperatureOnCollideComponent.cs
@@ -21,4 +21,4 @@ public sealed partial class ChangeTemperatureOnCollideComponent : Component
     /// </summary>
     [DataField]
     public bool IgnoreHeatResistance = true;
-}
\ No newline at end of file
+}
diff --git a/Content.Server/Temperature/Components/ContainerTemperatureComponent.cs b/Content.Server/Temperature/Components/ContainerTemperatureComponent.cs
index 7cbd398b79..708772c229 100644
--- a/Content.Server/Temperature/Components/ContainerTemperatureComponent.cs
+++ b/Content.Server/Temperature/Components/ContainerTemperatureComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Temperature.Components;
+using Content.Shared.Temperature.Components;
 
 namespace Content.Server.Temperature.Components;
 
diff --git a/Content.Server/Temperature/Components/TemperatureProtectionComponent.cs b/Content.Server/Temperature/Components/TemperatureProtectionComponent.cs
index 8c40e35fa0..f6c477c397 100644
--- a/Content.Server/Temperature/Components/TemperatureProtectionComponent.cs
+++ b/Content.Server/Temperature/Components/TemperatureProtectionComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Temperature.Systems;
+using Content.Server.Temperature.Systems;
 
 namespace Content.Server.Temperature.Components;
 
diff --git a/Content.Server/Tips/TipsSystem.cs b/Content.Server/Tips/TipsSystem.cs
index f1e3753132..bdaa569d95 100644
--- a/Content.Server/Tips/TipsSystem.cs
+++ b/Content.Server/Tips/TipsSystem.cs
@@ -3,6 +3,7 @@ using Content.Server.GameTicking;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Dataset;
+using Content.Shared.GameTicking;
 using Content.Shared.Tips;
 using Robust.Shared.Configuration;
 using Robust.Shared.Player;
@@ -18,7 +19,7 @@ public sealed partial class TipsSystem : SharedTipsSystem
     [Dependency] private IConfigurationManager _cfg = default!;
     [Dependency] private IGameTiming _timing = default!;
     [Dependency] private IRobustRandom _random = default!;
-    [Dependency] private GameTicker _ticker = default!;
+    [Dependency] private ServerGameTicker _ticker = default!;
 
     private bool _tipsEnabled;
     private float _tipTimeOutOfRound;
diff --git a/Content.Server/Toolshed/Commands/AdminDebug/ACmdCommand.cs b/Content.Server/Toolshed/Commands/AdminDebug/ACmdCommand.cs
index 53c6a4f7ad..9e9dc56188 100644
--- a/Content.Server/Toolshed/Commands/AdminDebug/ACmdCommand.cs
+++ b/Content.Server/Toolshed/Commands/AdminDebug/ACmdCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.Administration.Managers;
 using Content.Shared.Administration;
 using Robust.Shared.Player;
diff --git a/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs b/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
index 5204aa01be..2ef0bd916a 100644
--- a/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
+++ b/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.Verbs;
diff --git a/Content.Server/Toolshed/Commands/VisualizeCommand.cs b/Content.Server/Toolshed/Commands/VisualizeCommand.cs
index 7e208e69f0..49b806af46 100644
--- a/Content.Server/Toolshed/Commands/VisualizeCommand.cs
+++ b/Content.Server/Toolshed/Commands/VisualizeCommand.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Administration;
 using Content.Server.EUI;
 using Content.Shared.Administration;
diff --git a/Content.Server/Toolshed/Commands/XenoArtifacts/XenoArtifactCommands.cs b/Content.Server/Toolshed/Commands/XenoArtifacts/XenoArtifactCommands.cs
index 169147de0c..3d7de10c32 100644
--- a/Content.Server/Toolshed/Commands/XenoArtifacts/XenoArtifactCommands.cs
+++ b/Content.Server/Toolshed/Commands/XenoArtifacts/XenoArtifactCommands.cs
@@ -4,7 +4,6 @@ using Content.Server.Xenoarchaeology.Artifact;
 using Content.Shared.Administration;
 using Content.Shared.Toolshed.TypeParsers.XenoArtifact;
 using Content.Shared.Xenoarchaeology.Artifact.Components;
-using Content.Shared.Xenoarchaeology.Artifact.Prototypes;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
@@ -116,15 +115,18 @@ public sealed partial class XenoArtifactCommand : ToolshedCommand
 
     /// <summary> Unlocks all nodes of artifact. </summary>
     [CommandImplementation("unlockallnodes")]
-    public void UnlockAllNodes([PipedArgument] EntityUid artifactEntityUid)
+    public void UnlockAllNodes([PipedArgument] IEnumerable<EntityUid> artifactUids)
     {
         _artifact ??= Sys<XenoArtifactSystem>();
-        var comp = Comp<XenoArtifactComponent>(artifactEntityUid);
-
-        var nodes = _artifact.GetAllNodes((artifactEntityUid, comp));
-        foreach (var node in nodes)
+        foreach (var artifactUid in artifactUids)
         {
-            _artifact.SetNodeUnlocked((node, node.Comp));
+            var comp = Comp<XenoArtifactComponent>(artifactUid);
+
+            var nodes = _artifact.GetAllNodes((artifactUid, comp));
+            foreach (var node in nodes)
+            {
+                _artifact.SetNodeUnlocked((node, node.Comp));
+            }
         }
     }
 
@@ -134,8 +136,8 @@ public sealed partial class XenoArtifactCommand : ToolshedCommand
     [CommandImplementation("createnode")]
     public void CreateNodeNew(
         [CommandArgument] Entity<XenoArtifactComponent> artifact,
-        [CommandArgument(typeof(XenoEffectParser))] ProtoId<EntityPrototype> effect,
-        [CommandArgument] ProtoId<XenoArchTriggerPrototype> trigger
+        [CommandArgument(typeof(XenoArtifactEffectParser))] ProtoId<EntityPrototype> effect,
+        [CommandArgument(typeof(XenoArtifactTriggerParser))] ProtoId<EntityPrototype> trigger
     )
     {
         CreateNode(artifact, effect, trigger);
@@ -145,8 +147,8 @@ public sealed partial class XenoArtifactCommand : ToolshedCommand
     [CommandImplementation("createnodeatdepth")]
     public void CreateNodeAtDepth(
         [CommandArgument(typeof(XenoArtifactNodeParser))] (Entity<XenoArtifactComponent> Artifact, Entity<XenoArtifactNodeComponent> Node) tuple,
-        [CommandArgument(typeof(XenoEffectParser))] ProtoId<EntityPrototype> effect,
-        [CommandArgument] ProtoId<XenoArchTriggerPrototype> trigger
+        [CommandArgument(typeof(XenoArtifactEffectParser))] ProtoId<EntityPrototype> effect,
+        [CommandArgument(typeof(XenoArtifactTriggerParser))] ProtoId<EntityPrototype> trigger
     )
     {
         CreateNode(tuple.Artifact, effect, trigger, tuple.Node);
@@ -157,8 +159,8 @@ public sealed partial class XenoArtifactCommand : ToolshedCommand
     public void SpawnArtifactWithNode(
         [CommandArgument] ICommonSession target,
         [CommandArgument(typeof(XenoArtifactTypeParser))] ProtoId<EntityPrototype> artifactType,
-        [CommandArgument(typeof(XenoEffectParser))] ProtoId<EntityPrototype> effect,
-        [CommandArgument] ProtoId<XenoArchTriggerPrototype> trigger
+        [CommandArgument(typeof(XenoArtifactEffectParser))] ProtoId<EntityPrototype> effect,
+        [CommandArgument(typeof(XenoArtifactTriggerParser))] ProtoId<EntityPrototype> trigger
     )
     {
         if (target.AttachedEntity == null)
@@ -215,7 +217,7 @@ public sealed partial class XenoArtifactCommand : ToolshedCommand
     private void CreateNode(
         Entity<XenoArtifactComponent> artifact,
         ProtoId<EntityPrototype> effect,
-        ProtoId<XenoArchTriggerPrototype> trigger,
+        ProtoId<EntityPrototype> trigger,
         Entity<XenoArtifactNodeComponent>? node = null
     )
     {
diff --git a/Content.Server/Traitor/Components/TraitorCodePaperComponent.cs b/Content.Server/Traitor/Components/TraitorCodePaperComponent.cs
index d4ce40c066..8e7d9ab78e 100644
--- a/Content.Server/Traitor/Components/TraitorCodePaperComponent.cs
+++ b/Content.Server/Traitor/Components/TraitorCodePaperComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Codewords;
+using Content.Shared.Codewords;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Traitor.Components;
diff --git a/Content.Server/Traitor/Systems/AutoTraitorSystem.cs b/Content.Server/Traitor/Systems/AutoTraitorSystem.cs
index 96fdf51ab9..8f76aba0d3 100644
--- a/Content.Server/Traitor/Systems/AutoTraitorSystem.cs
+++ b/Content.Server/Traitor/Systems/AutoTraitorSystem.cs
@@ -1,8 +1,7 @@
-using Content.Server.Antag;
 using Content.Server.Traitor.Components;
+using Content.Shared.Antag;
 using Content.Shared.Mind.Components;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
 
 namespace Content.Server.Traitor.Systems;
 
diff --git a/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs b/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs
index 545b0f132d..cfbc203083 100644
--- a/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs
+++ b/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs
@@ -1,14 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
-using Content.Server.GameTicking;
-using Content.Server.GameTicking.Rules;
-using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Paper;
+using System.Linq;
 using Content.Server.Traitor.Components;
+using Content.Shared.Codewords;
+using Content.Shared.Paper;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
-using System.Linq;
-using Content.Server.Codewords;
-using Content.Shared.Paper;
 
 namespace Content.Server.Traitor.Systems;
 
diff --git a/Content.Server/Traits/Assorted/BuckleOnMapInitComponent.cs b/Content.Server/Traits/Assorted/BuckleOnMapInitComponent.cs
index 3e540391cb..58ebb6c9d7 100644
--- a/Content.Server/Traits/Assorted/BuckleOnMapInitComponent.cs
+++ b/Content.Server/Traits/Assorted/BuckleOnMapInitComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Traits.Assorted;
 
diff --git a/Content.Server/Traits/Assorted/BuckleOnMapInitSystem.cs b/Content.Server/Traits/Assorted/BuckleOnMapInitSystem.cs
index 8d9b57e311..e0a07a67f1 100644
--- a/Content.Server/Traits/Assorted/BuckleOnMapInitSystem.cs
+++ b/Content.Server/Traits/Assorted/BuckleOnMapInitSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Buckle;
+using Content.Shared.Buckle;
 
 namespace Content.Server.Traits.Assorted;
 
diff --git a/Content.Server/Trigger/Systems/GameRuleTriggerSystem.cs b/Content.Server/Trigger/Systems/GameRuleTriggerSystem.cs
index db7cf5973a..fdfb3fe568 100644
--- a/Content.Server/Trigger/Systems/GameRuleTriggerSystem.cs
+++ b/Content.Server/Trigger/Systems/GameRuleTriggerSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Administration.Logs;
 using Content.Server.GameTicking;
 using Content.Shared.Database;
+using Content.Shared.GameTicking;
 using Content.Shared.Trigger;
 using Content.Shared.Trigger.Components.Effects;
 
@@ -11,7 +12,7 @@ namespace Content.Server.Trigger.Systems;
 /// </summary>
 public sealed partial class GameRuleTriggerSystem : EntitySystem
 {
-    [Dependency] private GameTicker _ticker = default!;
+    [Dependency] private ServerGameTicker _ticker = default!;
     [Dependency] private IAdminLogManager _adminLogger = default!;
 
     /// <inheritdoc/>
@@ -27,7 +28,8 @@ public sealed partial class GameRuleTriggerSystem : EntitySystem
         if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
             return;
 
-        var rule = _ticker.AddGameRule(ent.Comp.GameRule);
+        if (_ticker.AddGameRule(ent.Comp.GameRule) is not { } rule)
+            return;
 
         _adminLogger.Add(LogType.EventStarted,
             $"{ToPrettyString(args.User):entity} added a game rule [{ent.Comp.GameRule}]" +
@@ -35,7 +37,7 @@ public sealed partial class GameRuleTriggerSystem : EntitySystem
 
         if (ent.Comp.StartRule && _ticker.RunLevel == GameRunLevel.InRound)
         {
-            _ticker.StartGameRule(rule);
+            _ticker.StartGameRule(rule.AsNullable());
             _adminLogger.Add(LogType.EventStarted, $"{ToPrettyString(args.User):entity} started game rule [{ent.Comp.GameRule}].");
         }
 
diff --git a/Content.Server/TurretController/DeployableTurretControllerSystem.cs b/Content.Server/TurretController/DeployableTurretControllerSystem.cs
index c953baa7da..89f7545147 100644
--- a/Content.Server/TurretController/DeployableTurretControllerSystem.cs
+++ b/Content.Server/TurretController/DeployableTurretControllerSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.DeviceNetwork.Systems;
 using Content.Shared.Access;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.DeviceNetwork.Systems;
@@ -19,26 +18,25 @@ public sealed partial class DeployableTurretControllerSystem : SharedDeployableT
 {
     [Dependency] private UserInterfaceSystem _userInterfaceSystem = default!;
     [Dependency] private DeviceNetworkSystem _deviceNetwork = default!;
+    [Dependency] private DeviceListSystem _deviceList = default!;
     [Dependency] private IAdminLogManager _adminLogger = default!;
 
-    /// Keys for the device network. See <see cref="DeviceNetworkConstants"/> for further examples.
-    public const string CmdSetArmamemtState = "set_armament_state";
-    public const string CmdSetAccessExemptions = "set_access_exemption";
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<DeployableTurretControllerComponent, BoundUIOpenedEvent>(OnBUIOpened);
-        SubscribeLocalEvent<DeployableTurretControllerComponent, DeviceListUpdateEvent>(OnDeviceListUpdate);
-        SubscribeLocalEvent<DeployableTurretControllerComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
-    }
-
+    [SubscribeLocalEvent]
     private void OnBUIOpened(Entity<DeployableTurretControllerComponent> ent, ref BoundUIOpenedEvent args)
     {
+        if (!TryComp<DeviceNetworkComponent>(ent, out var deviceNetwork))
+            return;
+
+        var payload = new TurretControllerRequestPayload();
+        foreach (var (address, _) in _deviceList.GetDeviceList(ent.Owner))
+        {
+            _deviceNetwork.SendPacket((ent.Owner, deviceNetwork), address, ref payload);
+        }
+
         UpdateUIState(ent);
     }
 
+    [SubscribeLocalEvent]
     private void OnDeviceListUpdate(Entity<DeployableTurretControllerComponent> ent, ref DeviceListUpdateEvent args)
     {
         if (!TryComp<DeviceNetworkComponent>(ent, out var deviceNetwork))
@@ -48,10 +46,7 @@ public sealed partial class DeployableTurretControllerSystem : SharedDeployableT
         var turretsToAdd = args.Devices.Except(args.OldDevices);
 
         // Request data from newly linked devices
-        var payload = new NetworkPayload
-        {
-            [DeviceNetworkConstants.Command] = DeviceNetworkConstants.CmdUpdatedState,
-        };
+        var payload = new TurretControllerRequestPayload();
 
         foreach (var turretUid in turretsToAdd)
         {
@@ -61,7 +56,7 @@ public sealed partial class DeployableTurretControllerSystem : SharedDeployableT
             if (!TryComp<DeviceNetworkComponent>(turretUid, out var turretDeviceNetwork))
                 continue;
 
-            _deviceNetwork.QueuePacket(ent, turretDeviceNetwork.Address, payload, device: deviceNetwork);
+            _deviceNetwork.SendPacket((ent.Owner, deviceNetwork), turretDeviceNetwork.Address, ref payload);
         }
 
         // Remove newly unlinked devices
@@ -81,21 +76,16 @@ public sealed partial class DeployableTurretControllerSystem : SharedDeployableT
             UpdateUIState(ent);
     }
 
-    private void OnPacketReceived(Entity<DeployableTurretControllerComponent> ent, ref DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnPacketReceived(Entity<DeployableTurretControllerComponent> ent, ref DeviceNetworkPacketEvent<TurretStatePayload> args)
     {
-        if (!args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? command))
-            return;
-
         if (!TryComp<DeviceNetworkComponent>(ent, out var deviceNetwork) || deviceNetwork.ReceiveFrequency != args.Frequency)
             return;
 
         // If an update was received from a turret, connect to it and update the UI
-        if (command == DeviceNetworkConstants.CmdUpdatedState &&
-            args.Data.TryGetValue(command, out DeployableTurretState updatedState))
-        {
-            ent.Comp.LinkedTurrets[args.SenderAddress] = updatedState;
-            UpdateUIState(ent);
-        }
+
+        ent.Comp.LinkedTurrets[args.SenderAddress] = args.Data.State;
+        UpdateUIState(ent);
     }
 
     protected override void ChangeArmamentSetting(Entity<DeployableTurretControllerComponent> ent, int armamentState, EntityUid? user = null)
@@ -106,15 +96,14 @@ public sealed partial class DeployableTurretControllerSystem : SharedDeployableT
             return;
 
         // Update linked turrets' armament statuses
-        var payload = new NetworkPayload
+        var payload = new TurretControllerSetArmamentPayload
         {
-            [DeviceNetworkConstants.Command] = CmdSetArmamemtState,
-            [CmdSetArmamemtState] = armamentState,
+            ArmamentState = armamentState,
         };
 
         _adminLogger.Add(LogType.ItemConfigure, LogImpact.Medium, $"{ToPrettyString(user)} set {ToPrettyString(ent)} to {armamentState}");
 
-        _deviceNetwork.QueuePacket(ent, null, payload, device: device);
+        _deviceNetwork.SendPacket((ent.Owner, device), null, ref payload);
     }
 
     protected override void ChangeExemptAccessLevels(
@@ -131,10 +120,9 @@ public sealed partial class DeployableTurretControllerSystem : SharedDeployableT
             return;
 
         // Update linked turrets' target selection exemptions
-        var payload = new NetworkPayload
+        var payload = new TurretControllerSetAccessPayload
         {
-            [DeviceNetworkConstants.Command] = CmdSetAccessExemptions,
-            [CmdSetAccessExemptions] = turretTargetingSettings.ExemptAccessLevels,
+            AccessExemptions = turretTargetingSettings.ExemptAccessLevels,
         };
 
         foreach (var exemption in exemptions)
@@ -142,7 +130,7 @@ public sealed partial class DeployableTurretControllerSystem : SharedDeployableT
             _adminLogger.Add(LogType.ItemConfigure, LogImpact.Medium, $"{ToPrettyString(user)} set {ToPrettyString(ent)} authorization of {exemption} to {enabled}");
         }
 
-        _deviceNetwork.QueuePacket(ent, null, payload, device: device);
+        _deviceNetwork.SendPacket((ent.Owner, device), null, ref payload);
     }
 
     private void UpdateUIState(Entity<DeployableTurretControllerComponent> ent)
diff --git a/Content.Server/Turrets/DeployableTurretSystem.cs b/Content.Server/Turrets/DeployableTurretSystem.cs
index d0c5c1accc..f57dcca658 100644
--- a/Content.Server/Turrets/DeployableTurretSystem.cs
+++ b/Content.Server/Turrets/DeployableTurretSystem.cs
@@ -2,22 +2,19 @@ using Content.Server.Destructible;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.NPC.HTN;
 using Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat.Ranged;
-using Content.Server.Power.Components;
-using Content.Server.TurretController;
-using Content.Shared.Access;
 using Content.Shared.Destructible;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.Power;
 using Content.Shared.Repairable;
+using Content.Shared.TurretController;
 using Content.Shared.Turrets;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Weapons.Ranged.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Turrets;
@@ -32,6 +29,8 @@ public sealed partial class DeployableTurretSystem : SharedDeployableTurretSyste
     [Dependency] private TurretTargetSettingsSystem _turretTargetingSettings = default!;
     [Dependency] private IGameTiming _timing = default!;
 
+    [Dependency] private EntityQuery<DeviceNetworkComponent> _deviceQuery = default!;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -41,7 +40,6 @@ public sealed partial class DeployableTurretSystem : SharedDeployableTurretSyste
         SubscribeLocalEvent<DeployableTurretComponent, PowerChangedEvent>(OnPowerChanged);
         SubscribeLocalEvent<DeployableTurretComponent, BreakageEventArgs>(OnBroken);
         SubscribeLocalEvent<DeployableTurretComponent, RepairedEvent>(OnRepaired);
-        SubscribeLocalEvent<DeployableTurretComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
         SubscribeLocalEvent<DeployableTurretComponent, BeforeBroadcastAttemptEvent>(OnBeforeBroadcast);
     }
 
@@ -74,37 +72,28 @@ public sealed partial class DeployableTurretSystem : SharedDeployableTurretSyste
             _appearance.SetData(ent, DeployableTurretVisuals.Broken, false, appearance);
     }
 
-    private void OnPacketReceived(Entity<DeployableTurretComponent> ent, ref DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnSetArmament(Entity<DeployableTurretComponent> ent, ref DeviceNetworkPacketEvent<TurretControllerSetArmamentPayload> args)
     {
-        if (!args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? command))
+        if (TryComp<BatteryWeaponFireModesComponent>(ent, out var batteryWeaponFireModes))
+            _fireModes.TrySetFireMode((ent.Owner, batteryWeaponFireModes), args.Data.ArmamentState);
+
+        TrySetState(ent, args.Data.ArmamentState >= 0);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnSetAccess(Entity<DeployableTurretComponent> ent, ref DeviceNetworkPacketEvent<TurretControllerSetAccessPayload> args)
+    {
+        if (!TryComp<TurretTargetSettingsComponent>(ent, out var targetSettings))
             return;
 
-        // Received a command to change armament state
-        if (command == DeployableTurretControllerSystem.CmdSetArmamemtState &&
-            args.Data.TryGetValue(command, out int? armamentState))
-        {
-            if (TryComp<BatteryWeaponFireModesComponent>(ent, out var batteryWeaponFireModes))
-                _fireModes.TrySetFireMode((ent, batteryWeaponFireModes), armamentState.Value);
+        _turretTargetingSettings.SyncAccessLevelExemptions((ent, targetSettings), args.Data.AccessExemptions);
+    }
 
-            TrySetState(ent, armamentState.Value >= 0);
-            return;
-        }
-
-        // Received a command to change access exemptions
-        if (command == DeployableTurretControllerSystem.CmdSetAccessExemptions &&
-            args.Data.TryGetValue(command, out HashSet<ProtoId<AccessLevelPrototype>>? accessExemptions) &&
-            TryComp<TurretTargetSettingsComponent>(ent, out var turretTargetSettings))
-        {
-            _turretTargetingSettings.SyncAccessLevelExemptions((ent, turretTargetSettings), accessExemptions);
-            return;
-        }
-
-        // Received a command to update the device network
-        if (command == DeviceNetworkConstants.CmdUpdatedState)
-        {
-            SendStateUpdateToDeviceNetwork(ent);
-            return;
-        }
+    [SubscribeLocalEvent]
+    private void OnRequest(Entity<DeployableTurretComponent> ent, ref DeviceNetworkPacketEvent<TurretControllerRequestPayload> args)
+    {
+        SendStateUpdateToDeviceNetwork(ent);
     }
 
     private void OnBeforeBroadcast(Entity<DeployableTurretComponent> ent, ref BeforeBroadcastAttemptEvent args)
@@ -112,15 +101,15 @@ public sealed partial class DeployableTurretSystem : SharedDeployableTurretSyste
         if (!TryComp<DeviceNetworkComponent>(ent, out var deviceNetwork))
             return;
 
-        var recipientDeviceNetworks = new HashSet<DeviceNetworkComponent>();
+        var recipientDeviceNetworks = new HashSet<Device>();
 
         // Only broadcast to connected devices
         foreach (var recipient in deviceNetwork.DeviceLists)
         {
-            if (!TryComp<DeviceNetworkComponent>(recipient, out var recipientDeviceNetwork))
+            if (!_deviceQuery.TryComp(recipient, out var recipientDeviceNetwork))
                 continue;
 
-            recipientDeviceNetworks.Add(recipientDeviceNetwork);
+            recipientDeviceNetworks.Add(new Device((recipient, recipientDeviceNetwork)));
         }
 
         if (recipientDeviceNetworks.Count > 0)
@@ -132,13 +121,11 @@ public sealed partial class DeployableTurretSystem : SharedDeployableTurretSyste
         if (!TryComp<DeviceNetworkComponent>(ent, out var device))
             return;
 
-        var payload = new NetworkPayload
+        var payload = new TurretStatePayload
         {
-            [DeviceNetworkConstants.Command] = DeviceNetworkConstants.CmdUpdatedState,
-            [DeviceNetworkConstants.CmdUpdatedState] = GetTurretState(ent)
+            State = GetTurretState(ent),
         };
-
-        _deviceNetwork.QueuePacket(ent, null, payload, device: device);
+        _deviceNetwork.SendPacket((ent.Owner, device), null, ref payload);
     }
 
     protected override void SetState(Entity<DeployableTurretComponent> ent, bool enabled, EntityUid? user = null)
diff --git a/Content.Server/VentHorde/Components/VentHordeSpawnerComponent.cs b/Content.Server/VentHorde/Components/VentHordeSpawnerComponent.cs
index ab1d68031c..233576e72f 100644
--- a/Content.Server/VentHorde/Components/VentHordeSpawnerComponent.cs
+++ b/Content.Server/VentHorde/Components/VentHordeSpawnerComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.VentHorde.Systems;
+using Content.Server.VentHorde.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
diff --git a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
index 0023eabc9a..d1804481e5 100644
--- a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
+++ b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
@@ -1,16 +1,15 @@
 using System.Linq;
-using System.Net;
-using System.Net.Sockets;
 using Content.Server.Administration;
 using Content.Server.Administration.Managers;
 using Content.Server.Discord.WebhookMessages;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Presets;
 using Content.Server.Roles;
 using Content.Server.RoundEnd;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Database;
+using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Prototypes;
 using Content.Shared.Maps;
 using Content.Shared.Players;
 using Content.Shared.Players.PlayTimeTracking;
@@ -31,7 +30,7 @@ namespace Content.Server.Voting.Managers
 
         private VotingSystem? _votingSystem;
         private RoleSystem? _roleSystem;
-        private GameTicker? _gameTicker;
+        private ServerGameTicker? _gameTicker;
 
         private static readonly Dictionary<StandardVoteType, CVarDef<bool>> VoteTypesToEnableCVars = new()
         {
@@ -50,7 +49,7 @@ namespace Content.Server.Voting.Managers
             else
                 _adminLogger.Add(LogType.Vote, LogImpact.Medium, $"Initiated a {voteType.ToString()} vote");
 
-            _gameTicker = _entityManager.EntitySysManager.GetEntitySystem<GameTicker>();
+            _gameTicker = _entityManager.EntitySysManager.GetEntitySystem<ServerGameTicker>();
 
             bool timeoutVote = true;
 
@@ -256,7 +255,7 @@ namespace Content.Server.Voting.Managers
                         Loc.GetString("ui-vote-gamemode-win", ("winner", Loc.GetString(presets[picked]))));
                 }
                 _adminLogger.Add(LogType.Vote, LogImpact.Medium, $"Preset vote finished: {picked}");
-                var ticker = _entityManager.EntitySysManager.GetEntitySystem<GameTicker>();
+                var ticker = _entityManager.EntitySysManager.GetEntitySystem<ServerGameTicker>();
                 ticker.SetGamePreset(picked);
             };
         }
@@ -303,7 +302,7 @@ namespace Content.Server.Voting.Managers
                 }
 
                 _adminLogger.Add(LogType.Vote, LogImpact.Medium, $"Map vote finished: {picked.MapName}");
-                var ticker = _entityManager.EntitySysManager.GetEntitySystem<GameTicker>();
+                var ticker = _entityManager.EntitySysManager.GetEntitySystem<ServerGameTicker>();
                 if (ticker.CanUpdateMap())
                 {
                     if (_gameMapManager.CheckMapExists(picked.ID))
diff --git a/Content.Server/Voting/Managers/VoteManager.cs b/Content.Server/Voting/Managers/VoteManager.cs
index 2f4cf272fa..824eb93877 100644
--- a/Content.Server/Voting/Managers/VoteManager.cs
+++ b/Content.Server/Voting/Managers/VoteManager.cs
@@ -363,7 +363,7 @@ namespace Content.Server.Voting.Managers
             if (voteType == StandardVoteType.Preset)
             {
                 var presets = GetGamePresets();
-                if (presets.Count == 1 && presets.Select(x => x.Key).Single() == _entityManager.System<GameTicker>().Preset?.ID)
+                if (presets.Count == 1 && presets.Select(x => x.Key).Single() == _entityManager.System<ServerGameTicker>().Preset?.ID)
                     return false;
             }
 
diff --git a/Content.Server/Voting/VoteCommands.cs b/Content.Server/Voting/VoteCommands.cs
index 57338490a4..eca8d9f249 100644
--- a/Content.Server/Voting/VoteCommands.cs
+++ b/Content.Server/Voting/VoteCommands.cs
@@ -112,7 +112,7 @@ namespace Content.Server.Voting
 
             var voteLogId = await _dbManager.CustomVoteLogAdd(
                 title,
-                GameTicker.GetRoundId(_esm),
+                ServerGameTicker.GetRoundId(_esm),
                 shell.Player?.UserId,
                 [..options.Options.Select(x => x.text)]);
 
diff --git a/Content.Server/Voting/VoteFinishedEventArgs.cs b/Content.Server/Voting/VoteFinishedEventArgs.cs
index 2a641272b0..46190d462e 100644
--- a/Content.Server/Voting/VoteFinishedEventArgs.cs
+++ b/Content.Server/Voting/VoteFinishedEventArgs.cs
@@ -1,4 +1,4 @@
-using System.Collections.Immutable;
+using System.Collections.Immutable;
 
 
 namespace Content.Server.Voting
diff --git a/Content.Server/Voting/VoteFinishedEventHandler.cs b/Content.Server/Voting/VoteFinishedEventHandler.cs
index 9debafd5c1..c75c76a554 100644
--- a/Content.Server/Voting/VoteFinishedEventHandler.cs
+++ b/Content.Server/Voting/VoteFinishedEventHandler.cs
@@ -1,4 +1,4 @@
-
+
 namespace Content.Server.Voting
 {
     public delegate void VoteFinishedEventHandler(IVoteHandle sender, VoteFinishedEventArgs args);
diff --git a/Content.Server/Voting/VotingSystem.cs b/Content.Server/Voting/VotingSystem.cs
index 41d7e72afc..bcad9bde90 100644
--- a/Content.Server/Voting/VotingSystem.cs
+++ b/Content.Server/Voting/VotingSystem.cs
@@ -13,6 +13,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Timing;
 using System.Threading.Tasks;
 using Content.Server.Players.Whitelist;
+using Content.Shared.GameTicking;
 using Content.Shared.Players.PlayTimeTracking;
 using Content.Shared.Ghost.Components;
 
@@ -20,13 +21,12 @@ namespace Content.Server.Voting;
 
 public sealed partial class VotingSystem : EntitySystem
 {
-
     [Dependency] private IPlayerManager _playerManager = default!;
     [Dependency] private IAdminManager _adminManager = default!;
     [Dependency] private IGameTiming _gameTiming = default!;
     [Dependency] private IConfigurationManager _cfg = default!;
     [Dependency] private JobSystem _jobs = default!;
-    [Dependency] private GameTicker _gameTicker = default!;
+    [Dependency] private ServerGameTicker _gameTicker = default!;
     [Dependency] private ISharedPlaytimeManager _playtimeManager = default!;
     [Dependency] private WhitelistManager _whitelistManager = default!;
 
diff --git a/Content.Server/Weapons/Hitscan/Components/HitscanIgniteComponent.cs b/Content.Server/Weapons/Hitscan/Components/HitscanIgniteComponent.cs
index 96b70ce89c..411e478bdb 100644
--- a/Content.Server/Weapons/Hitscan/Components/HitscanIgniteComponent.cs
+++ b/Content.Server/Weapons/Hitscan/Components/HitscanIgniteComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Server.Weapons.Hitscan.Components;
 
diff --git a/Content.Server/Weapons/Hitscan/Systems/HitscanIgniteSystem.cs b/Content.Server/Weapons/Hitscan/Systems/HitscanIgniteSystem.cs
index eae2409e6f..5e72dc081e 100644
--- a/Content.Server/Weapons/Hitscan/Systems/HitscanIgniteSystem.cs
+++ b/Content.Server/Weapons/Hitscan/Systems/HitscanIgniteSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Weapons.Hitscan.Components;
 using Content.Shared.Weapons.Hitscan.Events;
diff --git a/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs b/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs
index 69284864b5..f6cf335355 100644
--- a/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs
+++ b/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Hands.Systems;
+using Content.Server.Hands.Systems;
 using Content.Server.Popups;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Popups;
diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAETelepathicComponent.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAETelepathicComponent.cs
index 2354d2f16b..3a89e61e4e 100644
--- a/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAETelepathicComponent.cs
+++ b/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAETelepathicComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Xenoarchaeology.Artifact.XAE.Components;
+namespace Content.Server.Xenoarchaeology.Artifact.XAE.Components;
 
 /// <summary>
 ///     Harmless artifact that broadcast "thoughts" to players nearby.
diff --git a/Content.Server/Xenoarchaeology/Artifact/XenoArtifactSystem.ProcGen.cs b/Content.Server/Xenoarchaeology/Artifact/XenoArtifactSystem.ProcGen.cs
index 971c19c50f..8077e22e0b 100644
--- a/Content.Server/Xenoarchaeology/Artifact/XenoArtifactSystem.ProcGen.cs
+++ b/Content.Server/Xenoarchaeology/Artifact/XenoArtifactSystem.ProcGen.cs
@@ -1,8 +1,9 @@
 using System.Linq;
-using Content.Shared.Random.Helpers;
-using Content.Shared.Whitelist;
+using Content.Shared.Destructible.Thresholds;
+using Content.Shared.EntityTable;
+using Content.Shared.EntityTable.Conditions;
 using Content.Shared.Xenoarchaeology.Artifact.Components;
-using Content.Shared.Xenoarchaeology.Artifact.Prototypes;
+using Robust.Shared.Collections;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
@@ -10,199 +11,171 @@ namespace Content.Server.Xenoarchaeology.Artifact;
 
 public sealed partial class XenoArtifactSystem
 {
-    [Dependency] private EntityWhitelistSystem _entityWhitelist = default!;
+    [Dependency] private EntityTableSystem _entityTable = default!;
 
     private void GenerateArtifactStructure(Entity<XenoArtifactComponent> ent)
     {
-        var nodeCount = ent.Comp.NodeCount.Next(RobustRandom);
-        var triggerPool = CreateTriggerPool(ent, nodeCount);
-        // trigger pool could be smaller, then requested node count
-        nodeCount = triggerPool.Count;
-        ResizeNodeGraph(ent, nodeCount);
-        while (nodeCount > 0)
+        var desiredNodeCount = ent.Comp.NodeCount.Next(RobustRandom);
+        var totalGenerated = 0;
+
+        var triggerPool = new TriggerPoolData(desiredNodeCount);
+
+        while (desiredNodeCount > 0)
         {
-            GenerateArtifactSegment(ent, triggerPool, ref nodeCount);
+            var generatedInSegment = GenerateArtifactSegment(ent, triggerPool, desiredNodeCount);
+
+            desiredNodeCount -= generatedInSegment;
+            totalGenerated += generatedInSegment;
+
+            if (generatedInSegment == 0)
+                break;
         }
 
+        // trigger pool could be smaller, then requested node count
+        ResizeNodeGraph(ent, totalGenerated);
+
         RebuildXenoArtifactMetaData((ent, ent));
     }
 
     /// <summary>
-    /// Creates pool from all node triggers that current artifact can support.
-    /// As artifact cannot re-use triggers, pool will be growing smaller
-    /// and smaller with each node generated.
+    /// Generates segment of nodes inside artifact, layer by layer.
+    /// Segment is interconnected graph of nodes.
     /// </summary>
-    /// <param name="ent">Artifact for which pool should be created.</param>
-    /// <param name="size">
-    /// Max size of pool. Resulting pool is not guaranteed to be exactly as large, but it will 100% won't be bigger.
+    /// <param name="ent">Artifact entity, in which we need to generate segment.</param>
+    /// <param name="triggerPool">
+    /// Entity table context container that holds information about triggers that already was used.
     /// </param>
-    private List<XenoArchTriggerPrototype> CreateTriggerPool(Entity<XenoArtifactComponent> ent, int size)
-    {
-        var triggerPool = new List<XenoArchTriggerPrototype>(size);
-        var weightsProto = ProtoMan.Index(ent.Comp.TriggerWeights);
-        var weightsByTriggersLeft = new Dictionary<ProtoId<XenoArchTriggerPrototype>, float>(weightsProto.Weights);
-
-        while (triggerPool.Count < size)
-        {
-            // OOPS! We ran out of triggers.
-            if (weightsByTriggersLeft.Count == 0)
-            {
-                Log.Error($"Insufficient triggers for generating {ToPrettyString(ent)}! Needed {size} but had {triggerPool.Count}");
-                return triggerPool;
-            }
-
-            var triggerId = RobustRandom.PickAndTake(weightsByTriggersLeft);
-            var trigger = ProtoMan.Index(triggerId);
-            if (_entityWhitelist.IsWhitelistFail(trigger.Whitelist, ent))
-                continue;
-
-            triggerPool.Add(trigger);
-        }
-
-        return triggerPool;
-    }
-
-    /// <summary>
-    /// Generates segment of artifact - isolated graph, nodes inside which are interconnected.
-    /// As size of segment is randomized - it is subtracted from node count.
-    /// </summary>
-    private void GenerateArtifactSegment(
+    /// <param name="maxNodeCount">Max number of nodes to be constructed in this layer.</param>
+    /// <returns>Count of generated nodes.</returns>
+    private int GenerateArtifactSegment(
         Entity<XenoArtifactComponent> ent,
-        List<XenoArchTriggerPrototype> triggerPool,
-        ref int nodeCount
+        TriggerPoolData triggerPool,
+        int maxNodeCount
     )
     {
-        var segmentSize = GetArtifactSegmentSize(ent, nodeCount);
-        nodeCount -= segmentSize;
-        var populatedNodes = PopulateArtifactSegmentRecursive(ent, triggerPool, ref segmentSize);
-
-        var segments = GetSegmentsFromNodes(ent, populatedNodes).ToList();
-
-        // We didn't connect all of our nodes: do extra work to make sure there's a connection.
-        if (segments.Count > 1)
+        var nodesForSegmentToGenerate = GetArtifactSegmentDesiredSize(ent, maxNodeCount);
+        var depth = 0;
+        IReadOnlyCollection<Entity<XenoArtifactNodeComponent>> generatedNodes = [];
+        List<Entity<XenoArtifactNodeComponent>> totalGenerated = new();
+        while (nodesForSegmentToGenerate != 0)
         {
-            var parent = segments.MaxBy(s => s.Count)!;
-            var minP = parent.Min(n => n.Comp.Depth);
-            var maxP = parent.Max(n => n.Comp.Depth);
+            generatedNodes = PopulateLayer(ent, generatedNodes, triggerPool, nodesForSegmentToGenerate, depth);
+            if (generatedNodes.Count == 0) // failed to generate nodes - time to finish up
+                break;
 
-            segments.Remove(parent);
-            foreach (var segment in segments)
-            {
-                // calculate the range of the depth of the nodes in the segment
-                var minS = segment.Min(n => n.Comp.Depth);
-                var maxS = segment.Max(n => n.Comp.Depth);
+            nodesForSegmentToGenerate -= generatedNodes.Count;
 
-                // Figure out the range of depths that allows for a connection between these two.
-                // The range is essentially the lower values + 1 on each side.
-                var min = Math.Max(minS, minP) - 1;
-                var max = Math.Min(maxS, maxP) + 1;
-
-                // how the fuck did you do this? you don't even deserve to get a parent. fuck you.
-                if (min > max || min == max)
-                    continue;
-
-                var node1Options = segment.Where(n => n.Comp.Depth >= min && n.Comp.Depth <= max)
-                                          .ToList();
-                if (node1Options.Count == 0)
-                {
-                    continue;
-                }
-
-                var node1 = RobustRandom.Pick(node1Options);
-                var node1Depth = node1.Comp.Depth;
-
-                var node2Options = parent.Where(n => n.Comp.Depth >= node1Depth - 1 && n.Comp.Depth <= node1Depth + 1 && n.Comp.Depth != node1Depth)
-                                         .ToList();
-                if (node2Options.Count == 0)
-                {
-                    continue;
-                }
-
-                var node2 = RobustRandom.Pick(node2Options);
-
-                if (node1.Comp.Depth < node2.Comp.Depth)
-                {
-                    AddEdge((ent, ent.Comp), node1, node2, false);
-                }
-                else
-                {
-                    AddEdge((ent, ent.Comp), node2, node1, false);
-                }
-            }
+            totalGenerated.AddRange(generatedNodes);
+            depth++;
         }
+
+        if (totalGenerated.Count == 0)
+            return 0;
+
+        AddEdgesToUnderConnectedNodes(ent, totalGenerated);
+
+        return totalGenerated.Count;
     }
 
     /// <summary>
-    /// Recursively populate layers of artifact segment - isolated graph, nodes inside which are interconnected.
-    /// Each next iteration is going to have more chances to have more nodes (so it goes 'from top to bottom' of
+    /// Populates layer of artifact segment and return resulting set of nodes.
+    /// Each next layer is going to have more chances to have more nodes (so it goes 'from top to bottom' of
     /// the tree, creating its peak nodes first, and then making layers with more and more branches).
     /// </summary>
-    private List<Entity<XenoArtifactNodeComponent>> PopulateArtifactSegmentRecursive(
+    /// <param name="ent">Artifact entity, in which we need to generate segment.</param>
+    /// <param name="predecessors">Collection of nodes which are parts of previous layers for current segment.</param>
+    /// <param name="triggerPool">
+    /// Entity table context container that holds information about triggers that already was used.
+    /// </param>
+    /// <param name="maxNodes">Max number of nodes to be constructed in this layer.</param>
+    /// <param name="iteration">Number of layer.</param>
+    private IReadOnlyCollection<Entity<XenoArtifactNodeComponent>> PopulateLayer(
         Entity<XenoArtifactComponent> ent,
-        List<XenoArchTriggerPrototype> triggerPool,
-        ref int segmentSize,
+        IReadOnlyCollection<Entity<XenoArtifactNodeComponent>> predecessors,
+        TriggerPoolData triggerPool,
+        int maxNodes,
         int iteration = 0
     )
     {
-        if (segmentSize == 0)
-            return new();
+        if (maxNodes == 0)
+            return [];
 
         // Try and get larger as we create more layers. Prevents excessive layers.
         var mod = RobustRandom.Next((int)(iteration / 1.5f), iteration + 1);
 
-        var layerMin = Math.Min(ent.Comp.NodesPerSegmentLayer.Min + mod, segmentSize);
-        var layerMax = Math.Min(ent.Comp.NodesPerSegmentLayer.Max + mod, segmentSize);
-
+        var minPerLayer = Math.Min(ent.Comp.NodesPerSegmentLayer.Min + mod, maxNodes);
+        var maxPerLayer = Math.Min(ent.Comp.NodesPerSegmentLayer.Max + mod, maxNodes);
         // Default to one node if we had shenanigans and ended up with weird layer counts.
-        var nodeCount = 1;
-        if (layerMax >= layerMin)
-            nodeCount = RobustRandom.Next((int)layerMin, (int)layerMax + 1); // account for non-inclusive max
+        var desiredNodeCount = 1;
+        if (maxPerLayer >= minPerLayer)
+            desiredNodeCount = new MinMax(minPerLayer, maxPerLayer).Next(RobustRandom);
 
-        segmentSize -= nodeCount;
         var nodes = new List<Entity<XenoArtifactNodeComponent>>();
-        for (var i = 0; i < nodeCount; i++)
-        {
-            var trigger = RobustRandom.PickAndTake(triggerPool);
-            nodes.Add(CreateNode(ent, trigger, iteration));
-        }
-
-        var successors = PopulateArtifactSegmentRecursive(
-            ent,
-            triggerPool,
-            ref segmentSize,
-            iteration: iteration + 1
-        );
-
-        if (successors.Count == 0)
-            return nodes;
-
-        foreach (var successor in successors)
-        {
-            var node = RobustRandom.Pick(nodes);
-            AddEdge((ent, ent), node, successor, dirty: false);
-        }
-
-        // randomly add in some extra edges for variance.
         var scatterCount = ent.Comp.ScatterPerLayer.Next(RobustRandom);
-        for (var i = 0; i < scatterCount; i++)
+
+        for (var i = 0; i < desiredNodeCount; i++)
         {
-            var node = RobustRandom.Pick(nodes);
-            var successor = RobustRandom.Pick(successors);
-            AddEdge((ent, ent), node, successor, dirty: false);
+            var directPredecessors = SelectDirectPredecessors(predecessors, scatterCount);
+            scatterCount -= (directPredecessors.Count - 1);
+
+            var trigger = _entityTable.GetFirstOrNull(ent.Comp.TriggersTable, RobustRandom, triggerPool.Context);
+            // should log error but in next PRs we will get cases of no nodes fitting into budget so it will be usual case, not error
+            if (trigger == null)
+                continue;
+
+            var nodeEntity = CreateNode(ent, trigger.Value, ent.Comp.EffectsTable, iteration);
+            if (!nodeEntity.HasValue)
+                continue;
+
+            triggerPool.AddTriggerAsUsed(trigger.Value);
+
+            nodes.Add(nodeEntity.Value);
+
+            foreach (var predecessorForEdge in directPredecessors)
+            {
+                AddEdge((ent, ent), predecessorForEdge, nodeEntity.Value, dirty: false);
+            }
         }
 
         return nodes;
     }
 
+    private IReadOnlyCollection<Entity<XenoArtifactNodeComponent>> SelectDirectPredecessors(
+        IReadOnlyCollection<Entity<XenoArtifactNodeComponent>> predecessors,
+        int scatterCount
+    )
+    {
+        ValueList<Entity<XenoArtifactNodeComponent>> predecessorsToUse = new(predecessors);
+        if (predecessors.Count <= 0)
+            return [];
+
+        List<Entity<XenoArtifactNodeComponent>> directPredecessors = new();
+        // Select predecessors to build an edge to
+        do
+        {
+            var predecessor = RobustRandom.Pick(predecessorsToUse);
+            directPredecessors.Add(predecessor);
+            predecessorsToUse.Remove(predecessor);
+
+            // Randomly add extra edges
+            if (RobustRandom.Prob(0.5f))
+                break;
+
+            scatterCount--;
+        } while (scatterCount >= 0 && predecessorsToUse.Count != 0);
+
+        return directPredecessors;
+    }
+
     /// <summary>
     /// Rolls segment size, based on amount of nodes left and XenoArtifactComponent settings.
     /// </summary>
-    private int GetArtifactSegmentSize(Entity<XenoArtifactComponent> ent, int nodeCount)
+    private int GetArtifactSegmentDesiredSize(Entity<XenoArtifactComponent> ent, int nodeCount)
     {
         // Make sure we can't generate a single segment artifact.
         // We always want to have at least 2 segments. For variety.
         var segmentMin = ent.Comp.SegmentSize.Min;
-        var segmentMax = Math.Min(ent.Comp.SegmentSize.Max, Math.Max(nodeCount / 2, segmentMin));
+        var segmentMax = Math.Min(ent.Comp.SegmentSize.Max, Math.Max((float)nodeCount / 2, segmentMin));
 
         var segmentSize = RobustRandom.Next((int)segmentMin, (int)segmentMax + 1); // account for non-inclusive max
         var remainder = nodeCount - segmentSize;
@@ -216,4 +189,81 @@ public sealed partial class XenoArtifactSystem
 
         return segmentSize;
     }
+
+    private void AddEdgesToUnderConnectedNodes(Entity<XenoArtifactComponent> ent, IReadOnlyCollection<Entity<XenoArtifactNodeComponent>> generated)
+    {
+        var segments = GetSegmentsFromNodes(ent, generated);
+
+        // We didn't connect all of our nodes: do extra work to make sure there's a connection.
+        if (segments.Count <= 1)
+            return;
+
+        var parent = segments.MaxBy(s => s.Count)!;
+        var minP = parent.Min(n => n.Comp.Depth);
+        var maxP = parent.Max(n => n.Comp.Depth);
+
+        segments.Remove(parent);
+        foreach (var segment in segments)
+        {
+            // calculate the range of the depth of the nodes in the segment
+            var minS = segment.Min(n => n.Comp.Depth);
+            var maxS = segment.Max(n => n.Comp.Depth);
+
+            // Figure out the range of depths that allows for a connection between these two.
+            // The range is essentially the lower values + 1 on each side.
+            var min = Math.Max(minS, minP) - 1;
+            var max = Math.Min(maxS, maxP) + 1;
+
+            // how the fuck did you do this? you don't even deserve to get a parent. fuck you.
+            if (min > max || min == max)
+                continue;
+
+            var node1Options = segment.Where(n => n.Comp.Depth >= min && n.Comp.Depth <= max)
+                                      .ToList();
+            if (node1Options.Count == 0)
+                continue;
+
+            var node1 = RobustRandom.Pick(node1Options);
+            var node1Depth = node1.Comp.Depth;
+
+            var node2Options = parent.Where(n => n.Comp.Depth >= node1Depth - 1 && n.Comp.Depth <= node1Depth + 1 && n.Comp.Depth != node1Depth)
+                                     .ToList();
+            if (node2Options.Count == 0)
+                continue;
+
+            var node2 = RobustRandom.Pick(node2Options);
+
+            if (node1.Comp.Depth < node2.Comp.Depth)
+                AddEdge((ent, ent.Comp), node1, node2, false);
+            else
+                AddEdge((ent, ent.Comp), node2, node1, false);
+        }
+    }
+
+    /// <summary>
+    /// Container that represents pool of XenoArtifact triggers.
+    /// </summary>
+    private sealed class TriggerPoolData
+    {
+        private readonly HashSet<EntProtoId> _usedTriggers;
+
+        public TriggerPoolData(int requestedSize)
+        {
+            _usedTriggers = new(requestedSize);
+            Context = new EntityTableContext(new Dictionary<string, object>
+            {
+                [ExcludeEntitiesFromContextCondition.EntitiesToExclude] = _usedTriggers
+            });
+        }
+
+        public readonly EntityTableContext Context;
+
+        public void AddTriggerAsUsed(EntProtoId trigger)
+        {
+            if (!_usedTriggers.Add(trigger))
+                throw new ArgumentException();
+        }
+
+        public IReadOnlyCollection<EntProtoId> UsedTriggers => _usedTriggers;
+    }
 }
diff --git a/Content.Server/Xenoborgs/XenoborgSystem.cs b/Content.Server/Xenoborgs/XenoborgSystem.cs
index 17a067d3e4..215fe58a94 100644
--- a/Content.Server/Xenoborgs/XenoborgSystem.cs
+++ b/Content.Server/Xenoborgs/XenoborgSystem.cs
@@ -1,15 +1,12 @@
-using Content.Server.Antag;
 using Content.Server.GameTicking.Rules;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Silicons.Borgs;
+using Content.Shared.Antag;
 using Content.Shared.Destructible;
-using Content.Shared.Mind;
+using Content.Shared.GameTicking.Rules.Components;
 using Content.Shared.Mind.Components;
 using Content.Shared.Roles;
-using Content.Shared.Roles.Components;
 using Content.Shared.Silicons.Borgs.Components;
 using Content.Shared.Xenoborgs.Components;
-using Robust.Shared.Audio;
 using Robust.Shared.Player;
 
 namespace Content.Server.Xenoborgs;
@@ -19,7 +16,7 @@ public sealed partial class XenoborgSystem : EntitySystem
     [Dependency] private AntagSelectionSystem _antag = default!;
     [Dependency] private BorgSystem _borg = default!;
     [Dependency] private SharedRoleSystem _roles = default!;
-    [Dependency] private XenoborgsRuleSystem _xenoborgsRule = default!;
+    [Dependency] private ServerXenoborgsRuleSystem _xenoborgsRule = default!;
 
     private static readonly Color XenoborgBriefingColor = Color.BlueViolet;
 
diff --git a/Content.Server/Zombies/ZombieAccentOverrideComponent.cs b/Content.Server/Zombies/ZombieAccentOverrideComponent.cs
index f86711426c..eb5bb9d0f2 100644
--- a/Content.Server/Zombies/ZombieAccentOverrideComponent.cs
+++ b/Content.Server/Zombies/ZombieAccentOverrideComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Zombies;
+namespace Content.Server.Zombies;
 
 /// <summary>
 /// Overrides the applied accent for zombies.
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index a99a07e335..7b126f57e8 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -21,6 +21,7 @@ using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction.Components;
+using Content.Shared.Metabolism;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Pulling.Components;
@@ -71,6 +72,7 @@ public sealed partial class ZombieSystem
     [Dependency] private NPCSystem _npc = default!;
     [Dependency] private TagSystem _tag = default!;
     [Dependency] private ISharedPlayerManager _player = default!;
+    [Dependency] private BodySystem _body = default!;
 
     private static readonly ProtoId<TagPrototype> InvalidForGlobalSpawnSpellTag = "InvalidForGlobalSpawnSpell";
     private static readonly ProtoId<TagPrototype> CannotSuicideTag = "CannotSuicide";
@@ -144,6 +146,13 @@ public sealed partial class ZombieSystem
         RemComp<ComplexInteractionComponent>(target);
         RemComp<SentienceTargetComponent>(target);
 
+        // remove the metabolizer from all the body's organs. they're an undead.
+        var metabolizerOrgans = _body.EnumerateOrgans<MetabolizerComponent>(target);
+        foreach(var organ in metabolizerOrgans)
+        {
+            RemComp<MetabolizerComponent>(organ);
+        }
+
         //funny voice
         var accentType = "zombie";
         if (TryComp<ZombieAccentOverrideComponent>(target, out var accent))
@@ -189,7 +198,11 @@ public sealed partial class ZombieSystem
         }
 
         if (TryComp<BloodstreamComponent>(target, out var stream) && stream.BloodReferenceSolution is { } reagents)
+        {
             zombiecomp.BeforeZombifiedBloodReagents = reagents.Clone();
+            // Store the blood refresh amount for cloning later.
+            zombiecomp.BeforeZombifiedBloodRefresh = stream.BloodRefreshAmount;
+        }
 
         if (_visualBody.TryGatherMarkingsData(target, null, out var profiles, out _, out var markings))
         {
@@ -253,6 +266,9 @@ public sealed partial class ZombieSystem
         _bloodstream.SetBloodLossThreshold(target, 0f);
         //Give them zombie blood
         _bloodstream.ChangeBloodReagents(target, zombiecomp.NewBloodReagents);
+        //Stop their blood from automatically regenerating
+        _bloodstream.ChangeBloodRefreshAmount(target, 0f);
+        _bloodstream.ChangeBloodIncreaseEnabled(target, false);
 
         //This is specifically here to combat insuls, because frying zombies on grilles is funny as shit.
         _inventory.TryUnequip(target, "gloves", true, true);
diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs
index acfd43bcd4..dde4c8b0c6 100644
--- a/Content.Server/Zombies/ZombieSystem.cs
+++ b/Content.Server/Zombies/ZombieSystem.cs
@@ -28,6 +28,8 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Content.Server.Ghost.Roles.Components;
+using Content.Shared.Medical;
+using Content.Shared.Construction.Steps;
 
 namespace Content.Server.Zombies
 {
@@ -302,6 +304,13 @@ namespace Content.Server.Zombies
 
             _bloodstream.ChangeBloodReagents(target, zombiecomp.BeforeZombifiedBloodReagents);
 
+            // Restore the blood refresh amount to what it was before zombification. They can't regain blood otherwise.
+            _bloodstream.ChangeBloodRefreshAmount(target, zombiecomp.BeforeZombifiedBloodRefresh);
+            _bloodstream.ChangeBloodIncreaseEnabled(target, true);
+
+            // Remove the tags that we added during Zombification
+            _tag.RemoveTag(target, CannotSuicideTag);
+            _tag.RemoveTag(target, InvalidForGlobalSpawnSpellTag);
             return true;
         }
 
diff --git a/Content.Shared.Database/Bans.cs b/Content.Shared.Database/Bans.cs
index 9fb100f5db..18cc96c721 100644
--- a/Content.Shared.Database/Bans.cs
+++ b/Content.Shared.Database/Bans.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Database;
+namespace Content.Shared.Database;
 
 /// <summary>
 /// Types of bans that can be stored in the database.
diff --git a/Content.Shared.Database/LogImpact.cs b/Content.Shared.Database/LogImpact.cs
index 9f0d6a86f5..fd08bf2117 100644
--- a/Content.Shared.Database/LogImpact.cs
+++ b/Content.Shared.Database/LogImpact.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Database;
+namespace Content.Shared.Database;
 
 // DO NOT CHANGE THE NUMERIC VALUES OF THESE
 [Serializable]
diff --git a/Content.Shared.Database/TypedHwid.cs b/Content.Shared.Database/TypedHwid.cs
index 253375e9db..bc77b88bb2 100644
--- a/Content.Shared.Database/TypedHwid.cs
+++ b/Content.Shared.Database/TypedHwid.cs
@@ -1,4 +1,4 @@
-using System.Collections.Immutable;
+using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Content.Shared.Database;
diff --git a/Content.Shared/Access/Components/IdExaminableComponent.cs b/Content.Shared/Access/Components/IdExaminableComponent.cs
index 87d3e03a14..f08b8047cc 100644
--- a/Content.Shared/Access/Components/IdExaminableComponent.cs
+++ b/Content.Shared/Access/Components/IdExaminableComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Access.Systems;
+using Content.Shared.Access.Systems;
 
 namespace Content.Shared.Access.Components;
 
diff --git a/Content.Shared/Access/Systems/AccessReaderSystem.cs b/Content.Shared/Access/Systems/AccessReaderSystem.cs
index ae32557d8e..677526ed4c 100644
--- a/Content.Shared/Access/Systems/AccessReaderSystem.cs
+++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs
@@ -31,7 +31,7 @@ public sealed partial class AccessReaderSystem : EntitySystem
     [Dependency] private IGameTiming _gameTiming = default!;
     [Dependency] private EmagSystem _emag = default!;
     [Dependency] private TagSystem _tag = default!;
-    [Dependency] private SharedGameTicker _gameTicker = default!;
+    [Dependency] private GameTicker _gameTicker = default!;
     [Dependency] private SharedHandsSystem _handsSystem = default!;
     [Dependency] private SharedContainerSystem _containerSystem = default!;
     [Dependency] private StationRecordsSystem _recordsSystem = default!;
diff --git a/Content.Shared/Access/Systems/SharedAgentIDCardSystem.cs b/Content.Shared/Access/Systems/SharedAgentIDCardSystem.cs
index e84b28abff..f6b372b990 100644
--- a/Content.Shared/Access/Systems/SharedAgentIDCardSystem.cs
+++ b/Content.Shared/Access/Systems/SharedAgentIDCardSystem.cs
@@ -40,7 +40,7 @@ public abstract partial class SharedAgentIdCardSystem : EntitySystem
         access.Tags.UnionWith(targetAccess.Tags);
         var addedLength = access.Tags.Count - beforeLength;
 
-        _popup.PopupPredicted(Loc.GetString("agent-id-new", ("number", addedLength), ("card", args.Target)),
+        _popup.PopupEntity(Loc.GetString("agent-id-new", ("number", addedLength), ("card", args.Target)),
             args.Target.Value,
             args.User);
         if (addedLength > 0)
diff --git a/Content.Shared/Actions/ActionRequirementsSystem.cs b/Content.Shared/Actions/ActionRequirementsSystem.cs
new file mode 100644
index 0000000000..cef464de86
--- /dev/null
+++ b/Content.Shared/Actions/ActionRequirementsSystem.cs
@@ -0,0 +1,92 @@
+using System.Linq;
+using Content.Shared.Actions.Components;
+using Content.Shared.Actions.Events;
+using Content.Shared.EntityConditions;
+using Content.Shared.EntityEffects;
+using Content.Shared.IdentityManagement;
+
+namespace Content.Shared.Actions;
+
+/// <summary> <see cref="ActionRequirementsComponent"/> </summary>
+public sealed partial class ActionRequirementsSystem : EntitySystem
+{
+    [Dependency] private SharedEntityConditionsSystem _conditions = default!;
+    [Dependency] private SharedEntityEffectsSystem _effects = default!;
+
+    [SubscribeLocalEvent]
+    private void OnActionAttempt(Entity<ActionRequirementsComponent> ent, ref ActionAttemptEvent args)
+    {
+        var performerConditions = GetConditions(ent, ActionRequirementTarget.Performer);
+
+        var user = args.User;
+
+        // We always need to pass in some target to the Loc, it is probably safe to assume if there is no target we can just pass in the user.
+        // Its just popup stuff anyway.
+        var target = args.Target ?? args.User;
+
+        if (!_conditions.TryConditions(args.User, performerConditions))
+        {
+            DoCancel(ent, target, user, ref args);
+            return;
+        }
+
+        var targetConditions =  GetConditions(ent, ActionRequirementTarget.Target);
+
+        if (args.Target != null && !_conditions.TryConditions(args.Target.Value, targetConditions))
+        {
+            DoCancel(ent, target, user, ref args);
+        }
+    }
+
+    [SubscribeLocalEvent]
+    private void OnActionPerformed(Entity<ActionRequirementsComponent> ent, ref ActionPerformedEvent args)
+    {
+        var performerEffects = GetEffects(ent, ActionRequirementTarget.Performer);
+
+        var user = args.Performer;
+        var target = args.Target;
+
+        _effects.TryApplyEffects(user, performerEffects, user: user);
+
+        if (target == null)
+            return;
+
+        var targetEffects = GetEffects(ent, ActionRequirementTarget.Target);
+
+        _effects.TryApplyEffects(target.Value, targetEffects, user: user);
+    }
+
+    private EntityCondition[] GetConditions(Entity<ActionRequirementsComponent> ent, ActionRequirementTarget target)
+    {
+        var conditions = ent.Comp.Conditions
+            .Where(x => x.Key.HasFlag(target))
+            .SelectMany(x => x.Value);
+
+        return conditions.ToArray();
+    }
+
+    private EntityEffect[] GetEffects(Entity<ActionRequirementsComponent> ent, ActionRequirementTarget target)
+    {
+        var conditions = ent.Comp.Effects
+            .Where(x => x.Key.HasFlag(target))
+            .SelectMany(x => x.Value);
+
+        return conditions.ToArray();
+    }
+
+    private void DoCancel(Entity<ActionRequirementsComponent> ent, EntityUid target, EntityUid user, ref ActionAttemptEvent args)
+    {
+        if (ent.Comp.FailPopup != null)
+        {
+            args.Reason = Loc.GetString(
+                ent.Comp.FailPopup,
+                ("target", Identity.Name(target, EntityManager)),
+                ("performer", Identity.Name(user, EntityManager)),
+                ("action", ent)
+            );
+        }
+
+        args.Type = ent.Comp.FailPopupType;
+        args.Cancelled = true;
+    }
+}
diff --git a/Content.Shared/Actions/Components/ActionRequirementsComponent.cs b/Content.Shared/Actions/Components/ActionRequirementsComponent.cs
new file mode 100644
index 0000000000..c9a87fa882
--- /dev/null
+++ b/Content.Shared/Actions/Components/ActionRequirementsComponent.cs
@@ -0,0 +1,70 @@
+using Content.Shared.EntityConditions;
+using Content.Shared.EntityEffects;
+using Content.Shared.Popups;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Actions.Components;
+
+/// <summary>
+/// Specifies the action performer/target needs to meet specific conditions for the action to be correctly validated.
+/// Can optionally use entity effects to do things such as subtracting satiation.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(ActionRequirementsSystem))]
+public sealed partial class ActionRequirementsComponent : Component
+{
+    /// <summary>
+    /// What entity conditions the related entities need to meet for the action to count as valid.
+    /// Can be used, for example, to check if the performer has enough satiation.
+    /// </summary>
+    [DataField]
+    public Dictionary<ActionRequirementTarget, EntityCondition[]> Conditions = new ();
+
+    /// <summary>
+    /// Effects to use on the related entities AFTER the action is successfully performed.
+    /// Can be used, for example, to spend satiation after the action is performed.
+    /// </summary>
+    [DataField]
+    public Dictionary<ActionRequirementTarget, EntityEffect[]> Effects = new ();
+
+    /// <summary>
+    /// The text to show to the performer about why their action failed.
+    /// Gets "Performer", "Target" and "Action" passed into it as identities.
+    /// </summary>
+    [DataField]
+    public LocId? FailPopup; // TODO: Conditions should return their own text for why they failed to use in popups. Then this can be optional and be made to ignore that text instead.
+
+    /// <summary>
+    /// The type the popup for the performer should be.
+    /// </summary>
+    [DataField]
+    public PopupType FailPopupType = PopupType.Small;
+}
+
+/// <summary>
+/// Who the condition/effect will target.
+/// </summary>
+[Flags]
+public enum ActionRequirementTarget : byte
+{
+    /// <summary>
+    /// Literally nothing. The condition and effect will target nothing, and as such, cannot happen.
+    /// </summary>
+    None = 0,
+
+    /// <summary>
+    /// The target is the action performer.
+    /// </summary>
+    Performer = 1 << 0,
+
+    /// <summary>
+    /// The target is the action target (if any)
+    /// </summary>
+    Target = 1 << 1,
+
+    /// <summary>
+    /// The target is both the performer and the target.
+    /// </summary>
+    Both = Performer | Target,
+
+    // World - Maybe once conditions and effects support tile/world targeting properly.
+}
diff --git a/Content.Shared/Actions/Components/ActionUpgradeComponent.cs b/Content.Shared/Actions/Components/ActionUpgradeComponent.cs
index 72a3447a83..78eaf787db 100644
--- a/Content.Shared/Actions/Components/ActionUpgradeComponent.cs
+++ b/Content.Shared/Actions/Components/ActionUpgradeComponent.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Actions;
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Actions.Components;
diff --git a/Content.Shared/Actions/Events/ActionAttemptEvent.cs b/Content.Shared/Actions/Events/ActionAttemptEvent.cs
index ca15e01a58..db00c4e262 100644
--- a/Content.Shared/Actions/Events/ActionAttemptEvent.cs
+++ b/Content.Shared/Actions/Events/ActionAttemptEvent.cs
@@ -7,4 +7,4 @@ namespace Content.Shared.Actions.Events;
 /// Allowed to have side effects like modifying the action components.
 /// </summary>
 [ByRefEvent]
-public record struct ActionAttemptEvent(EntityUid User, bool Cancelled = false, string? Reason = null, PopupType Type = PopupType.SmallCaution);
+public record struct ActionAttemptEvent(EntityUid User, EntityUid? Target, bool Cancelled = false, string? Reason = null, PopupType Type = PopupType.SmallCaution);
diff --git a/Content.Shared/Actions/Events/ActionDoAfterEvent.cs b/Content.Shared/Actions/Events/ActionDoAfterEvent.cs
index 3ce2e364f4..3602b023bb 100644
--- a/Content.Shared/Actions/Events/ActionDoAfterEvent.cs
+++ b/Content.Shared/Actions/Events/ActionDoAfterEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Actions.Events;
diff --git a/Content.Shared/Actions/Events/ActionPerformedEvent.cs b/Content.Shared/Actions/Events/ActionPerformedEvent.cs
index 530d7c9335..3aab63dcf7 100644
--- a/Content.Shared/Actions/Events/ActionPerformedEvent.cs
+++ b/Content.Shared/Actions/Events/ActionPerformedEvent.cs
@@ -4,5 +4,6 @@ namespace Content.Shared.Actions.Events;
 ///     Raised on the action entity when it is used and <see cref="BaseActionEvent.Handled"/>.
 /// </summary>
 /// <param name="Performer">The entity that performed this action.</param>
+/// <param name="Target">The target of the action, if any.</param>
 [ByRefEvent]
-public readonly record struct ActionPerformedEvent(EntityUid Performer);
+public readonly record struct ActionPerformedEvent(EntityUid Performer, EntityUid? Target);
diff --git a/Content.Shared/Actions/Events/ActionUpgradeEvent.cs b/Content.Shared/Actions/Events/ActionUpgradeEvent.cs
index 40ff716b29..623590c916 100644
--- a/Content.Shared/Actions/Events/ActionUpgradeEvent.cs
+++ b/Content.Shared/Actions/Events/ActionUpgradeEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Actions.Events;
+namespace Content.Shared.Actions.Events;
 
 public sealed class ActionUpgradeEvent : EntityEventArgs
 {
diff --git a/Content.Shared/Actions/Events/InvisibleWallActionEvent.cs b/Content.Shared/Actions/Events/InvisibleWallActionEvent.cs
index d84b9910e0..357690f3e2 100644
--- a/Content.Shared/Actions/Events/InvisibleWallActionEvent.cs
+++ b/Content.Shared/Actions/Events/InvisibleWallActionEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Actions.Events;
+namespace Content.Shared.Actions.Events;
 
 public sealed partial class InvisibleWallActionEvent : InstantActionEvent
 {
diff --git a/Content.Shared/Actions/SharedActionsSystem.DoAfter.cs b/Content.Shared/Actions/SharedActionsSystem.DoAfter.cs
index 51e4b6e560..6a11f022fa 100644
--- a/Content.Shared/Actions/SharedActionsSystem.DoAfter.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.DoAfter.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions.Events;
+using Content.Shared.Actions.Events;
 using Content.Shared.DoAfter;
 
 namespace Content.Shared.Actions;
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index 977177193a..3c9fa7e2fc 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -305,8 +305,10 @@ public abstract partial class SharedActionsSystem : EntitySystem
         if (IsCooldownActive(action, curTime))
             return false;
 
+        var target = GetEntity(ev.EntityTarget);
+
         // check for action use prevention
-        var attemptEv = new ActionAttemptEvent(user);
+        var attemptEv = new ActionAttemptEvent(user, target);
         RaiseLocalEvent(action, ref attemptEv);
         if (attemptEv.Cancelled)
         {
@@ -370,13 +372,23 @@ public abstract partial class SharedActionsSystem : EntitySystem
 
         var target = GetEntity(netTarget);
 
+        // Already checked in validation, but GetWorldPosition causes errors if the entity doesn't exist.
+        if (TerminatingOrDeleted(target))
+        {
+            args.Invalid = true;
+            return;
+        }
+
         var targetWorldPos = _transform.GetWorldPosition(target);
 
         if (ent.Comp.RotateOnUse)
             _rotateToFace.TryFaceCoordinates(user, targetWorldPos);
 
         if (!ValidateEntityTarget(user, target, ent))
+        {
+            args.Invalid = true;
             return;
+        }
 
         _adminLogger.Add(LogType.Action,
             $"{ToPrettyString(user):user} is performing the {Name(ent):action} action (provided by {ToPrettyString(args.Provider):provider}) targeted at {ToPrettyString(target):target}.");
@@ -399,7 +411,10 @@ public abstract partial class SharedActionsSystem : EntitySystem
             _rotateToFace.TryFaceCoordinates(user, _transform.ToMapCoordinates(target).Position);
 
         if (!ValidateWorldTarget(user, target, ent))
+        {
+            args.Invalid = true;
             return;
+        }
 
         // if the client specified an entity it needs to be valid
         var targetEntity = GetEntity(args.Input.EntityTarget);
@@ -597,7 +612,11 @@ public abstract partial class SharedActionsSystem : EntitySystem
 
         UpdateAction(action);
 
-        var performed = new ActionPerformedEvent(performer);
+        EntityUid? actionTarget = null;
+        if (actionEvent is EntityTargetActionEvent targetEv)
+            actionTarget = targetEv.Target;
+
+        var performed = new ActionPerformedEvent(performer, actionTarget);
         RaiseLocalEvent(action, ref performed);
     }
     #endregion
diff --git a/Content.Shared/Administration/AdminCommandPermissions.cs b/Content.Shared/Administration/AdminCommandPermissions.cs
index 130409352f..5916c787de 100644
--- a/Content.Shared/Administration/AdminCommandPermissions.cs
+++ b/Content.Shared/Administration/AdminCommandPermissions.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
diff --git a/Content.Shared/Administration/AdminCommandSyntax.cs b/Content.Shared/Administration/AdminCommandSyntax.cs
index a1de5af7b6..2dbeeabaed 100644
--- a/Content.Shared/Administration/AdminCommandSyntax.cs
+++ b/Content.Shared/Administration/AdminCommandSyntax.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Administration;
+namespace Content.Shared.Administration;
 
 /// <summary>
 /// Command names that may be used programmatically (e.g. in cmdlinks). In their own class to ensure consistency.
diff --git a/Content.Shared/Administration/AdminData.cs b/Content.Shared/Administration/AdminData.cs
index bad36f78c5..597d951f31 100644
--- a/Content.Shared/Administration/AdminData.cs
+++ b/Content.Shared/Administration/AdminData.cs
@@ -1,4 +1,4 @@
-
+
 namespace Content.Shared.Administration
 {
     /// <summary>
diff --git a/Content.Shared/Administration/AdminEventLog/AdminEventLogEuiState.cs b/Content.Shared/Administration/AdminEventLog/AdminEventLogEuiState.cs
index a0119425f2..afc2f47ffe 100644
--- a/Content.Shared/Administration/AdminEventLog/AdminEventLogEuiState.cs
+++ b/Content.Shared/Administration/AdminEventLog/AdminEventLogEuiState.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Eui;
+using Content.Shared.Eui;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Administration/AdminFlagsHelper.cs b/Content.Shared/Administration/AdminFlagsHelper.cs
index d22ce33b62..d7e7c0476f 100644
--- a/Content.Shared/Administration/AdminFlagsHelper.cs
+++ b/Content.Shared/Administration/AdminFlagsHelper.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Numerics;
 
 namespace Content.Shared.Administration
diff --git a/Content.Shared/Administration/AdminFrozenComponent.cs b/Content.Shared/Administration/AdminFrozenComponent.cs
index 28df7c5fd0..3cff7c31af 100644
--- a/Content.Shared/Administration/AdminFrozenComponent.cs
+++ b/Content.Shared/Administration/AdminFrozenComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Administration;
 
diff --git a/Content.Shared/Administration/AnyCommandAttribute.cs b/Content.Shared/Administration/AnyCommandAttribute.cs
index 66a1bd0bad..6c0e261cb1 100644
--- a/Content.Shared/Administration/AnyCommandAttribute.cs
+++ b/Content.Shared/Administration/AnyCommandAttribute.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Shared.Console;
 using Robust.Shared.Toolshed;
 
diff --git a/Content.Shared/Administration/BanList/BanListEuiState.cs b/Content.Shared/Administration/BanList/BanListEuiState.cs
index c885ff1f70..f7ebd55806 100644
--- a/Content.Shared/Administration/BanList/BanListEuiState.cs
+++ b/Content.Shared/Administration/BanList/BanListEuiState.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Eui;
+using Content.Shared.Eui;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Administration.BanList;
diff --git a/Content.Shared/Administration/BanList/SharedBan.cs b/Content.Shared/Administration/BanList/SharedBan.cs
index 68ccc02c58..aeab777ce7 100644
--- a/Content.Shared/Administration/BanList/SharedBan.cs
+++ b/Content.Shared/Administration/BanList/SharedBan.cs
@@ -1,4 +1,4 @@
-using System.Collections.Immutable;
+using System.Collections.Immutable;
 using Content.Shared.Database;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Administration/BanList/SharedUnban.cs b/Content.Shared/Administration/BanList/SharedUnban.cs
index d60bb9184e..e406df2ae4 100644
--- a/Content.Shared/Administration/BanList/SharedUnban.cs
+++ b/Content.Shared/Administration/BanList/SharedUnban.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Administration.BanList;
 
diff --git a/Content.Shared/Administration/Components/AdminMinigunComponent.cs b/Content.Shared/Administration/Components/AdminMinigunComponent.cs
index 04a7aacd69..1f550368bd 100644
--- a/Content.Shared/Administration/Components/AdminMinigunComponent.cs
+++ b/Content.Shared/Administration/Components/AdminMinigunComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Administration.Components;
 
diff --git a/Content.Shared/Administration/Components/BufferingComponent.cs b/Content.Shared/Administration/Components/BufferingComponent.cs
index 3d365d00aa..4037a6e532 100644
--- a/Content.Shared/Administration/Components/BufferingComponent.cs
+++ b/Content.Shared/Administration/Components/BufferingComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration.Systems;
+using Content.Shared.Administration.Systems;
 
 namespace Content.Shared.Administration.Components;
 
diff --git a/Content.Shared/Administration/Components/DisarmProneComponent.cs b/Content.Shared/Administration/Components/DisarmProneComponent.cs
index 86addab4f6..b5b82c0190 100644
--- a/Content.Shared/Administration/Components/DisarmProneComponent.cs
+++ b/Content.Shared/Administration/Components/DisarmProneComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Weapons.Melee;
+using Content.Shared.Weapons.Melee;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Administration.Components;
diff --git a/Content.Shared/Administration/Components/HeadstandComponent.cs b/Content.Shared/Administration/Components/HeadstandComponent.cs
index 25576fc466..ace2081b54 100644
--- a/Content.Shared/Administration/Components/HeadstandComponent.cs
+++ b/Content.Shared/Administration/Components/HeadstandComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Administration.Components;
 
diff --git a/Content.Shared/Administration/Components/KillSignComponent.cs b/Content.Shared/Administration/Components/KillSignComponent.cs
index 796a98a71d..a04f68b518 100644
--- a/Content.Shared/Administration/Components/KillSignComponent.cs
+++ b/Content.Shared/Administration/Components/KillSignComponent.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Robust.Shared.GameStates;
 using Robust.Shared.Utility;
 
diff --git a/Content.Shared/Administration/Components/StationInfiniteBatteryTargetComponent.cs b/Content.Shared/Administration/Components/StationInfiniteBatteryTargetComponent.cs
index d26527a472..063d487a57 100644
--- a/Content.Shared/Administration/Components/StationInfiniteBatteryTargetComponent.cs
+++ b/Content.Shared/Administration/Components/StationInfiniteBatteryTargetComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Administration.Components;
 
diff --git a/Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs b/Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs
index 372bb4fb78..b360d808a3 100644
--- a/Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs
+++ b/Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Administration.Events;
 
diff --git a/Content.Shared/Administration/Events/PlayerInfoChangedEvent.cs b/Content.Shared/Administration/Events/PlayerInfoChangedEvent.cs
index e22ebc0b28..1e5e28ab99 100644
--- a/Content.Shared/Administration/Events/PlayerInfoChangedEvent.cs
+++ b/Content.Shared/Administration/Events/PlayerInfoChangedEvent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Administration.Events;
 
diff --git a/Content.Shared/Administration/Logs/AdminLogsEuiState.cs b/Content.Shared/Administration/Logs/AdminLogsEuiState.cs
index bb112525a3..349ad8bf8e 100644
--- a/Content.Shared/Administration/Logs/AdminLogsEuiState.cs
+++ b/Content.Shared/Administration/Logs/AdminLogsEuiState.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 using Content.Shared.Eui;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Administration/Logs/DateOrder.cs b/Content.Shared/Administration/Logs/DateOrder.cs
index a8b023c801..70d35934b6 100644
--- a/Content.Shared/Administration/Logs/DateOrder.cs
+++ b/Content.Shared/Administration/Logs/DateOrder.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Administration.Logs;
+namespace Content.Shared.Administration.Logs;
 
 public enum DateOrder
 {
diff --git a/Content.Shared/Administration/Logs/IAdminLogsPlayerValue.cs b/Content.Shared/Administration/Logs/IAdminLogsPlayerValue.cs
index e99b6b6034..81e758feac 100644
--- a/Content.Shared/Administration/Logs/IAdminLogsPlayerValue.cs
+++ b/Content.Shared/Administration/Logs/IAdminLogsPlayerValue.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Network;
+using Robust.Shared.Network;
 
 namespace Content.Shared.Administration.Logs;
 
diff --git a/Content.Shared/Administration/Logs/ISharedAdminLogManager.cs b/Content.Shared/Administration/Logs/ISharedAdminLogManager.cs
index 5e528fe1cd..b32c0b668e 100644
--- a/Content.Shared/Administration/Logs/ISharedAdminLogManager.cs
+++ b/Content.Shared/Administration/Logs/ISharedAdminLogManager.cs
@@ -1,4 +1,4 @@
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using Content.Shared.Database;
 
 namespace Content.Shared.Administration.Logs;
diff --git a/Content.Shared/Administration/Logs/LogStringHandler.cs b/Content.Shared/Administration/Logs/LogStringHandler.cs
index 2fab949d58..ac53c02e7a 100644
--- a/Content.Shared/Administration/Logs/LogStringHandler.cs
+++ b/Content.Shared/Administration/Logs/LogStringHandler.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using Robust.Shared.Player;
 using Robust.Shared.Toolshed.TypeParsers;
diff --git a/Content.Shared/Administration/Logs/SharedAdminLog.cs b/Content.Shared/Administration/Logs/SharedAdminLog.cs
index de4d1c8e2d..a2e7f3a868 100644
--- a/Content.Shared/Administration/Logs/SharedAdminLog.cs
+++ b/Content.Shared/Administration/Logs/SharedAdminLog.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Administration.Logs;
diff --git a/Content.Shared/Administration/Logs/SharedAdminLogManager.cs b/Content.Shared/Administration/Logs/SharedAdminLogManager.cs
index cea3eba69f..cf8f3acf22 100644
--- a/Content.Shared/Administration/Logs/SharedAdminLogManager.cs
+++ b/Content.Shared/Administration/Logs/SharedAdminLogManager.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 
 namespace Content.Shared.Administration.Logs;
 
diff --git a/Content.Shared/Administration/MsgUpdateAdminStatus.cs b/Content.Shared/Administration/MsgUpdateAdminStatus.cs
index 20da91fe10..5a865ef32f 100644
--- a/Content.Shared/Administration/MsgUpdateAdminStatus.cs
+++ b/Content.Shared/Administration/MsgUpdateAdminStatus.cs
@@ -1,4 +1,4 @@
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Administration/PermissionsEuiState.cs b/Content.Shared/Administration/PermissionsEuiState.cs
index 77fdad5fa7..2ecf4e1141 100644
--- a/Content.Shared/Administration/PermissionsEuiState.cs
+++ b/Content.Shared/Administration/PermissionsEuiState.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Eui;
+using Content.Shared.Eui;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Administration/QuickDialogOpenEvent.cs b/Content.Shared/Administration/QuickDialogOpenEvent.cs
index f4e77ab999..36b7359487 100644
--- a/Content.Shared/Administration/QuickDialogOpenEvent.cs
+++ b/Content.Shared/Administration/QuickDialogOpenEvent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Administration;
 
diff --git a/Content.Shared/Administration/SharedBwoinkSystem.cs b/Content.Shared/Administration/SharedBwoinkSystem.cs
index b0caefacaf..410df6d089 100644
--- a/Content.Shared/Administration/SharedBwoinkSystem.cs
+++ b/Content.Shared/Administration/SharedBwoinkSystem.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Administration/Systems/AdminGunSystem.cs b/Content.Shared/Administration/Systems/AdminGunSystem.cs
index fd2acd2829..084fe55d0a 100644
--- a/Content.Shared/Administration/Systems/AdminGunSystem.cs
+++ b/Content.Shared/Administration/Systems/AdminGunSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration.Components;
+using Content.Shared.Administration.Components;
 using Content.Shared.Weapons.Ranged.Events;
 
 namespace Content.Shared.Administration.Systems;
diff --git a/Content.Shared/Administration/Systems/RejuvenateSystem.cs b/Content.Shared/Administration/Systems/RejuvenateSystem.cs
index 17cd24bc4b..0096c0d393 100644
--- a/Content.Shared/Administration/Systems/RejuvenateSystem.cs
+++ b/Content.Shared/Administration/Systems/RejuvenateSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Rejuvenate;
+using Content.Shared.Rejuvenate;
 
 namespace Content.Shared.Administration.Systems;
 
diff --git a/Content.Shared/Administration/Verbs/Prototypes/AdminVerbCategoryPrototype.cs b/Content.Shared/Administration/Verbs/Prototypes/AdminVerbCategoryPrototype.cs
new file mode 100644
index 0000000000..e0a005ab7b
--- /dev/null
+++ b/Content.Shared/Administration/Verbs/Prototypes/AdminVerbCategoryPrototype.cs
@@ -0,0 +1,63 @@
+using Content.Shared.Database;
+using Content.Shared.Whitelist;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Administration.Verbs.Prototypes;
+
+/// <summary>
+/// Defines a category containing related admin-verbs.
+/// </summary>
+[Prototype]
+public sealed partial class AdminVerbCategoryPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// Localization key of the category name shown in the verb menu.
+    /// </summary>
+    [DataField(required: true)]
+    public LocId Name { get; private set; }
+
+    /// <summary>
+    /// Texture path for the category icon.
+    /// </summary>
+    [DataField]
+    public string? Icon { get; private set; }
+
+    /// <summary>
+    /// Display category entries as icons without their names.
+    /// </summary>
+    [DataField]
+    public bool IconsOnly { get; private set; }
+
+    /// <summary>
+    /// Number of columns in the category menu. Use one when showing names.
+    /// </summary>
+    [DataField]
+    public int Columns { get; private set; } = 1;
+
+    /// <summary>
+    /// All admin flags required to use entries in this category.
+    /// </summary>
+    [DataField]
+    public AdminFlags RequiredFlags { get; private set; } = AdminFlags.Admin;
+
+    /// <summary>
+    /// Importance of entry execution in admin logs.
+    /// </summary>
+    [DataField]
+    public LogImpact Impact { get; private set; } = LogImpact.Low;
+
+    /// <summary>
+    /// Required components for entries in this category.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Whitelist { get; private set; }
+
+    /// <summary>
+    /// Components that prevent entries in this category.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist { get; private set; }
+}
diff --git a/Content.Shared/Administration/Verbs/Prototypes/AdminVerbPrototype.cs b/Content.Shared/Administration/Verbs/Prototypes/AdminVerbPrototype.cs
new file mode 100644
index 0000000000..244cad4443
--- /dev/null
+++ b/Content.Shared/Administration/Verbs/Prototypes/AdminVerbPrototype.cs
@@ -0,0 +1,58 @@
+using Content.Shared.EntityEffects;
+using Content.Shared.Whitelist;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Administration.Verbs.Prototypes;
+
+/// <summary>
+/// Defines a target-filtered admin verb.
+/// </summary>
+[Prototype]
+public sealed partial class AdminVerbPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// Category containing this verb.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<AdminVerbCategoryPrototype> CategoryPrototype { get; private set; }
+
+    /// <summary>
+    /// Localization key of the verb name shown in the admin verb menu.
+    /// </summary>
+    [DataField(required: true)]
+    public LocId Name { get; private set; }
+
+    /// <summary>
+    /// Localization key of the verb description shown in the verb menu.
+    /// </summary>
+    [DataField]
+    public LocId? Description { get; private set; }
+
+    /// <summary>
+    /// Icon shown next to the verb in the admin verb menu.
+    /// </summary>
+    [DataField]
+    public SpriteSpecifier? Icon { get; private set; }
+
+    /// <summary>
+    /// Required components for the verb.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Whitelist { get; private set; }
+
+    /// <summary>
+    /// Components that prevent the verb.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist { get; private set; }
+
+    /// <summary>
+    /// Effects applied to the target when the verb is used.
+    /// </summary>
+    [DataField]
+    public EntityEffect[] Effects { get; private set; } = [];
+}
diff --git a/Content.Shared/Alert/AlertKey.cs b/Content.Shared/Alert/AlertKey.cs
index c5c3a7643e..91524cbaa1 100644
--- a/Content.Shared/Alert/AlertKey.cs
+++ b/Content.Shared/Alert/AlertKey.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Alert;
diff --git a/Content.Shared/Alert/AlertOrderPrototype.cs b/Content.Shared/Alert/AlertOrderPrototype.cs
index af4241a27e..8b4a5a2f99 100644
--- a/Content.Shared/Alert/AlertOrderPrototype.cs
+++ b/Content.Shared/Alert/AlertOrderPrototype.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
diff --git a/Content.Shared/Alert/ClickAlertEvent.cs b/Content.Shared/Alert/ClickAlertEvent.cs
index 43dd086b56..7a85f796ba 100644
--- a/Content.Shared/Alert/ClickAlertEvent.cs
+++ b/Content.Shared/Alert/ClickAlertEvent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Alert;
diff --git a/Content.Shared/AlertLevel/AlertLevelSystem.cs b/Content.Shared/AlertLevel/AlertLevelSystem.cs
index 73234337a8..7fe5a0afce 100644
--- a/Content.Shared/AlertLevel/AlertLevelSystem.cs
+++ b/Content.Shared/AlertLevel/AlertLevelSystem.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Chat;
-using Content.Shared.Station;
 using Content.Shared.CCVar;
+using Content.Shared.Station.Systems;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
@@ -18,7 +18,7 @@ public sealed partial class AlertLevelSystem : EntitySystem
     [Dependency] private IPrototypeManager _prototype = default!;
     [Dependency] private SharedAudioSystem _audio = default!;
     [Dependency] private SharedChatSystem _chat = default!;
-    [Dependency] private SharedStationSystem _station = default!;
+    [Dependency] private StationSystem _station = default!;
 
     private static string _fallbackAlertKey = "alert-level-unknown";
     private static string _fallbackAlertName = $"{_fallbackAlertKey}";
diff --git a/Content.Shared/Anomaly/Components/AnomalyPulsingComponent.cs b/Content.Shared/Anomaly/Components/AnomalyPulsingComponent.cs
index a7fedb821b..4dd1a877e1 100644
--- a/Content.Shared/Anomaly/Components/AnomalyPulsingComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalyPulsingComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Anomaly.Components;
 
diff --git a/Content.Shared/Anomaly/Components/AnomalyScannerComponent.cs b/Content.Shared/Anomaly/Components/AnomalyScannerComponent.cs
index 9109835289..8aa346d44d 100644
--- a/Content.Shared/Anomaly/Components/AnomalyScannerComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalyScannerComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Anomaly;
+using Content.Shared.Anomaly;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 
diff --git a/Content.Shared/Anomaly/Components/AnomalySupercriticalComponent.cs b/Content.Shared/Anomaly/Components/AnomalySupercriticalComponent.cs
index d72bc174be..375e99e9c1 100644
--- a/Content.Shared/Anomaly/Components/AnomalySupercriticalComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalySupercriticalComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Anomaly.Components;
diff --git a/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs b/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs
index c672c52dcf..8ba1b889be 100644
--- a/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs
+++ b/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Anomaly.Effects;
+using Content.Shared.Anomaly.Effects;
 using Content.Shared.Humanoid.Prototypes;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
diff --git a/Content.Shared/Anomaly/Components/InnerBodyAnomalyVisualsComponent.cs b/Content.Shared/Anomaly/Components/InnerBodyAnomalyVisualsComponent.cs
index 425324b46a..986899b720 100644
--- a/Content.Shared/Anomaly/Components/InnerBodyAnomalyVisualsComponent.cs
+++ b/Content.Shared/Anomaly/Components/InnerBodyAnomalyVisualsComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DisplacementMap;
+using Content.Shared.DisplacementMap;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/Anomaly/Effects/Components/PyroclasticAnomalyComponent.cs b/Content.Shared/Anomaly/Effects/Components/PyroclasticAnomalyComponent.cs
index 16c422f1ab..228a3cbee8 100644
--- a/Content.Shared/Anomaly/Effects/Components/PyroclasticAnomalyComponent.cs
+++ b/Content.Shared/Anomaly/Effects/Components/PyroclasticAnomalyComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Anomaly.Effects.Components;
+namespace Content.Shared.Anomaly.Effects.Components;
 
 [RegisterComponent]
 public sealed partial class PyroclasticAnomalyComponent : Component
diff --git a/Content.Shared/Anomaly/ScannerDoAfterEvent.cs b/Content.Shared/Anomaly/ScannerDoAfterEvent.cs
index e9c234d28f..37f287e7c0 100644
--- a/Content.Shared/Anomaly/ScannerDoAfterEvent.cs
+++ b/Content.Shared/Anomaly/ScannerDoAfterEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Anomaly;
diff --git a/Content.Server/Antag/AntagSelectionSystem.API.Assignment.cs b/Content.Shared/Antag/AntagSelectionSystem.API.Assignment.cs
similarity index 91%
rename from Content.Server/Antag/AntagSelectionSystem.API.Assignment.cs
rename to Content.Shared/Antag/AntagSelectionSystem.API.Assignment.cs
index 12582961d1..a6d41c6b17 100644
--- a/Content.Server/Antag/AntagSelectionSystem.API.Assignment.cs
+++ b/Content.Shared/Antag/AntagSelectionSystem.API.Assignment.cs
@@ -1,9 +1,6 @@
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Server.Antag.Components;
-using Content.Server.GameTicking.Rules.Components;
-using Content.Shared.Antag;
+using Content.Shared.Antag.Components;
 using Content.Shared.Database;
 using Content.Shared.Ghost.Components;
 using Content.Shared.Humanoid;
@@ -12,11 +9,11 @@ using JetBrains.Annotations;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using static Content.Server.Antag.Components.AntagSelectionTime;
+using Robust.Shared.Utility;
 
-namespace Content.Server.Antag;
+namespace Content.Shared.Antag;
 
-public sealed partial class AntagSelectionSystem
+public abstract partial class AntagSelectionSystem
 {
     /// <inhereitdoc cref="CanBeAntag(ICommonSession,Entity{AntagSelectionComponent},AntagSpecifierPrototype,bool)"/>
     [PublicAPI]
@@ -131,7 +128,7 @@ public sealed partial class AntagSelectionSystem
     private bool IsMindValid([NotNullWhen(true)] EntityUid? mind, AntagSpecifierPrototype def)
     {
         // The jobless can always be antag!
-        if (!_jobs.MindTryGetJob(mind, out var job))
+        if (!Jobs.MindTryGetJob(mind, out var job))
             return true;
 
         // "Sorry buddy, but you can't be a traitor and the head of security" - Urist 1984
@@ -175,7 +172,7 @@ public sealed partial class AntagSelectionSystem
     public bool IsEntityValid([NotNullWhen(true)] EntityUid? uid, AntagSpecifierPrototype def)
     {
         // If the player has not spawned in as any entity (e.g., in the lobby), they can be given an antag role/entity.
-        if (!_whitelist.CheckBoth(uid, def.Blacklist, def.Whitelist))
+        if (!Whitelist.CheckBoth(uid, def.Blacklist, def.Whitelist))
             return false;
 
         if (_arrivals.IsOnArrivals((uid.Value, null)))
@@ -199,20 +196,7 @@ public sealed partial class AntagSelectionSystem
     /// <param name="definition">The definition which a player may or may not be banned from</param>
     /// <returns>True if any of the preferred roles within the definition hit a ban.</returns>
     [PublicAPI]
-    public bool IsAntagBanned(ICommonSession session, AntagSpecifierPrototype definition)
-    {
-        if (_ban.GetAntagBans(session.UserId) is not { } bans)
-            return false;
-
-        foreach (var role in definition.PrefRoles)
-        {
-            // banned!
-            if (bans.Contains(role))
-                return true;
-        }
-
-        return false;
-    }
+    public abstract bool IsAntagBanned(ICommonSession session, AntagSpecifierPrototype definition);
 
     /// <inheritdoc cref="TryMakeAntag(Entity{AntagSelectionComponent},AntagSpecifierPrototype,ICommonSession,bool)"/>
     [PublicAPI]
@@ -236,7 +220,7 @@ public sealed partial class AntagSelectionSystem
         ICommonSession session,
         bool checkPref = true)
     {
-        _adminLogger.Add(LogType.AntagSelection,
+        AdminLogger.Add(LogType.AntagSelection,
             $"Start trying to make {session} become the antagonist: {ToPrettyString(gameRule)}, {prototype.ID}");
 
         if (!CanBeAntag(session, gameRule, prototype, checkPref))
@@ -295,10 +279,10 @@ public sealed partial class AntagSelectionSystem
         // This logic is effectively copy-pasted from the old system with some fixes.
         var query = QueryActiveRules();
         var rules = new List<(EntityUid, AntagSelectionComponent)>();
-        while (query.MoveNext(out var uid, out _, out var antag, out _))
+        while (query.MoveNext(out var uid, out var antag, out _, out _))
         {
             // This is intended to only be used for ghost roles so it shouldn't be assigned for late joins
-            if (antag.SelectionTime == Never || !antag.LateJoinAdditional)
+            if (antag.SelectionTime == AntagSelectionTime.Never || !antag.LateJoinAdditional)
                 continue;
 
             rules.Add((uid, antag));
@@ -394,7 +378,7 @@ public sealed partial class AntagSelectionSystem
     {
         if (proto.SpawnerPrototype is not { } spawnerPrototype)
         {
-            Debug.Assert(!assert, $"Tried to spawn a ghost role for {proto.ID}, but it had no prototype!");
+            DebugTools.Assert(!assert, $"Tried to spawn a ghost role for {proto.ID}, but it had no prototype!");
             return;
         }
 
@@ -409,7 +393,7 @@ public sealed partial class AntagSelectionSystem
         if (!TryComp<GhostRoleAntagSpawnerComponent>(spawner, out var spawnerComp))
         {
             Log.Error($"Antag spawner {spawner} does not have a {nameof(GhostRoleAntagSpawnerComponent)}.");
-            _adminLogger.Add(LogType.AntagSelection,
+            AdminLogger.Add(LogType.AntagSelection,
                 $"Antag spawner {spawner} in game rule {ToPrettyString(gameRule)} failed due to not having {nameof(GhostRoleAntagSpawnerComponent)}.");
             Del(spawner);
             return;
@@ -427,7 +411,8 @@ public sealed partial class AntagSelectionSystem
     [Obsolete]
     public void ForceMakeAntag<T>(ICommonSession player, EntProtoId defaultRule) where T : Component
     {
-        var rule = ForceGetGameRuleEnt<T>(defaultRule);
+        if (ForceGetGameRuleEnt<T>(defaultRule) is not { } rule)
+            return;
 
         if (TryAssignNextAvailableAntag(rule, player))
             return;
@@ -461,7 +446,8 @@ public sealed partial class AntagSelectionSystem
     /// </remarks>
     public void ForceMakeAntag<T>(ICommonSession player, EntProtoId ruleProto, AntagSpecifierPrototype proto) where T : Component
     {
-        var rule = ForceGetGameRuleEnt<T>(ruleProto);
+        if (ForceGetGameRuleEnt<T>(ruleProto) is not { } rule)
+            return;
 
         foreach (var antag in rule.Comp.Antags)
         {
@@ -482,21 +468,7 @@ public sealed partial class AntagSelectionSystem
     /// Note that this is private because you generally should not be forcing a gamerule and this code is evil.
     /// I'm not touching it any more than I have to.
     /// </summary>
-    private Entity<AntagSelectionComponent> ForceGetGameRuleEnt<T>(string id) where T : Component
-    {
-        var query = EntityQueryEnumerator<T, AntagSelectionComponent>();
-        while (query.MoveNext(out var uid, out _, out var comp))
-        {
-            if (MetaData(uid).EntityPrototype?.ID == id)
-                return (uid, comp);
-        }
-        var ruleEnt = GameTicker.AddGameRule(id);
-        RemComp<LoadMapRuleComponent>(ruleEnt);
-        var antag = RuleQuery.Comp(ruleEnt);
-        antag.AssignmentHandled = true; // don't do normal selection.
-        GameTicker.StartGameRule(ruleEnt);
-        return (ruleEnt, antag);
-    }
+    protected abstract Entity<AntagSelectionComponent>? ForceGetGameRuleEnt<T>(string id) where T : Component;
 
     /// <summary>
     /// Assigns components to an entity based on a <see cref="AntagSpecifierPrototype"/>
diff --git a/Content.Server/Antag/AntagSelectionSystem.API.cs b/Content.Shared/Antag/AntagSelectionSystem.API.cs
similarity index 67%
rename from Content.Server/Antag/AntagSelectionSystem.API.cs
rename to Content.Shared/Antag/AntagSelectionSystem.API.cs
index b125d41149..5213dddf01 100644
--- a/Content.Server/Antag/AntagSelectionSystem.API.cs
+++ b/Content.Shared/Antag/AntagSelectionSystem.API.cs
@@ -1,9 +1,6 @@
 using System.Linq;
-using Content.Server.Antag.Components;
-using Content.Server.Antag.Selectors;
-using Content.Shared.Antag;
-using Content.Shared.Chat;
-using Content.Shared.GameTicking.Components;
+using Content.Shared.Antag.Components;
+using Content.Shared.Antag.Selectors;
 using Content.Shared.Ghost.Components;
 using Content.Shared.Mind;
 using Content.Shared.Roles;
@@ -13,15 +10,15 @@ using Robust.Shared.Enums;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Antag;
+namespace Content.Shared.Antag;
 
-public sealed partial class AntagSelectionSystem
+public abstract partial class AntagSelectionSystem
 {
     /// <inhereitdoc cref="GetActivePlayerCount(IList{ICommonSession})"/>
     [PublicAPI]
     public int GetActivePlayerCount()
     {
-        return GetActivePlayerCount(_playerManager.Sessions);
+        return GetActivePlayerCount(PlayerManager.Sessions);
     }
 
     /// <summary>
@@ -51,7 +48,7 @@ public sealed partial class AntagSelectionSystem
     [PublicAPI]
     public IEnumerable<ICommonSession> GetActivePlayers()
     {
-        return GetActivePlayers(_playerManager.Sessions);
+        return GetActivePlayers(PlayerManager.Sessions);
     }
 
     [PublicAPI]
@@ -191,7 +188,7 @@ public sealed partial class AntagSelectionSystem
                 if (!TryComp<MindComponent>(mind, out var mindComp) || mindComp.OriginalOwnerUserId == null)
                     continue;
 
-                if (!_playerManager.TryGetPlayerData(mindComp.OriginalOwnerUserId.Value, out var data))
+                if (!PlayerManager.TryGetPlayerData(mindComp.OriginalOwnerUserId.Value, out var data))
                     continue;
 
                 yield return (mind, data, name);
@@ -253,7 +250,7 @@ public sealed partial class AntagSelectionSystem
         var minds = GetAntagMinds(ent);
         foreach (var mind in minds)
         {
-            if (_mind.IsCharacterDeadIc(mind))
+            if (Mind.IsCharacterDeadIc(mind))
                 continue;
 
             if (mind.Comp.OriginalOwnedEntity != null)
@@ -274,7 +271,7 @@ public sealed partial class AntagSelectionSystem
         var minds = GetAntagMinds(ent);
         foreach (var mind in minds)
         {
-            if (_mind.IsCharacterDeadIc(mind))
+            if (Mind.IsCharacterDeadIc(mind))
                 continue;
 
             numbah++;
@@ -317,13 +314,13 @@ public sealed partial class AntagSelectionSystem
     [PublicAPI]
     public void SendBriefing(EntityUid entity, string briefing, Color? briefingColor, SoundSpecifier? briefingSound)
     {
-        if (!_mind.TryGetMind(entity, out _, out var mindComponent))
+        if (!Mind.TryGetMind(entity, out _, out var mindComponent))
             return;
 
-        if (!_playerManager.TryGetSessionById(mindComponent.UserId, out var session))
+        if (!PlayerManager.TryGetSessionById(mindComponent.UserId, out var session))
             return;
 
-        SendBriefing(session, briefing, briefingColor, briefingSound);
+        SendBriefing((ICommonSession?)session, briefing, briefingColor, briefingSound);
     }
 
     /// <summary>
@@ -366,21 +363,114 @@ public sealed partial class AntagSelectionSystem
     /// <param name="briefingColor">The color the briefing should be, null for default</param>
     /// <param name="briefingSound">The sound to briefing/greeting sound to play</param>
     // TODO: It might take a bit of effort but this can probably be privated.
-    public void SendBriefing(
-        ICommonSession? session,
-        string briefing,
-        Color? briefingColor,
-        SoundSpecifier? briefingSound)
-    {
-        if (session == null)
-            return;
+    public abstract void SendBriefing(ICommonSession? session, string briefing, Color? briefingColor, SoundSpecifier? briefingSound);
 
-        _audio.PlayGlobal(briefingSound, session);
-        if (!string.IsNullOrEmpty(briefing))
+    /// <summary>
+    /// Returns a list of all antag players who are constrained by a job whitelist or blacklist from an antag.
+    /// </summary>
+    /// <returns>A dictionary of antag sessions, and their job blacklists.</returns>
+    [PublicAPI]
+    public Dictionary<ICommonSession, (HashSet<ProtoId<JobPrototype>>? Whitelist, HashSet<ProtoId<JobPrototype>>? Blacklist)>
+        GetAntagJobs()
+    {
+        var result = new Dictionary<ICommonSession, (HashSet<ProtoId<JobPrototype>>? Whitelist, HashSet<ProtoId<JobPrototype>>? Blacklist)>();
+        var query = QueryAllRules();
+        while (query.MoveNext(out var comp, out _))
         {
-            var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", briefing));
-            _chat.ChatMessageToOne(ChatChannel.Server, briefing, wrappedMessage, default, false, session.Channel, briefingColor);
+            foreach (var antag in comp.Antags)
+            {
+                if (!comp.PreSelectedSessions.TryGetValue(antag, out var set) || !ProtoMan.Resolve(antag.Proto, out var proto))
+                    continue;
+
+                // Check this here so we don't make a dictionary entry for a bunch of players, with empty blacklists and whitelists.
+                if (proto.JobBlacklist == null && proto.JobWhitelist == null)
+                    continue;
+
+                foreach (var player in set)
+                {
+                    if (result.TryGetValue(player, out var jobs))
+                    {
+                        if (proto.JobWhitelist != null)
+                        {
+                            if (jobs.Whitelist == null)
+                                jobs.Whitelist = proto.JobWhitelist;
+                            else
+                                jobs.Whitelist.UnionWith(proto.JobWhitelist);
+                        }
+
+                        if (proto.JobBlacklist != null)
+                        {
+                            if (jobs.Blacklist == null)
+                                jobs.Blacklist = proto.JobBlacklist;
+                            else
+                                jobs.Blacklist.UnionWith(proto.JobBlacklist);
+                        }
+                    }
+                    else
+                    {
+                        result.Add(player, (proto.JobWhitelist, proto.JobBlacklist));
+                    }
+                }
+            }
         }
+
+        return result;
+    }
+
+    /// <summary>
+    /// Returns a list of all antag players who are constrained by a job whitelist or blacklist from an antag.
+    /// </summary>
+    /// <param name="except">Antag prototype we're excluding for our returned job whitelist/blacklist.</param>
+    /// <returns>A dictionary of antag sessions, and their job blacklists.</returns>
+    [PublicAPI]
+    public Dictionary<ICommonSession, (HashSet<ProtoId<JobPrototype>>? Whitelist, HashSet<ProtoId<JobPrototype>>? Blacklist)>
+        GetAntagJobs(ProtoId<AntagSpecifierPrototype> except)
+    {
+        var result = new Dictionary<ICommonSession, (HashSet<ProtoId<JobPrototype>>? Whitelist, HashSet<ProtoId<JobPrototype>>? Blacklist)>();
+        var query = QueryAllRules();
+        while (query.MoveNext(out var comp, out _))
+        {
+            foreach (var antag in comp.Antags)
+            {
+                if (except == antag)
+                    continue;
+
+                if (!comp.PreSelectedSessions.TryGetValue(antag, out var set) || !ProtoMan.Resolve(antag.Proto, out var proto))
+                    continue;
+
+                // Check this here so we don't make a dictionary entry for a bunch of players, with empty blacklists and whitelists.
+                if (proto.JobBlacklist == null && proto.JobWhitelist == null)
+                    continue;
+
+                foreach (var player in set)
+                {
+                    if (result.TryGetValue(player, out var jobs))
+                    {
+                        if (proto.JobWhitelist != null)
+                        {
+                            if (jobs.Whitelist == null)
+                                jobs.Whitelist = proto.JobWhitelist;
+                            else
+                                jobs.Whitelist.UnionWith(proto.JobWhitelist);
+                        }
+
+                        if (proto.JobBlacklist != null)
+                        {
+                            if (jobs.Blacklist == null)
+                                jobs.Blacklist = proto.JobBlacklist;
+                            else
+                                jobs.Blacklist.UnionWith(proto.JobBlacklist);
+                        }
+                    }
+                    else
+                    {
+                        result.Add(player, (proto.JobWhitelist, proto.JobBlacklist));
+                    }
+                }
+            }
+        }
+
+        return result;
     }
 
     /// <summary>
@@ -390,15 +480,12 @@ public sealed partial class AntagSelectionSystem
     /// <returns>A dictionary of antag sessions, and their job blacklists.</returns>
     [PublicAPI]
     public Dictionary<ICommonSession, (HashSet<ProtoId<JobPrototype>>? Whitelist, HashSet<ProtoId<JobPrototype>>? Blacklist)>
-        GetAntagJobs(params HashSet<ProtoId<AntagSpecifierPrototype>> except)
+        GetAntagJobs(HashSet<ProtoId<AntagSpecifierPrototype>> except)
     {
         var result = new Dictionary<ICommonSession, (HashSet<ProtoId<JobPrototype>>? Whitelist, HashSet<ProtoId<JobPrototype>>? Blacklist)>();
         var query = QueryAllRules();
-        while (query.MoveNext(out var uid, out var comp, out _))
+        while (query.MoveNext(out var comp, out _))
         {
-            if (HasComp<EndedGameRuleComponent>(uid))
-                continue;
-
             foreach (var antag in comp.Antags)
             {
                 if (except.Contains(antag))
@@ -450,16 +537,60 @@ public sealed partial class AntagSelectionSystem
     /// <returns>A tuple of a whitelist and blacklist hashset for this player.</returns>
     [PublicAPI]
     public (HashSet<ProtoId<JobPrototype>>? Whitelist, HashSet<ProtoId<JobPrototype>>? Blacklist)
-        GetAntagJobs(ICommonSession player, params HashSet<ProtoId<AntagSpecifierPrototype>> except)
+        GetAntagJobs(ICommonSession player, ProtoId<AntagSpecifierPrototype> except)
     {
         HashSet<ProtoId<JobPrototype>>? whitelist = null;
         HashSet<ProtoId<JobPrototype>>? blacklist = null;
         var query = QueryAllRules();
-        while (query.MoveNext(out var uid, out var comp, out _))
+        while (query.MoveNext(out var comp, out _))
         {
-            if (HasComp<EndedGameRuleComponent>(uid))
-                continue;
+            foreach (var antag in comp.Antags)
+            {
+                if (except == antag)
+                    continue;
 
+                if (!comp.PreSelectedSessions.TryGetValue(antag, out var set) || !set.Contains(player))
+                    continue;
+
+                if (!ProtoMan.Resolve(antag.Proto, out var proto))
+                    continue;
+
+                if (proto.JobWhitelist != null)
+                {
+                    if (whitelist == null)
+                        whitelist = proto.JobWhitelist;
+                    else
+                        whitelist.UnionWith(proto.JobWhitelist);
+                }
+
+                if (proto.JobBlacklist != null)
+                {
+                    if (blacklist == null)
+                        blacklist = proto.JobBlacklist;
+                    else
+                        blacklist.UnionWith(proto.JobBlacklist);
+                }
+            }
+        }
+
+        return (whitelist, blacklist);
+    }
+
+    /// <summary>
+    /// Returns a list of all blacklisted and whitelisted jobs for this player
+    /// </summary>
+    /// <param name="player">Player we're checking the blocked jobs of</param>
+    /// <param name="except">Antag prototypes we're excluding in our search</param>
+    /// <returns>A tuple of a whitelist and blacklist hashset for this player.</returns>
+    [PublicAPI]
+    public (HashSet<ProtoId<JobPrototype>>? Whitelist, HashSet<ProtoId<JobPrototype>>? Blacklist)
+        GetAntagJobs(ICommonSession player, HashSet<ProtoId<AntagSpecifierPrototype>> except)
+    {
+        HashSet<ProtoId<JobPrototype>>? whitelist = null;
+        HashSet<ProtoId<JobPrototype>>? blacklist = null;
+        var query = QueryAllRules();
+        while (query.MoveNext(out var comp, out _))
+        {
             foreach (var antag in comp.Antags)
             {
                 if (except.Contains(antag))
@@ -497,15 +628,36 @@ public sealed partial class AntagSelectionSystem
     /// </summary>
     /// <param name="except">A specific definition to be excluded from the check.</param>
     [PublicAPI]
-    public HashSet<ICommonSession> GetPreSelectedAntagSessions(params HashSet<ProtoId<AntagSpecifierPrototype>> except)
+    public HashSet<ICommonSession> GetPreSelectedAntagSessions(ProtoId<AntagSpecifierPrototype> except)
     {
         var result = new HashSet<ICommonSession>();
         var query = QueryAllRules();
-        while (query.MoveNext(out var uid, out var comp, out _))
+        while (query.MoveNext(out var comp, out _))
         {
-            if (HasComp<EndedGameRuleComponent>(uid))
-                continue;
+            foreach (var antag in comp.Antags)
+            {
+                if (except == antag)
+                    continue;
 
+                if (comp.PreSelectedSessions.TryGetValue(antag, out var set))
+                    result.UnionWith(set);
+            }
+        }
+
+        return result;
+    }
+
+    /// <summary>
+    /// Get all sessions that have been preselected for antag.
+    /// </summary>
+    /// <param name="except">A specific definition to be excluded from the check.</param>
+    [PublicAPI]
+    public HashSet<ICommonSession> GetPreSelectedAntagSessions(HashSet<ProtoId<AntagSpecifierPrototype>> except)
+    {
+        var result = new HashSet<ICommonSession>();
+        var query = QueryAllRules();
+        while (query.MoveNext(out var comp, out _))
+        {
             foreach (var antag in comp.Antags)
             {
                 if (except.Contains(antag))
@@ -546,23 +698,7 @@ public sealed partial class AntagSelectionSystem
     /// <param name="filter">Optional list of antag preferences we're specifically looking for.</param>
     /// <returns>A list of all antags which the player meets the requirement for, and are contained in the filter</returns>
     [PublicAPI]
-    public IEnumerable<ProtoId<AntagPrototype>> GetValidAntagPreferences(ICommonSession session, List<ProtoId<AntagPrototype>>? filter = null)
-    {
-        if (!_pref.TryGetCachedPreferences(session.UserId, out var prefs))
-            yield break;
-
-        foreach (var antag in prefs.SelectedCharacter.AntagPreferences)
-        {
-            // We also check this in IsSessionValid, but we also check it here since this is public API.
-            if (_ban.IsRoleBanned(session, antag) || !_playTime.IsAllowed(session, antag))
-                continue;
-
-            if (filter != null && !filter.Contains(antag))
-                continue;
-
-            yield return antag;
-        }
-    }
+    public abstract IEnumerable<ProtoId<AntagPrototype>> GetValidAntagPreferences(ICommonSession session, List<ProtoId<AntagPrototype>>? filter = null);
 
     /// <summary>
     /// Checks if a player has been assigned antag for a specific game rule.
@@ -573,7 +709,7 @@ public sealed partial class AntagSelectionSystem
     public bool IsAssignedAntag(Entity<AntagSelectionComponent> gameRule, ICommonSession player)
     {
         // First check our mindroles.
-        if (_role.PlayerIsAntagonist(player))
+        if (Role.PlayerIsAntagonist(player))
             return true;
 
         foreach (var (_, sessions) in gameRule.Comp.PreSelectedSessions)
@@ -610,16 +746,47 @@ public sealed partial class AntagSelectionSystem
     /// You can only get one antag per game rule so it's fine to ignore by uid.</param>
     /// <returns>True if there is a game rule giving this player antag status</returns>
     [PublicAPI]
-    public bool IsAssignedAntag(ICommonSession player, params HashSet<EntityUid> ignored)
+    public bool IsAssignedAntag(ICommonSession player, EntityUid ignored)
     {
         // First check our mindroles.
-        if (_role.PlayerIsAntagonist(player))
+        if (Role.PlayerIsAntagonist(player))
             return true;
 
         var query = QueryAllRules();
         while (query.MoveNext(out var uid, out var comp, out _))
         {
-            if (ignored.Contains(uid) || HasComp<EndedGameRuleComponent>(uid))
+            if (ignored == uid)
+                continue;
+
+            foreach (var (_, sessions) in comp.PreSelectedSessions)
+            {
+                // Session has already been preselected as antagonist, and therefore *has* been assigned antag!
+                if (sessions.Contains(player))
+                    return true;
+            }
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Checks if the given player is currently assigned antag for any game rule.
+    /// </summary>
+    /// <param name="player">Player who may or may not be the antagonist.</param>
+    /// <param name="ignored">Game rule entities we're ignoring.
+    /// You can only get one antag per game rule so it's fine to ignore by uid.</param>
+    /// <returns>True if there is a game rule giving this player antag status</returns>
+    [PublicAPI]
+    public bool IsAssignedAntag(ICommonSession player, HashSet<EntityUid> ignored)
+    {
+        // First check our mindroles.
+        if (Role.PlayerIsAntagonist(player))
+            return true;
+
+        var query = QueryAllRules();
+        while (query.MoveNext(out var uid, out var comp, out _))
+        {
+            if (ignored.Contains(uid))
                 continue;
 
             foreach (var (_, sessions) in comp.PreSelectedSessions)
@@ -640,16 +807,51 @@ public sealed partial class AntagSelectionSystem
     /// <param name="ignored">Game rule entities we're ignoring.</param>
     /// <returns>True if there is a game rule giving this player antag status that is exclusive with other antags</returns>
     [PublicAPI]
-    public bool IsAssignedExclusiveAntag(ICommonSession player, params HashSet<EntityUid> ignored)
+    public bool IsAssignedExclusiveAntag(ICommonSession player, EntityUid ignored)
     {
         // First check our mindroles.
-        if (_role.MindIsExclusiveAntagonist(player.AttachedEntity))
+        if (Role.MindIsExclusiveAntagonist(player.AttachedEntity))
             return true;
 
         var query = QueryAllRules();
         while (query.MoveNext(out var uid, out var comp, out _))
         {
-            if (ignored.Contains(uid) || HasComp<EndedGameRuleComponent>(uid))
+            if (ignored == uid)
+                continue;
+
+            foreach (var (proto, sessions) in comp.PreSelectedSessions)
+            {
+                if (!ProtoMan.Resolve(proto, out var def))
+                    continue; // How did you even get here?
+
+                if (!sessions.Contains(player))
+                    continue;
+
+                if (def.MultiAntagSetting == AntagAcceptability.None)
+                    return true;
+            }
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Checks if the given player is currently assigned antag for any game rule that is incompatible with other antag prototypes.
+    /// </summary>
+    /// <param name="player">Player who may or may not be the antagonist.</param>
+    /// <param name="ignored">Game rule entities we're ignoring.</param>
+    /// <returns>True if there is a game rule giving this player antag status that is exclusive with other antags</returns>
+    [PublicAPI]
+    public bool IsAssignedExclusiveAntag(ICommonSession player, HashSet<EntityUid> ignored)
+    {
+        // First check our mindroles.
+        if (Role.MindIsExclusiveAntagonist(player.AttachedEntity))
+            return true;
+
+        var query = QueryAllRules();
+        while (query.MoveNext(out var uid, out var comp, out _))
+        {
+            if (ignored.Contains(uid))
                 continue;
 
             foreach (var (proto, sessions) in comp.PreSelectedSessions)
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Shared/Antag/AntagSelectionSystem.cs
similarity index 81%
rename from Content.Server/Antag/AntagSelectionSystem.cs
rename to Content.Shared/Antag/AntagSelectionSystem.cs
index 8ca6c70e6e..b02ebf914c 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Shared/Antag/AntagSelectionSystem.cs
@@ -1,43 +1,28 @@
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Server.Administration.Managers;
-using Content.Server.Antag.Components;
-using Content.Server.Chat.Managers;
-using Content.Server.GameTicking;
-using Content.Server.GameTicking.Events;
-using Content.Server.GameTicking.Rules;
-using Content.Server.Ghost.Roles;
-using Content.Server.Ghost.Roles.Components;
-using Content.Server.Mind;
-using Content.Server.Objectives;
-using Content.Server.Players.PlayTimeTracking;
-using Content.Server.Preferences.Managers;
-using Content.Server.Roles;
-using Content.Server.Roles.Jobs;
-using Content.Server.Shuttles.Systems;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Antag;
+using Content.Shared.Antag.Components;
 using Content.Shared.Clothing;
 using Content.Shared.Database;
 using Content.Shared.Follower;
 using Content.Shared.GameTicking;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules;
+using Content.Shared.Mind;
 using Content.Shared.Random.Helpers;
 using Content.Shared.Roles;
+using Content.Shared.Roles.Jobs;
+using Content.Shared.Shuttles.Systems;
 using Content.Shared.Whitelist;
-using JetBrains.Annotations;
-using Robust.Server.Audio;
-using Robust.Server.GameObjects;
-using Robust.Server.Player;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
-using static Content.Server.Antag.Components.AntagSelectionTime;
+using static Content.Shared.Antag.Components.AntagSelectionTime;
 
-namespace Content.Server.Antag;
+namespace Content.Shared.Antag;
 
 /// <summary>
 /// Turns players into antags.
@@ -54,24 +39,19 @@ namespace Content.Server.Antag;
 /// I hope this system is now readable and significantly less buggy thanks to my efforts.
 /// I could do more, but I've been soaped enough. Now it's your turn to fix it.
 /// </remarks>
-public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelectionComponent>
+public abstract partial class AntagSelectionSystem : GameRuleSystem<AntagSelectionComponent>
 {
-    [Dependency] private IBanManager _ban = default!;
-    [Dependency] private IChatManager _chat = default!;
-    [Dependency] private IPlayerManager _playerManager = default!;
-    [Dependency] private IServerPreferencesManager _pref = default!;
-    [Dependency] private ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] protected ISharedPlayerManager PlayerManager = default!;
+    [Dependency] protected ISharedAdminLogManager AdminLogger = default!;
     [Dependency] private ArrivalsSystem _arrivals = default!;
-    [Dependency] private AudioSystem _audio = default!;
-    [Dependency] private EntityWhitelistSystem _whitelist = default!;
-    [Dependency] private FollowerSystem _follower = default!;
-    [Dependency] private GhostRoleSystem _ghostRole = default!;
-    [Dependency] private JobSystem _jobs = default!;
-    [Dependency] private LoadoutSystem _loadout = default!;
-    [Dependency] private MindSystem _mind = default!;
-    [Dependency] private PlayTimeTrackingSystem _playTime = default!;
-    [Dependency] private RoleSystem _role = default!;
-    [Dependency] private TransformSystem _transform = default!;
+    [Dependency] protected EntityWhitelistSystem Whitelist = default!;
+    [Dependency] protected FollowerSystem Follower = default!;
+    [Dependency] protected LoadoutSystem Loadout = default!;
+    [Dependency] protected SharedAudioSystem Audio = default!;
+    [Dependency] protected SharedJobSystem Jobs = default!;
+    [Dependency] protected SharedMindSystem Mind = default!;
+    [Dependency] protected SharedRoleSystem Role = default!;
+    [Dependency] protected SharedTransformSystem XForm = default!;
 
     // arbitrary random number to give late joining some mild interest.
     public const float LateJoinRandomChance = 0.5f;
@@ -103,77 +83,37 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
 
         Log.Level = LogLevel.Debug;
 
-        SubscribeLocalEvent<GhostRoleAntagSpawnerComponent, TakeGhostRoleEvent>(OnTakeGhostRole);
-
-        SubscribeLocalEvent<AntagSelectionComponent, ObjectivesTextGetInfoEvent>(OnObjectivesTextGetInfo);
-
         // In order of how these occur.
         SubscribeLocalEvent<RulePlayerSpawningEvent>(OnPlayerSpawning);
-        SubscribeLocalEvent<NoJobsAvailableSpawningEvent>(OnJobNotAssigned);
         SubscribeLocalEvent<RulePlayerJobsAssignedEvent>(OnJobsAssigned);
         SubscribeLocalEvent<PlayerSpawnCompleteEvent>(OnSpawnComplete);
     }
 
-    protected override void Started(EntityUid uid, AntagSelectionComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
+    protected override void Started(Entity<AntagSelectionComponent, GameRuleComponent> rule, ref GameRuleStartedEvent args)
     {
-        base.Started(uid, component, gameRule, args);
+        base.Started(rule, ref args);
 
         // If we're not in round, don't spawn or assign antags. Those will be handled by RulePlayerSpawning, and RulePlayerJobs
         if (GameTicker.RunLevel != GameRunLevel.InRound)
             return;
 
-        if (component.AssignmentHandled)
+        if (rule.Comp1.AssignmentHandled)
             return;
 
         // Antags haven't been selected so we need to select them! Only if we select when the game rule starts though!
-        if (component.PreSelectionsComplete)
+        if (rule.Comp1.PreSelectionsComplete)
         {
-            AssignPreSelectedSessions((uid, component));
+            AssignPreSelectedSessions(rule);
             return;
         }
 
         // If pre-selections haven't completed, then we need to select and assign antags.
         var players = GetActivePlayers().ToArray();
 
-        if (component.SelectionTime == RuleStarted) // Only pre-select antags if we pre-select on rule start
-            AssignAntags((uid, component), players);
+        if (rule.Comp1.SelectionTime == RuleStarted) // Only pre-select antags if we pre-select on rule start
+            AssignAntags(rule, players);
         else // Otherwise, we only spawn the ghost roles!
-            SpawnGhostRoles((uid, component), players.Length);
-    }
-
-    private void OnTakeGhostRole(Entity<GhostRoleAntagSpawnerComponent> ent, ref TakeGhostRoleEvent args)
-    {
-        if (args.TookRole)
-            return;
-
-        if (ent.Comp.Rule is not { } rule || ent.Comp.Definition is not { } proto)
-            return;
-
-        if (!ProtoMan.Resolve(proto, out var def))
-            return;
-
-        if (!Exists(rule) || !RuleQuery.TryComp(rule, out var select))
-            return;
-
-        // Ensure the player is allowed to play this antagonist!
-        if (IsAntagBanned(args.Player, def) || !_playTime.IsAllowed(args.Player, def.PrefRoles))
-            return;
-
-        if (!TrySpawnAntagonist((rule, select), def, args.Player, _transform.GetMapCoordinates(ent), out var uid))
-        {
-            Log.Error($"Tried to make {args.Player.UserId} into an antagonist but was unable to spawn an entity for them. Game rule {ToPrettyString(ent)}");
-            return;
-        }
-
-        // We do this after TrySpawnAntagonist so we don't have to worry about a failed spawn adding permanent pre selections to a game rule.
-        PreSelectSession((rule, select), def, args.Player);
-        InitializeAntag((rule, select), def, uid.Value, args.Player);
-        args.TookRole = true;
-
-        // Move ghosts that were watching the raffle on the spawner over to the freshly spawned antag.
-        _follower.TransferFollowers(ent.Owner, uid.Value);
-
-        _ghostRole.UnregisterGhostRole((ent, Comp<GhostRoleComponent>(ent)));
+            SpawnGhostRoles(rule, players.Length);
     }
 
     private void OnSpawnComplete(PlayerSpawnCompleteEvent args)
@@ -197,7 +137,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
         {
             // Add it to the list of pre selections then mark it as complete.
             // This is the best query to do it in, and we're not returning early so might as well do it here.
-            AddGameRuleDefinitions((uid, antag), pool.Count, ref _preSpawnRules, ref _postSpawnRules, GameTicker.IsGameRuleActive(uid, rule));
+            AddGameRuleDefinitions((uid, antag), pool.Count, ref _preSpawnRules, ref _postSpawnRules, GameTicker.IsGameRuleActive((uid, rule)));
             antag.PreSelectionsComplete = true;
         }
 
@@ -248,30 +188,6 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
         _delayedAntags.Clear();
     }
 
-    private void OnJobNotAssigned(NoJobsAvailableSpawningEvent args)
-    {
-        // If someone fails to spawn in due to there being no jobs, they should be removed from any preselected antags.
-        // We only care about delayed rules, since if they're active the player should have already been removed via MakeAntag.
-        var query = QueryDelayedRules();
-        while (query.MoveNext(out var uid, out _, out var comp, out _))
-        {
-            if (comp.SelectionTime == RuleStarted)
-                continue;
-
-            Debug.Assert(comp.SelectionTime != Never, $"Player: {args.Player.Name}, was pre selected for an game rule {ToPrettyString(uid)} which does not do pre-selections");
-
-            if (!comp.RemoveUponFailedSpawn)
-                continue;
-
-            foreach (var antag in comp.Antags)
-            {
-                if (!comp.PreSelectedSessions.TryGetValue(antag, out var session))
-                    break;
-                session.Remove(args.Player);
-            }
-        }
-    }
-
     private void AddGameRuleDefinitions(Entity<AntagSelectionComponent> gameRule,
         int playerCount,
         ref List<AntagRule> preSpawnRoles,
@@ -400,7 +316,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
             // Skip definitions that don't want a player assigned to them.
             if (!antag.Definition.PickPlayer)
             {
-                Debug.Assert(antag.Definition.SpawnerPrototype != null,
+                DebugTools.Assert(antag.Definition.SpawnerPrototype != null,
                     $"Antag prototype {antag.Definition.ID} was set to not pre-select, but it also had no ghost spawner to spawn.");
                 continue;
             }
@@ -460,7 +376,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
             // Skip definitions that don't want a player assigned to them.
             if (!antag.Definition.PickPlayer)
             {
-                Debug.Assert(antag.Definition.SpawnerPrototype != null,
+                DebugTools.Assert(antag.Definition.SpawnerPrototype != null,
                     $"Antag prototype {antag.Definition.ID} was set to not pre-select, but it also had no ghost spawner to spawn.");
                 continue;
             }
@@ -512,7 +428,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
             // Skip definitions that don't want a player assigned to them.
             if (!antag.Definition.PickPlayer)
             {
-                Debug.Assert(antag.Definition.SpawnerPrototype != null,
+                DebugTools.Assert(antag.Definition.SpawnerPrototype != null,
                     $"Antag prototype {antag.Definition.ID} was set to not pre-select, but it also had no ghost spawner to spawn.");
                 continue;
             }
@@ -572,7 +488,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
     /// <param name="gameRule">Game rule which has chosen this player for antag.</param>
     /// <param name="protoId">Antag prototype this player will become.</param>
     /// <param name="player">Player.</param>
-    private void PreSelectSession(Entity<AntagSelectionComponent> gameRule, ProtoId<AntagSpecifierPrototype> protoId, ICommonSession player)
+    protected void PreSelectSession(Entity<AntagSelectionComponent> gameRule, ProtoId<AntagSpecifierPrototype> protoId, ICommonSession player)
     {
         if (!gameRule.Comp.PreSelectedSessions.TryGetValue(protoId, out var set))
             gameRule.Comp.PreSelectedSessions.Add(protoId, set = new HashSet<ICommonSession>());
@@ -582,7 +498,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
             return;
 
         Log.Debug($"Pre-selected {player.Name} as antagonist: {ToPrettyString(gameRule)}, {protoId}");
-        _adminLogger.Add(LogType.AntagSelection, $"Pre-selected {player.Name} as antagonist: {ToPrettyString(gameRule)}, {protoId}");
+        AdminLogger.Add(LogType.AntagSelection, $"Pre-selected {player.Name} as antagonist: {ToPrettyString(gameRule)}, {protoId}");
     }
 
     /// <summary>
@@ -618,7 +534,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
 
         // Not an error because player could've disconnected or died or something.
         Log.Debug($"De-selected {player.Name} as antagonist: {ToPrettyString(gameRule)}, {protoId}");
-        _adminLogger.Add(LogType.AntagSelection, $"De-selected {player.Name} as antagonist: {ToPrettyString(gameRule)}, {protoId}");
+        AdminLogger.Add(LogType.AntagSelection, $"De-selected {player.Name} as antagonist: {ToPrettyString(gameRule)}, {protoId}");
     }
 
     /// <summary>
@@ -695,7 +611,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
 
         // Move our entity to the new coordinates we found!
         var xform = Transform(uid);
-        _transform.SetMapCoordinates((uid, xform), coordinates.Value);
+        XForm.SetMapCoordinates((uid, xform), coordinates.Value);
         return uid;
     }
 
@@ -703,7 +619,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
     /// Attempts to create a new antagonist entity at the specified coordinates and attach a player session to it.
     /// If it cannot spawn an antagonist entity, it does nothing.
     /// </summary>
-    private bool TrySpawnAntagonist(Entity<AntagSelectionComponent> gameRule,
+    protected bool TrySpawnAntagonist(Entity<AntagSelectionComponent> gameRule,
         AntagSpecifierPrototype prototype,
         ICommonSession player,
         MapCoordinates coordinates,
@@ -729,7 +645,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
 
             foreach (var session in set)
             {
-                _adminLogger.Add(LogType.AntagSelection, $"Start trying to make {session} become the antagonist: {ToPrettyString(gameRule)}, {proto}");
+                AdminLogger.Add(LogType.AntagSelection, $"Start trying to make {session} become the antagonist: {ToPrettyString(gameRule)}, {proto}");
 
                 if (!IsSessionValid(session, gameRule, def))
                 {
@@ -774,10 +690,10 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
     /// Initializes the antagonist status on the specified entity.
     /// Adds the needed components, loadouts, items, attaches the player and fires off an event.
     /// </summary>
-    private void InitializeAntag(Entity<AntagSelectionComponent> gameRule, AntagSpecifierPrototype prototype, EntityUid antag, ICommonSession player)
+    protected void InitializeAntag(Entity<AntagSelectionComponent> gameRule, AntagSpecifierPrototype prototype, EntityUid antag, ICommonSession player)
     {
         // Make sure player was properly pre-selected.
-        Debug.Assert(gameRule.Comp.PreSelectedSessions.TryGetValue(prototype.ID, out var value) && value.Contains(player),
+        DebugTools.Assert(gameRule.Comp.PreSelectedSessions.TryGetValue(prototype.ID, out var value) && value.Contains(player),
             $"Game rule {ToPrettyString(gameRule)}, failed to pre-assign {player.Name} to antag {prototype.ID}");
 
         // The following is where we apply components, equipment, and other changes to our antagonist entity.
@@ -788,18 +704,18 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
         if (prototype.StartingGear is not null)
             gear.Add(prototype.StartingGear.Value);
 
-        _loadout.Equip(antag, gear, prototype.RoleLoadout);
+        Loadout.Equip(antag, gear, prototype.RoleLoadout);
 
         // Ensure that we have the right mind for our entity.
-        if (!_mind.TryGetMind(player, out var mind, out var mindComp) || mindComp.OwnedEntity != antag)
-            mind = _mind.CreateMind(player.UserId, Name(antag));
+        if (!Mind.TryGetMind(player, out var mind, out var mindComp) || mindComp.OwnedEntity != antag)
+            mind = Mind.CreateMind(player.UserId, Name(antag));
 
-        _mind.TransferTo(mind, antag, ghostCheckOverride: true);
-        _role.MindAddRoles(mind, prototype.MindRoles, silent: true);
+        Mind.TransferTo(mind, antag, ghostCheckOverride: true);
+        Role.MindAddRoles(mind, prototype.MindRoles, silent: true);
         AssignMind(gameRule, prototype, mind, antag);
 
         Log.Debug($"Assigned {ToPrettyString(antag):target}, mind {ToPrettyString(mind):target} as antagonist: {ToPrettyString(gameRule):user}");
-        _adminLogger.Add(LogType.AntagSelection, $"Assigned {ToPrettyString(antag):target}, mind {ToPrettyString(mind):target} as antagonist: {ToPrettyString(gameRule):user}");
+        AdminLogger.Add(LogType.AntagSelection, $"Assigned {ToPrettyString(antag):target}, mind {ToPrettyString(mind):target} as antagonist: {ToPrettyString(gameRule):user}");
 
         SendBriefing(player, prototype.Briefing);
 
@@ -807,7 +723,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
         RaiseLocalEvent(gameRule, ref afterEv, true);
     }
 
-    private void AssignMind(Entity<AntagSelectionComponent> gameRule, ProtoId<AntagSpecifierPrototype> proto, EntityUid mind, EntityUid antag)
+    protected void AssignMind(Entity<AntagSelectionComponent> gameRule, ProtoId<AntagSpecifierPrototype> proto, EntityUid mind, EntityUid antag)
     {
         if (gameRule.Comp.AssignedMinds.TryGetValue(proto, out var minds))
         {
@@ -820,15 +736,6 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
             gameRule.Comp.AssignedMinds.Add(proto, hashset);
         }
     }
-
-    private void OnObjectivesTextGetInfo(Entity<AntagSelectionComponent> ent, ref ObjectivesTextGetInfoEvent args)
-    {
-        if (ent.Comp.AgentName is not { } name)
-            return;
-
-        args.Minds = GetAntagIdentities(ent.AsNullable()).ToList();
-        args.AgentName = Loc.GetString(name);
-    }
 }
 
 /// <summary>
diff --git a/Content.Server/Antag/Components/AntagSelectionComponent.cs b/Content.Shared/Antag/Components/AntagSelectionComponent.cs
similarity index 92%
rename from Content.Server/Antag/Components/AntagSelectionComponent.cs
rename to Content.Shared/Antag/Components/AntagSelectionComponent.cs
index de26f81843..84581a32b0 100644
--- a/Content.Server/Antag/Components/AntagSelectionComponent.cs
+++ b/Content.Shared/Antag/Components/AntagSelectionComponent.cs
@@ -1,14 +1,12 @@
-using Content.Server.Administration.Systems;
-using Content.Server.Antag.Selectors;
-using Content.Server.GameTicking;
-using Content.Shared.Antag;
+using Content.Shared.Antag.Selectors;
+using Content.Shared.GameTicking;
 using Content.Shared.GameTicking.Components;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Antag.Components;
+namespace Content.Shared.Antag.Components;
 
-[RegisterComponent, Access(typeof(AntagSelectionSystem), typeof(AdminVerbSystem))]
+[RegisterComponent, Access(typeof(AntagSelectionSystem))]
 public sealed partial class AntagSelectionComponent : Component
 {
     /// <summary>
diff --git a/Content.Server/Antag/Components/GhostRoleAntagSpawnerComponent.cs b/Content.Shared/Antag/Components/GhostRoleAntagSpawnerComponent.cs
similarity index 84%
rename from Content.Server/Antag/Components/GhostRoleAntagSpawnerComponent.cs
rename to Content.Shared/Antag/Components/GhostRoleAntagSpawnerComponent.cs
index 0c563f3c40..5eaf887a9f 100644
--- a/Content.Server/Antag/Components/GhostRoleAntagSpawnerComponent.cs
+++ b/Content.Shared/Antag/Components/GhostRoleAntagSpawnerComponent.cs
@@ -1,7 +1,6 @@
-using Content.Shared.Antag;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Antag.Components;
+namespace Content.Shared.Antag.Components;
 
 /// <summary>
 /// Ghost role spawner that creates an antag for the associated game rule.
diff --git a/Content.Server/Antag/Selectors/AntagCountSelector.cs b/Content.Shared/Antag/Selectors/AntagCountSelector.cs
similarity index 93%
rename from Content.Server/Antag/Selectors/AntagCountSelector.cs
rename to Content.Shared/Antag/Selectors/AntagCountSelector.cs
index 3f02581385..b20c464fc1 100644
--- a/Content.Server/Antag/Selectors/AntagCountSelector.cs
+++ b/Content.Shared/Antag/Selectors/AntagCountSelector.cs
@@ -1,9 +1,8 @@
-using Content.Shared.Antag;
 using Content.Shared.Destructible.Thresholds;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
-namespace Content.Server.Antag.Selectors;
+namespace Content.Shared.Antag.Selectors;
 
 /// <summary>
 /// An abstract class meant to return the amount of antags to spawn.
diff --git a/Content.Server/Antag/Selectors/FixedAntagCount.cs b/Content.Shared/Antag/Selectors/FixedAntagCount.cs
similarity index 83%
rename from Content.Server/Antag/Selectors/FixedAntagCount.cs
rename to Content.Shared/Antag/Selectors/FixedAntagCount.cs
index 17b4dc30d0..39da2789a8 100644
--- a/Content.Server/Antag/Selectors/FixedAntagCount.cs
+++ b/Content.Shared/Antag/Selectors/FixedAntagCount.cs
@@ -1,6 +1,6 @@
-using Robust.Shared.Random;
+using Robust.Shared.Random;
 
-namespace Content.Server.Antag.Selectors;
+namespace Content.Shared.Antag.Selectors;
 
 /// <summary>
 /// Always spawns this many antags.
diff --git a/Content.Server/Antag/Selectors/LinearAntagCount.cs b/Content.Shared/Antag/Selectors/LinearAntagCount.cs
similarity index 82%
rename from Content.Server/Antag/Selectors/LinearAntagCount.cs
rename to Content.Shared/Antag/Selectors/LinearAntagCount.cs
index 78fce94733..0a38a92c4c 100644
--- a/Content.Server/Antag/Selectors/LinearAntagCount.cs
+++ b/Content.Shared/Antag/Selectors/LinearAntagCount.cs
@@ -1,6 +1,6 @@
-using Robust.Shared.Random;
+using Robust.Shared.Random;
 
-namespace Content.Server.Antag.Selectors;
+namespace Content.Shared.Antag.Selectors;
 
 /// <summary>
 /// Spawns a constrained number of antags that scales linearly.
diff --git a/Content.Shared/Arcade/BlockGameBlock.cs b/Content.Shared/Arcade/BlockGameBlock.cs
index 012950cda7..009f1c0a5e 100644
--- a/Content.Shared/Arcade/BlockGameBlock.cs
+++ b/Content.Shared/Arcade/BlockGameBlock.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Arcade
 {
diff --git a/Content.Shared/Arcade/BlockGamePlayerAction.cs b/Content.Shared/Arcade/BlockGamePlayerAction.cs
index 9334fd5812..d7e30a17b7 100644
--- a/Content.Shared/Arcade/BlockGamePlayerAction.cs
+++ b/Content.Shared/Arcade/BlockGamePlayerAction.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Arcade
 {
diff --git a/Content.Shared/Arcade/BlockGameUiKey.cs b/Content.Shared/Arcade/BlockGameUiKey.cs
index 8ab4359091..b14308916c 100644
--- a/Content.Shared/Arcade/BlockGameUiKey.cs
+++ b/Content.Shared/Arcade/BlockGameUiKey.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Arcade
 {
diff --git a/Content.Shared/Armable/ArmableComponent.cs b/Content.Shared/Armable/ArmableComponent.cs
index 11809c156c..1c016eb168 100644
--- a/Content.Shared/Armable/ArmableComponent.cs
+++ b/Content.Shared/Armable/ArmableComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Armable;
 
diff --git a/Content.Shared/Armable/ArmableSystem.cs b/Content.Shared/Armable/ArmableSystem.cs
index 391498d77a..4a991097c7 100644
--- a/Content.Shared/Armable/ArmableSystem.cs
+++ b/Content.Shared/Armable/ArmableSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Examine;
+using Content.Shared.Examine;
 using Content.Shared.Item.ItemToggle;
 using Content.Shared.Item.ItemToggle.Components;
 
diff --git a/Content.Shared/Armor/ArmorComponent.cs b/Content.Shared/Armor/ArmorComponent.cs
index 38f5f2cb1b..143d92400e 100644
--- a/Content.Shared/Armor/ArmorComponent.cs
+++ b/Content.Shared/Armor/ArmorComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage;
+using Content.Shared.Damage;
 using Content.Shared.Inventory;
 using Robust.Shared.GameStates;
 using Robust.Shared.Utility;
diff --git a/Content.Shared/Armor/SharedArmorSystem.cs b/Content.Shared/Armor/SharedArmorSystem.cs
index b65007aec5..6438262c29 100644
--- a/Content.Shared/Armor/SharedArmorSystem.cs
+++ b/Content.Shared/Armor/SharedArmorSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Clothing.Components;
+using Content.Shared.Clothing.Components;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Examine;
diff --git a/Content.Shared/Atmos/AtmosDirection.cs b/Content.Shared/Atmos/AtmosDirection.cs
index 4872a52236..f6e40ac812 100644
--- a/Content.Shared/Atmos/AtmosDirection.cs
+++ b/Content.Shared/Atmos/AtmosDirection.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using System.Runtime.CompilerServices;
 using JetBrains.Annotations;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Atmos/AtmosExposedEvents.cs b/Content.Shared/Atmos/AtmosExposedEvents.cs
index b64ebb49cd..81e28edd98 100644
--- a/Content.Shared/Atmos/AtmosExposedEvents.cs
+++ b/Content.Shared/Atmos/AtmosExposedEvents.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Map;
+using Robust.Shared.Map;
 
 namespace Content.Shared.Atmos;
 
diff --git a/Content.Shared/Atmos/Components/BreathToolComponent.cs b/Content.Shared/Atmos/Components/BreathToolComponent.cs
index b511258ff8..5b88d81b96 100644
--- a/Content.Shared/Atmos/Components/BreathToolComponent.cs
+++ b/Content.Shared/Atmos/Components/BreathToolComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Body.Components;
+using Content.Shared.Body.Components;
 using Content.Shared.Inventory;
 using Robust.Shared.GameStates;
 
diff --git a/Content.Shared/Atmos/Components/ExtinguishableSetCollisionWakeComponent.cs b/Content.Shared/Atmos/Components/ExtinguishableSetCollisionWakeComponent.cs
index 19e471f0e5..14ad065030 100644
--- a/Content.Shared/Atmos/Components/ExtinguishableSetCollisionWakeComponent.cs
+++ b/Content.Shared/Atmos/Components/ExtinguishableSetCollisionWakeComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Atmos.Components;
 
diff --git a/Content.Shared/Atmos/Components/GasMaxPressureHolderComponent.cs b/Content.Shared/Atmos/Components/GasMaxPressureHolderComponent.cs
index 0f028fa7b8..7e76939858 100644
--- a/Content.Shared/Atmos/Components/GasMaxPressureHolderComponent.cs
+++ b/Content.Shared/Atmos/Components/GasMaxPressureHolderComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Audio;
+using Robust.Shared.Audio;
 
 namespace Content.Shared.Atmos.Components;
 
diff --git a/Content.Shared/Atmos/Components/IGasMaxPressureHolder.cs b/Content.Shared/Atmos/Components/IGasMaxPressureHolder.cs
index e05d80c96c..1eddc479ba 100644
--- a/Content.Shared/Atmos/Components/IGasMaxPressureHolder.cs
+++ b/Content.Shared/Atmos/Components/IGasMaxPressureHolder.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Audio;
+using Robust.Shared.Audio;
 
 namespace Content.Shared.Atmos.Components;
 
diff --git a/Content.Shared/Atmos/Components/SharedGasTankComponent.cs b/Content.Shared/Atmos/Components/SharedGasTankComponent.cs
index 536d040766..1b353c2b20 100644
--- a/Content.Shared/Atmos/Components/SharedGasTankComponent.cs
+++ b/Content.Shared/Atmos/Components/SharedGasTankComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Atmos.Components;
 
diff --git a/Content.Shared/Atmos/EntitySystems/ExtinguishableSetCollisionWakeSystem.cs b/Content.Shared/Atmos/EntitySystems/ExtinguishableSetCollisionWakeSystem.cs
index 010229311f..b629feabd3 100644
--- a/Content.Shared/Atmos/EntitySystems/ExtinguishableSetCollisionWakeSystem.cs
+++ b/Content.Shared/Atmos/EntitySystems/ExtinguishableSetCollisionWakeSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.Components;
 
 namespace Content.Shared.Atmos.EntitySystems;
 
diff --git a/Content.Shared/Atmos/EntitySystems/GasMaxPressureSystem.cs b/Content.Shared/Atmos/EntitySystems/GasMaxPressureSystem.cs
index 27a3433bd6..9153998070 100644
--- a/Content.Shared/Atmos/EntitySystems/GasMaxPressureSystem.cs
+++ b/Content.Shared/Atmos/EntitySystems/GasMaxPressureSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.Components;
 using Content.Shared.CCVar;
 using Content.Shared.Destructible;
 using Content.Shared.Explosion.EntitySystems;
diff --git a/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.API.cs b/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.API.cs
index 5b953e6df4..4dca3627c6 100644
--- a/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.API.cs
+++ b/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.API.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
 
 namespace Content.Shared.Atmos.EntitySystems;
diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasPressureRegulatorSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasPressureRegulatorSystem.cs
index 8a1b1eb867..9022e6a522 100644
--- a/Content.Shared/Atmos/EntitySystems/SharedGasPressureRegulatorSystem.cs
+++ b/Content.Shared/Atmos/EntitySystems/SharedGasPressureRegulatorSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration.Logs;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.Piping.Binary.Components;
 using Content.Shared.Database;
diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasTankSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasTankSystem.cs
index 164846f9de..8c245f5cb0 100644
--- a/Content.Shared/Atmos/EntitySystems/SharedGasTankSystem.cs
+++ b/Content.Shared/Atmos/EntitySystems/SharedGasTankSystem.cs
@@ -2,7 +2,7 @@ using Content.Shared.Actions;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Body.Systems;
 using Content.Shared.Examine;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Toggleable;
 using Content.Shared.UserInterface;
 using Content.Shared.Verbs;
diff --git a/Content.Shared/Atmos/ExcitedGroup.cs b/Content.Shared/Atmos/ExcitedGroup.cs
index 837763f9ba..b5ec330bad 100644
--- a/Content.Shared/Atmos/ExcitedGroup.cs
+++ b/Content.Shared/Atmos/ExcitedGroup.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Atmos;
+namespace Content.Shared.Atmos;
 
 /// <summary>
 /// <para>Internal Atmospherics class that stores data about a group of <see cref="TileAtmosphere"/>s
diff --git a/Content.Shared/Atmos/FireEvents.cs b/Content.Shared/Atmos/FireEvents.cs
index 4e19ef6147..69ae680a1e 100644
--- a/Content.Shared/Atmos/FireEvents.cs
+++ b/Content.Shared/Atmos/FireEvents.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Inventory;
+using Content.Shared.Inventory;
 using Content.Shared.Nutrition.Components;
 
 namespace Content.Shared.Atmos;
diff --git a/Content.Shared/Atmos/FireVisuals.cs b/Content.Shared/Atmos/FireVisuals.cs
index 6758a95fd8..1d9dcbaea9 100644
--- a/Content.Shared/Atmos/FireVisuals.cs
+++ b/Content.Shared/Atmos/FireVisuals.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Atmos
 {
diff --git a/Content.Shared/Atmos/GasMixture.cs b/Content.Shared/Atmos/GasMixture.cs
index a5fc04e611..bbd6fbf26d 100644
--- a/Content.Shared/Atmos/GasMixture.cs
+++ b/Content.Shared/Atmos/GasMixture.cs
@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics.Tensors;
diff --git a/Content.Shared/Atmos/GasMixtureStringRepresentation.cs b/Content.Shared/Atmos/GasMixtureStringRepresentation.cs
index 33b9d9e181..0df0da3bc6 100644
--- a/Content.Shared/Atmos/GasMixtureStringRepresentation.cs
+++ b/Content.Shared/Atmos/GasMixtureStringRepresentation.cs
@@ -1,4 +1,4 @@
-using System.Text;
+using System.Text;
 
 namespace Content.Shared.Atmos;
 
diff --git a/Content.Shared/Atmos/Hotspot.cs b/Content.Shared/Atmos/Hotspot.cs
index 5dad064df4..20fd7fc190 100644
--- a/Content.Shared/Atmos/Hotspot.cs
+++ b/Content.Shared/Atmos/Hotspot.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Atmos;
+namespace Content.Shared.Atmos;
 
 /// <summary>
 /// Internal Atmospherics struct that stores data about a hotspot in a tile.
diff --git a/Content.Shared/Atmos/IGasMixtureHolder.cs b/Content.Shared/Atmos/IGasMixtureHolder.cs
index 5ad100319d..42c6607882 100644
--- a/Content.Shared/Atmos/IGasMixtureHolder.cs
+++ b/Content.Shared/Atmos/IGasMixtureHolder.cs
@@ -3,4 +3,4 @@ namespace Content.Shared.Atmos;
 public interface IGasMixtureHolder
 {
     public GasMixture Air { get; set; }
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Atmos/Monitor/AtmosSensorData.cs b/Content.Shared/Atmos/Monitor/AtmosSensorData.cs
index 041c386b5f..1a2b291243 100644
--- a/Content.Shared/Atmos/Monitor/AtmosSensorData.cs
+++ b/Content.Shared/Atmos/Monitor/AtmosSensorData.cs
@@ -1,12 +1,28 @@
-using Content.Shared.Atmos.Monitor.Components;
+using Content.Shared.DeviceNetwork;
+using Content.Shared.DeviceNetwork.Systems;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Atmos.Monitor;
 
-[Serializable, NetSerializable]
-public sealed class AtmosSensorData : IAtmosDeviceData
+/// <summary>
+/// Contains <see cref="AtmosMonitorData"/>.
+/// </summary>
+public partial record struct AtmosMonitorDataPayload : INetworkPayload
 {
-    public AtmosSensorData(float pressure, float temperature, float totalMoles, AtmosAlarmType alarmState, Dictionary<Gas, float> gases, AtmosAlarmThreshold pressureThreshold, AtmosAlarmThreshold temperatureThreshold, Dictionary<Gas, AtmosAlarmThreshold> gasThresholds)
+    [DataField]
+    public AtmosMonitorData Data;
+}
+
+[Serializable, NetSerializable]
+public sealed partial class AtmosMonitorData : BaseAtmosDeviceData
+{
+    public override void RaisePayload(EntityUid uid, string address, SharedDeviceNetworkSystem deviceNetSys)
+    {
+        var payload = new AtmosMonitorDataPayload { Data = this };
+        deviceNetSys.SendPacket(uid, address, ref payload);
+    }
+
+    public AtmosMonitorData(float pressure, float temperature, float totalMoles, AtmosAlarmType alarmState, Dictionary<Gas, float> gases, AtmosAlarmThreshold pressureThreshold, AtmosAlarmThreshold temperatureThreshold, Dictionary<Gas, AtmosAlarmThreshold> gasThresholds)
     {
         Pressure = pressure;
         Temperature = temperature;
@@ -18,10 +34,6 @@ public sealed class AtmosSensorData : IAtmosDeviceData
         GasThresholds = gasThresholds;
     }
 
-    public bool Enabled { get; set; }
-    public bool Dirty { get; set; }
-    public bool IgnoreAlarms { get; set; }
-
     /// Most fields are readonly, because it's data that's meant to be transmitted.
 
     /// <summary>
diff --git a/Content.Shared/Atmos/Monitor/BaseAtmosDeviceData.cs b/Content.Shared/Atmos/Monitor/BaseAtmosDeviceData.cs
new file mode 100644
index 0000000000..1a35387ee8
--- /dev/null
+++ b/Content.Shared/Atmos/Monitor/BaseAtmosDeviceData.cs
@@ -0,0 +1,19 @@
+using Content.Shared.DeviceNetwork.Systems;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Atmos.Monitor;
+
+[Serializable, NetSerializable]
+public abstract partial class BaseAtmosDeviceData : IAtmosDeviceData
+{
+    [DataField]
+    public bool Enabled { get; set; }
+
+    [DataField]
+    public bool Dirty { get; set; }
+
+    [DataField]
+    public bool IgnoreAlarms { get; set; }
+
+    public abstract void RaisePayload(EntityUid uid, string address, SharedDeviceNetworkSystem deviceNetSys);
+}
diff --git a/Content.Shared/Atmos/Monitor/Components/SharedAirAlarmComponent.cs b/Content.Shared/Atmos/Monitor/Components/SharedAirAlarmComponent.cs
index 3d67d18a0a..1b4675f711 100644
--- a/Content.Shared/Atmos/Monitor/Components/SharedAirAlarmComponent.cs
+++ b/Content.Shared/Atmos/Monitor/Components/SharedAirAlarmComponent.cs
@@ -27,13 +27,6 @@ public enum AirAlarmWireStatus
     DeviceSync
 }
 
-public interface IAtmosDeviceData
-{
-    public bool Enabled { get; set; }
-    public bool Dirty { get; set; }
-    public bool IgnoreAlarms { get; set; }
-}
-
 [Serializable, NetSerializable]
 public sealed class AirAlarmUIState : BoundUserInterfaceState
 {
@@ -69,8 +62,7 @@ public sealed class AirAlarmUIState : BoundUserInterfaceState
 }
 
 [Serializable, NetSerializable]
-public sealed class AirAlarmResyncAllDevicesMessage : BoundUserInterfaceMessage
-{}
+public sealed class AirAlarmResyncAllDevicesMessage : BoundUserInterfaceMessage;
 
 [Serializable, NetSerializable]
 public sealed class AirAlarmUpdateAlarmModeMessage : BoundUserInterfaceMessage
diff --git a/Content.Shared/Atmos/Monitor/IAtmosDeviceData.cs b/Content.Shared/Atmos/Monitor/IAtmosDeviceData.cs
new file mode 100644
index 0000000000..48e98d34af
--- /dev/null
+++ b/Content.Shared/Atmos/Monitor/IAtmosDeviceData.cs
@@ -0,0 +1,21 @@
+using Content.Shared.DeviceNetwork.Systems;
+
+namespace Content.Shared.Atmos.Monitor;
+
+[ImplicitDataDefinitionForInheritors]
+public partial interface IAtmosDeviceData
+{
+    bool Enabled { get; set; }
+
+    bool Dirty { get; set; }
+
+    bool IgnoreAlarms { get; set; }
+
+    /// <summary>
+    /// Creates a payload that contains this atmos device data and send it to the specified address.
+    /// </summary>
+    /// <param name="uid">Owner of this atmos data.</param>
+    /// <param name="address">The target address.</param>
+    /// <param name="deviceNetSys">The device network system.</param>
+    void RaisePayload(EntityUid uid, string address, SharedDeviceNetworkSystem deviceNetSys);
+}
diff --git a/Content.Shared/Atmos/MonstermosInfo.cs b/Content.Shared/Atmos/MonstermosInfo.cs
index 7b4b8b1347..565f5006e9 100644
--- a/Content.Shared/Atmos/MonstermosInfo.cs
+++ b/Content.Shared/Atmos/MonstermosInfo.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Atmos;
+namespace Content.Shared.Atmos;
 
 /// <summary>
 /// Atmospherics class that stores data on tiles for Monstermos calculations and operations.
diff --git a/Content.Shared/Atmos/Piping/Binary/Components/GasPressureRegulatorComponent.cs b/Content.Shared/Atmos/Piping/Binary/Components/GasPressureRegulatorComponent.cs
index 2e893d28fc..8a10bf2a67 100644
--- a/Content.Shared/Atmos/Piping/Binary/Components/GasPressureRegulatorComponent.cs
+++ b/Content.Shared/Atmos/Piping/Binary/Components/GasPressureRegulatorComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Guidebook;
+using Content.Shared.Guidebook;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
diff --git a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs
index 6ad576fd8c..3144842770 100644
--- a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs
+++ b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Atmos.Piping.Binary.Components
 {
diff --git a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressurePumpComponent.cs b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressurePumpComponent.cs
index 041708dde0..bcdb221b02 100644
--- a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressurePumpComponent.cs
+++ b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressurePumpComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Atmos.Piping.Binary.Components;
 
diff --git a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressureRegulatorComponent.cs b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressureRegulatorComponent.cs
index 74ca041d10..d5a208159e 100644
--- a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressureRegulatorComponent.cs
+++ b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressureRegulatorComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Atmos.Piping.Binary.Components;
 
diff --git a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasVolumePumpComponent.cs b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasVolumePumpComponent.cs
index f3b6bb8caf..f34d22d9ad 100644
--- a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasVolumePumpComponent.cs
+++ b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasVolumePumpComponent.cs
@@ -1,34 +1,41 @@
-using Robust.Shared.Serialization;
+using Content.Shared.DeviceNetwork;
+using Robust.Shared.Serialization;
 
-namespace Content.Shared.Atmos.Piping.Binary.Components
+namespace Content.Shared.Atmos.Piping.Binary.Components;
+
+/// <summary>
+/// Contains data about a <see cref="GasVolumePumpComponent"/>.
+/// </summary>
+public partial record struct GasVolumePumpDataPayload : INetworkPayload
 {
-    public sealed record GasVolumePumpData(float LastMolesTransferred);
+    [DataField]
+    public float LastMolesTransferred;
+}
 
-    [Serializable, NetSerializable]
-    public enum GasVolumePumpUiKey : byte
+[Serializable, NetSerializable]
+public enum GasVolumePumpUiKey : byte
+{
+    Key,
+}
+
+[Serializable, NetSerializable]
+public sealed class GasVolumePumpToggleStatusMessage : BoundUserInterfaceMessage
+{
+    public bool Enabled { get; }
+
+    public GasVolumePumpToggleStatusMessage(bool enabled)
     {
-        Key,
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class GasVolumePumpToggleStatusMessage : BoundUserInterfaceMessage
-    {
-        public bool Enabled { get; }
-
-        public GasVolumePumpToggleStatusMessage(bool enabled)
-        {
-            Enabled = enabled;
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class GasVolumePumpChangeTransferRateMessage : BoundUserInterfaceMessage
-    {
-        public float TransferRate { get; }
-
-        public GasVolumePumpChangeTransferRateMessage(float transferRate)
-        {
-            TransferRate = transferRate;
-        }
+        Enabled = enabled;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class GasVolumePumpChangeTransferRateMessage : BoundUserInterfaceMessage
+{
+    public float TransferRate { get; }
+
+    public GasVolumePumpChangeTransferRateMessage(float transferRate)
+    {
+        TransferRate = transferRate;
     }
 }
diff --git a/Content.Shared/Atmos/Piping/Unary/Components/SharedGasThermomachineComponent.cs b/Content.Shared/Atmos/Piping/Unary/Components/SharedGasThermomachineComponent.cs
index 5d2beb9de5..9b4caa953d 100644
--- a/Content.Shared/Atmos/Piping/Unary/Components/SharedGasThermomachineComponent.cs
+++ b/Content.Shared/Atmos/Piping/Unary/Components/SharedGasThermomachineComponent.cs
@@ -1,9 +1,16 @@
-using Robust.Shared.Serialization;
+using Content.Shared.DeviceNetwork;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Atmos.Piping.Unary.Components;
 
-[Serializable, NetSerializable]
-public sealed record GasThermoMachineData(float EnergyDelta);
+/// <summary>
+/// Contains data about <see cref="GasThermoMachineComponent"/>.
+/// </summary>
+public partial record struct GasThermoMachineDataPayload : INetworkPayload
+{
+    [DataField]
+    public float EnergyDelta;
+}
 
 [Serializable]
 [NetSerializable]
diff --git a/Content.Shared/Atmos/Piping/Unary/Components/SharedVentPumpComponent.cs b/Content.Shared/Atmos/Piping/Unary/Components/SharedVentPumpComponent.cs
index 15fece204d..1a06faba39 100644
--- a/Content.Shared/Atmos/Piping/Unary/Components/SharedVentPumpComponent.cs
+++ b/Content.Shared/Atmos/Piping/Unary/Components/SharedVentPumpComponent.cs
@@ -1,81 +1,94 @@
-using Content.Shared.Atmos.Monitor.Components;
+using Content.Shared.Atmos.Monitor;
+using Content.Shared.DeviceNetwork;
+using Content.Shared.DeviceNetwork.Systems;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Atmos.Piping.Unary.Components
+namespace Content.Shared.Atmos.Piping.Unary.Components;
+
+[Serializable, NetSerializable]
+public sealed partial class GasVentPumpData : BaseAtmosDeviceData
 {
-    [Serializable, NetSerializable]
-    public sealed class GasVentPumpData : IAtmosDeviceData
+    public override void RaisePayload(EntityUid uid, string address, SharedDeviceNetworkSystem deviceNetSys)
     {
-        public bool Enabled { get; set; }
-        public bool Dirty { get; set; }
-        public bool IgnoreAlarms { get; set; } = false;
-        public VentPumpDirection PumpDirection { get; set; } = VentPumpDirection.Releasing;
-        public VentPressureBound PressureChecks { get; set; } = VentPressureBound.ExternalBound;
-        public float ExternalPressureBound { get; set; } = Atmospherics.OneAtmosphere;
-        public float InternalPressureBound { get; set; } = 0f;
-        public bool PressureLockoutOverride { get; set; } = false;
-
-        // Presets for 'dumb' air alarm modes
-
-        public static GasVentPumpData FilterModePreset = new GasVentPumpData
-        {
-            Enabled = true,
-            PumpDirection = VentPumpDirection.Releasing,
-            PressureChecks = VentPressureBound.ExternalBound,
-            ExternalPressureBound = Atmospherics.OneAtmosphere,
-            InternalPressureBound = 0f,
-            PressureLockoutOverride = false
-        };
-
-        public static GasVentPumpData FillModePreset = new GasVentPumpData
-        {
-            Enabled = true,
-            Dirty = true,
-            PumpDirection = VentPumpDirection.Releasing,
-            PressureChecks = VentPressureBound.ExternalBound,
-            ExternalPressureBound = Atmospherics.OneAtmosphere * 50,
-            InternalPressureBound = 0f,
-            PressureLockoutOverride = true
-        };
-
-        public static GasVentPumpData PanicModePreset = new GasVentPumpData
-        {
-            Enabled = false,
-            Dirty = true,
-            PumpDirection = VentPumpDirection.Releasing,
-            PressureChecks = VentPressureBound.ExternalBound,
-            ExternalPressureBound = Atmospherics.OneAtmosphere,
-            InternalPressureBound = 0f,
-            PressureLockoutOverride = false
-        };
-
-        public static GasVentPumpData ReplaceModePreset = new GasVentPumpData
-        {
-            Enabled = false,
-            IgnoreAlarms = true,
-            Dirty = true,
-            PumpDirection = VentPumpDirection.Releasing,
-            PressureChecks = VentPressureBound.ExternalBound,
-            ExternalPressureBound = Atmospherics.OneAtmosphere,
-            InternalPressureBound = 0f,
-            PressureLockoutOverride = false
-        };
+        var payload = new GasVentPumpSetDataPayload { Data = this };
+        deviceNetSys.SendPacket(uid, address, ref payload);
     }
 
-    [Serializable, NetSerializable]
-    public enum VentPumpDirection : sbyte
-    {
-        Siphoning = 0,
-        Releasing = 1,
-    }
+    public VentPumpDirection PumpDirection { get; set; } = VentPumpDirection.Releasing;
+    public VentPressureBound PressureChecks { get; set; } = VentPressureBound.ExternalBound;
+    public float ExternalPressureBound { get; set; } = Atmospherics.OneAtmosphere;
+    public float InternalPressureBound { get; set; } = 0f;
+    public bool PressureLockoutOverride { get; set; } = false;
 
-    [Flags]
-    [Serializable, NetSerializable]
-    public enum VentPressureBound : sbyte
+    // Presets for 'dumb' air alarm modes
+
+    public static GasVentPumpData FilterModePreset = new GasVentPumpData
     {
-        NoBound       = 0,
-        InternalBound = 1,
-        ExternalBound = 2,
-        Both = 3,
-    }
+        Enabled = true,
+        PumpDirection = VentPumpDirection.Releasing,
+        PressureChecks = VentPressureBound.ExternalBound,
+        ExternalPressureBound = Atmospherics.OneAtmosphere,
+        InternalPressureBound = 0f,
+        PressureLockoutOverride = false
+    };
+
+    public static GasVentPumpData FillModePreset = new GasVentPumpData
+    {
+        Enabled = true,
+        Dirty = true,
+        PumpDirection = VentPumpDirection.Releasing,
+        PressureChecks = VentPressureBound.ExternalBound,
+        ExternalPressureBound = Atmospherics.OneAtmosphere * 50,
+        InternalPressureBound = 0f,
+        PressureLockoutOverride = true
+    };
+
+    public static GasVentPumpData PanicModePreset = new GasVentPumpData
+    {
+        Enabled = false,
+        Dirty = true,
+        PumpDirection = VentPumpDirection.Releasing,
+        PressureChecks = VentPressureBound.ExternalBound,
+        ExternalPressureBound = Atmospherics.OneAtmosphere,
+        InternalPressureBound = 0f,
+        PressureLockoutOverride = false
+    };
+
+    public static GasVentPumpData ReplaceModePreset = new GasVentPumpData
+    {
+        Enabled = false,
+        IgnoreAlarms = true,
+        Dirty = true,
+        PumpDirection = VentPumpDirection.Releasing,
+        PressureChecks = VentPressureBound.ExternalBound,
+        ExternalPressureBound = Atmospherics.OneAtmosphere,
+        InternalPressureBound = 0f,
+        PressureLockoutOverride = false
+    };
+}
+
+/// <summary>
+/// Used to set <see cref="GasVentPumpData"/>.
+/// </summary>
+public partial record struct GasVentPumpSetDataPayload : INetworkPayload
+{
+    [DataField]
+    public GasVentPumpData Data;
+}
+
+[Serializable, NetSerializable]
+public enum VentPumpDirection : sbyte
+{
+    Siphoning = 0,
+    Releasing = 1,
+}
+
+[Flags]
+[Serializable, NetSerializable]
+public enum VentPressureBound : sbyte
+{
+    NoBound       = 0,
+    InternalBound = 1,
+    ExternalBound = 2,
+    Both = 3,
 }
diff --git a/Content.Shared/Atmos/Piping/Unary/Components/SharedVentScrubberComponent.cs b/Content.Shared/Atmos/Piping/Unary/Components/SharedVentScrubberComponent.cs
index 63d2e552a7..5f5ebe7dd9 100644
--- a/Content.Shared/Atmos/Piping/Unary/Components/SharedVentScrubberComponent.cs
+++ b/Content.Shared/Atmos/Piping/Unary/Components/SharedVentScrubberComponent.cs
@@ -1,87 +1,100 @@
-using Content.Shared.Atmos.Monitor.Components;
+using Content.Shared.Atmos.Monitor;
+using Content.Shared.DeviceNetwork;
+using Content.Shared.DeviceNetwork.Systems;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Atmos.Piping.Unary.Components
+namespace Content.Shared.Atmos.Piping.Unary.Components;
+
+[Serializable, NetSerializable]
+public sealed partial class GasVentScrubberData : BaseAtmosDeviceData
 {
-    [Serializable, NetSerializable]
-    public sealed class GasVentScrubberData : IAtmosDeviceData
+    public override void RaisePayload(EntityUid uid, string address, SharedDeviceNetworkSystem deviceNetSys)
     {
-        public bool Enabled { get; set; }
-        public bool Dirty { get; set; }
-        public bool IgnoreAlarms { get; set; } = false;
-        public HashSet<Gas> FilterGases { get; set; } = new(DefaultFilterGases);
-        public ScrubberPumpDirection PumpDirection { get; set; } = ScrubberPumpDirection.Scrubbing;
-        public float VolumeRate { get; set; } = 200f;
-        public bool WideNet { get; set; } = false;
-        public bool AirAlarmPanicWireCut { get; set; }
-
-        public static HashSet<Gas> DefaultFilterGases = new()
-        {
-            Gas.CarbonDioxide,
-            Gas.Plasma,
-            Gas.Tritium,
-            Gas.WaterVapor,
-            Gas.Ammonia,
-            Gas.NitrousOxide,
-            Gas.Frezon
-        };
-
-        // Presets for 'dumb' air alarm modes
-
-        public static GasVentScrubberData FilterModePreset = new GasVentScrubberData
-        {
-            Enabled = true,
-            FilterGases = new(GasVentScrubberData.DefaultFilterGases),
-            PumpDirection = ScrubberPumpDirection.Scrubbing,
-            VolumeRate = 200f,
-            WideNet = false
-        };
-
-        public static GasVentScrubberData WideFilterModePreset = new GasVentScrubberData
-        {
-            Enabled = true,
-            FilterGases = new(GasVentScrubberData.DefaultFilterGases),
-            PumpDirection = ScrubberPumpDirection.Scrubbing,
-            VolumeRate = 200f,
-            WideNet = true
-        };
-
-        public static GasVentScrubberData FillModePreset = new GasVentScrubberData
-        {
-            Enabled = false,
-            Dirty = true,
-            FilterGases = new(GasVentScrubberData.DefaultFilterGases),
-            PumpDirection = ScrubberPumpDirection.Scrubbing,
-            VolumeRate = 200f,
-            WideNet = false
-        };
-
-        public static GasVentScrubberData PanicModePreset = new GasVentScrubberData
-        {
-            Enabled = true,
-            Dirty = true,
-            FilterGases = new(GasVentScrubberData.DefaultFilterGases),
-            PumpDirection = ScrubberPumpDirection.Siphoning,
-            VolumeRate = 200f,
-            WideNet = true
-        };
-
-        public static GasVentScrubberData ReplaceModePreset = new GasVentScrubberData
-        {
-            Enabled = true,
-            IgnoreAlarms = true,
-            Dirty = true,
-            FilterGases = new(GasVentScrubberData.DefaultFilterGases),
-            PumpDirection = ScrubberPumpDirection.Siphoning,
-            VolumeRate = 200f,
-            WideNet = false
-        };
+        var payload = new GasVentScrubberSetDataPayload { Data = this };
+        deviceNetSys.SendPacket(uid, address, ref payload);
     }
 
-    [Serializable, NetSerializable]
-    public enum ScrubberPumpDirection : sbyte
+    public HashSet<Gas> FilterGases { get; set; } = new(DefaultFilterGases);
+    public ScrubberPumpDirection PumpDirection { get; set; } = ScrubberPumpDirection.Scrubbing;
+    public float VolumeRate { get; set; } = 200f;
+    public bool WideNet { get; set; } = false;
+    public bool AirAlarmPanicWireCut { get; set; }
+
+    public static HashSet<Gas> DefaultFilterGases = new()
     {
-        Siphoning = 0,
-        Scrubbing = 1,
-    }
+        Gas.CarbonDioxide,
+        Gas.Plasma,
+        Gas.Tritium,
+        Gas.WaterVapor,
+        Gas.Ammonia,
+        Gas.NitrousOxide,
+        Gas.Frezon
+    };
+
+    // Presets for 'dumb' air alarm modes
+
+    public static GasVentScrubberData FilterModePreset = new GasVentScrubberData
+    {
+        Enabled = true,
+        FilterGases = new(GasVentScrubberData.DefaultFilterGases),
+        PumpDirection = ScrubberPumpDirection.Scrubbing,
+        VolumeRate = 200f,
+        WideNet = false
+    };
+
+    public static GasVentScrubberData WideFilterModePreset = new GasVentScrubberData
+    {
+        Enabled = true,
+        FilterGases = new(GasVentScrubberData.DefaultFilterGases),
+        PumpDirection = ScrubberPumpDirection.Scrubbing,
+        VolumeRate = 200f,
+        WideNet = true
+    };
+
+    public static GasVentScrubberData FillModePreset = new GasVentScrubberData
+    {
+        Enabled = false,
+        Dirty = true,
+        FilterGases = new(GasVentScrubberData.DefaultFilterGases),
+        PumpDirection = ScrubberPumpDirection.Scrubbing,
+        VolumeRate = 200f,
+        WideNet = false
+    };
+
+    public static GasVentScrubberData PanicModePreset = new GasVentScrubberData
+    {
+        Enabled = true,
+        Dirty = true,
+        FilterGases = new(GasVentScrubberData.DefaultFilterGases),
+        PumpDirection = ScrubberPumpDirection.Siphoning,
+        VolumeRate = 200f,
+        WideNet = true
+    };
+
+    public static GasVentScrubberData ReplaceModePreset = new GasVentScrubberData
+    {
+        Enabled = true,
+        IgnoreAlarms = true,
+        Dirty = true,
+        FilterGases = new(GasVentScrubberData.DefaultFilterGases),
+        PumpDirection = ScrubberPumpDirection.Siphoning,
+        VolumeRate = 200f,
+        WideNet = false
+    };
+}
+
+/// <summary>
+/// Used to set <see cref="GasVentScrubberData"/>.
+/// </summary>
+public partial record struct GasVentScrubberSetDataPayload : INetworkPayload
+{
+    [DataField]
+    public GasVentScrubberData Data;
+}
+
+[Serializable, NetSerializable]
+public enum ScrubberPumpDirection : sbyte
+{
+    Siphoning = 0,
+    Scrubbing = 1,
 }
diff --git a/Content.Shared/Atmos/Reactions/GasReactionEnums.cs b/Content.Shared/Atmos/Reactions/GasReactionEnums.cs
index 73b8998d40..492a7dbc70 100644
--- a/Content.Shared/Atmos/Reactions/GasReactionEnums.cs
+++ b/Content.Shared/Atmos/Reactions/GasReactionEnums.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Atmos.Reactions;
+namespace Content.Shared.Atmos.Reactions;
 
 [Flags]
 public enum ReactionResult : byte
diff --git a/Content.Shared/Atmos/Rotting/SharedRottingSystem.cs b/Content.Shared/Atmos/Rotting/SharedRottingSystem.cs
index 230593d906..2645065557 100644
--- a/Content.Shared/Atmos/Rotting/SharedRottingSystem.cs
+++ b/Content.Shared/Atmos/Rotting/SharedRottingSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Examine;
+using Content.Shared.Examine;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
diff --git a/Content.Shared/Atmos/Serialization/TileAtmosCollectionSerializer.cs b/Content.Shared/Atmos/Serialization/TileAtmosCollectionSerializer.cs
index d99cb3d210..9e6823057c 100644
--- a/Content.Shared/Atmos/Serialization/TileAtmosCollectionSerializer.cs
+++ b/Content.Shared/Atmos/Serialization/TileAtmosCollectionSerializer.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Markdown;
diff --git a/Content.Shared/Atmos/TileFireEvent.cs b/Content.Shared/Atmos/TileFireEvent.cs
index f0045f58fd..bef7fb8bc8 100644
--- a/Content.Shared/Atmos/TileFireEvent.cs
+++ b/Content.Shared/Atmos/TileFireEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Atmos;
+namespace Content.Shared.Atmos;
 
 /// <summary>
 /// Event raised on an entity when it is standing on a tile that's on fire.
diff --git a/Content.Shared/Audio/SharedGlobalSoundSystem.cs b/Content.Shared/Audio/SharedGlobalSoundSystem.cs
index b2ed5dc90d..0f0331535e 100644
--- a/Content.Shared/Audio/SharedGlobalSoundSystem.cs
+++ b/Content.Shared/Audio/SharedGlobalSoundSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.CCVar;
+using Content.Shared.CCVar;
 using Robust.Shared.Audio;
 using Robust.Shared.Serialization;
 namespace Content.Shared.Audio;
diff --git a/Content.Shared/Audio/SoundWhileAliveComponent.cs b/Content.Shared/Audio/SoundWhileAliveComponent.cs
index 977d9372ce..1bd3ee2c71 100644
--- a/Content.Shared/Audio/SoundWhileAliveComponent.cs
+++ b/Content.Shared/Audio/SoundWhileAliveComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Sound.Components;
+using Content.Shared.Sound.Components;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Audio;
diff --git a/Content.Shared/Beam/Components/BeamComponent.cs b/Content.Shared/Beam/Components/BeamComponent.cs
index 4916d4db30..74554c4b89 100644
--- a/Content.Shared/Beam/Components/BeamComponent.cs
+++ b/Content.Shared/Beam/Components/BeamComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Audio;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Beam/SharedBeamSystem.cs b/Content.Shared/Beam/SharedBeamSystem.cs
index 1127982cbb..5d6471bb4d 100644
--- a/Content.Shared/Beam/SharedBeamSystem.cs
+++ b/Content.Shared/Beam/SharedBeamSystem.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Beam;
+namespace Content.Shared.Beam;
 
 public abstract class SharedBeamSystem : EntitySystem
 {
diff --git a/Content.Shared/Beeper/BeeperEvents.cs b/Content.Shared/Beeper/BeeperEvents.cs
index 7f08902cdb..dc8a6e4026 100644
--- a/Content.Shared/Beeper/BeeperEvents.cs
+++ b/Content.Shared/Beeper/BeeperEvents.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Beeper;
+namespace Content.Shared.Beeper;
 [ByRefEvent]
 public record struct BeepPlayedEvent(bool Muted);
 
diff --git a/Content.Shared/Beeper/Components/BeeperComponent.cs b/Content.Shared/Beeper/Components/BeeperComponent.cs
index f6efbb10f3..9cfb10a2db 100644
--- a/Content.Shared/Beeper/Components/BeeperComponent.cs
+++ b/Content.Shared/Beeper/Components/BeeperComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Beeper.Systems;
+using Content.Shared.Beeper.Systems;
 using Content.Shared.FixedPoint;
 using Content.Shared.ProximityDetection.Systems;
 using Robust.Shared.Audio;
diff --git a/Content.Shared/Beeper/Components/ProximityBeeperComponent.cs b/Content.Shared/Beeper/Components/ProximityBeeperComponent.cs
index f439d6c9c2..49efa6b6cf 100644
--- a/Content.Shared/Beeper/Components/ProximityBeeperComponent.cs
+++ b/Content.Shared/Beeper/Components/ProximityBeeperComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Beeper.Components;
 
diff --git a/Content.Shared/Beeper/Systems/BeeperSystem.cs b/Content.Shared/Beeper/Systems/BeeperSystem.cs
index f97e097196..ec8e151081 100644
--- a/Content.Shared/Beeper/Systems/BeeperSystem.cs
+++ b/Content.Shared/Beeper/Systems/BeeperSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Beeper.Components;
+using Content.Shared.Beeper.Components;
 using Content.Shared.FixedPoint;
 using Content.Shared.Item.ItemToggle;
 using Content.Shared.Item.ItemToggle.Components;
diff --git a/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs b/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs
index db04accd21..dbae3949c0 100644
--- a/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs
+++ b/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Beeper.Components;
+using Content.Shared.Beeper.Components;
 using Content.Shared.Item.ItemToggle;
 using Content.Shared.Pinpointer;
 using Content.Shared.ProximityDetection;
diff --git a/Content.Shared/Bible/BibleSystem.cs b/Content.Shared/Bible/BibleSystem.cs
index ab4a9ea6f9..3a916dc6e5 100644
--- a/Content.Shared/Bible/BibleSystem.cs
+++ b/Content.Shared/Bible/BibleSystem.cs
@@ -11,7 +11,8 @@ using Content.Shared.Mobs;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Random.Helpers;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Verbs;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
diff --git a/Content.Shared/Bible/SummonActionEvent.cs b/Content.Shared/Bible/SummonActionEvent.cs
index d20fe7040c..5fc878306c 100644
--- a/Content.Shared/Bible/SummonActionEvent.cs
+++ b/Content.Shared/Bible/SummonActionEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 
 namespace Content.Shared.Bible;
 
diff --git a/Content.Shared/Blocking/BlockingSystem.User.cs b/Content.Shared/Blocking/BlockingSystem.User.cs
index 0ff6d768b9..8babc507fe 100644
--- a/Content.Shared/Blocking/BlockingSystem.User.cs
+++ b/Content.Shared/Blocking/BlockingSystem.User.cs
@@ -11,25 +11,19 @@ public sealed partial class BlockingSystem
     [Dependency] private DamageableSystem _damageable = default!;
     [Dependency] private SharedAudioSystem _audio = default!;
 
-    private void InitializeUser()
-    {
-        SubscribeLocalEvent<BlockingUserComponent, DamageModifyEvent>(OnUserDamageModified);
-        SubscribeLocalEvent<BlockingUserComponent, EntParentChangedMessage>(OnParentChanged);
-        SubscribeLocalEvent<BlockingUserComponent, ContainerGettingInsertedAttemptEvent>(OnInsertAttempt);
-        SubscribeLocalEvent<BlockingUserComponent, AnchorStateChangedEvent>(OnAnchorChanged);
-        SubscribeLocalEvent<BlockingUserComponent, EntityTerminatingEvent>(OnEntityTerminating);
-    }
-
+    [SubscribeLocalEvent]
     private void OnParentChanged(Entity<BlockingUserComponent> entity, ref EntParentChangedMessage args)
     {
         UserStopBlocking(entity);
     }
 
+    [SubscribeLocalEvent]
     private void OnInsertAttempt(Entity<BlockingUserComponent> entity, ref ContainerGettingInsertedAttemptEvent args)
     {
         UserStopBlocking(entity);
     }
 
+    [SubscribeLocalEvent]
     private void OnAnchorChanged(Entity<BlockingUserComponent> entity, ref AnchorStateChangedEvent args)
     {
         if (args.Anchored)
@@ -38,6 +32,7 @@ public sealed partial class BlockingSystem
         UserStopBlocking(entity);
     }
 
+    [SubscribeLocalEvent]
     private void OnUserDamageModified(Entity<BlockingUserComponent> entity, ref DamageModifyEvent args)
     {
         if (entity.Comp.BlockingItem is not { } item || !_blockQuery.TryComp(item, out var blocking))
@@ -64,6 +59,7 @@ public sealed partial class BlockingSystem
             _audio.PlayPvs(blocking.BlockSound, entity);
     }
 
+    [SubscribeLocalEvent]
     private void OnEntityTerminating(Entity<BlockingUserComponent> entity, ref EntityTerminatingEvent args)
     {
         if (!_blockQuery.TryComp(entity.Comp.BlockingItem, out var blockComponent))
diff --git a/Content.Shared/Blocking/BlockingSystem.cs b/Content.Shared/Blocking/BlockingSystem.cs
index 0026b4799a..25e603d720 100644
--- a/Content.Shared/Blocking/BlockingSystem.cs
+++ b/Content.Shared/Blocking/BlockingSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Actions;
 using Content.Shared.Blocking.Components;
 using Content.Shared.Damage;
@@ -18,6 +18,7 @@ using Content.Shared.Toggleable;
 using Content.Shared.Verbs;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
+using Robust.Shared.Timing;
 using Robust.Shared.Toolshed.Syntax;
 using Robust.Shared.Utility;
 
@@ -25,6 +26,7 @@ namespace Content.Shared.Blocking;
 
 public sealed partial class BlockingSystem : EntitySystem
 {
+    [Dependency] private IGameTiming _timing = default!;
     [Dependency] private ActionContainerSystem _actionContainer = default!;
     [Dependency] private EntityLookupSystem _lookup = default!;
     [Dependency] private ExamineSystemShared _examine = default!;
@@ -42,25 +44,7 @@ public sealed partial class BlockingSystem : EntitySystem
     [Dependency] private EntityQuery<HandsComponent> _handQuery;
     [Dependency] private EntityQuery<MobStateComponent> _mobQuery;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-        InitializeUser();
-
-        SubscribeLocalEvent<BlockingComponent, ItemToggledEvent>(OnItemToggled);
-        SubscribeLocalEvent<BlockingComponent, GotEquippedHandEvent>(OnEquip);
-        SubscribeLocalEvent<BlockingComponent, GotUnequippedHandEvent>(OnUnequip);
-        SubscribeLocalEvent<BlockingComponent, DroppedEvent>(OnDrop);
-
-        SubscribeLocalEvent<BlockingComponent, GetItemActionsEvent>(OnGetActions);
-        SubscribeLocalEvent<BlockingComponent, ToggleActionEvent>(OnToggleAction);
-
-        SubscribeLocalEvent<BlockingComponent, ComponentShutdown>(OnShutdown);
-
-        SubscribeLocalEvent<BlockingComponent, GetVerbsEvent<ExamineVerb>>(OnVerbExamine);
-        SubscribeLocalEvent<BlockingComponent, MapInitEvent>(OnMapInit);
-    }
-
+    [SubscribeLocalEvent]
     private void OnMapInit(Entity<BlockingComponent> entity, ref MapInitEvent args)
     {
         if (!CanBlock(entity.AsNullable()))
@@ -70,6 +54,7 @@ public sealed partial class BlockingSystem : EntitySystem
         DirtyField(entity, entity.Comp, nameof(BlockingComponent.BlockingToggleActionEntity));
     }
 
+    [SubscribeLocalEvent]
     private void OnItemToggled(Entity<BlockingComponent> entity, ref ItemToggledEvent args)
     {
         if (!_handsSystem.IsHeld(entity.Owner, out var holder))
@@ -81,6 +66,7 @@ public sealed partial class BlockingSystem : EntitySystem
             StopBlocking(entity, holder.Value);
     }
 
+    [SubscribeLocalEvent]
     private void OnEquip(Entity<BlockingComponent> entity, ref GotEquippedHandEvent args)
     {
         if (!CanBlock(entity.AsNullable()))
@@ -89,21 +75,25 @@ public sealed partial class BlockingSystem : EntitySystem
         StartBlocking(entity, args.User);
     }
 
+    [SubscribeLocalEvent]
     private void OnUnequip(Entity<BlockingComponent> entity, ref GotUnequippedHandEvent args)
     {
         StopBlocking(entity, args.User);
     }
 
+    [SubscribeLocalEvent]
     private void OnDrop(Entity<BlockingComponent> entity, ref DroppedEvent args)
     {
         StopBlocking(entity, args.User);
     }
 
+    [SubscribeLocalEvent]
     private void OnGetActions(Entity<BlockingComponent> entity, ref GetItemActionsEvent args)
     {
         args.AddAction(ref entity.Comp.BlockingToggleActionEntity, entity.Comp.BlockingToggleAction);
     }
 
+    [SubscribeLocalEvent]
     private void OnToggleAction(Entity<BlockingComponent> entity, ref ToggleActionEvent args)
     {
         if (args.Handled || !CanBlock(entity.AsNullable()))
@@ -134,6 +124,7 @@ public sealed partial class BlockingSystem : EntitySystem
         args.Handled = true;
     }
 
+    [SubscribeLocalEvent]
     private void OnShutdown(Entity<BlockingComponent> entity, ref ComponentShutdown args)
     {
         //In theory the user should not be null when this fires off
@@ -297,7 +288,7 @@ public sealed partial class BlockingSystem : EntitySystem
         DirtyField(entity, entity.Comp, nameof(BlockingComponent.User));
 
         //To make sure that this bodytype doesn't get set as anything but the original
-        if (EnsureComp<BlockingUserComponent>(user, out var userComp))
+        if (_timing.ApplyingState || EnsureComp<BlockingUserComponent>(user, out var userComp))
             return;
 
         userComp.BlockingItem = entity;
@@ -347,6 +338,7 @@ public sealed partial class BlockingSystem : EntitySystem
         return entity.Comp.IsRaised ? entity.Comp.ActiveBlockModifier ?? entity.Comp.PassiveBlockModifier : entity.Comp.PassiveBlockModifier;
     }
 
+    [SubscribeLocalEvent]
     private void OnVerbExamine(Entity<BlockingComponent> entity, ref GetVerbsEvent<ExamineVerb> args)
     {
         if (!args.CanInteract || !args.CanAccess)
diff --git a/Content.Shared/Blocking/Components/BlockingUserComponent.cs b/Content.Shared/Blocking/Components/BlockingUserComponent.cs
index ed26f685aa..3301dffffa 100644
--- a/Content.Shared/Blocking/Components/BlockingUserComponent.cs
+++ b/Content.Shared/Blocking/Components/BlockingUserComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Physics;
 
 namespace Content.Shared.Blocking.Components;
diff --git a/Content.Shared/Body/Components/BloodstreamComponent.cs b/Content.Shared/Body/Components/BloodstreamComponent.cs
index dc9991af01..1fc11d541d 100644
--- a/Content.Shared/Body/Components/BloodstreamComponent.cs
+++ b/Content.Shared/Body/Components/BloodstreamComponent.cs
@@ -107,6 +107,12 @@ public sealed partial class BloodstreamComponent : Component
     [DataField, AutoNetworkedField]
     public FixedPoint2 BleedPuddleThreshold = 1.0f;
 
+    /// <summary>
+    /// Should we allow entities to regain their blood? This affects blood increase from reagents and topicals.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool BloodIncreaseEnabled = true;
+
     /// <summary>
     /// A modifier set prototype ID corresponding to how damage should be modified
     /// before taking it into account for bloodloss.
diff --git a/Content.Shared/Body/Components/BrainComponent.cs b/Content.Shared/Body/Components/BrainComponent.cs
index be3c3ecbe5..1f8b23e7dc 100644
--- a/Content.Shared/Body/Components/BrainComponent.cs
+++ b/Content.Shared/Body/Components/BrainComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Body.Systems;
+using Content.Shared.Body.Systems;
 
 namespace Content.Shared.Body.Components;
 
diff --git a/Content.Shared/Body/OrganRelationSystem.cs b/Content.Shared/Body/OrganRelationSystem.cs
index d5236277e8..ac727151a4 100644
--- a/Content.Shared/Body/OrganRelationSystem.cs
+++ b/Content.Shared/Body/OrganRelationSystem.cs
@@ -18,10 +18,10 @@ public sealed partial class OrganRelationSystem : EntitySystem
 
     private void OnChildShutdown(Entity<ChildOrganComponent> ent, ref ComponentShutdown args)
     {
-        if (ent.Comp.Parent is not { } parentUid)
+        // Parent shut down before the child.
+        if (ent.Comp.Parent is not { } parentUid || !_parent.TryComp(parentUid, out var parentComp))
             return;
 
-        var parentComp = _parent.Comp(parentUid);
         parentComp.Children.Remove(ent);
         Dirty(parentUid, parentComp);
     }
@@ -33,9 +33,11 @@ public sealed partial class OrganRelationSystem : EntitySystem
 
         foreach (var childUid in ent.Comp.Children)
         {
-            var childComp = _child.Comp(childUid);
-            childComp.Parent = null;
+            // Child shut down before the parent.
+            if (!_child.TryComp(childUid, out var childComp))
+                continue;
 
+            childComp.Parent = null;
             Dirty(childUid, childComp);
         }
     }
diff --git a/Content.Shared/Body/Systems/BloodstreamSystem.cs b/Content.Shared/Body/Systems/BloodstreamSystem.cs
index 532b3928cb..7537e20cbc 100644
--- a/Content.Shared/Body/Systems/BloodstreamSystem.cs
+++ b/Content.Shared/Body/Systems/BloodstreamSystem.cs
@@ -433,6 +433,9 @@ public sealed partial class BloodstreamSystem : EntitySystem
             || amount == 0)
             return false;
 
+        if (!ent.Comp.BloodIncreaseEnabled && amount > 0)
+            return false;
+
         // TODO: Either make this percentage based regeneration and pre-pass the percentage.
         // TODO: Solution regulation API that doesn't result in very minor FixedPoint2 errors (Currently gingerbreadman only regenerates 0.99u instead of 1.00u)
         referenceFactor = Math.Clamp(referenceFactor, 0f, ent.Comp.MaxVolumeModifier);
@@ -591,7 +594,12 @@ public sealed partial class BloodstreamSystem : EntitySystem
             currentVolume += bloodSolution.RemoveReagent(reagent.Reagent, quantity: bloodSolution.Volume, ignoreReagentData: true);
         }
 
-        ent.Comp.BloodReferenceSolution = reagents.Clone();
+        // Scale the solution to the volume of the blood.
+        var newReagentsSolution = reagents.Clone();
+        newReagentsSolution.ScaleTo(ent.Comp.BloodReferenceSolution.MaxVolume);
+
+        // Set the scaled solution as the new blood reference.
+        ent.Comp.BloodReferenceSolution = newReagentsSolution;
         DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.BloodReferenceSolution));
 
         if (currentVolume == FixedPoint2.Zero)
@@ -602,6 +610,34 @@ public sealed partial class BloodstreamSystem : EntitySystem
         _solutionContainer.AddSolution(ent.Comp.BloodSolution.Value, solution);
     }
 
+    /// <summary>
+    /// Change how much blood is recovered in a bloodstream.
+    /// </summary>
+    public void ChangeBloodRefreshAmount(Entity<BloodstreamComponent?> ent, FixedPoint2 amount)
+    {
+        if(!Resolve(ent, ref ent.Comp, logMissing: false))
+        {
+            return;
+        }
+        if(amount < 0f)
+        {
+            amount = 0f;
+        }
+        ent.Comp.BloodRefreshAmount = amount;
+        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.BloodRefreshAmount));
+    }
+
+    /// <summary>
+    /// Change whether or not blood can be increased in a bloodstream.
+    /// </summary>
+    public void ChangeBloodIncreaseEnabled(Entity<BloodstreamComponent?> ent, bool status = true)
+    {
+        if (!Resolve(ent, ref ent.Comp, logMissing: false))
+            return;
+        ent.Comp.BloodIncreaseEnabled = status;
+        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.BloodIncreaseEnabled));
+    }
+
     /// <summary>
     /// Get the reagent data for blood that a specific entity should have.
     /// </summary>
diff --git a/Content.Shared/Botany/Components/PlantComponent.cs b/Content.Shared/Botany/Components/PlantComponent.cs
index aef62be0dc..06feb41f3b 100644
--- a/Content.Shared/Botany/Components/PlantComponent.cs
+++ b/Content.Shared/Botany/Components/PlantComponent.cs
@@ -48,7 +48,7 @@ public sealed partial class PlantComponent : Component
     public float Maturation;
 
     /// <summary>
-    /// The number of growth ticks it takes for a plant to be (re-)harvestable. Shouldn't be lower than <see cref="Maturation"/>.
+    /// The number of growth ticks it takes for a plant to be (re-)harvestable.
     /// </summary>
     [DataField, AutoNetworkedField]
     public float Production;
diff --git a/Content.Shared/Botany/Components/PlantHolderComponent.cs b/Content.Shared/Botany/Components/PlantHolderComponent.cs
index 684e54f9a0..9fcb1a8599 100644
--- a/Content.Shared/Botany/Components/PlantHolderComponent.cs
+++ b/Content.Shared/Botany/Components/PlantHolderComponent.cs
@@ -1,4 +1,5 @@
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Botany.Components;
@@ -37,10 +38,11 @@ public sealed partial class PlantHolderComponent : Component
     public int MaxYieldMod = 2;
 
     /// <summary>
-    /// Current mutation level.
+    /// Current mutation level buildup per mutation table.
+    /// Levels are consumed (reset to zero) each time the plant ages and processes its mutations.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public float MutationLevel;
+    public Dictionary<ProtoId<RandomPlantMutationListPrototype>, float> MutationLevels = [];
 
     [DataField, AutoNetworkedField]
     public float MaxMutationLevel = 25f;
diff --git a/Content.Shared/Botany/Components/PlantTrayComponent.cs b/Content.Shared/Botany/Components/PlantTrayComponent.cs
index 99c60d985a..d510be4ffe 100644
--- a/Content.Shared/Botany/Components/PlantTrayComponent.cs
+++ b/Content.Shared/Botany/Components/PlantTrayComponent.cs
@@ -62,13 +62,13 @@ public sealed partial class PlantTrayComponent : Component
     /// Chance per tick for weeds to grow around this tray.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public float WeedGrowthChance = 0.05f;
+    public float WeedGrowthChance = 0.01f;
 
     /// <summary>
     /// Amount of weed growth per successful weed tray tick.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public float WeedGrowthAmount = 0.1f;
+    public float WeedGrowthAmount = 0.5f;
 
     /// <summary>
     /// Multiplier for weed growth rate.
diff --git a/Content.Shared/Botany/Components/RandomPlantMutationListPrototype.cs b/Content.Shared/Botany/Components/RandomPlantMutationListPrototype.cs
index 29bb38b87d..01279c1461 100644
--- a/Content.Shared/Botany/Components/RandomPlantMutationListPrototype.cs
+++ b/Content.Shared/Botany/Components/RandomPlantMutationListPrototype.cs
@@ -11,6 +11,12 @@ public sealed partial class RandomPlantMutationListPrototype : IPrototype
     [IdDataField]
     public string ID { get; private set; } = default!;
 
+    /// <summary>
+    /// Whether mutation odds from this table ignore mutationMod.
+    /// </summary>
+    [DataField]
+    public bool IgnoreMutationMod;
+
     /// <summary>
     /// List of RandomFills that can be picked from.
     /// </summary>
diff --git a/Content.Shared/Botany/Events/PlantGrowthEvent.cs b/Content.Shared/Botany/Events/PlantGrowthEvent.cs
index 5108d4e159..8d48ed6044 100644
--- a/Content.Shared/Botany/Events/PlantGrowthEvent.cs
+++ b/Content.Shared/Botany/Events/PlantGrowthEvent.cs
@@ -1,30 +1,19 @@
-using Robust.Shared.Serialization;
-
 namespace Content.Shared.Botany.Events;
 
 /// <summary>
 /// Event of plant growing ticking.
 /// </summary>
 [ByRefEvent]
-[Serializable, NetSerializable]
-public readonly record struct PlantGrowEvent(NetEntity Tray);
+public readonly record struct PlantGrowEvent(EntityUid Tray);
 
 /// <summary>
-/// Event raised when a harvest is attempted.
+/// Event raised when a harvest is attempted. Cancel to prevent the harvest.
 /// </summary>
 [ByRefEvent]
-public sealed class DoHarvestEvent(EntityUid user, EntityUid target) : CancellableEntityEventArgs
-{
-    public EntityUid User { get; } = user;
-    public EntityUid Target { get; } = target;
-}
+public record struct PlantHarvestAttemptEvent(EntityUid User, EntityUid Target, bool Cancelled = false);
 
 /// <summary>
-/// Event raised after a harvest is attempted.
+/// Event raised after a plant has been harvested.
 /// </summary>
 [ByRefEvent]
-public sealed class AfterDoHarvestEvent(EntityUid user, EntityUid target) : CancellableEntityEventArgs
-{
-    public EntityUid User { get; } = user;
-    public EntityUid Target { get; } = target;
-}
+public readonly record struct PlantHarvestedEvent(EntityUid User, EntityUid Target);
diff --git a/Content.Shared/Botany/Items/Systems/BotanyHoeSystem.cs b/Content.Shared/Botany/Items/Systems/BotanyHoeSystem.cs
index 750f166d50..6d7c46426a 100644
--- a/Content.Shared/Botany/Items/Systems/BotanyHoeSystem.cs
+++ b/Content.Shared/Botany/Items/Systems/BotanyHoeSystem.cs
@@ -15,11 +15,9 @@ namespace Content.Shared.Botany.Items.Systems;
 public sealed partial class BotanyHoeSystem : EntitySystem
 {
     [Dependency] private PlantTraySystem _plantTray = default!;
-    [Dependency] private PlantSystem _plant = default!;
     [Dependency] private SharedPopupSystem _popup = default!;
 
-    [Dependency] private EntityQuery<PlantComponent> _plantQuery = default!;
-    [Dependency] private EntityQuery<PlantTrayComponent> _trayQuery = default!;
+    [Dependency] private EntityQuery<PlantTrayComponent> _trayQuery;
 
     [SubscribeLocalEvent]
     private void OnAfterInteract(Entity<BotanyHoeComponent> ent, ref AfterInteractEvent args)
@@ -27,20 +25,11 @@ public sealed partial class BotanyHoeSystem : EntitySystem
         if (args.Target == null || args.Handled || !args.CanReach)
             return;
 
-        // Allow interacting with either the plant or the tray.
-        var target = args.Target.Value;
-        if (_plantQuery.TryComp(target, out var targetPlant))
-        {
-            if (!_plant.TryGetTray((target, targetPlant), out var tray))
-                return;
-
-            target = tray.Owner;
-        }
-        else if (!_trayQuery.HasComp(target))
+        if (!_trayQuery.HasComp(args.Target.Value))
             return;
 
         var ev = new TrayHoeAttemptEvent(ent, args.User);
-        RaiseLocalEvent(target, ref ev);
+        RaiseLocalEvent(args.Target.Value, ref ev);
 
         args.Handled = true;
     }
diff --git a/Content.Shared/Botany/Items/Systems/BotanyProduceSystem.cs b/Content.Shared/Botany/Items/Systems/BotanyProduceSystem.cs
index 21fa0f0aee..6a26d49f07 100644
--- a/Content.Shared/Botany/Items/Systems/BotanyProduceSystem.cs
+++ b/Content.Shared/Botany/Items/Systems/BotanyProduceSystem.cs
@@ -22,7 +22,7 @@ public sealed partial class BotanyProduceSystem : EntitySystem
     [Dependency] private SharedPopupSystem _popup = default!;
     [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!;
 
-    [Dependency] private EntityQuery<PlantTrayComponent> _trayQuery = default!;
+    [Dependency] private EntityQuery<PlantTrayComponent> _trayQuery;
 
     [SubscribeLocalEvent]
     private void OnAfterInteract(Entity<ProduceComponent> ent, ref AfterInteractEvent args)
diff --git a/Content.Shared/Botany/Items/Systems/BotanySampleTakerSystem.cs b/Content.Shared/Botany/Items/Systems/BotanySampleTakerSystem.cs
index 695baad698..fc9e09b7cc 100644
--- a/Content.Shared/Botany/Items/Systems/BotanySampleTakerSystem.cs
+++ b/Content.Shared/Botany/Items/Systems/BotanySampleTakerSystem.cs
@@ -22,9 +22,9 @@ public sealed partial class BotanySampleTakerSystem : EntitySystem
     [Dependency] private PlantSystem _plant = default!;
     [Dependency] private SharedPopupSystem _popup = default!;
 
-    [Dependency] private EntityQuery<PlantHolderComponent> _holderQuery = default!;
-    [Dependency] private EntityQuery<PlantDataComponent> _dataQuery = default!;
-    [Dependency] private EntityQuery<PlantComponent> _plantQuery = default!;
+    [Dependency] private EntityQuery<PlantHolderComponent> _holderQuery;
+    [Dependency] private EntityQuery<PlantDataComponent> _dataQuery;
+    [Dependency] private EntityQuery<PlantComponent> _plantQuery;
 
     [SubscribeLocalEvent]
     private void OnAfterInteract(Entity<BotanySampleTakerComponent> ent, ref AfterInteractEvent args)
@@ -54,9 +54,9 @@ public sealed partial class BotanySampleTakerSystem : EntitySystem
             return;
         }
 
-        // Prevent early sampling.
+        // Prevent early sampling, unless the plant is fully grown.
         var growthStage = _plant.GetGrowthStageValue(ent.AsNullable());
-        if (growthStage <= args.Sample.Comp.MinSampleStage)
+        if (growthStage < ent.Comp.GrowthStages && growthStage <= args.Sample.Comp.MinSampleStage)
         {
             _popup.PopupCursor(Loc.GetString("plant-sample-component-early-sample-popup"), args.User);
             return;
diff --git a/Content.Shared/Botany/Items/Systems/BotanySeedSystem.cs b/Content.Shared/Botany/Items/Systems/BotanySeedSystem.cs
index 572d0d1c1d..41a37b11ab 100644
--- a/Content.Shared/Botany/Items/Systems/BotanySeedSystem.cs
+++ b/Content.Shared/Botany/Items/Systems/BotanySeedSystem.cs
@@ -22,9 +22,9 @@ public sealed partial class BotanySeedSystem : EntitySystem
     [Dependency] private PlantTraySystem _plantTray = default!;
     [Dependency] private SharedPopupSystem _popup = default!;
 
-    [Dependency] private EntityQuery<PlantDataComponent> _dataQuery = default!;
-    [Dependency] private EntityQuery<PlantTrayComponent> _trayQuery = default!;
-    [Dependency] private EntityQuery<PaperLabelComponent> _labelQuery = default!;
+    [Dependency] private EntityQuery<PlantDataComponent> _dataQuery;
+    [Dependency] private EntityQuery<PlantTrayComponent> _trayQuery;
+    [Dependency] private EntityQuery<PaperLabelComponent> _labelQuery;
 
     [SubscribeLocalEvent]
     private void OnAfterInteract(Entity<SeedComponent> ent, ref AfterInteractEvent args)
@@ -44,7 +44,7 @@ public sealed partial class BotanySeedSystem : EntitySystem
         if (args.Cancelled)
             return;
 
-        if (_plantTray.TryGetPlant(ent.AsNullable(), out _))
+        if (_plantTray.HasPlant(ent.AsNullable()))
         {
             _popup.PopupCursor(
                 Loc.GetString("plant-component-already-seeded-popup", ("name", MetaData(ent.Owner).EntityName)),
@@ -64,8 +64,7 @@ public sealed partial class BotanySeedSystem : EntitySystem
         _popup.PopupCursor(Loc.GetString("plant-component-plant-success-popup",
                 ("seedName", name),
                 ("seedNoun", noun)),
-            args.User,
-            PopupType.Medium);
+            args.User);
 
         if (_labelQuery.TryComp(args.Seed, out var paperLabel))
             _itemSlots.TryEjectToHands(args.Seed, paperLabel.LabelSlot, args.User);
diff --git a/Content.Shared/Botany/Items/Systems/BotanyShovelSystem.cs b/Content.Shared/Botany/Items/Systems/BotanyShovelSystem.cs
index 4dd6c716a7..dd12c44c70 100644
--- a/Content.Shared/Botany/Items/Systems/BotanyShovelSystem.cs
+++ b/Content.Shared/Botany/Items/Systems/BotanyShovelSystem.cs
@@ -18,8 +18,7 @@ public sealed partial class BotanyShovelSystem : EntitySystem
     [Dependency] private PlantTraySystem _plantTray = default!;
     [Dependency] private SharedPopupSystem _popup = default!;
 
-    [Dependency] private EntityQuery<PlantComponent> _plantQuery = default!;
-    [Dependency] private EntityQuery<PlantTrayComponent> _trayQuery = default!;
+    [Dependency] private EntityQuery<PlantTrayComponent> _trayQuery;
 
     [SubscribeLocalEvent]
     private void OnAfterInteract(Entity<ShovelComponent> ent, ref AfterInteractEvent args)
@@ -27,20 +26,11 @@ public sealed partial class BotanyShovelSystem : EntitySystem
         if (args.Target == null || args.Handled || !args.CanReach)
             return;
 
-        // Allow interacting with either the plant or the tray.
-        var target = args.Target.Value;
-        if (_plantQuery.HasComp(target))
-        {
-            if (!_plant.TryGetTray(target, out var tray))
-                return;
-
-            target = tray.Owner;
-        }
-        else if (!_trayQuery.HasComp(target))
+        if (!_trayQuery.HasComp(args.Target.Value))
             return;
 
         var ev = new TrayShovelAttemptEvent(ent, args.User);
-        RaiseLocalEvent(target, ref ev);
+        RaiseLocalEvent(args.Target.Value, ref ev);
 
         args.Handled = true;
     }
diff --git a/Content.Shared/Botany/Items/Systems/BotanySwabSystem.cs b/Content.Shared/Botany/Items/Systems/BotanySwabSystem.cs
index 94916ec6bc..5b9b6fb136 100644
--- a/Content.Shared/Botany/Items/Systems/BotanySwabSystem.cs
+++ b/Content.Shared/Botany/Items/Systems/BotanySwabSystem.cs
@@ -1,7 +1,7 @@
 using Content.Shared.Botany.Components;
+using Content.Shared.Botany.Events;
 using Content.Shared.Botany.Items.Components;
 using Content.Shared.Botany.Systems;
-using Content.Shared.Botany.Events;
 using Content.Shared.DoAfter;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
@@ -17,7 +17,7 @@ public sealed partial class BotanySwabSystem : EntitySystem
     [Dependency] private SharedDoAfterSystem _doAfter = default!;
     [Dependency] private SharedPopupSystem _popup = default!;
 
-    [Dependency] private EntityQuery<PlantComponent> _plantQuery = default!;
+    [Dependency] private EntityQuery<PlantComponent> _plantQuery;
 
     /// <summary>
     /// This handles swab examination text
diff --git a/Content.Shared/Botany/ProduceVisuals.cs b/Content.Shared/Botany/ProduceVisuals.cs
index dd3bd2e746..a20adc99f1 100644
--- a/Content.Shared/Botany/ProduceVisuals.cs
+++ b/Content.Shared/Botany/ProduceVisuals.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Botany;
 
diff --git a/Content.Shared/Botany/Systems/BotanySystem.Produce.cs b/Content.Shared/Botany/Systems/BotanySystem.Produce.cs
index f1b8c1463b..535a3a48be 100644
--- a/Content.Shared/Botany/Systems/BotanySystem.Produce.cs
+++ b/Content.Shared/Botany/Systems/BotanySystem.Produce.cs
@@ -1,10 +1,10 @@
-using JetBrains.Annotations;
 using Content.Shared.Botany.Components;
 using Content.Shared.Botany.Items.Components;
 using Content.Shared.EntityEffects;
 using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
 using Content.Shared.Random.Helpers;
+using JetBrains.Annotations;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
 
diff --git a/Content.Shared/Botany/Systems/BotanySystem.Seed.cs b/Content.Shared/Botany/Systems/BotanySystem.Seed.cs
index 4e9e13a8be..93efbbfb09 100644
--- a/Content.Shared/Botany/Systems/BotanySystem.Seed.cs
+++ b/Content.Shared/Botany/Systems/BotanySystem.Seed.cs
@@ -1,4 +1,3 @@
-using JetBrains.Annotations;
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Botany.Components;
 using Content.Shared.Botany.Items.Components;
@@ -7,6 +6,7 @@ using Content.Shared.Cloning;
 using Content.Shared.Examine;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Random;
+using JetBrains.Annotations;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -179,4 +179,33 @@ public sealed partial class BotanySystem : EntitySystem
         _hands.TryPickupAnyHand(user, seedItem);
         return seedItem;
     }
+
+    /// <summary>
+    /// Reverts a planted plant back into a seed packet while preserving its genetics.
+    /// </summary>
+    [PublicAPI]
+    public bool TryRevertPlantToSeed(Entity<PlantComponent?, PlantDataComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp1, ref ent.Comp2, false))
+            return false;
+
+        if (!_plant.TryGetTray(ent.Owner, out var tray))
+            return false;
+
+        if (!ProtoMan.Resolve(ent.Comp2.PacketPrototype, out var seedProto)
+            || !seedProto.TryComp<SeedComponent>(out var seedComp, _componentFactory))
+        {
+            return false;
+        }
+
+        SpawnSeedPacket(
+            ent.Comp2,
+            seedComp.PlantProtoId,
+            ent.Owner,
+            Transform(tray).Coordinates,
+            tray.Owner);
+
+        _plant.RemovePlant(ent.Owner);
+        return true;
+    }
 }
diff --git a/Content.Shared/Botany/Systems/MutationSystem.cs b/Content.Shared/Botany/Systems/MutationSystem.cs
index f7700edd47..00135c5163 100644
--- a/Content.Shared/Botany/Systems/MutationSystem.cs
+++ b/Content.Shared/Botany/Systems/MutationSystem.cs
@@ -1,14 +1,14 @@
-using JetBrains.Annotations;
 using System.Linq;
 using Content.Shared.Atmos;
 using Content.Shared.Botany.Components;
 using Content.Shared.Botany.Traits.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.EntityEffects;
+using JetBrains.Annotations;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Random;
+using Robust.Shared.Serialization.Manager;
 
 namespace Content.Shared.Botany.Systems;
 
@@ -18,9 +18,6 @@ namespace Content.Shared.Botany.Systems;
 /// </summary>
 public sealed partial class PlantMutationSystem : EntitySystem
 {
-    private static readonly ProtoId<RandomPlantMutationListPrototype> RandomPlantMutations = "RandomPlantMutations";
-    private RandomPlantMutationListPrototype _randomMutations = default!;
-
     [Dependency] private INetManager _net = default!;
     [Dependency] private IRobustRandom _random = default!;
     [Dependency] private BotanySystem _botany = default!;
@@ -29,33 +26,36 @@ public sealed partial class PlantMutationSystem : EntitySystem
     [Dependency] private PlantTraySystem _plantTray = default!;
     [Dependency] private SharedEntityEffectsSystem _entityEffects = default!;
 
-    [Dependency] private EntityQuery<PlantChemicalsComponent> _chemicalsQuery = default!;
-    [Dependency] private EntityQuery<PlantComponent> _plantQuery = default!;
-
-    public override void Initialize()
-    {
-        _randomMutations = ProtoMan.Index(RandomPlantMutations);
-    }
+    [Dependency] private EntityQuery<PlantChemicalsComponent> _chemicalsQuery;
+    [Dependency] private EntityQuery<PlantComponent> _plantQuery;
 
     /// <summary>
+    /// For each mutation table, go through each mutation.
     /// For each random mutation, see if it occurs on this plant this check.
     /// </summary>
     [PublicAPI]
-    public void CheckRandomMutations(Entity<PlantComponent?> ent, float severity)
+    public void CheckRandomMutations(Entity<PlantComponent?> ent, ProtoId<RandomPlantMutationListPrototype> mutationTableId, float severity)
     {
         if (!Resolve(ent, ref ent.Comp, false))
             return;
 
-        foreach (var mutation in _randomMutations.Mutations)
+        var mutationTable = ProtoMan.Index(mutationTableId);
+        foreach (var mutation in mutationTable.Mutations)
         {
-            if (Random(Math.Min(mutation.BaseOdds * severity, 1.0f)))
+            var triggers = 0;
+            while (mutation.BaseOdds * severity > triggers) // If the odds are greater than one, potentially trigger the mutation multiple times
             {
-                if (mutation.AppliesToPlant)
-                    _entityEffects.TryApplyEffect(ent, mutation.Effect);
+                var odds = mutation.BaseOdds * severity - triggers;
+                triggers++;
+                if (Random(Math.Min(odds, 1.0f)))
+                {
+                    if (mutation.AppliesToPlant)
+                        _entityEffects.TryApplyEffect(ent, mutation.Effect);
 
-                // Stat adjustments do not persist by being an attached effect, they just change the stat.
-                if (mutation.Persists && ent.Comp.Mutations.All(m => m.Name != mutation.Name))
-                    ent.Comp.Mutations.Add(mutation);
+                    // Stat adjustments do not persist by being an attached effect, they just change the stat.
+                    if (mutation.Persists && ent.Comp.Mutations.All(m => m.Name != mutation.Name))
+                        ent.Comp.Mutations.Add(mutation);
+                }
             }
         }
     }
diff --git a/Content.Shared/Botany/Systems/PlantChemicalsSystem.cs b/Content.Shared/Botany/Systems/PlantChemicalsSystem.cs
index 25c6697f19..2de0e22edb 100644
--- a/Content.Shared/Botany/Systems/PlantChemicalsSystem.cs
+++ b/Content.Shared/Botany/Systems/PlantChemicalsSystem.cs
@@ -1,9 +1,10 @@
-using JetBrains.Annotations;
 using Content.Shared.Botany.Components;
 using Content.Shared.Botany.Events;
 using Content.Shared.FixedPoint;
 using Content.Shared.Random;
 using Content.Shared.Random.Helpers;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Botany.Systems;
@@ -31,13 +32,48 @@ public sealed partial class PlantChemicalsSystem : EntitySystem
     /// Adds a random chemical to the plant chemicals.
     /// </summary>
     [PublicAPI]
-    public void MutateRandomChemical(Entity<PlantChemicalsComponent?> ent, WeightedRandomFillSolutionPrototype randomChems)
+    public void MutateRandomChemical(Entity<PlantChemicalsComponent?> ent, IReadOnlyList<ProtoId<WeightedRandomFillSolutionPrototype>> randomChemTables)
     {
         if (!Resolve(ent, ref ent.Comp, false))
             return;
 
+        var totalWeight = 0f;
+        foreach (var table in randomChemTables)
+        {
+            foreach (var fill in ProtoMan.Index(table).Fills)
+            {
+                totalWeight += fill.Weight;
+            }
+        }
+
+        if (totalWeight <= 0f)
+            return;
+
         var random = SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(ent));
-        var (chemicalId, quantity) = randomChems.Pick(random);
+        var selectedWeight = random.NextFloat() * totalWeight;
+        var accumulatedWeight = 0f;
+        WeightedRandomFillSolutionPrototype? selectedTable = null;
+
+        foreach (var table in randomChemTables)
+        {
+            var tableProto = ProtoMan.Index(table);
+            foreach (var fill in tableProto.Fills)
+            {
+                accumulatedWeight += fill.Weight;
+            }
+
+            if (accumulatedWeight > selectedWeight)
+            {
+                selectedTable = tableProto;
+                break;
+            }
+        }
+
+        if (selectedTable == null)
+            return;
+
+        var (chemicalId, quantity) = selectedTable.Pick(random);
+
         var amount = FixedPoint2.Max(random.NextFloat(0f, 1f) * quantity, FixedPoint2.Epsilon);
         var seedChemQuantity = new PlantChemQuantity();
         if (ent.Comp.Chemicals.TryGetValue(chemicalId, out var value))
diff --git a/Content.Shared/Botany/Systems/PlantGrowthSystem.cs b/Content.Shared/Botany/Systems/PlantGrowthSystem.cs
index 5074a3b173..f57f477cb4 100644
--- a/Content.Shared/Botany/Systems/PlantGrowthSystem.cs
+++ b/Content.Shared/Botany/Systems/PlantGrowthSystem.cs
@@ -1,7 +1,7 @@
-using JetBrains.Annotations;
 using Content.Shared.Botany.Components;
 using Content.Shared.Botany.Events;
 using Content.Shared.Random.Helpers;
+using JetBrains.Annotations;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
@@ -20,8 +20,8 @@ public sealed partial class PlantGrowthSystem : EntitySystem
     [Dependency] private PlantHolderSystem _plantHolder = default!;
     [Dependency] private PlantTraySystem _plantTray = default!;
 
-    [Dependency] private EntityQuery<PlantHolderComponent> _holderQuery = default!;
-    [Dependency] private EntityQuery<PlantTrayComponent> _trayQuery = default!;
+    [Dependency] private EntityQuery<PlantHolderComponent> _holderQuery;
+    [Dependency] private EntityQuery<PlantTrayComponent> _trayQuery;
 
     [SubscribeLocalEvent]
     private void OnCrossPollinate(Entity<PlantGrowthComponent> ent, ref PlantCrossPollinateEvent args)
@@ -38,7 +38,7 @@ public sealed partial class PlantGrowthSystem : EntitySystem
     private void OnPlantGrow(Entity<PlantGrowthComponent> ent, ref PlantGrowEvent args)
     {
         var (plantUid, plantComp) = ent;
-        var trayUid = GetEntity(args.Tray);
+        var trayUid = args.Tray;
 
         if (!_trayQuery.TryComp(trayUid, out var trayComp))
             return;
diff --git a/Content.Shared/Botany/Systems/PlantHarvestSystem.cs b/Content.Shared/Botany/Systems/PlantHarvestSystem.cs
index e3c53fb56e..4dc4870bd3 100644
--- a/Content.Shared/Botany/Systems/PlantHarvestSystem.cs
+++ b/Content.Shared/Botany/Systems/PlantHarvestSystem.cs
@@ -1,10 +1,10 @@
-using JetBrains.Annotations;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Botany.Components;
 using Content.Shared.Botany.Events;
 using Content.Shared.Database;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
+using JetBrains.Annotations;
 
 namespace Content.Shared.Botany.Systems;
 
@@ -21,10 +21,10 @@ public sealed partial class PlantHarvestSystem : EntitySystem
     [Dependency] private PlantHolderSystem _plantHolder = default!;
     [Dependency] private PlantTraySystem _plantTray = default!;
 
-    [Dependency] private EntityQuery<PlantHolderComponent> _holderQuery = default!;
-    [Dependency] private EntityQuery<PlantHarvestComponent> _harvestQuery = default!;
-    [Dependency] private EntityQuery<PlantComponent> _plantQuery = default!;
-    [Dependency] private EntityQuery<PlantDataComponent> _dataQuery = default!;
+    [Dependency] private EntityQuery<PlantHolderComponent> _holderQuery;
+    [Dependency] private EntityQuery<PlantHarvestComponent> _harvestQuery;
+    [Dependency] private EntityQuery<PlantComponent> _plantQuery;
+    [Dependency] private EntityQuery<PlantDataComponent> _dataQuery;
 
     [SubscribeLocalEvent]
     private void OnInteractHand(Entity<PlantTrayComponent> ent, ref InteractHandEvent args)
@@ -32,14 +32,12 @@ public sealed partial class PlantHarvestSystem : EntitySystem
         if (args.Handled)
             return;
 
-        if (!_plantTray.TryGetPlant(ent.AsNullable(), out var plantUid)
-            || !_holderQuery.TryComp(plantUid, out var holder)
-            || !holder.ReadyForHarvest)
+        // TODO: Remove this once trays have a proper UI.
+        if (!_plantTray.TryGetAlivePlant(ent.AsNullable(), out var plantUid))
             return;
 
-        // TODO: Remove this once trays have a proper UI.
-        TryHandleHarvest(plantUid.Value, args.User);
-        args.Handled = true;
+        if (TryHandleHarvest(plantUid.Value, args.User))
+            args.Handled = true;
     }
 
     [SubscribeLocalEvent]
@@ -79,21 +77,8 @@ public sealed partial class PlantHarvestSystem : EntitySystem
             return;
         }
 
-        if (!ent.Comp.ReadyForHarvest)
-            return;
-
-        var ev = new DoHarvestEvent(args.User, ent.Owner);
-        RaiseLocalEvent(ent.Owner, ref ev);
-        args.Handled = true;
-    }
-
-    [SubscribeLocalEvent]
-    private void OnHandledDoHarvest(Entity<PlantHolderComponent> ent, ref DoHarvestEvent args)
-    {
-        if (args.Cancelled)
-            return;
-
-        TryHandleHarvest(ent, args.User);
+        if (TryHandleHarvest(ent, args.User))
+            args.Handled = true;
     }
 
     private void TryAutoHarvest(Entity<PlantHarvestComponent> ent, EntityUid user)
@@ -102,21 +87,31 @@ public sealed partial class PlantHarvestSystem : EntitySystem
             return;
 
         if (_dataQuery.TryComp(ent.Owner, out var plantData) && plantData.HarvestLogImpact != null)
-            _adminLogger.Add(LogType.Botany, plantData.HarvestLogImpact.Value, $"Auto-harvested {Loc.GetString(plantData.Name):seed} at Pos:{Transform(ent.Owner).Coordinates}.");
+            _adminLogger.Add(LogType.Botany, plantData.HarvestLogImpact.Value, $"Auto-harvested {Loc.GetString(plantData.Name):seed} at Pos:{Transform(ent).Coordinates}.");
 
         DoHarvest(ent.Owner, user);
     }
 
     /// <summary>
-    /// Handles harvesting a plant for the specified user.
+    /// Attempts to harvest the plant, raising <see cref="PlantHarvestAttemptEvent"/> and harvesting if not cancelled.
     /// </summary>
+    /// <returns>True if the harvest was handled, even if cancelled.</returns>
     [PublicAPI]
-    public void TryHandleHarvest(EntityUid plant, EntityUid user)
+    public bool TryHandleHarvest(EntityUid plant, EntityUid user)
     {
+        if (!_holderQuery.TryComp(plant, out var holder) || !holder.ReadyForHarvest)
+            return false;
+
+        var ev = new PlantHarvestAttemptEvent(user, plant);
+        RaiseLocalEvent(plant, ref ev);
+        if (ev.Cancelled)
+            return true;
+
         if (_dataQuery.TryComp(plant, out var plantData) && plantData.HarvestLogImpact != null)
-            _adminLogger.Add(LogType.Botany, plantData.HarvestLogImpact.Value, $"Auto-harvested {Loc.GetString(plantData.Name):seed} at Pos:{Transform(plant).Coordinates}.");
+            _adminLogger.Add(LogType.Botany, plantData.HarvestLogImpact.Value, $"{ToPrettyString(user):player} harvested {Loc.GetString(plantData.Name):seed} at Pos:{Transform(user).Coordinates}.");
 
         DoHarvest(plant, user);
+        return true;
     }
 
     /// <summary>
@@ -156,10 +151,23 @@ public sealed partial class PlantHarvestSystem : EntitySystem
         if (harvest.HarvestRepeat == HarvestType.NoRepeat)
             _plant.RemovePlant(ent.Owner);
 
-        var ev = new AfterDoHarvestEvent(user, ent.Owner);
+        var ev = new PlantHarvestedEvent(user, ent.Owner);
         RaiseLocalEvent(ent.Owner, ref ev);
     }
 
+    /// <summary>
+    /// Resets harvest progress to the plant's current age.
+    /// </summary>
+    [PublicAPI]
+    public void ResetHarvestProgress(Entity<PlantHolderComponent?> ent)
+    {
+        if (!Resolve(ent.Owner, ref ent.Comp, false))
+            return;
+
+        ent.Comp.LastHarvest = ent.Comp.Age;
+        DirtyField(ent, nameof(ent.Comp.LastHarvest));
+    }
+
     /// <summary>
     /// Affects the growth of a plant by modifying its age or production timing.
     /// </summary>
diff --git a/Content.Shared/Botany/Systems/PlantHolderSystem.Relay.cs b/Content.Shared/Botany/Systems/PlantHolderSystem.Relay.cs
new file mode 100644
index 0000000000..a44902f73c
--- /dev/null
+++ b/Content.Shared/Botany/Systems/PlantHolderSystem.Relay.cs
@@ -0,0 +1,61 @@
+using Content.Shared.Botany.Components;
+using Content.Shared.Interaction;
+
+namespace Content.Shared.Botany.Systems;
+
+public sealed partial class PlantHolderSystem
+{
+    [Dependency] private PlantSystem _plantSystem = default!;
+
+    private void InitializeRelay()
+    {
+        SubscribeLocalEvent<PlantHolderComponent, InteractUsingEvent>(RelayPlantHolderEvent);
+    }
+
+    private void RefRelayPlantHolderEvent<T>(EntityUid uid, PlantHolderComponent component, ref T args) where T : struct
+    {
+        RelayEvent((uid, component), ref args);
+    }
+
+    private void RelayPlantHolderEvent<T>(EntityUid uid, PlantHolderComponent component, T args) where T : class
+    {
+        RelayEvent((uid, component), args);
+    }
+
+    /// <summary>
+    /// Relays the given event to the tray holding the plant.
+    /// </summary>
+    /// <param name="ent">The plant which is receiving the event</param>
+    /// <param name="args">The event to relay</param>
+    /// <typeparam name="T">The type of the event</typeparam>
+    public void RelayEvent<T>(Entity<PlantHolderComponent> ent, ref T args) where T : struct
+    {
+        if (!_plantSystem.TryGetTray(ent.Owner, out var tray))
+            return;
+
+        var ev = new PlantHolderRelayedEvent<T>(args, ent);
+        RaiseLocalEvent(tray, ref ev);
+        args = ev.Args;
+    }
+
+    /// <summary>
+    /// Relays the given event to the tray holding the plant.
+    /// </summary>
+    /// <param name="ent">The plant which is receiving the event</param>
+    /// <param name="args">The event to relay</param>
+    /// <typeparam name="T">The type of the event</typeparam>
+    public void RelayEvent<T>(Entity<PlantHolderComponent> ent, T args) where T : class
+    {
+        if (!_plantSystem.TryGetTray(ent.Owner, out var tray))
+            return;
+
+        var ev = new PlantHolderRelayedEvent<T>(args, ent);
+        RaiseLocalEvent(tray, ref ev);
+    }
+}
+
+/// <summary>
+/// Event wrapper for events being relayed to plant trays holding a plant.
+/// </summary>
+[ByRefEvent]
+public record struct PlantHolderRelayedEvent<TEvent>(TEvent Args, EntityUid AppliedTo);
diff --git a/Content.Shared/Botany/Systems/PlantHolderSystem.cs b/Content.Shared/Botany/Systems/PlantHolderSystem.cs
index 349827140f..e5fd0d0efa 100644
--- a/Content.Shared/Botany/Systems/PlantHolderSystem.cs
+++ b/Content.Shared/Botany/Systems/PlantHolderSystem.cs
@@ -1,8 +1,9 @@
-using JetBrains.Annotations;
 using Content.Shared.Botany.Components;
 using Content.Shared.Cloning.Events;
 using Content.Shared.Damage.Systems;
+using JetBrains.Annotations;
 using Robust.Shared.Serialization.Manager;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Botany.Systems;
 
@@ -13,7 +14,13 @@ public sealed partial class PlantHolderSystem : EntitySystem
 {
     [Dependency] private ISerializationManager _serialization = default!;
 
-    [Dependency] private EntityQuery<PlantComponent> _plantQuery = default!;
+    [Dependency] private EntityQuery<PlantComponent> _plantQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        InitializeRelay();
+    }
 
     [SubscribeLocalEvent]
     private void OnCloning(Entity<PlantHolderComponent> ent, ref CloningEvent args)
@@ -54,14 +61,18 @@ public sealed partial class PlantHolderSystem : EntitySystem
     /// Adjusts the mutation level of the plant.
     /// </summary>
     [PublicAPI]
-    public void AdjustsMutationLevel(Entity<PlantHolderComponent?> ent, float amount)
+    public void AdjustsMutationLevel(Entity<PlantHolderComponent?> ent, ProtoId<RandomPlantMutationListPrototype> mutationTableId, float amount)
     {
         if (!Resolve(ent.Owner, ref ent.Comp))
             return;
 
-        ent.Comp.MutationLevel += amount * ent.Comp.MutationMod;
-        ent.Comp.MutationLevel = MathHelper.Clamp(ent.Comp.MutationLevel, 0f, ent.Comp.MaxMutationLevel);
-        DirtyField(ent, nameof(ent.Comp.MutationLevel));
+        var mutationTable = ProtoMan.Index(mutationTableId);
+
+        var current = ent.Comp.MutationLevels.GetValueOrDefault(mutationTableId);
+        var adjustmentAmount = mutationTable.IgnoreMutationMod ? amount : amount * ent.Comp.MutationMod;
+
+        ent.Comp.MutationLevels[mutationTableId] = MathHelper.Clamp(current + adjustmentAmount, 0f, ent.Comp.MaxMutationLevel);
+        DirtyField(ent, nameof(ent.Comp.MutationLevels));
         CheckHealth(ent);
     }
 
diff --git a/Content.Shared/Botany/Systems/PlantSystem.cs b/Content.Shared/Botany/Systems/PlantSystem.cs
index 247aaf825c..9c2650e990 100644
--- a/Content.Shared/Botany/Systems/PlantSystem.cs
+++ b/Content.Shared/Botany/Systems/PlantSystem.cs
@@ -1,9 +1,9 @@
 using System.Linq;
-using JetBrains.Annotations;
 using Content.Shared.Botany.Components;
 using Content.Shared.Botany.Events;
 using Content.Shared.Botany.Traits.Components;
 using Content.Shared.Examine;
+using JetBrains.Annotations;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Botany.Systems;
@@ -18,8 +18,8 @@ public sealed partial class PlantSystem : EntitySystem
     [Dependency] private PlantMutationSystem _mutation = default!;
     [Dependency] private PlantHolderSystem _plantHolder = default!;
 
-    [Dependency] private EntityQuery<PlantHolderComponent> _holderQuery = default!;
-    [Dependency] private EntityQuery<PlantTrayComponent> _trayQuery = default!;
+    [Dependency] private EntityQuery<PlantHolderComponent> _holderQuery;
+    [Dependency] private EntityQuery<PlantTrayComponent> _trayQuery;
 
     private readonly List<Entity<PlantHolderComponent>> _holdersToUpdate = [];
 
@@ -131,15 +131,19 @@ public sealed partial class PlantSystem : EntitySystem
             return;
 
         TryGetTray(ent.Owner, out var trayEnt);
-        var plantGrow = new PlantGrowEvent(GetNetEntity(trayEnt.Owner));
+        var plantGrow = new PlantGrowEvent(trayEnt.Owner);
         RaiseLocalEvent(ent.Owner, ref plantGrow);
 
         // Process mutations.
-        if (ent.Comp.MutationLevel > 0)
+        foreach (var mutationTable in ent.Comp.MutationLevels.Keys)
         {
-            _mutation.CheckRandomMutations(ent.Owner, Math.Min(ent.Comp.MutationLevel, ent.Comp.MaxMutationLevel));
-            ent.Comp.MutationLevel = 0;
-            DirtyField(ent, ent.Comp, nameof(ent.Comp.MutationLevel));
+            var mutationBuildup = ent.Comp.MutationLevels[mutationTable];
+            if (mutationBuildup <= 0)
+                continue;
+
+            ent.Comp.MutationLevels[mutationTable] = 0;
+            DirtyField(ent, ent.Comp, nameof(ent.Comp.MutationLevels));
+            _mutation.CheckRandomMutations(ent.Owner, mutationTable, Math.Min(mutationBuildup, ent.Comp.MaxMutationLevel));
         }
 
         if (ent.Comp.Health <= 0)
@@ -166,7 +170,7 @@ public sealed partial class PlantSystem : EntitySystem
     public bool TryGetTray(Entity<PlantComponent?> ent, out Entity<PlantTrayComponent> trayEnt)
     {
         trayEnt = default!;
-        if (!Resolve(ent.Owner, ref ent.Comp))
+        if (!Resolve(ent.Owner, ref ent.Comp, false))
             return false;
 
         trayEnt.Owner = Transform(ent.Owner).ParentUid;
@@ -242,16 +246,11 @@ public sealed partial class PlantSystem : EntitySystem
         ent.Comp.Maturation = MathF.Max(1f, ent.Comp.Maturation + amount);
         DirtyField(ent, nameof(ent.Comp.Maturation));
 
-        if (ent.Comp.Production < ent.Comp.Maturation)
-        {
-            ent.Comp.Production = ent.Comp.Maturation;
-            DirtyField(ent, nameof(ent.Comp.Production));
-        }
     }
 
     /// <summary>
     /// Adjusts the production time of a plant component.
-    /// Should not be lower than <see cref="PlantComponent.Maturation"/>.
+    /// Must be at least 1.
     /// </summary>
     [PublicAPI]
     public void AdjustProduction(Entity<PlantComponent?> ent, float amount)
@@ -259,7 +258,7 @@ public sealed partial class PlantSystem : EntitySystem
         if (!Resolve(ent.Owner, ref ent.Comp, false))
             return;
 
-        ent.Comp.Production = MathF.Max(ent.Comp.Maturation, ent.Comp.Production + amount);
+        ent.Comp.Production = MathF.Max(1f, ent.Comp.Production + amount);
         DirtyField(ent, nameof(ent.Comp.Production));
     }
 
diff --git a/Content.Shared/Botany/Systems/PlantToxinsSystem.cs b/Content.Shared/Botany/Systems/PlantToxinsSystem.cs
index 80e4fcfad5..7dd60560ff 100644
--- a/Content.Shared/Botany/Systems/PlantToxinsSystem.cs
+++ b/Content.Shared/Botany/Systems/PlantToxinsSystem.cs
@@ -32,7 +32,7 @@ public sealed partial class PlantToxinsSystem : EntitySystem
     [SubscribeLocalEvent]
     private void OnPlantGrow(Entity<PlantToxinsComponent> ent, ref PlantGrowEvent args)
     {
-        var trayUid = GetEntity(args.Tray);
+        var trayUid = args.Tray;
         if (!_trayQuery.TryComp(trayUid, out var tray)
             || !_holderQuery.TryComp(ent.Owner, out var holder))
             return;
diff --git a/Content.Shared/Botany/Systems/PlantTraySystem.cs b/Content.Shared/Botany/Systems/PlantTraySystem.cs
index 831452fe7a..fd51c79166 100644
--- a/Content.Shared/Botany/Systems/PlantTraySystem.cs
+++ b/Content.Shared/Botany/Systems/PlantTraySystem.cs
@@ -1,12 +1,12 @@
-using JetBrains.Annotations;
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Botany.Components;
 using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.EntityEffects;
 using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
+using Content.Shared.Interaction;
 using Content.Shared.Random.Helpers;
+using JetBrains.Annotations;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Timing;
@@ -24,11 +24,12 @@ public sealed partial class PlantTraySystem : EntitySystem
     [Dependency] private PlantSystem _plant = default!;
     [Dependency] private SharedAudioSystem _audio = default!;
     [Dependency] private SharedEntityEffectsSystem _entityEffects = default!;
+    [Dependency] private SharedInteractionSystem _interaction = default!;
     [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private SharedTransformSystem _transform = default!;
 
-    [Dependency] private EntityQuery<PlantDataComponent> _dataQuery = default!;
-    [Dependency] private EntityQuery<PlantWeedPestComponent> _weedPestQuery = default!;
+    [Dependency] private EntityQuery<PlantTrayComponent> _trayQuery;
+    [Dependency] private EntityQuery<PlantDataComponent> _dataQuery;
 
     [SubscribeLocalEvent]
     private void OnExamine(Entity<PlantTrayComponent> ent, ref ExaminedEvent args)
@@ -65,6 +66,24 @@ public sealed partial class PlantTraySystem : EntitySystem
         _audio.PlayPredicted(ent.Comp.WateringSound, ent, args.User);
     }
 
+    // TODO: replace with relationship system when it will be merged.
+    // this is really cursed - handler is getting hits on client when plant getting into tray
+    // but not when it gets out, yet it works just fine on server.
+    [SubscribeLocalEvent]
+    private void OnPlantTerminating(Entity<PlantComponent> ent, ref EntityTerminatingEvent args)
+    {
+        var trayUid = Transform(ent).ParentUid;
+
+        if (!_trayQuery.TryComp(trayUid, out var tray)
+            || tray.PlantEntity != ent.Owner)
+        {
+            return;
+        }
+
+        tray.PlantEntity = null;
+        DirtyField(trayUid, tray, nameof(tray.PlantEntity));
+    }
+
     // Workaround for https://github.com/space-wizards/space-station-14/pull/35314
     [SubscribeLocalEvent]
     private void OnEntRemoved(Entity<PlantTrayComponent> ent, ref EntRemovedFromContainerMessage args)
@@ -74,6 +93,13 @@ public sealed partial class PlantTraySystem : EntitySystem
             ent.Comp.SoilSolution = null;
     }
 
+    [SubscribeLocalEvent]
+    private void OnRelayInteractUsing(Entity<PlantTrayComponent> ent,
+        ref PlantHolderRelayedEvent<InteractUsingEvent> args)
+    {
+        args.Args.Handled = _interaction.InteractUsing(args.Args.User, args.Args.Used, ent, args.Args.ClickLocation);
+    }
+
     /// <summary>
     /// Updates trays whose periodic processing is due.
     /// </summary>
@@ -111,19 +137,23 @@ public sealed partial class PlantTraySystem : EntitySystem
         if (!_solutionContainer.ResolveSolution(trayUid, trayComp.SoilSolutionName, ref trayComp.SoilSolution, out var solution))
             return;
 
-        if (!TryGetPlant(ent, out var plantUid))
-            return;
-
         if (solution.Volume <= 0)
             return;
 
+        TryGetPlant(ent, out var plantUid);
         var contents = trayComp.SoilSolution.Value.Comp.Solution.Contents.ToArray();
-
         foreach (var entry in contents)
         {
-            var reagentProto = ProtoMan.Index<ReagentPrototype>(entry.Reagent.Prototype);
-            _entityEffects.ApplyEffects(trayUid, [.. reagentProto.PlantMetabolisms], entry.Quantity.Float());
-            _entityEffects.ApplyEffects(plantUid.Value, [.. reagentProto.PlantMetabolisms], entry.Quantity.Float());
+            if (entry.Quantity.Float() >= 1f)
+            {
+                var reagentProto = ProtoMan.Index(entry.Reagent.Prototype);
+                _entityEffects.ApplyEffects(trayUid, [.. reagentProto.PlantMetabolisms], entry.Quantity.Float());
+
+                if (plantUid != null)
+                {
+                    _entityEffects.ApplyEffects(plantUid.Value, [.. reagentProto.PlantMetabolisms], entry.Quantity.Float());
+                }
+            }
         }
 
         _solutionContainer.RemoveEachReagent(trayComp.SoilSolution.Value, FixedPoint2.New(1));
@@ -137,15 +167,6 @@ public sealed partial class PlantTraySystem : EntitySystem
         if (ent.Comp is not { WaterLevel: > 10, NutritionLevel: > 5 })
             return;
 
-        if (TryGetPlant(ent, out var plantUid))
-        {
-            if (!_weedPestQuery.TryComp(plantUid.Value, out var weedPestGrowth))
-                return;
-
-            if (ent.Comp.WeedLevel > weedPestGrowth.WeedTolerance)
-                _plantHolder.AdjustsHealth(plantUid.Value, -weedPestGrowth.WeedDamageAmount);
-        }
-
         if (SharedRandomExtensions.PredictedProb(_timing, ent.Comp.WeedGrowthChance, GetNetEntity(ent)))
             AdjustWeed(ent, ent.Comp.WeedGrowthAmount);
     }
@@ -252,6 +273,14 @@ public sealed partial class PlantTraySystem : EntitySystem
         return ent.Comp.ToxinLevel >= ent.Comp.MaxToxinLevel * 0.5f;
     }
 
+    /// <summary>
+    /// Checks whether the tray contains a plant entity.
+    /// </summary>
+    public bool HasPlant(Entity<PlantTrayComponent?> ent)
+    {
+        return TryGetPlant(ent, out _);
+    }
+
     /// <summary>
     /// Tries to get the plant entity in the tray.
     /// </summary>
@@ -264,16 +293,15 @@ public sealed partial class PlantTraySystem : EntitySystem
 
         plant = ent.Comp.PlantEntity;
         if (plant == null || Deleted(plant))
-        {
-            ent.Comp.PlantEntity = null;
-            DirtyField(ent, nameof(ent.Comp.PlantEntity));
             return false;
-        }
 
         return true;
     }
 
-    public bool TryGetAlivePlant(Entity<PlantTrayComponent?> ent)
+    /// <summary>
+    /// Checks whether the tray contains a living plant entity.
+    /// </summary>
+    public bool HasAlivePlant(Entity<PlantTrayComponent?> ent)
     {
         return TryGetAlivePlant(ent, out _);
     }
diff --git a/Content.Shared/Botany/Systems/PlantWeedPestSystem.cs b/Content.Shared/Botany/Systems/PlantWeedPestSystem.cs
index 5df8ad489b..37ff69bbfa 100644
--- a/Content.Shared/Botany/Systems/PlantWeedPestSystem.cs
+++ b/Content.Shared/Botany/Systems/PlantWeedPestSystem.cs
@@ -1,7 +1,8 @@
-using JetBrains.Annotations;
 using Content.Shared.Botany.Components;
 using Content.Shared.Botany.Events;
-using Robust.Shared.Random;
+using Content.Shared.Random.Helpers;
+using JetBrains.Annotations;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.Botany.Systems;
 
@@ -11,13 +12,13 @@ namespace Content.Shared.Botany.Systems;
 /// </summary>
 public sealed partial class PlantWeedPestSystem : EntitySystem
 {
+    [Dependency] private IGameTiming _timing = default!;
     [Dependency] private BotanySystem _botany = default!;
-    [Dependency] private IRobustRandom _random = default!;
     [Dependency] private PlantMutationSystem _mutation = default!;
     [Dependency] private PlantHolderSystem _plantHolder = default!;
     [Dependency] private PlantTraySystem _plantTray = default!;
 
-    [Dependency] private EntityQuery<PlantTrayComponent> _trayQuery = default!;
+    [Dependency] private EntityQuery<PlantTrayComponent> _trayQuery;
 
     [SubscribeLocalEvent]
     private void OnCrossPollinate(Entity<PlantWeedPestComponent> ent, ref PlantCrossPollinateEvent args)
@@ -33,13 +34,16 @@ public sealed partial class PlantWeedPestSystem : EntitySystem
     [SubscribeLocalEvent]
     private void OnPlantGrow(Entity<PlantWeedPestComponent> ent, ref PlantGrowEvent args)
     {
-        var trayUid = GetEntity(args.Tray);
+        var trayUid = args.Tray;
         if (!_trayQuery.TryComp(trayUid, out var tray))
             return;
 
-        if (_random.Prob(ent.Comp.PestGrowthChance))
+        if (SharedRandomExtensions.PredictedProb(_timing, ent.Comp.PestGrowthChance, GetNetEntity(ent)))
             _plantTray.AdjustPest((trayUid, tray), ent.Comp.PestGrowthAmount);
 
+        if (tray.WeedLevel > ent.Comp.WeedTolerance)
+            _plantHolder.AdjustsHealth(ent.Owner, -ent.Comp.WeedDamageAmount);
+
         if (tray.PestLevel > ent.Comp.PestTolerance)
             _plantHolder.AdjustsHealth(ent.Owner, -ent.Comp.PestDamageAmount);
     }
diff --git a/Content.Shared/Botany/Systems/SeedExtractorSystem.cs b/Content.Shared/Botany/Systems/SeedExtractorSystem.cs
index 22b3bdbcb8..2c6251a4a4 100644
--- a/Content.Shared/Botany/Systems/SeedExtractorSystem.cs
+++ b/Content.Shared/Botany/Systems/SeedExtractorSystem.cs
@@ -16,7 +16,7 @@ public sealed partial class SeedExtractorSystem : EntitySystem
     [Dependency] private SharedPopupSystem _popup = default!;
     [Dependency] private SharedPowerReceiverSystem _powerReceiver = default!;
 
-    [Dependency] private EntityQuery<ProduceComponent> _produceQuery = default!;
+    [Dependency] private EntityQuery<ProduceComponent> _produceQuery;
 
     [SubscribeLocalEvent]
     private void OnInteractUsing(Entity<SeedExtractorComponent> ent, ref InteractUsingEvent args)
@@ -38,20 +38,18 @@ public sealed partial class SeedExtractorSystem : EntitySystem
         {
             _popup.PopupCursor(Loc.GetString("seed-extractor-component-no-seeds", ("name", args.Used)),
                 args.User,
-                PopupType.MediumCaution);
+                PopupType.SmallCaution);
             return;
         }
 
         _popup.PopupCursor(Loc.GetString("seed-extractor-component-interact-message", ("name", args.Used)),
-            args.User,
-            PopupType.Medium);
+            args.User);
 
         PredictedQueueDel(args.Used);
         args.Handled = true;
 
-
         var random = SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(ent));
-        var amount = random.NextFloat(ent.Comp.BaseSeeds.Min, ent.Comp.BaseSeeds.Max + 1);
+        var amount = ent.Comp.BaseSeeds.NextFloat(random);
         var coords = Transform(ent).Coordinates;
 
         for (var i = 0; i < amount; i++)
diff --git a/Content.Shared/Botany/Systems/SharedPlantAtmosphericSystem.cs b/Content.Shared/Botany/Systems/SharedPlantAtmosphericSystem.cs
index f51b096865..6b6d483c5b 100644
--- a/Content.Shared/Botany/Systems/SharedPlantAtmosphericSystem.cs
+++ b/Content.Shared/Botany/Systems/SharedPlantAtmosphericSystem.cs
@@ -1,6 +1,6 @@
-using JetBrains.Annotations;
 using Content.Shared.Botany.Components;
 using Content.Shared.Botany.Events;
+using JetBrains.Annotations;
 
 namespace Content.Shared.Botany.Systems;
 
diff --git a/Content.Shared/Botany/Systems/SharedPlantConsumeExudeGasSystem.cs b/Content.Shared/Botany/Systems/SharedPlantConsumeExudeGasSystem.cs
index 036ec835c7..8f1f09aee5 100644
--- a/Content.Shared/Botany/Systems/SharedPlantConsumeExudeGasSystem.cs
+++ b/Content.Shared/Botany/Systems/SharedPlantConsumeExudeGasSystem.cs
@@ -1,8 +1,8 @@
-using JetBrains.Annotations;
 using Content.Shared.Atmos;
 using Content.Shared.Botany.Components;
 using Content.Shared.Botany.Events;
 using Content.Shared.Random.Helpers;
+using JetBrains.Annotations;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
diff --git a/Content.Shared/Botany/Traits/Components/PlantTraitKudzuComponent.cs b/Content.Shared/Botany/Traits/Components/PlantTraitKudzuComponent.cs
index 3c4789b85f..ad033ac06b 100644
--- a/Content.Shared/Botany/Traits/Components/PlantTraitKudzuComponent.cs
+++ b/Content.Shared/Botany/Traits/Components/PlantTraitKudzuComponent.cs
@@ -30,5 +30,7 @@ public sealed partial class PlantTraitKudzuComponent : PlantTraitsComponent
     public float WeedGrowthAmount = 1f;
 
     /// <inheritdoc/>
-    public override LocId? TraitState { get; set; } = "mutation-plant-kudzu";
+    public override LocId? TraitState { get; set; } = "mutation-plant-description-kudzu";
+    /// <inheritdoc/>
+    public override LocId? TraitName { get; set; } = "mutation-plant-noun-kudzu";
 }
diff --git a/Content.Shared/Botany/Traits/Components/PlantTraitLigneousComponent.cs b/Content.Shared/Botany/Traits/Components/PlantTraitLigneousComponent.cs
index 1c73f88b28..08ebab8688 100644
--- a/Content.Shared/Botany/Traits/Components/PlantTraitLigneousComponent.cs
+++ b/Content.Shared/Botany/Traits/Components/PlantTraitLigneousComponent.cs
@@ -17,5 +17,7 @@ public sealed partial class PlantTraitLigneousComponent : PlantTraitsComponent
     public ProtoId<ToolQualityPrototype>? HarvestToolQuality = "Sawing";
 
     /// <inheritdoc/>
-    public override LocId? TraitState { get; set; } = "mutation-plant-ligneous";
+    public override LocId? TraitState { get; set; } = "mutation-plant-description-ligneous";
+    /// <inheritdoc/>
+    public override LocId? TraitName { get; set; } = "mutation-plant-noun-ligneous";
 }
diff --git a/Content.Shared/Botany/Traits/Components/PlantTraitSampledComponent.cs b/Content.Shared/Botany/Traits/Components/PlantTraitSampledComponent.cs
index 61dc51f742..5e8ecdd6cf 100644
--- a/Content.Shared/Botany/Traits/Components/PlantTraitSampledComponent.cs
+++ b/Content.Shared/Botany/Traits/Components/PlantTraitSampledComponent.cs
@@ -9,5 +9,7 @@ namespace Content.Shared.Botany.Traits.Components;
 public sealed partial class PlantTraitSampledComponent : PlantTraitsComponent
 {
     /// <inheritdoc/>
-    public override LocId? TraitState { get; set; } = "mutation-plant-sampled";
+    public override LocId? TraitState { get; set; } = "mutation-plant-description-sampled";
+    /// <inheritdoc/>
+    public override LocId? TraitName { get; set; } = "mutation-plant-noun-sampled";
 }
diff --git a/Content.Shared/Botany/Traits/Components/PlantTraitScreamComponent.cs b/Content.Shared/Botany/Traits/Components/PlantTraitScreamComponent.cs
index 0b6d90fca0..189d471eb3 100644
--- a/Content.Shared/Botany/Traits/Components/PlantTraitScreamComponent.cs
+++ b/Content.Shared/Botany/Traits/Components/PlantTraitScreamComponent.cs
@@ -16,5 +16,7 @@ public sealed partial class PlantTraitScreamComponent : PlantTraitsComponent
     public SoundSpecifier ScreamSound = new SoundCollectionSpecifier("PlantScreams", AudioParams.Default.AddVolume(-10));
 
     /// <inheritdoc/>
-    public override LocId? TraitState { get; set; } = "mutation-plant-scream";
+    public override LocId? TraitState { get; set; } = "mutation-plant-description-scream";
+    /// <inheritdoc/>
+    public override LocId? TraitName { get; set; } = "mutation-plant-noun-scream";
 }
diff --git a/Content.Shared/Botany/Traits/Components/PlantTraitSeedlessComponent.cs b/Content.Shared/Botany/Traits/Components/PlantTraitSeedlessComponent.cs
index 4bca2f57cf..5a1c2711ed 100644
--- a/Content.Shared/Botany/Traits/Components/PlantTraitSeedlessComponent.cs
+++ b/Content.Shared/Botany/Traits/Components/PlantTraitSeedlessComponent.cs
@@ -9,5 +9,8 @@ namespace Content.Shared.Botany.Traits.Components;
 public sealed partial class PlantTraitSeedlessComponent : PlantTraitsComponent
 {
     /// <inheritdoc/>
-    public override LocId? TraitState { get; set; } = "mutation-plant-seedless";
+    public override LocId? TraitState { get; set; } = "mutation-plant-description-seedless";
+    /// <inheritdoc/>
+    public override LocId? TraitName { get; set; } = "mutation-plant-noun-seedless";
+
 }
diff --git a/Content.Shared/Botany/Traits/Components/PlantTraitUnviableComponent.cs b/Content.Shared/Botany/Traits/Components/PlantTraitUnviableComponent.cs
index 18d949a4fe..cf56bb0478 100644
--- a/Content.Shared/Botany/Traits/Components/PlantTraitUnviableComponent.cs
+++ b/Content.Shared/Botany/Traits/Components/PlantTraitUnviableComponent.cs
@@ -16,5 +16,7 @@ public sealed partial class PlantTraitUnviableComponent : PlantTraitsComponent
     public float UnviableDamage = 6f;
 
     /// <inheritdoc/>
-    public override LocId? TraitState { get; set; } = "mutation-plant-unviable";
+    public override LocId? TraitState { get; set; } = "mutation-plant-description-unviable";
+    /// <inheritdoc/>
+    public override LocId? TraitName { get; set; } = "mutation-plant-noun-unviable";
 }
diff --git a/Content.Shared/Botany/Traits/Components/PlantTraitsComponent.cs b/Content.Shared/Botany/Traits/Components/PlantTraitsComponent.cs
index e68a67941e..01a72048bf 100644
--- a/Content.Shared/Botany/Traits/Components/PlantTraitsComponent.cs
+++ b/Content.Shared/Botany/Traits/Components/PlantTraitsComponent.cs
@@ -10,4 +10,10 @@ public abstract partial class PlantTraitsComponent : Component
     /// </summary>
     [DataField]
     public virtual LocId? TraitState { get; set; }
+
+    /// <summary>
+    /// Localization key for the name of the trait.
+    /// </summary>
+    [DataField]
+    public virtual LocId? TraitName { get; set; }
 }
diff --git a/Content.Shared/Botany/Traits/Systems/PlantTraitKudzuSystem.cs b/Content.Shared/Botany/Traits/Systems/PlantTraitKudzuSystem.cs
index 936ede950d..7e348a0f3b 100644
--- a/Content.Shared/Botany/Traits/Systems/PlantTraitKudzuSystem.cs
+++ b/Content.Shared/Botany/Traits/Systems/PlantTraitKudzuSystem.cs
@@ -11,13 +11,13 @@ public sealed partial class PlantTraitKudzuSystem : EntitySystem
     [Dependency] private PlantHolderSystem _plantHolder = default!;
     [Dependency] private PlantTraySystem _plantTray = default!;
     [Dependency] private SharedTransformSystem _transform = default!;
-    
-    [Dependency] private EntityQuery<PlantTrayComponent> _trayQuery = default!;
+
+    [Dependency] private EntityQuery<PlantTrayComponent> _trayQuery;
 
     [SubscribeLocalEvent]
     private void OnPlantGrow(Entity<PlantTraitKudzuComponent> ent, ref PlantGrowEvent args)
     {
-        var trayUid = GetEntity(args.Tray);
+        var trayUid = args.Tray;
         if (!_trayQuery.TryComp(trayUid, out var trayComp))
             return;
 
@@ -27,7 +27,7 @@ public sealed partial class PlantTraitKudzuSystem : EntitySystem
         // Handle kudzu transformation.
         if (trayComp.WeedLevel >= ent.Comp.WeedLevelThreshold)
         {
-            EntityManager.PredictedSpawn(ent.Comp.KudzuPrototype, _transform.GetMapCoordinates(ent.Owner));
+            PredictedSpawn(ent.Comp.KudzuPrototype, _transform.GetMapCoordinates(ent.Owner));
             RemComp<PlantTraitKudzuComponent>(ent.Owner);
             _plantHolder.KillPlant(ent.Owner);
         }
diff --git a/Content.Shared/Botany/Traits/Systems/PlantTraitLigneousSystem.cs b/Content.Shared/Botany/Traits/Systems/PlantTraitLigneousSystem.cs
index 524b2da8f0..9ea4408aae 100644
--- a/Content.Shared/Botany/Traits/Systems/PlantTraitLigneousSystem.cs
+++ b/Content.Shared/Botany/Traits/Systems/PlantTraitLigneousSystem.cs
@@ -16,7 +16,7 @@ public sealed partial class PlantTraitLigneousSystem : EntitySystem
     [Dependency] private SharedPopupSystem _popup = default!;
     [Dependency] private SharedToolSystem _tool = default!;
 
-    [Dependency] private EntityQuery<PlantHolderComponent> _holderQuery = default!;
+    [Dependency] private EntityQuery<PlantHolderComponent> _holderQuery;
 
     [SubscribeLocalEvent]
     private void OnInteractUsing(Entity<PlantTraitLigneousComponent> ent, ref InteractUsingEvent args)
@@ -39,19 +39,16 @@ public sealed partial class PlantTraitLigneousSystem : EntitySystem
         // Ligneous requires sharp tool.
         var harvestToolQuality = ent.Comp.HarvestToolQuality;
         if (harvestToolQuality.HasValue && !_tool.HasQuality(args.Used, harvestToolQuality.Value))
-        {
-            _popup.PopupCursor(Loc.GetString("plant-component-ligneous-cant-harvest-message"), args.User);
             return;
-        }
 
         _plantHarvest.TryHandleHarvest(ent.Owner, args.User);
         args.Handled = true;
     }
 
     [SubscribeLocalEvent(before: [typeof(PlantHarvestSystem)])]
-    private void OnDoHarvest(Entity<PlantTraitLigneousComponent> ent, ref DoHarvestEvent args)
+    private void OnHarvestAttempt(Entity<PlantTraitLigneousComponent> ent, ref PlantHarvestAttemptEvent args)
     {
         _popup.PopupCursor(Loc.GetString("plant-component-ligneous-cant-harvest-message"), args.User);
-        args.Cancel();
+        args.Cancelled = true;
     }
 }
diff --git a/Content.Shared/Botany/Traits/Systems/PlantTraitScreamSystem.cs b/Content.Shared/Botany/Traits/Systems/PlantTraitScreamSystem.cs
index 7cfa9de314..0b4f1ae174 100644
--- a/Content.Shared/Botany/Traits/Systems/PlantTraitScreamSystem.cs
+++ b/Content.Shared/Botany/Traits/Systems/PlantTraitScreamSystem.cs
@@ -10,7 +10,7 @@ public sealed partial class PlantTraitScreamSystem : EntitySystem
     [Dependency] private SharedAudioSystem _audio = default!;
 
     [SubscribeLocalEvent]
-    private void OnAfterDoHarvest(Entity<PlantTraitScreamComponent> ent, ref AfterDoHarvestEvent args)
+    private void OnPlantHarvested(Entity<PlantTraitScreamComponent> ent, ref PlantHarvestedEvent args)
     {
         _audio.PlayPredicted(ent.Comp.ScreamSound, ent, args.User);
     }
diff --git a/Content.Shared/Bql/ToolshedVisualizeEuiState.cs b/Content.Shared/Bql/ToolshedVisualizeEuiState.cs
index 64595f6ecf..2003d1c3f9 100644
--- a/Content.Shared/Bql/ToolshedVisualizeEuiState.cs
+++ b/Content.Shared/Bql/ToolshedVisualizeEuiState.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Eui;
+using Content.Shared.Eui;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Bql;
diff --git a/Content.Shared/CCVar/CCVars.Accessibility.cs b/Content.Shared/CCVar/CCVars.Accessibility.cs
index 5d53d265c3..bb528e5028 100644
--- a/Content.Shared/CCVar/CCVars.Accessibility.cs
+++ b/Content.Shared/CCVar/CCVars.Accessibility.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Admin.Logs.cs b/Content.Shared/CCVar/CCVars.Admin.Logs.cs
index f760f3418f..84f1a77e58 100644
--- a/Content.Shared/CCVar/CCVars.Admin.Logs.cs
+++ b/Content.Shared/CCVar/CCVars.Admin.Logs.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Admin.Rules.cs b/Content.Shared/CCVar/CCVars.Admin.Rules.cs
index 7385104364..492a78de5b 100644
--- a/Content.Shared/CCVar/CCVars.Admin.Rules.cs
+++ b/Content.Shared/CCVar/CCVars.Admin.Rules.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Admin.cs b/Content.Shared/CCVar/CCVars.Admin.cs
index e0f7fe9cc5..69c7eec5ca 100644
--- a/Content.Shared/CCVar/CCVars.Admin.cs
+++ b/Content.Shared/CCVar/CCVars.Admin.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 using Content.Shared.Administration;
 using Content.Shared.CCVar.CVarAccess;
diff --git a/Content.Shared/CCVar/CCVars.Atmos.cs b/Content.Shared/CCVar/CCVars.Atmos.cs
index eccee01151..1a3b067664 100644
--- a/Content.Shared/CCVar/CCVars.Atmos.cs
+++ b/Content.Shared/CCVar/CCVars.Atmos.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Chat.Admin.cs b/Content.Shared/CCVar/CCVars.Chat.Admin.cs
index 808d2c91d8..854cff2cb8 100644
--- a/Content.Shared/CCVar/CCVars.Chat.Admin.cs
+++ b/Content.Shared/CCVar/CCVars.Chat.Admin.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Chat.Dead.cs b/Content.Shared/CCVar/CCVars.Chat.Dead.cs
index f9618d793b..92db804dc9 100644
--- a/Content.Shared/CCVar/CCVars.Chat.Dead.cs
+++ b/Content.Shared/CCVar/CCVars.Chat.Dead.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Chat.Looc.cs b/Content.Shared/CCVar/CCVars.Chat.Looc.cs
index 84ee2c2807..d924dd6d7c 100644
--- a/Content.Shared/CCVar/CCVars.Chat.Looc.cs
+++ b/Content.Shared/CCVar/CCVars.Chat.Looc.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Chat.Ooc.cs b/Content.Shared/CCVar/CCVars.Chat.Ooc.cs
index e4617fc470..e53fcc3921 100644
--- a/Content.Shared/CCVar/CCVars.Chat.Ooc.cs
+++ b/Content.Shared/CCVar/CCVars.Chat.Ooc.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Chat.cs b/Content.Shared/CCVar/CCVars.Chat.cs
index 9f31e0527e..ef4589f9b3 100644
--- a/Content.Shared/CCVar/CCVars.Chat.cs
+++ b/Content.Shared/CCVar/CCVars.Chat.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
@@ -83,4 +83,10 @@ public sealed partial class CCVars
     /// </summary>
     public static readonly CVarDef<string> ChatHighlightsColor =
         CVarDef.Create("chat.highlights_color", "#17FFC1FF", CVar.CLIENTONLY | CVar.ARCHIVE, "The color in which the highlights will be displayed.");
+
+    /// <summary>
+    /// If true will allow TextLinkTags to make interactable chat labels in place of sender names.
+    /// </summary>
+    public static readonly CVarDef<bool> ChatNameLinks =
+        CVarDef.Create("chat.chat_name_links", true, CVar.REPLICATED | CVar.SERVER, "Toggles Chat Name Link functionality.");
 }
diff --git a/Content.Shared/CCVar/CCVars.Config.cs b/Content.Shared/CCVar/CCVars.Config.cs
index 4e11f09ee7..3e8157dd0c 100644
--- a/Content.Shared/CCVar/CCVars.Config.cs
+++ b/Content.Shared/CCVar/CCVars.Config.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Console.cs b/Content.Shared/CCVar/CCVars.Console.cs
index e670b9f836..d909d1ae25 100644
--- a/Content.Shared/CCVar/CCVars.Console.cs
+++ b/Content.Shared/CCVar/CCVars.Console.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Crewmanifest.cs b/Content.Shared/CCVar/CCVars.Crewmanifest.cs
index d6251886b9..43289cc426 100644
--- a/Content.Shared/CCVar/CCVars.Crewmanifest.cs
+++ b/Content.Shared/CCVar/CCVars.Crewmanifest.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Database.cs b/Content.Shared/CCVar/CCVars.Database.cs
index c6deb73339..65cdc7dd9c 100644
--- a/Content.Shared/CCVar/CCVars.Database.cs
+++ b/Content.Shared/CCVar/CCVars.Database.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Debug.cs b/Content.Shared/CCVar/CCVars.Debug.cs
index a95acc4dac..b7c47f1950 100644
--- a/Content.Shared/CCVar/CCVars.Debug.cs
+++ b/Content.Shared/CCVar/CCVars.Debug.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Discord.cs b/Content.Shared/CCVar/CCVars.Discord.cs
index 324503887d..b77604557a 100644
--- a/Content.Shared/CCVar/CCVars.Discord.cs
+++ b/Content.Shared/CCVar/CCVars.Discord.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Events.cs b/Content.Shared/CCVar/CCVars.Events.cs
index c1be29a023..9f7ebeca58 100644
--- a/Content.Shared/CCVar/CCVars.Events.cs
+++ b/Content.Shared/CCVar/CCVars.Events.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using Content.Shared.CCVar.CVarAccess;
 using Robust.Shared.Configuration;
 
diff --git a/Content.Shared/CCVar/CCVars.Explosion.cs b/Content.Shared/CCVar/CCVars.Explosion.cs
index 51d93456b7..8582765383 100644
--- a/Content.Shared/CCVar/CCVars.Explosion.cs
+++ b/Content.Shared/CCVar/CCVars.Explosion.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Game.Infolinks.cs b/Content.Shared/CCVar/CCVars.Game.Infolinks.cs
index 5544953a0d..74c930cda8 100644
--- a/Content.Shared/CCVar/CCVars.Game.Infolinks.cs
+++ b/Content.Shared/CCVar/CCVars.Game.Infolinks.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Ghost.cs b/Content.Shared/CCVar/CCVars.Ghost.cs
index 39e7a3c491..1b645f5766 100644
--- a/Content.Shared/CCVar/CCVars.Ghost.cs
+++ b/Content.Shared/CCVar/CCVars.Ghost.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Hud.cs b/Content.Shared/CCVar/CCVars.Hud.cs
index c435f07cbe..08202d1c1b 100644
--- a/Content.Shared/CCVar/CCVars.Hud.cs
+++ b/Content.Shared/CCVar/CCVars.Hud.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Ic.cs b/Content.Shared/CCVar/CCVars.Ic.cs
index a075bb0144..422cb9878e 100644
--- a/Content.Shared/CCVar/CCVars.Ic.cs
+++ b/Content.Shared/CCVar/CCVars.Ic.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Interactions.cs b/Content.Shared/CCVar/CCVars.Interactions.cs
index 401fabfa29..452a7a02aa 100644
--- a/Content.Shared/CCVar/CCVars.Interactions.cs
+++ b/Content.Shared/CCVar/CCVars.Interactions.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Interface.cs b/Content.Shared/CCVar/CCVars.Interface.cs
index 8b23cedcee..1deb3cf43c 100644
--- a/Content.Shared/CCVar/CCVars.Interface.cs
+++ b/Content.Shared/CCVar/CCVars.Interface.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
@@ -126,10 +126,4 @@ public sealed partial class CCVars
     /// </summary>
     public static readonly CVarDef<bool> AdminStripMenuOverlayDefault =
         CVarDef.Create("ui.admin_strip_menu_overlay_default", true, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-    /// <summary>
-    /// If true, ghosts will see an "(F)" button next to chat messages, which can be used to follow the sender.
-    /// </summary>
-    public static readonly CVarDef<bool> InterfaceChatFollowButton =
-        CVarDef.Create("ui.chat_follow_button", true, CVar.CLIENT | CVar.REPLICATED | CVar.ARCHIVE);
 }
diff --git a/Content.Shared/CCVar/CCVars.Mapping.cs b/Content.Shared/CCVar/CCVars.Mapping.cs
index 06cd2870ba..369e48fac0 100644
--- a/Content.Shared/CCVar/CCVars.Mapping.cs
+++ b/Content.Shared/CCVar/CCVars.Mapping.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Midi.cs b/Content.Shared/CCVar/CCVars.Midi.cs
index 806bcc2b52..d9cb18dc35 100644
--- a/Content.Shared/CCVar/CCVars.Midi.cs
+++ b/Content.Shared/CCVar/CCVars.Midi.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Misc.cs b/Content.Shared/CCVar/CCVars.Misc.cs
index fe45b3eb29..1d9ed6b885 100644
--- a/Content.Shared/CCVar/CCVars.Misc.cs
+++ b/Content.Shared/CCVar/CCVars.Misc.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 using Content.Shared.Administration;
 using Content.Shared.CCVar.CVarAccess;
diff --git a/Content.Shared/CCVar/CCVars.NPC.cs b/Content.Shared/CCVar/CCVars.NPC.cs
index f0d5520195..6df32900d8 100644
--- a/Content.Shared/CCVar/CCVars.NPC.cs
+++ b/Content.Shared/CCVar/CCVars.NPC.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Parallax.cs b/Content.Shared/CCVar/CCVars.Parallax.cs
index 9b19c8f494..1850ba627f 100644
--- a/Content.Shared/CCVar/CCVars.Parallax.cs
+++ b/Content.Shared/CCVar/CCVars.Parallax.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Physics.cs b/Content.Shared/CCVar/CCVars.Physics.cs
index 88aa479ec1..8575d44669 100644
--- a/Content.Shared/CCVar/CCVars.Physics.cs
+++ b/Content.Shared/CCVar/CCVars.Physics.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Playtest.cs b/Content.Shared/CCVar/CCVars.Playtest.cs
index ea403ca75e..03796a495c 100644
--- a/Content.Shared/CCVar/CCVars.Playtest.cs
+++ b/Content.Shared/CCVar/CCVars.Playtest.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using Content.Shared.CCVar.CVarAccess;
 using Content.Shared.Roles;
 using Robust.Shared.Configuration;
diff --git a/Content.Shared/CCVar/CCVars.Radiation.cs b/Content.Shared/CCVar/CCVars.Radiation.cs
index dfcce15b2f..cabc8fd409 100644
--- a/Content.Shared/CCVar/CCVars.Radiation.cs
+++ b/Content.Shared/CCVar/CCVars.Radiation.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Replays.cs b/Content.Shared/CCVar/CCVars.Replays.cs
index 64f47e8ad8..d7b5b9ee9d 100644
--- a/Content.Shared/CCVar/CCVars.Replays.cs
+++ b/Content.Shared/CCVar/CCVars.Replays.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Salvage.cs b/Content.Shared/CCVar/CCVars.Salvage.cs
index ddc332786b..cd9b971e6b 100644
--- a/Content.Shared/CCVar/CCVars.Salvage.cs
+++ b/Content.Shared/CCVar/CCVars.Salvage.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Server.cs b/Content.Shared/CCVar/CCVars.Server.cs
index aad6d0a808..f8b47cdfe0 100644
--- a/Content.Shared/CCVar/CCVars.Server.cs
+++ b/Content.Shared/CCVar/CCVars.Server.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Shuttle.cs b/Content.Shared/CCVar/CCVars.Shuttle.cs
index c29ee7a488..309572bb6c 100644
--- a/Content.Shared/CCVar/CCVars.Shuttle.cs
+++ b/Content.Shared/CCVar/CCVars.Shuttle.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using Content.Shared.CCVar.CVarAccess;
 using Robust.Shared.Configuration;
 
@@ -31,7 +31,7 @@ public sealed partial class CCVars
     ///     Whether the arrivals shuttle is enabled.
     /// </summary>
     public static readonly CVarDef<bool> ArrivalsShuttles =
-        CVarDef.Create("shuttle.arrivals", true, CVar.SERVERONLY);
+        CVarDef.Create("shuttle.arrivals", true);
 
     /// <summary>
     ///     The map to use for the arrivals station.
@@ -55,7 +55,7 @@ public sealed partial class CCVars
     ///     Should all players who spawn at arrivals have godmode until they leave the map?
     /// </summary>
     public static readonly CVarDef<bool> GodmodeArrivals =
-        CVarDef.Create("shuttle.godmode_arrivals", false, CVar.SERVERONLY);
+        CVarDef.Create("shuttle.godmode_arrivals", false);
 
     /// <summary>
     ///     If a grid is split then hide any smaller ones under this mass (kg) from the map.
diff --git a/Content.Shared/CCVar/CCVars.Tips.cs b/Content.Shared/CCVar/CCVars.Tips.cs
index 61e6342061..deb7f64610 100644
--- a/Content.Shared/CCVar/CCVars.Tips.cs
+++ b/Content.Shared/CCVar/CCVars.Tips.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Viewport.cs b/Content.Shared/CCVar/CCVars.Viewport.cs
index 9b8057be51..f8fd328fa2 100644
--- a/Content.Shared/CCVar/CCVars.Viewport.cs
+++ b/Content.Shared/CCVar/CCVars.Viewport.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Vote.cs b/Content.Shared/CCVar/CCVars.Vote.cs
index deb860e03c..92ed7d7a01 100644
--- a/Content.Shared/CCVar/CCVars.Vote.cs
+++ b/Content.Shared/CCVar/CCVars.Vote.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CCVars.Whitelist.cs b/Content.Shared/CCVar/CCVars.Whitelist.cs
index 7a7a5206a1..28d9f270a3 100644
--- a/Content.Shared/CCVar/CCVars.Whitelist.cs
+++ b/Content.Shared/CCVar/CCVars.Whitelist.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
diff --git a/Content.Shared/CCVar/CVarAccess/CVarControl.cs b/Content.Shared/CCVar/CVarAccess/CVarControl.cs
index 799738cf3d..c03773bc5b 100644
--- a/Content.Shared/CCVar/CVarAccess/CVarControl.cs
+++ b/Content.Shared/CCVar/CVarAccess/CVarControl.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using Robust.Shared.Reflection;
 
 namespace Content.Shared.CCVar.CVarAccess;
diff --git a/Content.Shared/Cabinet/ItemCabinetSystem.cs b/Content.Shared/Cabinet/ItemCabinetSystem.cs
index 02766427d8..1c40956005 100644
--- a/Content.Shared/Cabinet/ItemCabinetSystem.cs
+++ b/Content.Shared/Cabinet/ItemCabinetSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Interaction;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
diff --git a/Content.Shared/CardboardBox/Components/CardboardBoxComponent.cs b/Content.Shared/CardboardBox/Components/CardboardBoxComponent.cs
index 79e65473a1..a26df53722 100644
--- a/Content.Shared/CardboardBox/Components/CardboardBoxComponent.cs
+++ b/Content.Shared/CardboardBox/Components/CardboardBoxComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Audio;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Cargo/CargoOrderData.cs b/Content.Shared/Cargo/CargoOrderData.cs
index f7e56e59f5..ec316925c5 100644
--- a/Content.Shared/Cargo/CargoOrderData.cs
+++ b/Content.Shared/Cargo/CargoOrderData.cs
@@ -27,27 +27,51 @@ namespace Content.Shared.Cargo
         public int OrderQuantity;
 
         /// <summary>
-        /// How many instances of this order that we've already dispatched
+        /// How many instances of this order that we've already dispatched.
         /// </summary>
         [DataField]
         public int NumDispatched = 0;
 
+        /// <summary>
+        /// A string representation of the requestor's name.
+        /// </summary>
         [DataField]
         public string Requester { get; private set; }
         // public String RequesterRank; // TODO Figure out how to get Character ID card data
         // public int RequesterId;
+
+        /// <summary>
+        /// A player-provided string of the reason for the order.
+        /// </summary>
         [DataField]
         public string Reason { get; private set; }
-        public  bool Approved;
+
+        /// <summary>
+        /// If the order has been approved.
+        /// </summary>
+        public bool Approved;
+
+        /// <summary>
+        /// The console that approved the order.
+        /// </summary>
+        [DataField]
+        public NetEntity? ApprovingConsole { get; set; }
+
+        /// <summary>
+        /// A string representation of the approver's name, unless the ordering console was emagged.
+        /// </summary>
         [DataField]
         public string? Approver;
 
         /// <summary>
-        /// Which account to deduct funds from when ordering
+        /// Which account to deduct funds from when ordering.
         /// </summary>
         [DataField]
         public ProtoId<CargoAccountPrototype> Account;
 
+        /// <summary>
+        /// Constructor.
+        /// </summary>
         public CargoOrderData(int orderId, ProtoId<CargoProductPrototype> product, int amount, string requester, string reason, ProtoId<CargoAccountPrototype> account)
         {
             OrderId = orderId;
@@ -58,11 +82,21 @@ namespace Content.Shared.Cargo
             Account = account;
         }
 
+        /// <summary>
+        /// Sets the approver for this order.
+        /// </summary>
+        /// <param name="approver">Nullable string representation of the approver's name.</param>
         public void SetApproverData(string? approver)
         {
             Approver = approver;
         }
 
+        /// <summary>
+        /// Sets the approver for this order by concatenating the name and job title.
+        /// If both are null, will be an empty string.
+        /// </summary>
+        /// <param name="fullName">Nullable string representation of the approver's full name.</param>
+        /// <param name="jobTitle">Nullable string representation of the approver's job title.</param>
         public void SetApproverData(string? fullName, string? jobTitle)
         {
             var sb = new StringBuilder();
diff --git a/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs b/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs
index 495ad14a9d..62253f7795 100644
--- a/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs
+++ b/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Whitelist;
+using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
diff --git a/Content.Shared/CartridgeLoader/CartridgeComponent.cs b/Content.Shared/CartridgeLoader/CartridgeComponent.cs
index cd699f742e..be41528707 100644
--- a/Content.Shared/CartridgeLoader/CartridgeComponent.cs
+++ b/Content.Shared/CartridgeLoader/CartridgeComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
diff --git a/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs b/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs
index 47f3b5bafc..39bf6c745b 100644
--- a/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs
+++ b/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Containers.ItemSlots;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.CartridgeLoader;
diff --git a/Content.Shared/CartridgeLoader/CartridgeLoaderSystem.Relay.cs b/Content.Shared/CartridgeLoader/CartridgeLoaderSystem.Relay.cs
index db4e952a48..985093b792 100644
--- a/Content.Shared/CartridgeLoader/CartridgeLoaderSystem.Relay.cs
+++ b/Content.Shared/CartridgeLoader/CartridgeLoaderSystem.Relay.cs
@@ -1,4 +1,3 @@
-using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.Interaction;
 
 namespace Content.Shared.CartridgeLoader;
@@ -9,7 +8,6 @@ public sealed partial class CartridgeLoaderSystem
     {
         SubscribeLocalEvent<CartridgeLoaderComponent, AfterInteractEvent>(RelayEvent);
         SubscribeLocalEvent<CartridgeLoaderComponent, InteractUsingEvent>(RelayEvent);
-        SubscribeLocalEvent<CartridgeLoaderComponent, DeviceNetworkPacketEvent>(RelayEvent);
     }
 
     private void RefRelayEvent<T>(EntityUid uid, CartridgeLoaderComponent component, ref T args) where T : struct
diff --git a/Content.Shared/CartridgeLoader/CartridgeLoaderUiMessage.cs b/Content.Shared/CartridgeLoader/CartridgeLoaderUiMessage.cs
index 18c5cf9f91..f618b87896 100644
--- a/Content.Shared/CartridgeLoader/CartridgeLoaderUiMessage.cs
+++ b/Content.Shared/CartridgeLoader/CartridgeLoaderUiMessage.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.CartridgeLoader;
 
diff --git a/Content.Shared/CartridgeLoader/CartridgeLoaderUiState.cs b/Content.Shared/CartridgeLoader/CartridgeLoaderUiState.cs
index 0bc3f66a57..3a613c7be0 100644
--- a/Content.Shared/CartridgeLoader/CartridgeLoaderUiState.cs
+++ b/Content.Shared/CartridgeLoader/CartridgeLoaderUiState.cs
@@ -1,4 +1,4 @@
-using System.Collections.Immutable;
+using System.Collections.Immutable;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.CartridgeLoader;
diff --git a/Content.Shared/CartridgeLoader/CartridgeLoaderVisuals.cs b/Content.Shared/CartridgeLoader/CartridgeLoaderVisuals.cs
index c973fb2994..bf06bce01a 100644
--- a/Content.Shared/CartridgeLoader/CartridgeLoaderVisuals.cs
+++ b/Content.Shared/CartridgeLoader/CartridgeLoaderVisuals.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.CartridgeLoader;
 
diff --git a/Content.Shared/CartridgeLoader/CartridgeUiMessage.cs b/Content.Shared/CartridgeLoader/CartridgeUiMessage.cs
index 7d02a4944e..0d086fa4d4 100644
--- a/Content.Shared/CartridgeLoader/CartridgeUiMessage.cs
+++ b/Content.Shared/CartridgeLoader/CartridgeUiMessage.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.CartridgeLoader;
 
diff --git a/Content.Shared/CartridgeLoader/Cartridges/CrewManifestCartridgeComponent.cs b/Content.Shared/CartridgeLoader/Cartridges/CrewManifestCartridgeComponent.cs
index ce3b4cf482..71de48ea1e 100644
--- a/Content.Shared/CartridgeLoader/Cartridges/CrewManifestCartridgeComponent.cs
+++ b/Content.Shared/CartridgeLoader/Cartridges/CrewManifestCartridgeComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Server.CartridgeLoader.Cartridges;
 
diff --git a/Content.Shared/CartridgeLoader/Cartridges/CrewManifestUiState.cs b/Content.Shared/CartridgeLoader/Cartridges/CrewManifestUiState.cs
index 9eaca5a2d3..8feedc4ddb 100644
--- a/Content.Shared/CartridgeLoader/Cartridges/CrewManifestUiState.cs
+++ b/Content.Shared/CartridgeLoader/Cartridges/CrewManifestUiState.cs
@@ -1,4 +1,4 @@
-using Content.Shared.CrewManifest;
+using Content.Shared.CrewManifest;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.CartridgeLoader.Cartridges;
diff --git a/Content.Shared/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs b/Content.Shared/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs
index 05dc788d3a..fc5e644144 100644
--- a/Content.Shared/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs
+++ b/Content.Shared/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs
@@ -93,7 +93,7 @@ public sealed partial class LogProbeCartridgeSystem : EntitySystem
 
         ent.Comp.NextPrintAllowed = _timing.CurTime + ent.Comp.PrintCooldown;
 
-        var paper = EntityManager.PredictedSpawn(ent.Comp.PaperPrototype, _transform.GetMapCoordinates(user));
+        var paper = PredictedSpawn(ent.Comp.PaperPrototype, _transform.GetMapCoordinates(user));
         _label.Label(paper, ent.Comp.EntityName); // label it for easy identification
 
         _audio.PlayEntity(ent.Comp.PrintSound, user, paper);
diff --git a/Content.Shared/CartridgeLoader/Cartridges/LogProbeUiState.cs b/Content.Shared/CartridgeLoader/Cartridges/LogProbeUiState.cs
index b83967ec32..cb134146e3 100644
--- a/Content.Shared/CartridgeLoader/Cartridges/LogProbeUiState.cs
+++ b/Content.Shared/CartridgeLoader/Cartridges/LogProbeUiState.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.CartridgeLoader.Cartridges;
 
diff --git a/Content.Shared/CartridgeLoader/Cartridges/NetProbeCartridgeComponent.cs b/Content.Shared/CartridgeLoader/Cartridges/NetProbeCartridgeComponent.cs
index a690309165..aa93b10a93 100644
--- a/Content.Shared/CartridgeLoader/Cartridges/NetProbeCartridgeComponent.cs
+++ b/Content.Shared/CartridgeLoader/Cartridges/NetProbeCartridgeComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Audio;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.CartridgeLoader.Cartridges;
diff --git a/Content.Shared/CartridgeLoader/Cartridges/NetProbeCartridgeSystem.cs b/Content.Shared/CartridgeLoader/Cartridges/NetProbeCartridgeSystem.cs
index 4d339134be..81e0bf0866 100644
--- a/Content.Shared/CartridgeLoader/Cartridges/NetProbeCartridgeSystem.cs
+++ b/Content.Shared/CartridgeLoader/Cartridges/NetProbeCartridgeSystem.cs
@@ -56,8 +56,8 @@ public sealed partial class NetProbeCartridgeSystem : EntitySystem
         var device = new ProbedNetworkDevice(
             Name(target),
             networkComponent.Address,
-            networkComponent.ReceiveFrequency?.FrequencyToString() ?? string.Empty,
-            networkComponent.DeviceNetId.DeviceNetIdToLocalizedName()
+            DeviceLocalizationHelpers.FrequencyToString(networkComponent.ReceiveFrequency),
+            DeviceLocalizationHelpers.DeviceNetIdToLocalizedName(networkComponent.DeviceNetId, Loc)
         );
 
         component.ProbedDevices.Add(device);
diff --git a/Content.Shared/CartridgeLoader/Cartridges/NetProbeUiState.cs b/Content.Shared/CartridgeLoader/Cartridges/NetProbeUiState.cs
index 04594a2139..041cc895be 100644
--- a/Content.Shared/CartridgeLoader/Cartridges/NetProbeUiState.cs
+++ b/Content.Shared/CartridgeLoader/Cartridges/NetProbeUiState.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.CartridgeLoader.Cartridges;
 
diff --git a/Content.Shared/CartridgeLoader/Cartridges/NotekeeperUiState.cs b/Content.Shared/CartridgeLoader/Cartridges/NotekeeperUiState.cs
index 52c86936ec..8aaf022b7f 100644
--- a/Content.Shared/CartridgeLoader/Cartridges/NotekeeperUiState.cs
+++ b/Content.Shared/CartridgeLoader/Cartridges/NotekeeperUiState.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.CartridgeLoader.Cartridges;
 
diff --git a/Content.Shared/Changeling/ChangelingDevourEvents.cs b/Content.Shared/Changeling/ChangelingDevourEvents.cs
index ba8d25f30c..9453a7111b 100644
--- a/Content.Shared/Changeling/ChangelingDevourEvents.cs
+++ b/Content.Shared/Changeling/ChangelingDevourEvents.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Changeling/ChangelingTransformEvents.cs b/Content.Shared/Changeling/ChangelingTransformEvents.cs
index 9a4ff4454e..feee82adeb 100644
--- a/Content.Shared/Changeling/ChangelingTransformEvents.cs
+++ b/Content.Shared/Changeling/ChangelingTransformEvents.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Changeling/Components/ChangelingCloneableStatusEffectComponent.cs b/Content.Shared/Changeling/Components/ChangelingCloneableStatusEffectComponent.cs
index f7b633cfe5..3d98940a55 100644
--- a/Content.Shared/Changeling/Components/ChangelingCloneableStatusEffectComponent.cs
+++ b/Content.Shared/Changeling/Components/ChangelingCloneableStatusEffectComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Changeling.Components;
 
diff --git a/Content.Shared/Changeling/Components/ChangelingDevourComponent.cs b/Content.Shared/Changeling/Components/ChangelingDevourComponent.cs
index 59cfc92bcd..15cc1b7d18 100644
--- a/Content.Shared/Changeling/Components/ChangelingDevourComponent.cs
+++ b/Content.Shared/Changeling/Components/ChangelingDevourComponent.cs
@@ -91,9 +91,8 @@ public sealed partial class ChangelingDevourComponent : Component
     {
         DamageDict = new()
         {
-            { "Slash", 10},
-            { "Piercing", 10 },
-            { "Blunt", 5 },
+            { "Slash", 15},
+            { "Piercing", 15 },
         },
     };
 
@@ -105,9 +104,9 @@ public sealed partial class ChangelingDevourComponent : Component
     {
         DamageDict = new()
         {
-            { "Slash", 20},
-            { "Piercing", 20 },
-            { "Blunt", 10 },
+            { "Slash", 60},
+            { "Piercing", 60 },
+            { "Caustic", 100 },
         },
     };
 
@@ -143,6 +142,18 @@ public sealed partial class ChangelingDevourComponent : Component
         { "ChangelingDNA", 10 }
     };
 
+    /// <summary>
+    /// What to show on examine while the changeling's devour is in the windup stage.
+    /// </summary>
+    [DataField]
+    public LocId? WindupExamine = "changeling-devour-doafter-windup";
+
+    /// <summary>
+    /// What to show on examine while the changeling is currently devouring somebody.
+    /// </summary>
+    [DataField]
+    public LocId? DevourExamine = "changeling-devour-doafter";
+
     public override bool SendOnlyToOwner => true;
 }
 
diff --git a/Content.Shared/Changeling/Components/ChangelingTransformComponent.cs b/Content.Shared/Changeling/Components/ChangelingTransformComponent.cs
index 5446f1b849..6ca3702a34 100644
--- a/Content.Shared/Changeling/Components/ChangelingTransformComponent.cs
+++ b/Content.Shared/Changeling/Components/ChangelingTransformComponent.cs
@@ -50,12 +50,18 @@ public sealed partial class ChangelingTransformComponent : Component
     /// </summary>
     public ProtoId<CloningSettingsPrototype> TransformCloningSettings = "ChangelingCloningSettings";
 
-    public override bool SendOnlyToOwner => true;
-
     /// <summary>
     /// If true, then the changeling can manually drop identities. If false, then whenever they transform, the changeling will drop their former identity.
     /// </summary>
     [DataField, AutoNetworkedField]
     public bool ManualDrop = true;
+
+    /// <summary>
+    /// Examine text to show when the changeling is currently transforming.
+    /// </summary>
+    [DataField]
+    public LocId? TransformExamine = "changeling-transform-doafter";
+
+    public override bool SendOnlyToOwner => true;
 }
 
diff --git a/Content.Shared/Changeling/Systems/ChangelingAbilitySystem.cs b/Content.Shared/Changeling/Systems/ChangelingAbilitySystem.cs
index 3cdf1f3a34..f8c2251a13 100644
--- a/Content.Shared/Changeling/Systems/ChangelingAbilitySystem.cs
+++ b/Content.Shared/Changeling/Systems/ChangelingAbilitySystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Actions;
 using Content.Shared.Atmos.Rotting;
 using Content.Shared.Changeling.Components;
diff --git a/Content.Shared/Changeling/Systems/ChangelingDevourSystem.cs b/Content.Shared/Changeling/Systems/ChangelingDevourSystem.cs
index bbcac88a4b..119f53699a 100644
--- a/Content.Shared/Changeling/Systems/ChangelingDevourSystem.cs
+++ b/Content.Shared/Changeling/Systems/ChangelingDevourSystem.cs
@@ -2,6 +2,8 @@ using Content.Shared.Actions;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Armor;
 using Content.Shared.Atmos.Rotting;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Systems;
 using Content.Shared.Changeling.Components;
 using Content.Shared.Store;
 using Content.Shared.Damage.Systems;
@@ -15,6 +17,7 @@ using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Store.Components;
 using Content.Shared.Whitelist;
+using Content.Shared.Zombies;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
 
@@ -22,6 +25,7 @@ namespace Content.Shared.Changeling.Systems;
 
 public sealed partial class ChangelingDevourSystem : EntitySystem
 {
+    [Dependency] private BloodstreamSystem _bloodstream = default!;
     [Dependency] private DamageableSystem _damageable = default!;
     [Dependency] private EntityWhitelistSystem _whitelistSystem = default!;
     [Dependency] private INetManager _net = default!;
@@ -86,6 +90,7 @@ public sealed partial class ChangelingDevourSystem : EntitySystem
             BreakOnMove = true,
             CancelDuplicate = true,
             DuplicateCondition = DuplicateConditions.None,
+            ExamineText = ent.Comp.WindupExamine == null ? null : Loc.GetString(ent.Comp.WindupExamine, ("user", Identity.Entity(ent, EntityManager)), ("target", Identity.Entity(target, EntityManager)))
         });
 
         var selfMessage = Loc.GetString("changeling-devour-begin-windup-self", ("user", Identity.Entity(ent.Owner, EntityManager)));
@@ -138,6 +143,7 @@ public sealed partial class ChangelingDevourSystem : EntitySystem
             BreakOnMove = true,
             CancelDuplicate = true,
             DuplicateCondition = DuplicateConditions.None,
+            ExamineText = ent.Comp.DevourExamine == null ? null : Loc.GetString(ent.Comp.DevourExamine, ("user", Identity.Entity(ent, EntityManager)), ("target", Identity.Entity(target, EntityManager)))
         });
     }
 
@@ -187,7 +193,14 @@ public sealed partial class ChangelingDevourSystem : EntitySystem
         EnsureComp<RecentlyDevouredComponent>(target);
 
         if (ent.Comp.DevourSpill != null)
-            _puddle.TrySpillAt(target, ent.Comp.DevourSpill, out _, false);
+        {
+            // Spilled solution should have the same DNA as the changeling at the time of devouring
+            var spill = ent.Comp.DevourSpill.Clone();
+            if (TryComp<BloodstreamComponent>(ent, out var bloodstream))
+                spill.SetReagentData(_bloodstream.GetEntityBloodData((ent, bloodstream)));
+
+            _puddle.TrySpillAt(target, spill, out _, false);
+        }
 
         // Grants the DNA reward associated with a successful unique devour.
         if (willGrantDna && TryComp<StoreComponent>(ent, out var store))
@@ -226,7 +239,7 @@ public sealed partial class ChangelingDevourSystem : EntitySystem
             return false;
         }
 
-        if (HasComp<RottingComponent>(victim))
+        if (HasComp<RottingComponent>(victim) || HasComp<ZombieComponent>(victim))
         {
             if (showPopup)
                 _popupSystem.PopupEntity(Loc.GetString("changeling-devour-attempt-failed-rotting"), changeling.Owner, changeling.Owner, PopupType.Medium);
diff --git a/Content.Shared/Changeling/Systems/SharedChangelingLastResortSystem.cs b/Content.Shared/Changeling/Systems/ChangelingLastResortSystem.cs
similarity index 96%
rename from Content.Shared/Changeling/Systems/SharedChangelingLastResortSystem.cs
rename to Content.Shared/Changeling/Systems/ChangelingLastResortSystem.cs
index d17f9ee324..811df858f0 100644
--- a/Content.Shared/Changeling/Systems/SharedChangelingLastResortSystem.cs
+++ b/Content.Shared/Changeling/Systems/ChangelingLastResortSystem.cs
@@ -7,7 +7,7 @@ using Robust.Shared.Network;
 
 namespace Content.Shared.Changeling.Systems;
 
-public abstract partial class SharedChangelingLastResortSystem : EntitySystem
+public abstract partial class ChangelingLastResortSystem : EntitySystem
 {
     [Dependency] private INetManager _net = default!;
     [Dependency] private GibbingSystem _gibbing = default!;
diff --git a/Content.Shared/Changeling/Systems/ChangelingMetabolismSystem.cs b/Content.Shared/Changeling/Systems/ChangelingMetabolismSystem.cs
index 58bae88093..daddf34d95 100644
--- a/Content.Shared/Changeling/Systems/ChangelingMetabolismSystem.cs
+++ b/Content.Shared/Changeling/Systems/ChangelingMetabolismSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Changeling.Components;
+using Content.Shared.Changeling.Components;
 using Content.Shared.Metabolism;
 
 namespace Content.Shared.Changeling.Systems;
diff --git a/Content.Shared/Changeling/Systems/ChangelingTransformSystem.UI.cs b/Content.Shared/Changeling/Systems/ChangelingTransformSystem.UI.cs
index 50f5ceb547..752acad059 100644
--- a/Content.Shared/Changeling/Systems/ChangelingTransformSystem.UI.cs
+++ b/Content.Shared/Changeling/Systems/ChangelingTransformSystem.UI.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Changeling.Systems;
 
diff --git a/Content.Shared/Changeling/Systems/ChangelingTransformSystem.cs b/Content.Shared/Changeling/Systems/ChangelingTransformSystem.cs
index 63d5e81ddd..c2841f2b97 100644
--- a/Content.Shared/Changeling/Systems/ChangelingTransformSystem.cs
+++ b/Content.Shared/Changeling/Systems/ChangelingTransformSystem.cs
@@ -161,6 +161,7 @@ public sealed partial class ChangelingTransformSystem : EntitySystem
             DuplicateCondition = DuplicateConditions.None,
             RequireCanInteract = false,
             DistanceThreshold = null,
+            ExamineText = ent.Comp.TransformExamine == null ? null : Loc.GetString(ent.Comp.TransformExamine, ("user", Identity.Entity(ent, EntityManager)))
         });
     }
 
diff --git a/Content.Shared/Changeling/Systems/DestructionResistanceSystem.cs b/Content.Shared/Changeling/Systems/DestructionResistanceSystem.cs
index f39fcb2dd0..1eafd99fd7 100644
--- a/Content.Shared/Changeling/Systems/DestructionResistanceSystem.cs
+++ b/Content.Shared/Changeling/Systems/DestructionResistanceSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Changeling.Components;
+using Content.Shared.Changeling.Components;
 using Content.Shared.Destructible;
 
 namespace Content.Shared.Changeling.Systems;
diff --git a/Content.Shared/Changeling/Systems/RegenerativeStasisSystem.cs b/Content.Shared/Changeling/Systems/RegenerativeStasisSystem.cs
index 5463b8b35c..fbe0ac7168 100644
--- a/Content.Shared/Changeling/Systems/RegenerativeStasisSystem.cs
+++ b/Content.Shared/Changeling/Systems/RegenerativeStasisSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Systems;
 using Content.Shared.Changeling.Components;
diff --git a/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs b/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs
index 11662c8ac2..fbaf6da3f5 100644
--- a/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs
+++ b/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.Changeling.Components;
 using Content.Shared.Cloning;
diff --git a/Content.Shared/Chasm/ChasmComponent.cs b/Content.Shared/Chasm/ChasmComponent.cs
index db8d73d7e2..2db7405817 100644
--- a/Content.Shared/Chasm/ChasmComponent.cs
+++ b/Content.Shared/Chasm/ChasmComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chat.Prototypes;
+using Content.Shared.Chat.Prototypes;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
diff --git a/Content.Shared/Chasm/ChasmFallingComponent.cs b/Content.Shared/Chasm/ChasmFallingComponent.cs
index eaa8ab7129..5df398c224 100644
--- a/Content.Shared/Chasm/ChasmFallingComponent.cs
+++ b/Content.Shared/Chasm/ChasmFallingComponent.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
diff --git a/Content.Shared/Chasm/ChasmSystem.cs b/Content.Shared/Chasm/ChasmSystem.cs
index 03c8e8c0e9..a7eab7d975 100644
--- a/Content.Shared/Chasm/ChasmSystem.cs
+++ b/Content.Shared/Chasm/ChasmSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.ActionBlocker;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Chat;
 using Content.Shared.Movement.Events;
 using Content.Shared.StepTrigger.Systems;
diff --git a/Content.Shared/Chat/ChatChannelExtensions.cs b/Content.Shared/Chat/ChatChannelExtensions.cs
index 9b707a53a0..bc20351870 100644
--- a/Content.Shared/Chat/ChatChannelExtensions.cs
+++ b/Content.Shared/Chat/ChatChannelExtensions.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Chat;
+namespace Content.Shared.Chat;
 
 public static class ChatChannelExtensions
 {
diff --git a/Content.Shared/Chat/ChatSelectChannel.cs b/Content.Shared/Chat/ChatSelectChannel.cs
index c18bb9b8ee..59e82ed9de 100644
--- a/Content.Shared/Chat/ChatSelectChannel.cs
+++ b/Content.Shared/Chat/ChatSelectChannel.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Chat
+namespace Content.Shared.Chat
 {
     /// <summary>
     ///     Chat channels that the player can select in the chat box.
diff --git a/Content.Shared/Chat/MsgChatMessage.cs b/Content.Shared/Chat/MsgChatMessage.cs
index 4666648624..85367ffb73 100644
--- a/Content.Shared/Chat/MsgChatMessage.cs
+++ b/Content.Shared/Chat/MsgChatMessage.cs
@@ -53,20 +53,6 @@ namespace Content.Shared.Chat
             AudioPath = audioPath;
             AudioVolume = audioVolume;
         }
-
-        public ChatMessage(ChatMessage copyFrom)
-        {
-            Channel = copyFrom.Channel;
-            Message = copyFrom.Message;
-            WrappedMessage = copyFrom.WrappedMessage;
-            SenderEntity = copyFrom.SenderEntity;
-            SenderKey = copyFrom.SenderKey;
-            HideChat = copyFrom.HideChat;
-            MessageColorOverride = copyFrom.MessageColorOverride;
-            AudioPath = copyFrom.AudioPath;
-            AudioVolume = copyFrom.AudioVolume;
-            Read = copyFrom.Read;
-        }
     }
 
     /// <summary>
diff --git a/Content.Shared/Chat/MsgDeleteChatMessagesBy.cs b/Content.Shared/Chat/MsgDeleteChatMessagesBy.cs
index 55d27518d8..1f73c65f6c 100644
--- a/Content.Shared/Chat/MsgDeleteChatMessagesBy.cs
+++ b/Content.Shared/Chat/MsgDeleteChatMessagesBy.cs
@@ -1,4 +1,4 @@
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Chat/SharedChatEvents.cs b/Content.Shared/Chat/SharedChatEvents.cs
index d145037da3..9c63063e2d 100644
--- a/Content.Shared/Chat/SharedChatEvents.cs
+++ b/Content.Shared/Chat/SharedChatEvents.cs
@@ -2,6 +2,7 @@ using Content.Shared.Inventory;
 using Content.Shared.Radio;
 using Content.Shared.Speech;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Chat;
 
@@ -77,3 +78,24 @@ public sealed class EntitySpokeEvent : EntityEventArgs
         ObfuscatedMessage = obfuscatedMessage;
     }
 }
+
+/// <summary>
+/// Checks if an entity link can be clicked on or not, so that it may be teleported to.
+/// </summary>
+/// <param name="Target">Target we are attempting to teleport to.</param>
+/// <param name="Pure">If pure is true, will only act as an attempt event. If pure is false, will teleport to the entity.</param>
+[ByRefEvent]
+public record struct ClickEntityLinkEvent(EntityUid Target, bool Pure)
+{
+    public bool Handled;
+}
+
+/// <summary>
+/// Net Message that is sent when a client clicks a link in the chat box.
+/// </summary>
+/// <param name="target">Target entity of the text link</param>
+[Serializable, NetSerializable]
+public sealed class ChatLinkClickedRequestEvent(NetEntity target) : EntityEventArgs
+{
+    public readonly NetEntity Target = target;
+}
diff --git a/Content.Shared/Chat/SharedChatSystem.Emote.cs b/Content.Shared/Chat/SharedChatSystem.Emote.cs
index 1a62b7123a..eede09d44f 100644
--- a/Content.Shared/Chat/SharedChatSystem.Emote.cs
+++ b/Content.Shared/Chat/SharedChatSystem.Emote.cs
@@ -96,7 +96,7 @@ public abstract partial class SharedChatSystem
         if (didEmote && emote.ChatMessages.Count != 0)
         {
             // not all emotes are loc'd, but for the ones that are we pass in entity
-            var action = Loc.GetString(_random.Pick(emote.ChatMessages), ("entity", source));
+            var action = Loc.GetString(Random.Pick(emote.ChatMessages), ("entity", source));
             SendEntityEmote(source, action, range, nameOverride, hideLog: hideLog, checkEmote: false, ignoreActionBlocker: ignoreActionBlocker);
         }
 
diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs
index cc75b2b595..819e6e1a68 100644
--- a/Content.Shared/Chat/SharedChatSystem.cs
+++ b/Content.Shared/Chat/SharedChatSystem.cs
@@ -1,6 +1,8 @@
 using System.Collections.Frozen;
+using System.Linq;
 using System.Text.RegularExpressions;
 using Content.Shared.ActionBlocker;
+using Content.Shared.CCVar;
 using Content.Shared.Chat.Prototypes;
 using Content.Shared.Popups;
 using Content.Shared.Radio;
@@ -8,6 +10,7 @@ using Content.Shared.Speech;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
@@ -40,16 +43,19 @@ public abstract partial class SharedChatSystem : EntitySystem
         = new SoundPathSpecifier("/Audio/Announcements/announce.ogg");
 
     public static readonly ProtoId<RadioChannelPrototype> CommonChannel = "Common";
+    public bool ChatNameLinks { get; private set; }
 
     public static readonly string DefaultChannelPrefix = $"{RadioChannelPrefix}{DefaultChannelKey}";
     public static readonly ProtoId<SpeechVerbPrototype> DefaultSpeechVerb = "Default";
 
-    [Dependency] private SharedPopupSystem _popup = default!;
-    [Dependency] private EntityWhitelistSystem _whitelist = default!;
-    [Dependency] private ActionBlockerSystem _actionBlocker = default!;
-    [Dependency] private SharedAudioSystem _audio = default!;
-    [Dependency] private IRobustRandom _random = default!;
+    [Dependency] protected IConfigurationManager Config = default!;
     [Dependency] private INetManager _net = default!;
+    [Dependency] protected IRobustRandom Random = default!;
+    [Dependency] private ISharedPlayerManager _player = default!;
+    [Dependency] private ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private SharedAudioSystem _audio = default!;
+    [Dependency] private SharedPopupSystem _popup = default!;
 
     /// <summary>
     /// Cache of the keycodes for faster lookup.
@@ -63,8 +69,11 @@ public abstract partial class SharedChatSystem : EntitySystem
         DebugTools.Assert(ProtoMan.HasIndex(CommonChannel));
 
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypeReload);
+        SubscribeAllEvent<ChatLinkClickedRequestEvent>(OnChatMessageLinkClicked);
         CacheRadios();
         CacheEmotes();
+
+        Subs.CVar(Config, CCVars.ChatNameLinks, v => ChatNameLinks = v, true);
     }
 
     protected virtual void OnPrototypeReload(PrototypesReloadedEventArgs obj)
@@ -76,6 +85,20 @@ public abstract partial class SharedChatSystem : EntitySystem
             CacheEmotes();
     }
 
+    private void OnChatMessageLinkClicked(ChatLinkClickedRequestEvent msg, EntitySessionEventArgs args)
+    {
+        if (!ChatNameLinks)
+            return;
+
+        if (GetEntity(msg.Target) is not { Valid: true } target || !Exists(target))
+            return;
+
+        if (args.SenderSession.AttachedEntity is not { Valid: true } ent)
+            return;
+
+        ClickMessageSender(target, ent);
+    }
+
     private void CacheRadios()
     {
         _keyCodes = ProtoMan.EnumeratePrototypes<RadioChannelPrototype>()
@@ -273,7 +296,10 @@ public abstract partial class SharedChatSystem : EntitySystem
         return trimmed;
     }
 
-    public static string InjectTagInsideTag(ChatMessage message, string outerTag, string innerTag, string? tagParameter)
+    /// <summary>
+    /// Injects a tag inside the first found instance of a specific <paramref name="outerTag"/> string in a <see cref="ChatMessage"/>.
+    /// </summary>
+    public static string InjectTagInsideTag(ChatMessage message, string outerTag, string innerTag, string? tagValue = null, params (string Key, string Value)[]? tagParameters)
     {
         var rawmsg = message.WrappedMessage;
         var tagStart = rawmsg.IndexOf($"[{outerTag}]");
@@ -282,9 +308,14 @@ public abstract partial class SharedChatSystem : EntitySystem
             return rawmsg;
         tagStart += outerTag.Length + 2;
 
-        string innerTagProcessed = tagParameter != null ? $"[{innerTag}={tagParameter}]" : $"[{innerTag}]";
-
         rawmsg = rawmsg.Insert(tagEnd, $"[/{innerTag}]");
+        if (tagValue != null)
+            innerTag = $"{innerTag}=\"{FormattedMessage.EscapeText(tagValue)}\"";
+
+        var innerTagProcessed = tagParameters == null
+            ? $"[{innerTag}]"
+            : $"[{innerTag} {string.Join(" ", tagParameters.Select(t => $"{FormattedMessage.EscapeText(t.Key)}=\"{FormattedMessage.RemoveMarkupPermissive(t.Value)}\""))}]";
+
         rawmsg = rawmsg.Insert(tagStart, innerTagProcessed);
 
         return rawmsg;
@@ -304,6 +335,62 @@ public abstract partial class SharedChatSystem : EntitySystem
         return rawmsg;
     }
 
+    /// <inheritdoc cref="CanClickMessageSender(EntityUid,EntityUid?)"/>
+    public bool CanClickMessageSender(NetEntity target, EntityUid? ent = null)
+    {
+        return CanClickMessageSender(GetEntity(target), ent);
+    }
+
+    /// <summary>
+    /// Checks whether an entity can click a chat message link.
+    /// </summary>
+    /// <param name="target">Target of the message link</param>
+    /// <param name="ent">Entity that is attempting to click the chat message, defaults to attached player entity if null.</param>
+    /// <returns>True if the entity is able to click the link</returns>
+    public bool CanClickMessageSender(EntityUid target, EntityUid? ent = null)
+    {
+        ent ??= _player.LocalEntity;
+        if (ent == null)
+            return false;
+
+        if (!CanClick(target, ent.Value))
+            return false;
+
+        var ev = new ClickEntityLinkEvent(target, true);
+        RaiseLocalEvent(ent.Value, ref ev);
+        return ev.Handled;
+    }
+
+    private bool CanClick(EntityUid target, EntityUid ent)
+    {
+        if (!ChatNameLinks)
+            return false;
+
+        if (ent == target)
+            return false;
+
+        return true;
+    }
+
+    /// <summary>
+    /// Teleports an entity to a target via <see cref="ClickEntityLinkEvent"/>
+    /// </summary>
+    /// <param name="target">Target we are attempted to teleport to</param>
+    /// <param name="ent">Entity that is attempting to warp</param>
+    /// <returns>True if warp was successful.</returns>
+    public void ClickMessageSender(EntityUid target, EntityUid? ent = null)
+    {
+        ent ??= _player.LocalEntity;
+        if (ent == null)
+            return;
+
+        if (!CanClick(target, ent.Value))
+            return;
+
+        var ev = new ClickEntityLinkEvent(target, false);
+        RaiseLocalEvent(ent.Value, ref ev);
+    }
+
     public static string GetStringInsideTag(ChatMessage message, string tag)
     {
         var rawmsg = message.WrappedMessage;
diff --git a/Content.Shared/Chat/TypingIndicator/TypingIndicatorClothingComponent.cs b/Content.Shared/Chat/TypingIndicator/TypingIndicatorClothingComponent.cs
index 4993e912e9..d3889a2efa 100644
--- a/Content.Shared/Chat/TypingIndicator/TypingIndicatorClothingComponent.cs
+++ b/Content.Shared/Chat/TypingIndicator/TypingIndicatorClothingComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
diff --git a/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs b/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs
index 7861da4546..0239d85082 100644
--- a/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs
+++ b/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Chat.TypingIndicator;
diff --git a/Content.Shared/Chat/V2/Moderation/ChatCensor.cs b/Content.Shared/Chat/V2/Moderation/ChatCensor.cs
index b5d6aa0344..e1fdc20a26 100644
--- a/Content.Shared/Chat/V2/Moderation/ChatCensor.cs
+++ b/Content.Shared/Chat/V2/Moderation/ChatCensor.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 
 namespace Content.Shared.Chat.V2.Moderation;
 
diff --git a/Content.Shared/Chat/V2/Moderation/RegexCensor.cs b/Content.Shared/Chat/V2/Moderation/RegexCensor.cs
index cd47bf0c33..08ce8592f0 100644
--- a/Content.Shared/Chat/V2/Moderation/RegexCensor.cs
+++ b/Content.Shared/Chat/V2/Moderation/RegexCensor.cs
@@ -1,4 +1,4 @@
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 
 namespace Content.Shared.Chat.V2.Moderation;
 
diff --git a/Content.Shared/Chat/V2/Moderation/SimpleCensor.cs b/Content.Shared/Chat/V2/Moderation/SimpleCensor.cs
index a6bb70dd9f..79a113a404 100644
--- a/Content.Shared/Chat/V2/Moderation/SimpleCensor.cs
+++ b/Content.Shared/Chat/V2/Moderation/SimpleCensor.cs
@@ -1,4 +1,4 @@
-using System.Collections.Frozen;
+using System.Collections.Frozen;
 using System.Linq;
 using System.Text;
 using System.Text.Unicode;
diff --git a/Content.Shared/Chat/V2/Repository/Types.cs b/Content.Shared/Chat/V2/Repository/Types.cs
index 59acb849d4..541e767bc3 100644
--- a/Content.Shared/Chat/V2/Repository/Types.cs
+++ b/Content.Shared/Chat/V2/Repository/Types.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Runtime.InteropServices;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Chemistry/Components/ReagentTankComponent.cs b/Content.Shared/Chemistry/Components/ReagentTankComponent.cs
index 3aa1756cf9..618cd4e6a2 100644
--- a/Content.Shared/Chemistry/Components/ReagentTankComponent.cs
+++ b/Content.Shared/Chemistry/Components/ReagentTankComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.FixedPoint;
+using Content.Shared.FixedPoint;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs b/Content.Shared/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs
index a949ae72e2..d1c85a509a 100644
--- a/Content.Shared/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Chemistry.Components.SolutionManager;
+namespace Content.Shared.Chemistry.Components.SolutionManager;
 
 /// <summary>
 ///     Denotes the solution that can removed  be with syringes.
diff --git a/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs b/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
index 913622e19d..8738314794 100644
--- a/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.Components;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Chemistry.Components.SolutionManager;
diff --git a/Content.Shared/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs b/Content.Shared/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs
index 97266764dc..2e2dea0dfb 100644
--- a/Content.Shared/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Chemistry.Components.SolutionManager;
+namespace Content.Shared.Chemistry.Components.SolutionManager;
 
 /// <summary>
 ///     Denotes a solution which can be added with syringes.
diff --git a/Content.Shared/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs b/Content.Shared/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs
index 26e6346c8a..2b75c5bf9b 100644
--- a/Content.Shared/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.EntitySystems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 
diff --git a/Content.Shared/Chemistry/Components/SolutionManager/SolutionManagerComponent.cs b/Content.Shared/Chemistry/Components/SolutionManager/SolutionManagerComponent.cs
index 176bd9e2db..7dffddecef 100644
--- a/Content.Shared/Chemistry/Components/SolutionManager/SolutionManagerComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionManager/SolutionManagerComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.EntitySystems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
index ad209ce5d8..ec2e628785 100644
--- a/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
@@ -15,12 +15,11 @@ using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
 using Content.Shared.Standing;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Melee.Events;
 using JetBrains.Annotations;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Chemistry.EntitySystems;
 
@@ -648,7 +647,7 @@ public sealed partial class InjectorSystem : EntitySystem
         _forensics.TransferDna(injector, target);
         // Reset the delay, if present.
 
-        _useDelay.TryResetDelay(injector);
+        _useDelay.TryResetDelay(injector.Owner);
 
         // Automatically set syringe to draw after completely draining it.
         if (!_solutionContainer.ResolveSolution(injector.Owner, injector.Comp.SolutionName, ref injector.Comp.Solution, out var solution)
diff --git a/Content.Shared/Chemistry/EntitySystems/RiggableSystem.cs b/Content.Shared/Chemistry/EntitySystems/RiggableSystem.cs
index 4c44bf549a..50dcd81df5 100644
--- a/Content.Shared/Chemistry/EntitySystems/RiggableSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/RiggableSystem.cs
@@ -36,8 +36,7 @@ public sealed partial class RiggableSystem : EntitySystem
         if (!entity.Comp.IsRigged)
             return;
 
-        var charge = _battery.GetCharge(entity.Owner);
-        Explode(entity, charge, args.User);
+        Explode(entity, _battery.GetCharge(entity.Owner).Charge, args.User);
         args.Handled = true;
     }
 
@@ -60,7 +59,7 @@ public sealed partial class RiggableSystem : EntitySystem
         if (!TryComp<ItemToggleComponent>(entity, out var toggleComp) || !toggleComp.Activated)
             return;
 
-        Explode(entity, _battery.GetCharge(entity.Owner));
+        Explode(entity, _battery.GetCharge(entity.Owner).Charge);
     }
 
     [SubscribeLocalEvent]
@@ -85,7 +84,7 @@ public sealed partial class RiggableSystem : EntitySystem
         if (!args.Activated || !entity.Comp.IsRigged)
             return;
 
-        Explode(entity, _battery.GetCharge(entity.Owner), args.User);
+        Explode(entity, _battery.GetCharge(entity.Owner).Charge, args.User);
     }
 
     public void Explode(Entity<RiggableComponent> entity, float charge, EntityUid? cause = null)
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Compatibility.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Compatibility.cs
index 4ae9aba173..b23ef95919 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Compatibility.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Compatibility.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.Components.SolutionManager;
 using Robust.Shared.Containers;
 
 namespace Content.Shared.Chemistry.EntitySystems;
diff --git a/Content.Shared/Chemistry/Events/InjectorEvents.cs b/Content.Shared/Chemistry/Events/InjectorEvents.cs
index ce4ccb88f1..78694b5ba6 100644
--- a/Content.Shared/Chemistry/Events/InjectorEvents.cs
+++ b/Content.Shared/Chemistry/Events/InjectorEvents.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Content.Shared.Inventory;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Chemistry/Prototypes/InjectorModePrototype.cs b/Content.Shared/Chemistry/Prototypes/InjectorModePrototype.cs
index 0255d8798f..63176643e2 100644
--- a/Content.Shared/Chemistry/Prototypes/InjectorModePrototype.cs
+++ b/Content.Shared/Chemistry/Prototypes/InjectorModePrototype.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Chemistry/Reaction/ReactiveGroupPrototype.cs b/Content.Shared/Chemistry/Reaction/ReactiveGroupPrototype.cs
index 37d9b0decd..bdfe7b43b4 100644
--- a/Content.Shared/Chemistry/Reaction/ReactiveGroupPrototype.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactiveGroupPrototype.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Chemistry.Reaction;
 
diff --git a/Content.Shared/Chemistry/Reagent/ReagentData.cs b/Content.Shared/Chemistry/Reagent/ReagentData.cs
index a4a77f552e..2953ba3bd7 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentData.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentData.cs
@@ -1,4 +1,4 @@
-using Content.Shared.FixedPoint;
+using Content.Shared.FixedPoint;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Chemistry.Reagent;
diff --git a/Content.Shared/Chemistry/Reagent/ReagentQuantity.cs b/Content.Shared/Chemistry/Reagent/ReagentQuantity.cs
index 22c1a3e0e5..f0f78e17b8 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentQuantity.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentQuantity.cs
@@ -1,4 +1,4 @@
-using Content.Shared.FixedPoint;
+using Content.Shared.FixedPoint;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Chemistry.Reagent;
diff --git a/Content.Shared/Chemistry/SharedChemistryGuideDataSystem.cs b/Content.Shared/Chemistry/SharedChemistryGuideDataSystem.cs
index c92aa3552d..20326e34e4 100644
--- a/Content.Shared/Chemistry/SharedChemistryGuideDataSystem.cs
+++ b/Content.Shared/Chemistry/SharedChemistryGuideDataSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Chemistry;
diff --git a/Content.Shared/Chemistry/SharedTransferAmount.cs b/Content.Shared/Chemistry/SharedTransferAmount.cs
index 9b47e2f0e6..0c24ec61f7 100644
--- a/Content.Shared/Chemistry/SharedTransferAmount.cs
+++ b/Content.Shared/Chemistry/SharedTransferAmount.cs
@@ -1,4 +1,4 @@
-using Content.Shared.FixedPoint;
+using Content.Shared.FixedPoint;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Chemistry
diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs
index 39e5607c6c..89f093d027 100644
--- a/Content.Shared/Climbing/Systems/ClimbSystem.cs
+++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs
@@ -24,6 +24,7 @@ using Robust.Shared.Physics.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.Climbing.Systems;
 
@@ -174,11 +175,11 @@ public sealed partial class ClimbSystem : VirtualController
         if (!TryComp(args.User, out ClimbingComponent? climbingComponent) || climbingComponent.IsClimbing || !climbingComponent.CanClimb)
             return;
 
-        // TODO VERBS ICON add a climbing icon?
         args.Verbs.Add(new AlternativeVerb
         {
             Act = () => TryClimb(args.User, args.User, args.Target, out _, component),
-            Text = Loc.GetString("comp-climbable-verb-climb")
+            Text = Loc.GetString("comp-climbable-verb-climb"),
+            Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/vault.svg.192dpi.png")),
         });
     }
 
@@ -228,7 +229,7 @@ public sealed partial class ClimbSystem : VirtualController
             used: entityToMove)
         {
             BreakOnMove = true,
-            BreakOnDamage = true,
+            BreakOnDamage = user != entityToMove,
             DuplicateCondition = DuplicateConditions.SameTool | DuplicateConditions.SameTarget
         };
 
diff --git a/Content.Shared/Clock/SharedClockSystem.cs b/Content.Shared/Clock/SharedClockSystem.cs
index c07fb5e83e..da8f5b6afe 100644
--- a/Content.Shared/Clock/SharedClockSystem.cs
+++ b/Content.Shared/Clock/SharedClockSystem.cs
@@ -6,7 +6,7 @@ namespace Content.Shared.Clock;
 
 public abstract partial class SharedClockSystem : EntitySystem
 {
-    [Dependency] private SharedGameTicker _ticker = default!;
+    [Dependency] private GameTicker _ticker = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
diff --git a/Content.Shared/Cloning/AcceptCloningEuiMessage.cs b/Content.Shared/Cloning/AcceptCloningEuiMessage.cs
index cbd82cc91f..9b73735979 100644
--- a/Content.Shared/Cloning/AcceptCloningEuiMessage.cs
+++ b/Content.Shared/Cloning/AcceptCloningEuiMessage.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Eui;
+using Content.Shared.Eui;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Cloning
diff --git a/Content.Shared/Cloning/SharedCloningConsole.cs b/Content.Shared/Cloning/SharedCloningConsole.cs
index 55a41f97d3..35d45e703f 100644
--- a/Content.Shared/Cloning/SharedCloningConsole.cs
+++ b/Content.Shared/Cloning/SharedCloningConsole.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Cloning.CloningConsole
 {
diff --git a/Content.Shared/Clothing/ClothingEvents.cs b/Content.Shared/Clothing/ClothingEvents.cs
index fccc07609f..d9cbc3d00b 100644
--- a/Content.Shared/Clothing/ClothingEvents.cs
+++ b/Content.Shared/Clothing/ClothingEvents.cs
@@ -7,17 +7,22 @@ namespace Content.Shared.Clothing;
 /// <summary>
 /// Raised directed at a piece of clothing to get the set of layers to show on the wearer's sprite.
 /// </summary>
-public sealed class GetEquipmentVisualsEvent : EntityEventArgs
+public sealed class GetEquipmentVisualsEvent(EntityUid equipee, string slot) : EntityEventArgs
 {
     /// <summary>
     /// Entity that is wearing the item.
     /// </summary>
-    public readonly EntityUid Equipee;
+    public readonly EntityUid Equipee = equipee;
 
-    public readonly string Slot;
+    /// <summary>
+    /// The name of slot that the item is being worn in.
+    /// </summary>
+    public readonly string Slot = slot;
 
     /// <summary>
     /// The layers that will be added to the entity that is wearing this item.
+    /// PrototypeLayerData objects passed may be modified, do not pass your component state directly!
+    ///
     /// NOTE: any layers will be checked for species-specific layers automatically inside ClothingSystem.
     /// If you return a state of "equipped-HEAD" and "equipped-HEAD-reptilian" exists,
     /// it will be automatically used by entities with InventoryComponent.SpeciesId set to "reptilian".
@@ -26,12 +31,6 @@ public sealed class GetEquipmentVisualsEvent : EntityEventArgs
     /// Note that the actual ordering of the layers depends on the order in which they are added to this list.
     /// </remarks>
     public List<(string, PrototypeLayerData)> Layers = new();
-
-    public GetEquipmentVisualsEvent(EntityUid equipee, string slot)
-    {
-        Equipee = equipee;
-        Slot = slot;
-    }
 }
 
 /// <summary>
@@ -40,29 +39,25 @@ public sealed class GetEquipmentVisualsEvent : EntityEventArgs
 /// <remarks>
 /// Useful for systems/components that modify the visual layers that an item adds to a player. (e.g. RGB memes)
 /// </remarks>
-public sealed class EquipmentVisualsUpdatedEvent : EntityEventArgs
+public sealed class EquipmentVisualsUpdatedEvent(
+    EntityUid equipee,
+    string slot,
+    HashSet<string> revealedLayers) : EntityEventArgs
 {
     /// <summary>
     /// Entity that is wearing the item.
     /// </summary>
-    public readonly EntityUid Equipee;
+    public readonly EntityUid Equipee = equipee;
 
     /// <summary>
     /// The slot that the equipment is being worn in.
     /// </summary>
-    public readonly string Slot;
+    public readonly string Slot = slot;
 
     /// <summary>
     /// The layers that this item is now revealing.
     /// </summary>
-    public HashSet<string> RevealedLayers;
-
-    public EquipmentVisualsUpdatedEvent(EntityUid equipee, string slot, HashSet<string> revealedLayers)
-    {
-        Equipee = equipee;
-        Slot = slot;
-        RevealedLayers = revealedLayers;
-    }
+    public HashSet<string> RevealedLayers = revealedLayers;
 }
 
 public sealed partial class ToggleMaskEvent : InstantActionEvent;
diff --git a/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs b/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs
index 37f0a83eaa..b44e2ba70b 100644
--- a/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs
+++ b/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Clothing;
diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
index 1f9124e172..7bd74beeae 100644
--- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -145,6 +145,11 @@ public abstract partial class ClothingSystem : EntitySystem
         if (!Resolve(item, ref item.Comp, false))
             return false;
 
+        // If the entity is in a user's hand, or not on their body at all,
+        // the flag is null, and the bitwise and below returns null!
+        if (item.Comp.InSlotFlag == null)
+            return false;
+
         if ((item.Comp.Slots & item.Comp.InSlotFlag) != SlotFlags.NONE)
             return true;
 
diff --git a/Content.Shared/Clothing/Events/ToggleMaskDoAfterEvent.cs b/Content.Shared/Clothing/Events/ToggleMaskDoAfterEvent.cs
index 6657dc3122..3fa4c0993c 100644
--- a/Content.Shared/Clothing/Events/ToggleMaskDoAfterEvent.cs
+++ b/Content.Shared/Clothing/Events/ToggleMaskDoAfterEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Clothing.Events;
diff --git a/Content.Shared/Clothing/LoadoutSystem.cs b/Content.Shared/Clothing/LoadoutSystem.cs
index fcb1982dc5..fe541684d8 100644
--- a/Content.Shared/Clothing/LoadoutSystem.cs
+++ b/Content.Shared/Clothing/LoadoutSystem.cs
@@ -5,7 +5,7 @@ using Content.Shared.Humanoid;
 using Content.Shared.Preferences;
 using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Roles;
-using Content.Shared.Station;
+using Content.Shared.Station.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
@@ -20,7 +20,7 @@ public sealed partial class LoadoutSystem : EntitySystem
     // Shared so we can predict it for placement manager.
 
     [Dependency] private ActorSystem _actors = default!;
-    [Dependency] private SharedStationSpawningSystem _station = default!;
+    [Dependency] private StationSpawningSystem _station = default!;
     [Dependency] private IRobustRandom _random = default!;
 
     public override void Initialize()
diff --git a/Content.Shared/Clothing/MagbootsComponent.cs b/Content.Shared/Clothing/MagbootsComponent.cs
index c0a8b40866..496e9e0eb3 100644
--- a/Content.Shared/Clothing/MagbootsComponent.cs
+++ b/Content.Shared/Clothing/MagbootsComponent.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Alert;
-using Content.Shared.Inventory;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/Clothing/MagbootsSystem.cs b/Content.Shared/Clothing/MagbootsSystem.cs
index 249c46401f..9ec4f2bd3b 100644
--- a/Content.Shared/Clothing/MagbootsSystem.cs
+++ b/Content.Shared/Clothing/MagbootsSystem.cs
@@ -1,45 +1,45 @@
-using Content.Shared.Actions;
 using Content.Shared.Alert;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Clothing.EntitySystems;
 using Content.Shared.Gravity;
 using Content.Shared.Inventory;
-using Content.Shared.Item;
 using Content.Shared.Item.ItemToggle;
 using Content.Shared.Item.ItemToggle.Components;
 using Robust.Shared.Containers;
 
 namespace Content.Shared.Clothing;
 
+/// <summary>
+/// A system for enabling and disabling the effects of magboots.
+/// The boots "force" gravity for the wearing entity when enabled and on a grid.
+/// </summary>
 public sealed partial class SharedMagbootsSystem : EntitySystem
 {
     [Dependency] private AlertsSystem _alerts = default!;
+    [Dependency] private ClothingSystem _clothing = default!;
     [Dependency] private ItemToggleSystem _toggle = default!;
     [Dependency] private SharedContainerSystem _container = default!;
     [Dependency] private SharedGravitySystem _gravity = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<MagbootsComponent, ItemToggledEvent>(OnToggled);
-        SubscribeLocalEvent<MagbootsComponent, ClothingGotEquippedEvent>(OnGotEquipped);
-        SubscribeLocalEvent<MagbootsComponent, ClothingGotUnequippedEvent>(OnGotUnequipped);
-        SubscribeLocalEvent<MagbootsComponent, IsWeightlessEvent>(OnIsWeightless);
-        SubscribeLocalEvent<MagbootsComponent, InventoryRelayedEvent<IsWeightlessEvent>>(OnIsWeightless);
-    }
+    [Dependency] private EntityQuery<MovedByPressureComponent> _movedByPressureQuery;
 
+    [SubscribeLocalEvent]
     private void OnToggled(Entity<MagbootsComponent> ent, ref ItemToggledEvent args)
     {
-        if (_container.TryGetContainingContainer((ent.Owner, null, null), out var container))
+        if (_clothing.IsEquipped(ent.Owner)
+            && _container.TryGetContainingContainer((ent.Owner, null, null), out var container))
+        {
             UpdateMagbootEffects(container.Owner, ent, args.Activated);
+        }
     }
 
+    [SubscribeLocalEvent]
     private void OnGotUnequipped(Entity<MagbootsComponent> ent, ref ClothingGotUnequippedEvent args)
     {
         UpdateMagbootEffects(args.Wearer, ent, false);
     }
 
+    [SubscribeLocalEvent]
     private void OnGotEquipped(Entity<MagbootsComponent> ent, ref ClothingGotEquippedEvent args)
     {
         UpdateMagbootEffects(args.Wearer, ent, _toggle.IsActivated(ent.Owner));
@@ -48,7 +48,7 @@ public sealed partial class SharedMagbootsSystem : EntitySystem
     public void UpdateMagbootEffects(EntityUid user, Entity<MagbootsComponent> ent, bool state)
     {
         // TODO: public api for this and add access
-        if (TryComp<MovedByPressureComponent>(user, out var moved))
+        if (_movedByPressureQuery.TryComp(user, out var moved))
             moved.Enabled = !state;
 
         _gravity.RefreshWeightless(user);
@@ -59,6 +59,7 @@ public sealed partial class SharedMagbootsSystem : EntitySystem
             _alerts.ClearAlert(user, ent.Comp.MagbootsAlert);
     }
 
+    [SubscribeLocalEvent]
     private void OnIsWeightless(Entity<MagbootsComponent> ent, ref IsWeightlessEvent args)
     {
         if (args.Handled || !_toggle.IsActivated(ent.Owner))
@@ -72,6 +73,7 @@ public sealed partial class SharedMagbootsSystem : EntitySystem
         args.Handled = true;
     }
 
+    [SubscribeLocalEvent]
     private void OnIsWeightless(Entity<MagbootsComponent> ent, ref InventoryRelayedEvent<IsWeightlessEvent> args)
     {
         OnIsWeightless(ent, ref args.Args);
diff --git a/Content.Server/Codewords/CodewordComponent.cs b/Content.Shared/Codewords/CodewordComponent.cs
similarity index 88%
rename from Content.Server/Codewords/CodewordComponent.cs
rename to Content.Shared/Codewords/CodewordComponent.cs
index 6ceb3a513a..e9e8104e77 100644
--- a/Content.Server/Codewords/CodewordComponent.cs
+++ b/Content.Shared/Codewords/CodewordComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Codewords;
+namespace Content.Shared.Codewords;
 
 /// <summary>
 /// Container for generated codewords.
diff --git a/Content.Server/Codewords/CodewordFactionPrototype.cs b/Content.Shared/Codewords/CodewordFactionPrototype.cs
similarity index 87%
rename from Content.Server/Codewords/CodewordFactionPrototype.cs
rename to Content.Shared/Codewords/CodewordFactionPrototype.cs
index 62552c1966..710625be4c 100644
--- a/Content.Server/Codewords/CodewordFactionPrototype.cs
+++ b/Content.Shared/Codewords/CodewordFactionPrototype.cs
@@ -1,6 +1,6 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
-namespace Content.Server.Codewords;
+namespace Content.Shared.Codewords;
 
 /// <summary>
 /// This is a prototype for easy access to codewords using identifiers instead of magic strings.
diff --git a/Content.Server/Codewords/CodewordGeneratorPrototype.cs b/Content.Shared/Codewords/CodewordGeneratorPrototype.cs
similarity index 80%
rename from Content.Server/Codewords/CodewordGeneratorPrototype.cs
rename to Content.Shared/Codewords/CodewordGeneratorPrototype.cs
index b17a40fc6a..268dafac7e 100644
--- a/Content.Server/Codewords/CodewordGeneratorPrototype.cs
+++ b/Content.Shared/Codewords/CodewordGeneratorPrototype.cs
@@ -1,7 +1,7 @@
-using Content.Shared.Dataset;
+using Content.Shared.Dataset;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Codewords;
+namespace Content.Shared.Codewords;
 
 /// <summary>
 /// This is a prototype for specifying codeword generation
@@ -17,12 +17,11 @@ public sealed partial class CodewordGeneratorPrototype : IPrototype
     /// List of datasets to use for word generation. All values will be concatenated into one list and then randomly chosen from
     /// </summary>
     [DataField]
-    public List<ProtoId<LocalizedDatasetPrototype>> Words { get; private set; } =
-    [
-        "Adjectives",
-        "Verbs",
-    ];
-
+    public List<ProtoId<LocalizedDatasetPrototype>> Words { get; private set; } = new(2)
+        {
+            "Adjectives",
+            "Verbs",
+        };
 
     /// <summary>
     /// How many codewords should be generated?
diff --git a/Content.Server/Codewords/CodewordManagerComponent.cs b/Content.Shared/Codewords/CodewordManagerComponent.cs
similarity index 88%
rename from Content.Server/Codewords/CodewordManagerComponent.cs
rename to Content.Shared/Codewords/CodewordManagerComponent.cs
index 46ddc357a1..bc4fbc87f6 100644
--- a/Content.Server/Codewords/CodewordManagerComponent.cs
+++ b/Content.Shared/Codewords/CodewordManagerComponent.cs
@@ -1,6 +1,6 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
-namespace Content.Server.Codewords;
+namespace Content.Shared.Codewords;
 
 /// <summary>
 /// Component that defines <see cref="CodewordGeneratorPrototype"/> to use and keeps track of generated codewords.
diff --git a/Content.Server/Codewords/CodewordSystem.cs b/Content.Shared/Codewords/CodewordSystem.cs
similarity index 89%
rename from Content.Server/Codewords/CodewordSystem.cs
rename to Content.Shared/Codewords/CodewordSystem.cs
index 2b8251bd99..5cdfa17963 100644
--- a/Content.Server/Codewords/CodewordSystem.cs
+++ b/Content.Shared/Codewords/CodewordSystem.cs
@@ -1,28 +1,22 @@
-using System.Linq;
-using Content.Server.Administration.Logs;
-using Content.Server.GameTicking.Events;
+using System.Linq;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
+using Content.Shared.GameTicking.Events;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
-namespace Content.Server.Codewords;
+namespace Content.Shared.Codewords;
 
 /// <summary>
 /// Gamerule that provides codewords for other gamerules that rely on them.
 /// </summary>
 public sealed partial class CodewordSystem : EntitySystem
 {
-    [Dependency] private IAdminLogManager _adminLogger = default!;
+    [Dependency] private ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private IRobustRandom _random = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<RoundStartingEvent>(OnRoundStart);
-    }
-
+    [SubscribeLocalEvent]
     private void OnRoundStart(RoundStartingEvent ev)
     {
         var manager = Spawn();
diff --git a/Content.Shared/CombatMode/Pacification/PacifismDangerousAttackComponent.cs b/Content.Shared/CombatMode/Pacification/PacifismDangerousAttackComponent.cs
index df79d46d76..4079ec6e07 100644
--- a/Content.Shared/CombatMode/Pacification/PacifismDangerousAttackComponent.cs
+++ b/Content.Shared/CombatMode/Pacification/PacifismDangerousAttackComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.CombatMode.Pacification;
 
diff --git a/Content.Shared/Commands/CommandHelper.cs b/Content.Shared/Commands/CommandHelper.cs
index 443efb7d1e..3a77e86a01 100644
--- a/Content.Shared/Commands/CommandHelper.cs
+++ b/Content.Shared/Commands/CommandHelper.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Console;
+using Robust.Shared.Console;
 
 namespace Content.Shared.Commands;
 
diff --git a/Content.Shared/Construction/Components/AnchorOnlyOnStationComponent.cs b/Content.Shared/Construction/Components/AnchorOnlyOnStationComponent.cs
index 38fcaa636e..86129787d3 100644
--- a/Content.Shared/Construction/Components/AnchorOnlyOnStationComponent.cs
+++ b/Content.Shared/Construction/Components/AnchorOnlyOnStationComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Construction.Components;
 
diff --git a/Content.Shared/Construction/Components/PartAssemblyComponent.cs b/Content.Shared/Construction/Components/PartAssemblyComponent.cs
index 2e0667bbdb..338ad29802 100644
--- a/Content.Shared/Construction/Components/PartAssemblyComponent.cs
+++ b/Content.Shared/Construction/Components/PartAssemblyComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Containers;
+using Robust.Shared.Containers;
 
 namespace Content.Shared.Construction.Components;
 
diff --git a/Content.Shared/Construction/Conditions/EmptyOrWindowValidInTile.cs b/Content.Shared/Construction/Conditions/EmptyOrWindowValidInTile.cs
index 73b23d11ae..9bfc3d1e21 100644
--- a/Content.Shared/Construction/Conditions/EmptyOrWindowValidInTile.cs
+++ b/Content.Shared/Construction/Conditions/EmptyOrWindowValidInTile.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Maps;
+using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
 
diff --git a/Content.Shared/Construction/Conditions/IConstructionCondition.cs b/Content.Shared/Construction/Conditions/IConstructionCondition.cs
index 5c5ece5c0b..726a5dc8c6 100644
--- a/Content.Shared/Construction/Conditions/IConstructionCondition.cs
+++ b/Content.Shared/Construction/Conditions/IConstructionCondition.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Map;
+using Robust.Shared.Map;
 
 namespace Content.Shared.Construction.Conditions
 {
diff --git a/Content.Shared/Construction/Conditions/NoUnstackableInTile.cs b/Content.Shared/Construction/Conditions/NoUnstackableInTile.cs
index 78518187d6..b20081862a 100644
--- a/Content.Shared/Construction/Conditions/NoUnstackableInTile.cs
+++ b/Content.Shared/Construction/Conditions/NoUnstackableInTile.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Construction.EntitySystems;
+using Content.Shared.Construction.EntitySystems;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
 
diff --git a/Content.Shared/Construction/Conditions/TileType.cs b/Content.Shared/Construction/Conditions/TileType.cs
index e066e6af2e..a613b5bda7 100644
--- a/Content.Shared/Construction/Conditions/TileType.cs
+++ b/Content.Shared/Construction/Conditions/TileType.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Maps;
+using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
 using Robust.Shared.Utility;
diff --git a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
index 997cc4d3dd..1e5ab9e16f 100644
--- a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
+++ b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
@@ -9,7 +9,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Pulling.Systems;
 using Content.Shared.Popups;
-using Content.Shared.Station;
+using Content.Shared.Station.Systems;
 using Content.Shared.Tools.Components;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
@@ -28,7 +28,7 @@ public sealed partial class AnchorableSystem : EntitySystem
     [Dependency] private SharedPopupSystem _popup = default!;
     [Dependency] private PullingSystem _pulling = default!;
     [Dependency] private SharedMapSystem _map = default!;
-    [Dependency] private SharedStationSystem _stationSystem = null!;
+    [Dependency] private StationSystem _stationSystem = null!;
     [Dependency] private SharedToolSystem _tool = default!;
     [Dependency] private SharedTransformSystem _transformSystem = default!;
     [Dependency] private TagSystem _tagSystem = default!;
diff --git a/Content.Shared/Construction/IGraphAction.cs b/Content.Shared/Construction/IGraphAction.cs
index 0c2a867859..bba2c1b777 100644
--- a/Content.Shared/Construction/IGraphAction.cs
+++ b/Content.Shared/Construction/IGraphAction.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Construction
+namespace Content.Shared.Construction
 {
     [ImplicitDataDefinitionForInheritors]
     public partial interface IGraphAction
diff --git a/Content.Shared/Construction/IGraphCondition.cs b/Content.Shared/Construction/IGraphCondition.cs
index f8da8594f7..115d0763bf 100644
--- a/Content.Shared/Construction/IGraphCondition.cs
+++ b/Content.Shared/Construction/IGraphCondition.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Examine;
+using Content.Shared.Examine;
 
 namespace Content.Shared.Construction
 {
diff --git a/Content.Shared/Construction/MachineDeconstructedEvent.cs b/Content.Shared/Construction/MachineDeconstructedEvent.cs
index 1f65e7941f..ab58466cc1 100644
--- a/Content.Shared/Construction/MachineDeconstructedEvent.cs
+++ b/Content.Shared/Construction/MachineDeconstructedEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Construction;
+namespace Content.Shared.Construction;
 
 [DataDefinition]
 public sealed partial class MachineDeconstructedEvent : EntityEventArgs
diff --git a/Content.Shared/Construction/PartAssemblySystem.cs b/Content.Shared/Construction/PartAssemblySystem.cs
index 15a169e42c..4fbc2f4692 100644
--- a/Content.Shared/Construction/PartAssemblySystem.cs
+++ b/Content.Shared/Construction/PartAssemblySystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Construction.Components;
+using Content.Shared.Construction.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Tag;
 using Robust.Shared.Containers;
diff --git a/Content.Shared/Construction/Prototypes/ConstructionGraphPrototype.cs b/Content.Shared/Construction/Prototypes/ConstructionGraphPrototype.cs
index 26d1c3d0a6..93b3243dba 100644
--- a/Content.Shared/Construction/Prototypes/ConstructionGraphPrototype.cs
+++ b/Content.Shared/Construction/Prototypes/ConstructionGraphPrototype.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs b/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs
index b7a586aafe..d578048411 100644
--- a/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs
+++ b/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Construction
+namespace Content.Shared.Construction
 {
     [RegisterComponent]
     public sealed partial class SharedCanBuildWindowOnTopComponent : Component
diff --git a/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
index 7615460001..27a5473a87 100644
--- a/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Examine;
+using Content.Shared.Examine;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Construction.Steps
diff --git a/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs
index 95f0eefb8a..c9a93e3fd6 100644
--- a/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Examine;
+using Content.Shared.Examine;
 
 namespace Content.Shared.Construction.Steps
 {
diff --git a/Content.Shared/Construction/Steps/ConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ConstructionGraphStep.cs
index 82248fa105..dcfe2c400c 100644
--- a/Content.Shared/Construction/Steps/ConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/ConstructionGraphStep.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Examine;
+using Content.Shared.Examine;
 
 namespace Content.Shared.Construction.Steps
 {
diff --git a/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs b/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs
index 3b1093bd48..719ea908be 100644
--- a/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs
+++ b/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Serialization.Markdown.Validation;
diff --git a/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs b/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs
index 28684dead3..b609223c29 100644
--- a/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Construction.Steps
+namespace Content.Shared.Construction.Steps
 {
     [ImplicitDataDefinitionForInheritors]
     public abstract partial class EntityInsertConstructionGraphStep : ConstructionGraphStep
diff --git a/Content.Shared/Containers/ContainerFillSystem.cs b/Content.Shared/Containers/ContainerFillSystem.cs
index 184eb02c0c..0ccc6a7192 100644
--- a/Content.Shared/Containers/ContainerFillSystem.cs
+++ b/Content.Shared/Containers/ContainerFillSystem.cs
@@ -1,9 +1,12 @@
-using System.Linq;
-using System.Numerics;
 using Content.Shared.EntityTable;
+using Content.Shared.EntityTable.Conditions;
 using Content.Shared.Item;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+using System;
+using System.Linq;
+using System.Numerics;
 
 namespace Content.Shared.Containers;
 
@@ -71,7 +74,19 @@ public sealed partial class ContainerFillSystem : EntitySystem
                 continue;
             }
 
-            var spawns = _entityTable.GetSpawns(table).ToList();
+            EntityTableContext? ctx = null;
+            if (ent.Comp.ContextContainers)
+            {
+                // Pass in the container being filled so conditions can look at it
+                ctx = new EntityTableContext(
+                    new Dictionary<string, object>
+                    {
+                        [EmptyContainerCondition.ContainerContextKey] = container,
+                    }
+                );
+            }
+
+            var spawns = _entityTable.GetSpawns(table, ctx: ctx).ToList();
 
             if (ent.Comp.Sort)
             {
diff --git a/Content.Shared/Containers/EntityTableContainerFillComponent.cs b/Content.Shared/Containers/EntityTableContainerFillComponent.cs
index 199c737c98..6d19e309be 100644
--- a/Content.Shared/Containers/EntityTableContainerFillComponent.cs
+++ b/Content.Shared/Containers/EntityTableContainerFillComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.EntityTable;
 using Content.Shared.EntityTable.EntitySelectors;
 
 namespace Content.Shared.Containers;
@@ -17,4 +18,10 @@ public sealed partial class EntityTableContainerFillComponent : Component
     /// </summary>
     [DataField]
     public bool Sort;
+
+    /// <summary>
+    /// When true the container will be passed into the table with an <see cref="EntityTableContext"/>.
+    /// </summary>
+    [DataField]
+    public bool ContextContainers;
 }
diff --git a/Content.Shared/Contraband/ContrabandComponent.cs b/Content.Shared/Contraband/ContrabandComponent.cs
index f758d91f0c..f2db80aa5f 100644
--- a/Content.Shared/Contraband/ContrabandComponent.cs
+++ b/Content.Shared/Contraband/ContrabandComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Roles;
+using Content.Shared.Roles;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs b/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs
index 47d359d387..99e9631d5d 100644
--- a/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs
+++ b/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Robust.Shared.Map;
 
 namespace Content.Shared.Coordinates
diff --git a/Content.Shared/Corvax/SecApartment/Components/SecApartmentComponent.cs b/Content.Shared/Corvax/SecApartment/Components/SecApartmentComponent.cs
index 8a07402f75..bc62cc3d58 100644
--- a/Content.Shared/Corvax/SecApartment/Components/SecApartmentComponent.cs
+++ b/Content.Shared/Corvax/SecApartment/Components/SecApartmentComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Medical.SuitSensor;
+using Content.Shared.Medical.SuitSensors;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Corvax/SecApartment/SecApartmentUi.cs b/Content.Shared/Corvax/SecApartment/SecApartmentUi.cs
index f5bb57e53d..9f470e651d 100644
--- a/Content.Shared/Corvax/SecApartment/SecApartmentUi.cs
+++ b/Content.Shared/Corvax/SecApartment/SecApartmentUi.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Medical.SuitSensor;
+using Content.Shared.Medical.SuitSensors;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.SecApartment;
diff --git a/Content.Shared/Crayon/SharedCrayonSystem.cs b/Content.Shared/Crayon/SharedCrayonSystem.cs
index 42da01904a..c60ae35ea7 100644
--- a/Content.Shared/Crayon/SharedCrayonSystem.cs
+++ b/Content.Shared/Crayon/SharedCrayonSystem.cs
@@ -1,3 +1,3 @@
-namespace Content.Shared.Crayon;
+namespace Content.Shared.Crayon;
 
 public abstract class SharedCrayonSystem : EntitySystem { }
diff --git a/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsConsoleSystem.cs b/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsConsoleSystem.cs
index 68b1fb15be..ff22c9dff5 100644
--- a/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsConsoleSystem.cs
+++ b/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsConsoleSystem.cs
@@ -2,6 +2,7 @@ using Content.Shared.IdentityManagement;
 using Content.Shared.Security;
 using Content.Shared.Security.Components;
 using Content.Shared.Station;
+using Content.Shared.Station.Systems;
 using Content.Shared.StationRecords;
 using Content.Shared.StationRecords.Systems;
 
@@ -11,7 +12,7 @@ public abstract partial class SharedCriminalRecordsConsoleSystem : EntitySystem
 {
     [Dependency] private SharedCriminalRecordsSystem _criminalRecords = default!;
     [Dependency] private StationRecordsSystem _records = default!;
-    [Dependency] private SharedStationSystem _station = default!;
+    [Dependency] private StationSystem _station = default!;
 
     /// <summary>
     /// Checks if the new identity's name has a criminal record attached to it, and gives the entity the icon that
diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index 18eb6472a4..6c4f05fdf7 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -26,7 +26,7 @@ using Content.Shared.Popups;
 using Content.Shared.Pulling.Events;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Stunnable;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Audio.Systems;
@@ -478,12 +478,15 @@ namespace Content.Shared.Cuffs
             if (TryComp<HandsComponent>(target, out var hands) && hands.Count <= component.CuffedHandCount)
                 return false;
 
+            var beforeEv = new BeforeTargetHandcuffedEvent(user);
+            RaiseLocalEvent(target, ref beforeEv);
+
             // Success!
             _hands.TryDrop(user, handcuff);
 
             _container.Insert(handcuff, component.Container);
 
-            var ev = new TargetHandcuffedEvent();
+            var ev = new TargetHandcuffedEvent(user);
             RaiseLocalEvent(target, ref ev);
 
             UpdateHeldItems(target, handcuff, component);
@@ -633,10 +636,7 @@ namespace Content.Shared.Cuffs
 
             if (isOwner)
             {
-                if (!TryComp(cuff, out UseDelayComponent? useDelay))
-                    return;
-
-                if (!_delay.TryResetDelay((cuff, useDelay), true))
+                if (!_delay.TryResetDelay(cuff.Owner, true))
                 {
                     return;
                 }
@@ -868,12 +868,25 @@ namespace Content.Shared.Cuffs
     [Serializable, NetSerializable]
     public sealed partial class AddCuffDoAfterEvent : SimpleDoAfterEvent;
 
+    /// <summary>
+    /// Raised on the target before they get handcuffed.
+    /// Relayed to their held items.
+    /// </summary>
+    [ByRefEvent]
+    public record struct BeforeTargetHandcuffedEvent(EntityUid User) : IInventoryRelayEvent
+    {
+        /// <summary>
+        /// All slots to relay to
+        /// </summary>
+        public SlotFlags TargetSlots { get; set; }
+    }
+
     /// <summary>
     /// Raised on the target when they get handcuffed.
     /// Relayed to their held items.
     /// </summary>
     [ByRefEvent]
-    public record struct TargetHandcuffedEvent : IInventoryRelayEvent
+    public record struct TargetHandcuffedEvent(EntityUid User) : IInventoryRelayEvent
     {
         /// <summary>
         /// All slots to relay to
diff --git a/Content.Shared/Damage/Components/DamageModifierStatusEffectComponent.cs b/Content.Shared/Damage/Components/DamageModifierStatusEffectComponent.cs
index 51a80a12fe..139c5cd959 100644
--- a/Content.Shared/Damage/Components/DamageModifierStatusEffectComponent.cs
+++ b/Content.Shared/Damage/Components/DamageModifierStatusEffectComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Damage.Components;
 
diff --git a/Content.Shared/Damage/Components/DamagePopupComponent.cs b/Content.Shared/Damage/Components/DamagePopupComponent.cs
index 917763fb7d..73049481af 100644
--- a/Content.Shared/Damage/Components/DamagePopupComponent.cs
+++ b/Content.Shared/Damage/Components/DamagePopupComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage.Systems;
+using Content.Shared.Damage.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Damage/Components/SlowOnDamageComponent.cs b/Content.Shared/Damage/Components/SlowOnDamageComponent.cs
index aa0cafa057..0bec1a25f9 100644
--- a/Content.Shared/Damage/Components/SlowOnDamageComponent.cs
+++ b/Content.Shared/Damage/Components/SlowOnDamageComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.FixedPoint;
+using Content.Shared.FixedPoint;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Damage.Components
diff --git a/Content.Shared/Damage/ForceSay/AllowNextCritSpeechComponent.cs b/Content.Shared/Damage/ForceSay/AllowNextCritSpeechComponent.cs
index 66a57860b2..dfa757d1e7 100644
--- a/Content.Shared/Damage/ForceSay/AllowNextCritSpeechComponent.cs
+++ b/Content.Shared/Damage/ForceSay/AllowNextCritSpeechComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Robust.Shared.GameStates;
 
diff --git a/Content.Shared/Damage/ForceSay/DamageForceSayComponent.cs b/Content.Shared/Damage/ForceSay/DamageForceSayComponent.cs
index e184f4beb9..42e7e02ecf 100644
--- a/Content.Shared/Damage/ForceSay/DamageForceSayComponent.cs
+++ b/Content.Shared/Damage/ForceSay/DamageForceSayComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage.Prototypes;
+using Content.Shared.Damage.Prototypes;
 using Content.Shared.Dataset;
 using Content.Shared.FixedPoint;
 using Robust.Shared.GameStates;
diff --git a/Content.Shared/Damage/ForceSay/DamageForceSayEvent.cs b/Content.Shared/Damage/ForceSay/DamageForceSayEvent.cs
index a8ed9288a6..ebcfa4d727 100644
--- a/Content.Shared/Damage/ForceSay/DamageForceSayEvent.cs
+++ b/Content.Shared/Damage/ForceSay/DamageForceSayEvent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Damage.ForceSay;
 
diff --git a/Content.Shared/Damage/Systems/DamageModifierStatusEffect.cs b/Content.Shared/Damage/Systems/DamageModifierStatusEffect.cs
index 9deff6efb0..c6da34ceea 100644
--- a/Content.Shared/Damage/Systems/DamageModifierStatusEffect.cs
+++ b/Content.Shared/Damage/Systems/DamageModifierStatusEffect.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Components;
 using Content.Shared.StatusEffectNew;
 
 namespace Content.Shared.Damage.Systems;
diff --git a/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs b/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs
index 0175b5fb5e..214792333b 100644
--- a/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Components;
 
 namespace Content.Shared.Damage.Systems;
 
diff --git a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
index cdc9497be3..e5cd529e77 100644
--- a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
+++ b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
@@ -245,7 +245,7 @@ public abstract partial class SharedStaminaSystem : EntitySystem
         if (args.Cancelled)
             return;
 
-        if (_battery.GetCharge(ent.Owner) >= ent.Comp.RequiredCharge)
+        if (_battery.GetCharge(ent.Owner).Charge >= ent.Comp.RequiredCharge)
             return;
 
         args.Cancelled = true;
diff --git a/Content.Shared/Dataset/DatasetPrototype.cs b/Content.Shared/Dataset/DatasetPrototype.cs
index b022be2be4..c69c3bc0c1 100644
--- a/Content.Shared/Dataset/DatasetPrototype.cs
+++ b/Content.Shared/Dataset/DatasetPrototype.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Dataset
 {
diff --git a/Content.Shared/Decals/ColorPalettePrototype.cs b/Content.Shared/Decals/ColorPalettePrototype.cs
index 9c31201950..a07f75b2a6 100644
--- a/Content.Shared/Decals/ColorPalettePrototype.cs
+++ b/Content.Shared/Decals/ColorPalettePrototype.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Decals;
 
diff --git a/Content.Shared/Destructible/ThresholdActs.cs b/Content.Shared/Destructible/ThresholdActs.cs
index 281d58092f..4c78e46809 100644
--- a/Content.Shared/Destructible/ThresholdActs.cs
+++ b/Content.Shared/Destructible/ThresholdActs.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Destructible;
 
diff --git a/Content.Shared/DetailExaminable/DetailExaminableComponent.cs b/Content.Shared/DetailExaminable/DetailExaminableComponent.cs
index 616906de45..b8b7eef6d8 100644
--- a/Content.Shared/DetailExaminable/DetailExaminableComponent.cs
+++ b/Content.Shared/DetailExaminable/DetailExaminableComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.DetailExaminable;
 
diff --git a/Content.Shared/DeviceLinking/Events/DeviceLinkOverloadedEvent.cs b/Content.Shared/DeviceLinking/Events/DeviceLinkOverloadedEvent.cs
index 0a1e4e046a..b2ac19a87d 100644
--- a/Content.Shared/DeviceLinking/Events/DeviceLinkOverloadedEvent.cs
+++ b/Content.Shared/DeviceLinking/Events/DeviceLinkOverloadedEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.DeviceLinking.Events;
+namespace Content.Shared.DeviceLinking.Events;
 
 [ByRefEvent]
 public readonly record struct DeviceLinkOverloadedEvent;
diff --git a/Content.Shared/DeviceLinking/Events/SignalReceivedEvent.cs b/Content.Shared/DeviceLinking/Events/SignalReceivedEvent.cs
index 335a95cecc..534714f176 100644
--- a/Content.Shared/DeviceLinking/Events/SignalReceivedEvent.cs
+++ b/Content.Shared/DeviceLinking/Events/SignalReceivedEvent.cs
@@ -1,6 +1,7 @@
-using Content.Shared.DeviceNetwork;
-
 namespace Content.Shared.DeviceLinking.Events;
 
 [ByRefEvent]
-public readonly record struct SignalReceivedEvent(string Port, EntityUid? Trigger = null, NetworkPayload? Data = null);
+public readonly record struct SignalReceivedEvent(string Port, EntityUid? Trigger = null);
+
+[ByRefEvent]
+public readonly record struct SignalReceivedEvent<T>(string Port, T Data, EntityUid? Trigger = null) where T : ISignalNetworkPayload;
diff --git a/Content.Shared/DeviceLinking/LogicStatePayload.cs b/Content.Shared/DeviceLinking/LogicStatePayload.cs
new file mode 100644
index 0000000000..82fff01787
--- /dev/null
+++ b/Content.Shared/DeviceLinking/LogicStatePayload.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared.DeviceLinking;
+
+/// <summary>
+/// Contains a logic state of a <see cref="SignalPayload"/>.
+/// </summary>
+public partial record struct LogicStatePayload : ISignalNetworkPayload
+{
+    [DataField]
+    public SignalState State;
+}
diff --git a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
index a19f001fcb..d3beb43ef2 100644
--- a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
+++ b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
@@ -17,13 +17,13 @@ public abstract partial class SharedDeviceLinkSystem : EntitySystem
     [Dependency] private SharedTransformSystem _transform = default!;
     [Dependency] private IGameTiming _gameTiming = default!;
 
-    [Dependency] private EntityQuery<DeviceLinkSinkComponent> _deviceLinkSinkQuery = default!;
-
-    public const string InvokedPort = "link_port";
+    [Dependency] protected EntityQuery<DeviceLinkSinkComponent> DeviceLinkSinkQuery = default!;
+    [Dependency] protected EntityQuery<DeviceLinkSourceComponent> DeviceLinkSourceQuery = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
     {
+        base.Initialize();
         SubscribeLocalEvent<DeviceLinkSourceComponent, ComponentStartup>(OnSourceStartup);
         SubscribeLocalEvent<DeviceLinkSourceComponent, ComponentRemove>(OnSourceRemoved);
         SubscribeLocalEvent<DeviceLinkSinkComponent, ComponentRemove>(OnSinkRemoved);
@@ -85,7 +85,7 @@ public abstract partial class SharedDeviceLinkSystem : EntitySystem
     {
         foreach (var sinkUid in source.Comp.LinkedPorts.Keys)
         {
-            if (_deviceLinkSinkQuery.TryGetComponent(sinkUid, out var sink))
+            if (DeviceLinkSinkQuery.TryGetComponent(sinkUid, out var sink))
                 RemoveSinkFromSourceInternal(source, sinkUid, source, sink);
             else
                 Log.Error($"Device source {ToPrettyString(source)} links to invalid entity: {ToPrettyString(sinkUid)}");
@@ -539,12 +539,21 @@ public abstract partial class SharedDeviceLinkSystem : EntitySystem
     /// Sends a network payload directed at the sink entity.
     /// Just raises a <see cref="SignalReceivedEvent"/> without data if the source or the sink doesn't have a <see cref="DeviceNetworkComponent"/>
     /// </summary>
-    /// <param name="uid">The source uid that invokes the port</param>
+    /// <param name="ent">The source uid that invokes the port</param>
+    /// <param name="port">The port to invoke</param>
+    public virtual void InvokePort(Entity<DeviceLinkSourceComponent?> ent, string port)
+    {
+        // NOOP on client for the moment.
+    }
+
+    /// <summary>
+    /// Sends a network payload directed at the sink entity.
+    /// Just raises a <see cref="SignalReceivedEvent"/> without data if the source or the sink doesn't have a <see cref="DeviceNetworkComponent"/>
+    /// </summary>
+    /// <param name="ent">The source entity that invokes the port</param>
     /// <param name="port">The port to invoke</param>
     /// <param name="data">Optional data to send along</param>
-    /// <param name="sourceComponent"></param>
-    public virtual void InvokePort(EntityUid uid, string port, NetworkPayload? data = null,
-        DeviceLinkSourceComponent? sourceComponent = null)
+    public virtual void InvokePort<T>(Entity<DeviceLinkSourceComponent?> ent, string port, ref T data) where T : ISignalNetworkPayload
     {
         // NOOP on client for the moment.
     }
diff --git a/Content.Shared/DeviceLinking/SignalPayload.cs b/Content.Shared/DeviceLinking/SignalPayload.cs
new file mode 100644
index 0000000000..41b7613b44
--- /dev/null
+++ b/Content.Shared/DeviceLinking/SignalPayload.cs
@@ -0,0 +1,41 @@
+using Content.Shared.DeviceLinking.Events;
+using Content.Shared.DeviceNetwork;
+
+namespace Content.Shared.DeviceLinking;
+
+/// <summary>
+/// A network payload that can be nested inside <see cref="SignalPayload{T}"/>.
+/// </summary>
+public partial interface ISignalNetworkPayload : INetworkPayload;
+
+/// <summary>
+/// A network payload that raises <see cref="SignalReceivedEvent"/> when successfully delivered.
+/// Optionally contains a <see cref="INetworkPayload"/> to provide additional data for the event.
+/// </summary>
+public partial record struct SignalPayload : INetworkPayload
+{
+    /// <summary>
+    /// A signal port that was invoked.
+    /// </summary>
+    [DataField]
+    public string InvokedPort;
+}
+
+/// <summary>
+/// A network payload that raises <see cref="SignalReceivedEvent"/> when successfully delivered.
+/// Optionally contains a <see cref="INetworkPayload"/> to provide additional data for the event.
+/// </summary>
+public partial record struct SignalPayload<T> : INetworkPayload where T : ISignalNetworkPayload
+{
+    /// <summary>
+    /// A signal port that was invoked.
+    /// </summary>
+    [DataField]
+    public string InvokedPort;
+
+    /// <summary>
+    /// Optional additional data about the signal.
+    /// </summary>
+    [DataField]
+    public T Payload;
+}
diff --git a/Content.Shared/DeviceLinking/TwoWayLeverSignal.cs b/Content.Shared/DeviceLinking/TwoWayLeverSignal.cs
index a41e48556b..115294d6df 100644
--- a/Content.Shared/DeviceLinking/TwoWayLeverSignal.cs
+++ b/Content.Shared/DeviceLinking/TwoWayLeverSignal.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.DeviceLinking
 {
diff --git a/Content.Shared/DeviceNetwork/Components/DeviceListComponent.cs b/Content.Shared/DeviceNetwork/Components/DeviceListComponent.cs
index 98f177c0f3..7b83552097 100644
--- a/Content.Shared/DeviceNetwork/Components/DeviceListComponent.cs
+++ b/Content.Shared/DeviceNetwork/Components/DeviceListComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DeviceNetwork.Systems;
+using Content.Shared.DeviceNetwork.Systems;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.DeviceNetwork.Components;
diff --git a/Content.Shared/DeviceNetwork/Components/DeviceNetworkComponent.cs b/Content.Shared/DeviceNetwork/Components/DeviceNetworkComponent.cs
index 42c897d3b1..13abc3ebaa 100644
--- a/Content.Shared/DeviceNetwork/Components/DeviceNetworkComponent.cs
+++ b/Content.Shared/DeviceNetwork/Components/DeviceNetworkComponent.cs
@@ -1,120 +1,107 @@
 using Content.Shared.DeviceNetwork.Systems;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.DeviceNetwork.Components
+namespace Content.Shared.DeviceNetwork.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedDeviceNetworkSystem), typeof(DeviceNet))]
+public sealed partial class DeviceNetworkComponent : Component
 {
-    [RegisterComponent]
-    [Access(typeof(SharedDeviceNetworkSystem), typeof(DeviceNet))]
-    public sealed partial class DeviceNetworkComponent : Component
-    {
-        public enum DeviceNetIdDefaults
-        {
-            Private,
-            Wired,
-            Wireless,
-            Apc,
-            AtmosDevices,
-            Reserved = 100,
-            // Ids outside this enum may exist
-            // This exists to let yml use nice names instead of numbers
-        }
+    /// <summary>
+    /// Default device network ID to connect to.
+    /// </summary>
+    [DataField("deviceNetId")]
+    public DeviceNetIdDefaults NetIdEnum { get; set; }
 
-        [DataField("deviceNetId")]
-        public DeviceNetIdDefaults NetIdEnum { get; set; }
+    public int DeviceNetId => (int) NetIdEnum;
 
-        public int DeviceNetId => (int) NetIdEnum;
+    /// <summary>
+    ///     The frequency that this device is listening on.
+    /// </summary>
+    [DataField]
+    public uint? ReceiveFrequency;
 
-        /// <summary>
-        ///     The frequency that this device is listening on.
-        /// </summary>
-        [DataField]
-        public uint? ReceiveFrequency;
+    /// <summary>
+    ///     The address ID of the device, either on the network it is currently connected to or whatever address it
+    ///     most recently used.
+    /// </summary>
+    [DataField]
+    public string Address = string.Empty;
 
-        /// <summary>
-        ///     frequency prototype. Used to select a default frequency to listen to on. Used when the map is
-        ///     initialized.
-        /// </summary>
-        [DataField]
-        public ProtoId<DeviceFrequencyPrototype>? ReceiveFrequencyId;
+    /// <summary>
+    ///     Whether the device should listen for all device messages, regardless of the intended recipient.
+    /// </summary>
+    [DataField]
+    public bool ReceiveAll;
 
-        /// <summary>
-        ///     The frequency that this device going to try transmit on.
-        /// </summary>
-        [DataField]
-        public uint? TransmitFrequency;
+    /// <summary>
+    /// The frequency that this device going to try to transmit on.
+    /// </summary>
+    [DataField]
+    public uint? TransmitFrequency;
 
-        /// <summary>
-        ///     frequency prototype. Used to select a default frequency to transmit on. Used when the map is
-        ///     initialized.
-        /// </summary>
-        [DataField]
-        public ProtoId<DeviceFrequencyPrototype>? TransmitFrequencyId;
+    /// <summary>
+    /// Frequency prototype, used to select a default frequency to listen to on.
+    /// </summary>
+    [DataField]
+    public ProtoId<DeviceFrequencyPrototype>? ReceiveFrequencyId;
 
-        /// <summary>
-        ///     The address of the device, either on the network it is currently connected to or whatever address it
-        ///     most recently used.
-        /// </summary>
-        [DataField]
-        public string Address = string.Empty;
+    /// <summary>
+    /// Frequency prototype, used to select a default frequency to transmit on.
+    /// </summary>
+    [DataField]
+    public ProtoId<DeviceFrequencyPrototype>? TransmitFrequencyId;
 
-        /// <summary>
-        ///     If true, the address was customized and should be preserved across networks. If false, a randomly
-        ///     generated address will be created whenever this device connects to a network.
-        /// </summary>
-        [DataField]
-        public bool CustomAddress = false;
+    /// <summary>
+    /// Whether to send the broadcast recipients list to the sender so it can be filtered.
+    /// </summary>
+    [DataField]
+    public bool SendBroadcastAttemptEvent;
 
-        /// <summary>
-        ///     Prefix to prepend to any automatically generated addresses. Helps players to identify devices. This gets
-        ///     localized.
-        /// </summary>
-        [DataField]
-        public string? Prefix;
+    /// <summary>
+    /// If the device should show its address upon an examine.
+    /// Useful for devices that do not have a visible UI.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool ExaminableAddress;
 
-        /// <summary>
-        ///     Whether the device should listen for all device messages, regardless of the intended recipient.
-        /// </summary>
-        [DataField]
-        public bool ReceiveAll;
+    /// <summary>
+    /// Prefix to prepend to any automatically generated addresses. Helps players to identify devices.
+    /// </summary>
+    [DataField]
+    public LocId? Prefix;
 
-        /// <summary>
-        ///     If the device should show its address upon an examine. Useful for devices
-        ///     that do not have a visible UI.
-        /// </summary>
-        [DataField]
-        public bool ExaminableAddress;
+    /// <summary>
+    /// Whether the device should attempt to join the network on map init.
+    /// </summary>
+    [DataField]
+    public bool AutoConnect = true;
 
-        /// <summary>
-        ///     Whether the device should attempt to join the network on map init.
-        /// </summary>
-        [DataField]
-        public bool AutoConnect = true;
+    /// <summary>
+    /// Whether this device's address can be saved to device-lists
+    /// </summary>
+    [DataField]
+    public bool SavableAddress = true;
 
-        /// <summary>
-        ///     Whether to send the broadcast recipients list to the sender so it can be filtered.
-        /// <see cref="DeviceListSystem"/>
-        /// </summary>
-        [DataField]
-        public bool SendBroadcastAttemptEvent = false;
+    /// <summary>
+    ///     If true, the address was customized and should be preserved across networks. If false, a randomly
+    ///     generated address will be created whenever this device connects to a network.
+    /// </summary>
+    [DataField]
+    public bool CustomAddress;
 
-        /// <summary>
-        ///     Whether this device's address can be saved to device-lists
-        /// </summary>
-        [DataField]
-        public bool SavableAddress = true;
+    /// <summary>
+    /// A list of device-lists that this device is on.
+    /// </summary>
+    [DataField]
+    [Access(typeof(SharedDeviceListSystem))]
+    public HashSet<EntityUid> DeviceLists = new();
 
-        /// <summary>
-        ///     A list of device-lists that this device is on.
-        /// </summary>
-        [DataField]
-        [Access(typeof(SharedDeviceListSystem))]
-        public HashSet<EntityUid> DeviceLists = new();
-
-        /// <summary>
-        ///     A list of configurators that this device is on.
-        /// </summary>
-        [DataField]
-        [Access(typeof(SharedNetworkConfiguratorSystem))]
-        public HashSet<EntityUid> Configurators = new();
-    }
+    /// <summary>
+    /// A list of configurators that this device is on.
+    /// </summary>
+    [DataField]
+    [Access(typeof(SharedNetworkConfiguratorSystem))]
+    public HashSet<EntityUid> Configurators = new();
 }
diff --git a/Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs b/Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs
index 5ee04de0d1..05edea42e7 100644
--- a/Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs
+++ b/Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs
@@ -21,7 +21,7 @@ public sealed partial class DeviceNetworkJammerComponent : Component
     /// Network ids are not guaranteed to be limited to DeviceNetIdDefaults.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public HashSet<string> JammableNetworks = [];
+    public HashSet<int> JammableNetworks = [];
 
     /// <summary>
     /// Device networks frequencies that wont be jammed.
diff --git a/Content.Shared/DeviceNetwork/Components/DeviceNetworkRouterComponent.cs b/Content.Shared/DeviceNetwork/Components/DeviceNetworkRouterComponent.cs
new file mode 100644
index 0000000000..745688774d
--- /dev/null
+++ b/Content.Shared/DeviceNetwork/Components/DeviceNetworkRouterComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.DeviceNetwork.Payloads;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.DeviceNetwork.Components;
+
+/// <summary>
+/// Re-routs <see cref="RoutedNetworkPayload"/>s to some other devices.
+/// Useful for server setups where there are lots of payloads that have to be relayed.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class DeviceNetworkRouterComponent : Component;
diff --git a/Content.Shared/DeviceNetwork/Device.cs b/Content.Shared/DeviceNetwork/Device.cs
new file mode 100644
index 0000000000..41ee3891e7
--- /dev/null
+++ b/Content.Shared/DeviceNetwork/Device.cs
@@ -0,0 +1,25 @@
+using Content.Shared.DeviceNetwork.Components;
+using Content.Shared.DeviceNetwork.Systems;
+
+namespace Content.Shared.DeviceNetwork;
+
+/// <summary>
+/// Represents a device in a <see cref="DeviceNet"/>.
+/// </summary>
+/// <remarks>
+/// This type is read-only. To change any parameters of the device, use <see cref="SharedDeviceNetworkSystem"/>'s API.
+/// </remarks>
+[DataRecord]
+public readonly partial record struct Device(EntityUid Owner, uint? ReceiveFrequency, string Address, bool ReceiveAll)
+{
+    public Device(Entity<DeviceNetworkComponent> ent) : this(
+        ent.Owner,
+        ent.Comp.ReceiveFrequency,
+        ent.Comp.Address,
+        ent.Comp.ReceiveAll)
+    {
+        Owner = ent.Owner;
+        ReceiveFrequency = ent.Comp.ReceiveFrequency;
+        ReceiveAll = ent.Comp.ReceiveAll;
+    }
+}
diff --git a/Content.Shared/DeviceNetwork/DeviceFrequencyPrototype.cs b/Content.Shared/DeviceNetwork/DeviceFrequencyPrototype.cs
index ac5b6eec18..7e486e5b1d 100644
--- a/Content.Shared/DeviceNetwork/DeviceFrequencyPrototype.cs
+++ b/Content.Shared/DeviceNetwork/DeviceFrequencyPrototype.cs
@@ -13,13 +13,12 @@ public sealed partial class DeviceFrequencyPrototype : IPrototype
     public string ID { get; private set; } = default!;
 
     // TODO Somehow Allow per-station or some other type of named but randomized frequencies?
-    [DataField("frequency", required: true)]
+    [DataField(required: true)]
     public uint Frequency;
 
     /// <summary>
     ///     Optional name for this frequency, for displaying in game.
     /// </summary>
-    [DataField("name")]
-    public string? Name;
-
+    [DataField]
+    public LocId? Name;
 }
diff --git a/Content.Shared/DeviceNetwork/DeviceLocalizationHelpers.cs b/Content.Shared/DeviceNetwork/DeviceLocalizationHelpers.cs
new file mode 100644
index 0000000000..1ccb3c0242
--- /dev/null
+++ b/Content.Shared/DeviceNetwork/DeviceLocalizationHelpers.cs
@@ -0,0 +1,42 @@
+using Robust.Shared.Utility;
+
+namespace Content.Shared.DeviceNetwork;
+
+/// <summary>
+/// A helper class for localization of frequencies and device network IDs.
+/// </summary>
+public static class DeviceLocalizationHelpers
+{
+    /// <summary>
+    /// Converts the unsigned int to string and inserts a number before the last digit
+    /// </summary>
+    public static string FrequencyToString(uint? frequency)
+    {
+        if (frequency == null)
+            return string.Empty;
+
+        var result = frequency.Value.ToString();
+        if (result.Length <= 2)
+            return result + ".0";
+
+        return result.Insert(result.Length - 1, ".");
+    }
+
+    /// <summary>
+    /// Either returns the localized name representation of the corresponding <see cref="DeviceNetIdDefaults"/>
+    /// or converts the id to string
+    /// </summary>
+    public static string DeviceNetIdToLocalizedName(int? id, ILocalizationManager localeMan)
+    {
+        if (id == null)
+            return string.Empty;
+
+        if (!Enum.IsDefined(typeof(DeviceNetIdDefaults), id))
+            return id.Value.ToString();
+
+        var result = ((DeviceNetIdDefaults) id).ToString();
+        var resultKebab = "device-net-id-" + CaseConversion.PascalToKebab(result);
+
+        return !localeMan.TryGetString(resultKebab, out var name) ? result : name;
+    }
+}
diff --git a/Content.Shared/DeviceNetwork/DeviceNet.cs b/Content.Shared/DeviceNetwork/DeviceNet.cs
index 4234b30385..0a831796cd 100644
--- a/Content.Shared/DeviceNetwork/DeviceNet.cs
+++ b/Content.Shared/DeviceNetwork/DeviceNet.cs
@@ -17,17 +17,20 @@ public sealed class DeviceNet
     ///     This dictionary contains all devices connected to this network, though they may not be listening to any
     ///     specific frequency.
     /// </summary>
-    public readonly Dictionary<string, DeviceNetworkComponent> Devices = new();
+    [ViewVariables]
+    public readonly Dictionary<string, Device> Devices = new();
 
     /// <summary>
     ///     Devices listening on a given frequency.
     /// </summary>
-    public readonly Dictionary<uint, HashSet<DeviceNetworkComponent>> ListeningDevices = new();
+    [ViewVariables]
+    public readonly Dictionary<uint, HashSet<Device>> ListeningDevices = new();
 
     /// <summary>
     ///     Devices listening to all packets on a given frequency, regardless of the intended recipient.
     /// </summary>
-    public readonly Dictionary<uint, HashSet<DeviceNetworkComponent>> ReceiveAllDevices = new();
+    [ViewVariables]
+    public readonly Dictionary<uint, HashSet<Device>> ReceiveAllDevices = new();
 
     private readonly IRobustRandom _random;
     public readonly int NetId;
@@ -41,9 +44,11 @@ public sealed class DeviceNet
     /// <summary>
     ///     Add a device to the network.
     /// </summary>
-    public bool Add(DeviceNetworkComponent device)
+    public bool Add(Entity<DeviceNetworkComponent> ent)
     {
-        if (device.CustomAddress)
+        var deviceComp = ent.Comp;
+        var device = new Device(ent);
+        if (deviceComp.CustomAddress)
         {
             // Only add if the device's existing address is available.
             if (!Devices.TryAdd(device.Address, device))
@@ -53,12 +58,15 @@ public sealed class DeviceNet
         {
             // Randomly generate a new address if the existing random one is invalid. Otherwise, keep the existing address
             if (string.IsNullOrWhiteSpace(device.Address) || Devices.ContainsKey(device.Address))
-                device.Address = GenerateValidAddress(device.Prefix);
+            {
+                deviceComp.Address = GenerateValidAddress(deviceComp.Prefix);
+                device = new Device(ent); // Reallocate because the data had changed
+            }
 
             Devices[device.Address] = device;
         }
 
-        if (device.ReceiveFrequency is not uint freq)
+        if (device.ReceiveFrequency is not { } freq)
             return true;
 
         if (!ListeningDevices.TryGetValue(freq, out var devices))
@@ -79,12 +87,14 @@ public sealed class DeviceNet
     /// <summary>
     ///     Remove a device from the network.
     /// </summary>
-    public bool Remove(DeviceNetworkComponent device)
+    public bool Remove(Entity<DeviceNetworkComponent> ent)
     {
-        if (device.Address == null || !Devices.Remove(device.Address))
+        var deviceComp = ent.Comp;
+        var device = new Device(ent);
+        if (!Devices.Remove(device.Address))
             return false;
 
-        if (device.ReceiveFrequency is not uint freq)
+        if (device.ReceiveFrequency is not { } freq)
             return true;
 
         if (ListeningDevices.TryGetValue(freq, out var listening))
@@ -104,121 +114,6 @@ public sealed class DeviceNet
         return true;
     }
 
-    /// <summary>
-    ///     Give an existing device a new randomly generated address. Useful if the device's address prefix was updated
-    ///     and they want a new address to reflect that, or something like that.
-    /// </summary>
-    public bool RandomizeAddress(string oldAddress, string? prefix = null)
-    {
-        if (!Devices.Remove(oldAddress, out var device))
-            return false;
-
-        device.Address = GenerateValidAddress(prefix ?? device.Prefix);
-        device.CustomAddress = false;
-        Devices[device.Address] = device;
-        return true;
-    }
-
-    /// <summary>
-    ///     Update the address of an existing device.
-    /// </summary>
-    public bool UpdateAddress(string oldAddress, string newAddress)
-    {
-        if (Devices.ContainsKey(newAddress))
-            return false;
-
-        if (!Devices.Remove(oldAddress, out var device))
-            return false;
-
-        device.Address = newAddress;
-        device.CustomAddress = true;
-        Devices[newAddress] = device;
-        return true;
-    }
-
-    /// <summary>
-    ///     Make an existing network device listen to a new frequency.
-    /// </summary>
-    public bool UpdateReceiveFrequency(string address, uint? newFrequency)
-    {
-        if (!Devices.TryGetValue(address, out var device))
-            return false;
-
-        if (device.ReceiveFrequency == newFrequency)
-            return true;
-
-        if (device.ReceiveFrequency is uint freq)
-        {
-            if (ListeningDevices.TryGetValue(freq, out var listening))
-            {
-                listening.Remove(device);
-                if (listening.Count == 0)
-                    ListeningDevices.Remove(freq);
-            }
-
-            if (device.ReceiveAll && ReceiveAllDevices.TryGetValue(freq, out var receiveAll))
-            {
-                receiveAll.Remove(device);
-                if (receiveAll.Count == 0)
-                    ListeningDevices.Remove(freq);
-            }
-        }
-
-        device.ReceiveFrequency = newFrequency;
-
-        if (newFrequency == null)
-            return true;
-
-        if (!ListeningDevices.TryGetValue(newFrequency.Value, out var devices))
-            ListeningDevices[newFrequency.Value] = devices = new();
-
-        devices.Add(device);
-
-        if (!device.ReceiveAll)
-            return true;
-
-        if (!ReceiveAllDevices.TryGetValue(newFrequency.Value, out var receiveAlldevices))
-            ReceiveAllDevices[newFrequency.Value] = receiveAlldevices = new();
-
-        receiveAlldevices.Add(device);
-        return true;
-    }
-
-    /// <summary>
-    ///     Make an existing network device listen to a new frequency.
-    /// </summary>
-    public bool UpdateReceiveAll(string address, bool receiveAll)
-    {
-        if (!Devices.TryGetValue(address, out var device))
-            return false;
-
-        if (device.ReceiveAll == receiveAll)
-            return true;
-
-        device.ReceiveAll = receiveAll;
-
-        if (device.ReceiveFrequency is not uint freq)
-            return true;
-
-        // remove or add to set of listening devices
-
-        HashSet<DeviceNetworkComponent>? devices;
-        if (receiveAll)
-        {
-            if (!ReceiveAllDevices.TryGetValue(freq, out devices))
-                ReceiveAllDevices[freq] = devices = new();
-            devices.Add(device);
-        }
-        else if (ReceiveAllDevices.TryGetValue(freq, out devices))
-        {
-            devices.Remove(device);
-            if (devices.Count == 0)
-                ReceiveAllDevices.Remove(freq);
-        }
-
-        return true;
-    }
-
     /// <summary>
     ///     Generates a valid address by randomly generating one and checking if it already exists on the network.
     /// </summary>
@@ -230,8 +125,7 @@ public sealed class DeviceNet
         {
             var num = _random.Next();
             address = $"{prefix}{num >> 16:X4}-{num & 0xFFFF:X4}";
-        }
-        while (Devices.ContainsKey(address));
+        } while (Devices.ContainsKey(address));
 
         return address;
     }
diff --git a/Content.Shared/DeviceNetwork/DeviceNetIdDefaults.cs b/Content.Shared/DeviceNetwork/DeviceNetIdDefaults.cs
new file mode 100644
index 0000000000..21498e89ff
--- /dev/null
+++ b/Content.Shared/DeviceNetwork/DeviceNetIdDefaults.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.DeviceNetwork;
+
+[Serializable, NetSerializable]
+public enum DeviceNetIdDefaults
+{
+    Private,
+    Wired,
+    Wireless,
+    Apc,
+    AtmosDevices,
+    Reserved = 100,
+    // Ids outside this enum may exist
+    // This exists to let yml use nice names instead of numbers
+}
diff --git a/Content.Shared/DeviceNetwork/DeviceNetworkConstants.cs b/Content.Shared/DeviceNetwork/DeviceNetworkConstants.cs
deleted file mode 100644
index 7fec72bb69..0000000000
--- a/Content.Shared/DeviceNetwork/DeviceNetworkConstants.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using Robust.Shared.Utility;
-using Content.Shared.DeviceNetwork.Components;
-
-namespace Content.Shared.DeviceNetwork
-{
-    /// <summary>
-    /// A collection of constants to help with using device networks
-    /// </summary>
-    public static class DeviceNetworkConstants
-    {
-        /// <summary>
-        /// Used by logic gates to transmit the state of their ports
-        /// </summary>
-        public const string LogicState = "logic_state";
-
-        #region Commands
-
-        /// <summary>
-        /// The key for command names
-        /// E.g. [DeviceNetworkConstants.Command] = "ping"
-        /// </summary>
-        public const string Command = "command";
-
-        /// <summary>
-        /// The command for setting a devices state
-        /// E.g. to turn a light on or off
-        /// </summary>
-        public const string CmdSetState = "set_state";
-
-        /// <summary>
-        /// The command for a device that just updated its state
-        /// E.g. suit sensors broadcasting owners vitals state
-        /// </summary>
-        public const string CmdUpdatedState = "updated_state";
-
-        #endregion
-
-        #region SetState
-
-        /// <summary>
-        /// Used with the <see cref="CmdSetState"/> command to turn a device on or off
-        /// </summary>
-        public const string StateEnabled = "state_enabled";
-
-        #endregion
-
-        #region DisplayHelpers
-
-        /// <summary>
-        /// Converts the unsigned int to string and inserts a number before the last digit
-        /// </summary>
-        public static string FrequencyToString(this uint frequency)
-        {
-            var result = frequency.ToString();
-            if (result.Length <= 2)
-                return result + ".0";
-
-            return result.Insert(result.Length - 1, ".");
-        }
-
-        /// <summary>
-        /// Either returns the localized name representation of the corresponding <see cref="DeviceNetworkComponent.DeviceNetIdDefaults"/>
-        /// or converts the id to string
-        /// </summary>
-        public static string DeviceNetIdToLocalizedName(this int id)
-        {
-
-            if (!Enum.IsDefined(typeof(DeviceNetworkComponent.DeviceNetIdDefaults), id))
-                return id.ToString();
-
-            var result = ((DeviceNetworkComponent.DeviceNetIdDefaults) id).ToString();
-            var resultKebab = "device-net-id-" + CaseConversion.PascalToKebab(result);
-
-            return !Loc.TryGetString(resultKebab, out var name) ? result : name;
-        }
-
-        #endregion
-    }
-}
diff --git a/Content.Shared/DeviceNetwork/Events/BeforeBroadcastAttemptEvent.cs b/Content.Shared/DeviceNetwork/Events/BeforeBroadcastAttemptEvent.cs
index f495847482..0c9cd90f35 100644
--- a/Content.Shared/DeviceNetwork/Events/BeforeBroadcastAttemptEvent.cs
+++ b/Content.Shared/DeviceNetwork/Events/BeforeBroadcastAttemptEvent.cs
@@ -1,16 +1,18 @@
-using Content.Shared.DeviceNetwork.Components;
-
 namespace Content.Shared.DeviceNetwork.Events;
 
 /// <summary>
 /// Sent to the sending entity before broadcasting network packets to recipients
 /// </summary>
-public sealed class BeforeBroadcastAttemptEvent : CancellableEntityEventArgs
+[ByRefEvent]
+public record struct BeforeBroadcastAttemptEvent
 {
-    public readonly IReadOnlySet<DeviceNetworkComponent> Recipients;
-    public HashSet<DeviceNetworkComponent>? ModifiedRecipients;
+    public readonly IReadOnlySet<Device> Recipients;
 
-    public BeforeBroadcastAttemptEvent(IReadOnlySet<DeviceNetworkComponent> recipients)
+    public HashSet<Device>? ModifiedRecipients;
+
+    public bool Cancelled = false;
+
+    public BeforeBroadcastAttemptEvent(IReadOnlySet<Device> recipients)
     {
         Recipients = recipients;
     }
diff --git a/Content.Shared/DeviceNetwork/Events/BeforePacketSentEvent.cs b/Content.Shared/DeviceNetwork/Events/BeforePacketSentEvent.cs
index b34995a285..2e7c49cbd8 100644
--- a/Content.Shared/DeviceNetwork/Events/BeforePacketSentEvent.cs
+++ b/Content.Shared/DeviceNetwork/Events/BeforePacketSentEvent.cs
@@ -3,39 +3,16 @@ using System.Numerics;
 namespace Content.Shared.DeviceNetwork.Events;
 
 /// <summary>
-/// Event raised before a device network packet is send.
+/// Event raised before a device network packet is sent.
 /// Subscribed to by other systems to prevent the packet from being sent.
 /// </summary>
-public sealed class BeforePacketSentEvent : CancellableEntityEventArgs
-{
-    /// <summary>
-    /// The EntityUid of the entity the packet was sent from.
-    /// </summary>
-    public readonly EntityUid Sender;
-
-    public readonly TransformComponent SenderTransform;
-
-    /// <summary>
-    ///     The senders current position in world coordinates.
-    /// </summary>
-    public readonly Vector2 SenderPosition;
-
-    /// <summary>
-    /// The network the packet will be sent to.
-    /// </summary>
-    public readonly string NetworkId;
-
-    /// <summary>
-    /// The frequency the packet is sent on.
-    /// </summary>
-    public readonly uint Frequency;
-
-    public BeforePacketSentEvent(EntityUid sender, TransformComponent xform, Vector2 senderPosition, string networkId, uint frequency)
-    {
-        Sender = sender;
-        SenderTransform = xform;
-        SenderPosition = senderPosition;
-        NetworkId = networkId;
-        Frequency = frequency;
-    }
-}
+[ByRefEvent]
+public record struct BeforePacketSentEvent(
+    int NetId,
+    string? Address,
+    uint Frequency,
+    string SenderAddress,
+    EntityUid Sender,
+    TransformComponent SenderTransform,
+    Vector2 SenderPosition,
+    bool Cancelled = false);
diff --git a/Content.Shared/DeviceNetwork/Events/DeviceAddressChangedEvent.cs b/Content.Shared/DeviceNetwork/Events/DeviceAddressChangedEvent.cs
new file mode 100644
index 0000000000..10bafa8d52
--- /dev/null
+++ b/Content.Shared/DeviceNetwork/Events/DeviceAddressChangedEvent.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.DeviceNetwork.Events;
+
+/// <summary>
+/// Raised when the <see cref="DeviceData.Address"/> was changed.
+/// </summary>
+[ByRefEvent]
+public record struct DeviceAddressChangedEvent(string OldAddress, string NewAddress, bool IsCustom);
diff --git a/Content.Shared/DeviceNetwork/Events/DeviceNetworkPacketEvent.cs b/Content.Shared/DeviceNetwork/Events/DeviceNetworkPacketEvent.cs
index 4ae6afeef7..05938483da 100644
--- a/Content.Shared/DeviceNetwork/Events/DeviceNetworkPacketEvent.cs
+++ b/Content.Shared/DeviceNetwork/Events/DeviceNetworkPacketEvent.cs
@@ -1,47 +1,38 @@
+using Content.Shared.DeviceNetwork.Components;
+
 namespace Content.Shared.DeviceNetwork.Events;
 
 /// <summary>
-/// Event raised when a device network packet gets sent.
+/// Event raised when a device network packet is received by an entity.
 /// </summary>
-public sealed class DeviceNetworkPacketEvent : EntityEventArgs
-{
-    /// <summary>
-    /// The id of the network that this packet is being sent on.
-    /// </summary>
-    public int NetId;
-
-    /// <summary>
-    /// The frequency the packet is sent on.
-    /// </summary>
-    public readonly uint Frequency;
-
-    /// <summary>
-    /// Address of the intended recipient. Null if the message was broadcast.
-    /// </summary>
-    public string? Address;
-
-    /// <summary>
-    /// The device network address of the sending entity.
-    /// </summary>
-    public readonly string SenderAddress;
-
-    /// <summary>
-    /// The entity that sent the packet.
-    /// </summary>
-    public EntityUid Sender;
-
-    /// <summary>
-    /// The data that is being sent.
-    /// </summary>
-    public readonly NetworkPayload Data;
-
-    public DeviceNetworkPacketEvent(int netId, string? address, uint frequency, string senderAddress, EntityUid sender, NetworkPayload data)
-    {
-        NetId = netId;
-        Address = address;
-        Frequency = frequency;
-        SenderAddress = senderAddress;
-        Sender = sender;
-        Data = data;
-    }
-}
\ No newline at end of file
+/// <param name="NetId">
+/// ID of the network that this packet is translated on.
+/// Device networks are currently global and only represent the way of signal transmission.
+/// </param>
+/// <param name="Address">
+/// Address of the target device in a target network.
+/// If null, this packet gets broadcasted to all devices in the network.
+/// Empty string means invalid address.
+/// </param>
+/// <param name="Frequency">
+/// Transmit frequency of the sender and receive frequency of the targeted device.
+/// </param>
+/// <param name="SenderAddress">
+/// The device address of the sender. Can be used to send responses to payloads.
+/// </param>
+/// <param name="Sender">
+/// The sender entity with its <see cref="DeviceNetworkComponent"/>.
+/// </param>
+/// <param name="Data">
+/// The <see cref="INetworkPayload"/> of a specific type.
+/// This is the main container for custom information.
+/// </param>
+/// <typeparam name="T">Type of the payload sent by this event.</typeparam>
+[ByRefEvent]
+public readonly record struct DeviceNetworkPacketEvent<T>(
+    int NetId,
+    string? Address,
+    uint Frequency,
+    string SenderAddress,
+    Entity<DeviceNetworkComponent> Sender,
+    T Data) where T : INetworkPayload;
diff --git a/Content.Shared/DeviceNetwork/Events/DeviceReceiveAllChangedEvent.cs b/Content.Shared/DeviceNetwork/Events/DeviceReceiveAllChangedEvent.cs
new file mode 100644
index 0000000000..aa9a23d4dc
--- /dev/null
+++ b/Content.Shared/DeviceNetwork/Events/DeviceReceiveAllChangedEvent.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.DeviceNetwork.Events;
+
+/// <summary>
+/// Raised when the <see cref="DeviceData.ReceiveAll"/> was changed.
+/// </summary>
+[ByRefEvent]
+public record struct DeviceReceiveAllChangedEvent(bool ReceiveAll);
diff --git a/Content.Shared/DeviceNetwork/Events/DeviceReceiveFrequencyChangedEvent.cs b/Content.Shared/DeviceNetwork/Events/DeviceReceiveFrequencyChangedEvent.cs
new file mode 100644
index 0000000000..2690da7729
--- /dev/null
+++ b/Content.Shared/DeviceNetwork/Events/DeviceReceiveFrequencyChangedEvent.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.DeviceNetwork.Events;
+
+/// <summary>
+/// Raised when the <see cref="DeviceData.ReceiveFrequency"/> was changed.
+/// </summary>
+[ByRefEvent]
+public record struct DeviceReceiveFrequencyChangedEvent(uint? OldFrequency, uint? NewFrequency);
diff --git a/Content.Shared/DeviceNetwork/Events/DeviceTransmitFrequencyChangedEvent.cs b/Content.Shared/DeviceNetwork/Events/DeviceTransmitFrequencyChangedEvent.cs
new file mode 100644
index 0000000000..618d5dc0d0
--- /dev/null
+++ b/Content.Shared/DeviceNetwork/Events/DeviceTransmitFrequencyChangedEvent.cs
@@ -0,0 +1,9 @@
+using Content.Shared.DeviceNetwork.Components;
+
+namespace Content.Shared.DeviceNetwork.Events;
+
+/// <summary>
+/// Raised when the <see cref="DeviceNetworkComponent.TransmitFrequency"/> was changed.
+/// </summary>
+[ByRefEvent]
+public record struct DeviceTransmitFrequencyChangedEvent(uint? OldFrequency, uint? NewFrequency);
diff --git a/Content.Shared/DeviceNetwork/NetworkConfiguratorUIMessages.cs b/Content.Shared/DeviceNetwork/NetworkConfiguratorUIMessages.cs
index e6e273b1fa..8ffbb42b05 100644
--- a/Content.Shared/DeviceNetwork/NetworkConfiguratorUIMessages.cs
+++ b/Content.Shared/DeviceNetwork/NetworkConfiguratorUIMessages.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.DeviceNetwork;
 
diff --git a/Content.Shared/DeviceNetwork/NetworkPayload.cs b/Content.Shared/DeviceNetwork/NetworkPayload.cs
index 3239374021..624faf0bfe 100644
--- a/Content.Shared/DeviceNetwork/NetworkPayload.cs
+++ b/Content.Shared/DeviceNetwork/NetworkPayload.cs
@@ -1,24 +1,7 @@
-using System.Diagnostics.CodeAnalysis;
-using Robust.Shared.Utility;
-
 namespace Content.Shared.DeviceNetwork;
 
-public sealed class NetworkPayload : Dictionary<string, object?>
-{
-    /// <summary>
-    /// Tries to get a value from the payload and checks if that value is of type  T.
-    /// </summary>
-    /// <typeparam name="T">The type that should be casted to</typeparam>
-    /// <returns>Whether the value was present in the payload and of the required type</returns>
-    public bool TryGetValue<T>(string key, [NotNullWhen(true)] out T? value)
-    {
-        if (this.TryCastValue(key, out T? result))
-        {
-            value = result;
-            return true;
-        }
-
-        value = default;
-        return false;
-    }
-}
+/// <summary>
+/// A data class for information passing through a Device Network.
+/// </summary>
+[ImplicitDataRecord]
+public partial interface INetworkPayload;
diff --git a/Content.Shared/DeviceNetwork/Payloads/ApcNetTogglePayload.cs b/Content.Shared/DeviceNetwork/Payloads/ApcNetTogglePayload.cs
new file mode 100644
index 0000000000..de24e6b18a
--- /dev/null
+++ b/Content.Shared/DeviceNetwork/Payloads/ApcNetTogglePayload.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared.DeviceNetwork.Payloads;
+
+/// <summary>
+/// A payload for the Apc net switch.
+/// </summary>
+public partial record struct ApcNetTogglePayload : INetworkPayload
+{
+    [DataField]
+    public bool Enabled;
+}
diff --git a/Content.Shared/DeviceNetwork/Payloads/RoutedNetworkPayload.cs b/Content.Shared/DeviceNetwork/Payloads/RoutedNetworkPayload.cs
new file mode 100644
index 0000000000..424901dfb7
--- /dev/null
+++ b/Content.Shared/DeviceNetwork/Payloads/RoutedNetworkPayload.cs
@@ -0,0 +1,88 @@
+using Content.Shared.DeviceNetwork.Components;
+using Content.Shared.DeviceNetwork.Systems;
+
+namespace Content.Shared.DeviceNetwork.Payloads;
+
+/// <summary>
+/// Represents a payload that can be re-routed by a <see cref="DeviceNetworkRouterComponent"/>.
+/// </summary>
+public partial interface IRoutableNetworkPayload : INetworkPayload
+{
+    /// <summary>
+    /// Original sender address of this payload.
+    /// </summary>
+    string? SenderAddress { get; set; }
+
+    /// <summary>
+    /// Original sender entity of this payload.
+    /// </summary>
+    EntityUid Sender { get; set; }
+}
+
+public partial interface IRoutedNetworkPayload : INetworkPayload
+{
+    /// <summary>
+    /// If specified, the device router will use this frequency for transmitting the <see cref="Payload"/>.
+    /// </summary>
+    uint? OverrideFrequency { get; set; }
+
+    /// <summary>
+    /// If specified, the device router will use this network ID for transmitting the <see cref="Payload"/>.
+    /// </summary>
+    int? OverrideNetwork { get; set; }
+
+    /// <summary>
+    /// Address to re-route to when the <see cref="RoutedNetworkPayload{T}"/> is being handled.
+    /// </summary>
+    string? TargetAddress { get; set; }
+
+    /// <summary>
+    ///
+    /// </summary>
+    void Reroute(EntityUid sender, string? address, uint? frequency, int? network, SharedDeviceNetworkSystem system);
+}
+
+/// <summary>
+/// A wrapper around the <see cref="IRoutableNetworkPayload"/>, sent to an entity with <see cref="DeviceNetworkRouterComponent"/>.
+/// </summary>
+public partial record struct RoutedNetworkPayload<T> : IRoutedNetworkPayload where T : IRoutableNetworkPayload
+{
+    /// <summary>
+    /// The wrapped payload that is going to be sent when received by <see cref="DeviceNetworkRouterComponent"/>.
+    /// </summary>
+    [DataField]
+    public T Payload;
+
+    /// <summary>
+    /// If specified, the device router will use this frequency for transmitting the <see cref="Payload"/>.
+    /// </summary>
+    [DataField]
+    public uint? OverrideFrequency { get; set; }
+
+    /// <summary>
+    /// If specified, the device router will use this network ID for transmitting the <see cref="Payload"/>.
+    /// </summary>
+    [DataField]
+    public int? OverrideNetwork { get; set; }
+
+    /// <summary>
+    /// Address to re-route to when the <see cref="RoutedNetworkPayload{T}"/> is being handled.
+    /// </summary>
+    [DataField]
+    public string? TargetAddress { get; set; }
+
+    public void Reroute(EntityUid sender,
+        string? address,
+        uint? frequency,
+        int? network,
+        SharedDeviceNetworkSystem system)
+    {
+        // Things sometimes take a **weird route** when it comes to type parameters.
+        system.SendPacket(
+            sender,
+            address,
+            ref Payload,
+            frequency,
+            network);
+    }
+}
diff --git a/Content.Shared/DeviceNetwork/Systems/DeviceNetworkRouterSystem.cs b/Content.Shared/DeviceNetwork/Systems/DeviceNetworkRouterSystem.cs
new file mode 100644
index 0000000000..ae9e9f1b92
--- /dev/null
+++ b/Content.Shared/DeviceNetwork/Systems/DeviceNetworkRouterSystem.cs
@@ -0,0 +1,97 @@
+using Content.Shared.DeviceNetwork.Components;
+using Content.Shared.DeviceNetwork.Events;
+using Content.Shared.DeviceNetwork.Payloads;
+using Content.Shared.SurveillanceCamera;
+
+namespace Content.Shared.DeviceNetwork.Systems;
+
+/// <summary>
+/// A system for re-routing <see cref="IRoutableNetworkPayload"/>s
+/// through an entity with <see cref="DeviceNetworkRouterComponent"/>.
+/// </summary>
+public sealed partial class DeviceNetworkRouterSystem : EntitySystem
+{
+    [Dependency] private SharedDeviceNetworkSystem _deviceNetworkSystem = default!;
+
+    [Dependency] private EntityQuery<DeviceNetworkComponent> _query = default!;
+
+    // TODO: make an engine PR to allow for auto-generated relay subscriptions
+    // Should be doable by using reflection on marker interfaces and then adding them to the auto-generated subscriptions
+    // I know it looks absolutely hilarious and horrible, but uuuhhhh anything to not make boxing allocations!!!!!!!! :godo:
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        // Surveillance cameras
+        SubscribeLocalEvent<DeviceNetworkRouterComponent, DeviceNetworkPacketEvent<RoutedNetworkPayload<SurveillanceCameraConnectPayload>>>((ent, ref args) => OnRoutePayload(ent, ref args));
+        SubscribeLocalEvent<DeviceNetworkRouterComponent, DeviceNetworkPacketEvent<RoutedNetworkPayload<SurveillanceCameraConnectRequestPayload>>>((ent, ref args) => OnRoutePayload(ent, ref args));
+        SubscribeLocalEvent<DeviceNetworkRouterComponent, DeviceNetworkPacketEvent<RoutedNetworkPayload<SurveillanceCameraHeartbeatRequestPayload>>>((ent, ref args) => OnRoutePayload(ent, ref args));
+        SubscribeLocalEvent<DeviceNetworkRouterComponent, DeviceNetworkPacketEvent<RoutedNetworkPayload<SurveillanceCameraHeartbeatPayload>>>((ent, ref args) => OnRoutePayload(ent, ref args));
+        SubscribeLocalEvent<DeviceNetworkRouterComponent, DeviceNetworkPacketEvent<RoutedNetworkPayload<SurveillanceCameraPingPayload>>>((ent, ref args) => OnRoutePayload(ent, ref args));
+        SubscribeLocalEvent<DeviceNetworkRouterComponent, DeviceNetworkPacketEvent<RoutedNetworkPayload<SurveillanceCameraDataPayload>>>((ent, ref args) => OnRoutePayload(ent, ref args));
+    }
+
+    private void OnRoutePayload<T>(Entity<DeviceNetworkRouterComponent> ent, ref DeviceNetworkPacketEvent<T> args) where T : IRoutedNetworkPayload
+    {
+        var payload = args.Data;
+        if (!_query.TryComp(ent, out var deviceComp))
+            return;
+
+        args.Data.Reroute(ent.Owner,
+            payload.TargetAddress,
+            payload.OverrideFrequency ?? deviceComp.TransmitFrequency,
+            payload.OverrideNetwork ?? deviceComp.DeviceNetId,
+            _deviceNetworkSystem);
+    }
+
+    /// <summary>
+    /// Sends the given <see cref="IRoutableNetworkPayload"/> as a device network packet to the Relay entity with the given address and frequency.
+    /// After the payload is received by an entity with <see cref="DeviceNetworkRouterComponent"/>,
+    /// it gets re-routed to <see cref="targetAddress"/>.
+    /// </summary>
+    /// <remarks>
+    /// This is useful for routing server setups where the packet must be sent in both directions through a server.
+    /// </remarks>
+    /// <param name="ent">The sending entity.</param>
+    /// <param name="data">The data to be sent.</param>
+    /// <param name="routerAddress">
+    /// The address of the entity with <see cref="DeviceNetworkRouterComponent"/> that the packet gets sent to.
+    /// If null, the message is broadcast to all devices on that frequency (except the sender).
+    /// This address must include the router entity, so the packet can be relayed.
+    /// </param>
+    /// <param name="targetAddress">
+    /// The Actual address to which the payload will be relayed
+    /// to after it was received by a <see cref="DeviceNetworkRouterComponent"/>.
+    /// </param>
+    /// <param name="frequency">The frequency to send on to the router.</param>
+    /// <param name="overrideFrequency">If specified, will use this frequency when re-routing the packet.</param>
+    /// <param name="network">The network to send on to the router.</param>
+    /// <param name="overrideNetwork">If specified, will use this network when re-routing the packet.</param>
+    /// <returns>Returns true when the packet was successfully enqueued.</returns>
+    public void SendPacketRouted<T>(
+        Entity<DeviceNetworkComponent?> ent,
+        ref T data,
+        string? routerAddress,
+        string? targetAddress,
+        uint? overrideFrequency = null,
+        uint? frequency = null,
+        int? overrideNetwork = null,
+        int? network = null)
+        where T : IRoutableNetworkPayload
+    {
+        if (!_query.Resolve(ref ent) || ent.Comp == null)
+            return;
+
+        data.SenderAddress = ent.Comp.Address;
+        data.Sender = ent.Owner;
+        var payload = new RoutedNetworkPayload<T>
+        {
+            Payload = data,
+            OverrideFrequency = overrideFrequency,
+            OverrideNetwork = overrideNetwork,
+            TargetAddress = targetAddress,
+        };
+
+        _deviceNetworkSystem.SendPacket(ent.Owner, routerAddress, ref payload, frequency, network);
+    }
+}
diff --git a/Content.Shared/DeviceNetwork/Systems/SharedDeviceNetworkJammerSystem.cs b/Content.Shared/DeviceNetwork/Systems/SharedDeviceNetworkJammerSystem.cs
index 6ed770ffbc..9b4227bb39 100644
--- a/Content.Shared/DeviceNetwork/Systems/SharedDeviceNetworkJammerSystem.cs
+++ b/Content.Shared/DeviceNetwork/Systems/SharedDeviceNetworkJammerSystem.cs
@@ -26,7 +26,7 @@ public abstract class SharedDeviceNetworkJammerSystem : EntitySystem
 
     /// <summary>
     /// Returns the set of networks that this entity can jam.
-    public IReadOnlySet<string> GetJammableNetworks(Entity<DeviceNetworkJammerComponent> ent)
+    public IReadOnlySet<int> GetJammableNetworks(Entity<DeviceNetworkJammerComponent> ent)
     {
         return ent.Comp.JammableNetworks;
     }
@@ -34,7 +34,7 @@ public abstract class SharedDeviceNetworkJammerSystem : EntitySystem
     /// <summary>
     /// Enables this entity to jam packets on the specified network.
     /// </summary>
-    public void AddJammableNetwork(Entity<DeviceNetworkJammerComponent> ent, string networkId)
+    public void AddJammableNetwork(Entity<DeviceNetworkJammerComponent> ent, int networkId)
     {
         if (ent.Comp.JammableNetworks.Add(networkId))
             Dirty(ent);
@@ -43,7 +43,7 @@ public abstract class SharedDeviceNetworkJammerSystem : EntitySystem
     /// <summary>
     /// Stops this entity from jamming packets on the specified network.
     /// </summary>
-    public void RemoveJammableNetwork(Entity<DeviceNetworkJammerComponent> ent, string networkId)
+    public void RemoveJammableNetwork(Entity<DeviceNetworkJammerComponent> ent, int networkId)
     {
         if (ent.Comp.JammableNetworks.Remove(networkId))
             Dirty(ent);
diff --git a/Content.Shared/DeviceNetwork/Systems/SharedDeviceNetworkSystem.cs b/Content.Shared/DeviceNetwork/Systems/SharedDeviceNetworkSystem.cs
index 5992c40413..5bede5cb11 100644
--- a/Content.Shared/DeviceNetwork/Systems/SharedDeviceNetworkSystem.cs
+++ b/Content.Shared/DeviceNetwork/Systems/SharedDeviceNetworkSystem.cs
@@ -1,24 +1,44 @@
 using Content.Shared.DeviceNetwork.Components;
+using Content.Shared.Examine;
+using JetBrains.Annotations;
 
 namespace Content.Shared.DeviceNetwork.Systems;
 
-public abstract class SharedDeviceNetworkSystem : EntitySystem
+/// <summary>
+///     Entity system that handles everything device network related.
+///     Device networking allows machines and devices to communicate with each other
+///     while adhering to restrictions like range or being connected to the same power network.
+/// </summary>
+public abstract partial class SharedDeviceNetworkSystem : EntitySystem
 {
+    [SubscribeLocalEvent]
+    private void OnExamine(Entity<DeviceNetworkComponent> ent, ref ExaminedEvent args)
+    {
+        if (ent.Comp.ExaminableAddress)
+            args.PushText(Loc.GetString("device-address-examine-message", ("address", ent.Comp.Address)));
+    }
+
     /// <summary>
-    /// Sends the given payload as a device network packet to the entity with the given address and frequency.
-    /// Addresses are given to the DeviceNetworkComponent of an entity when connecting.
+    /// Sends the given <see cref="INetworkPayload"/> as a device network packet to the entity with the given address and frequency.
+    /// Addresses are given to the <see cref="DeviceNetworkComponent"/> of an entity when connecting.
     /// </summary>
-    /// <param name="uid">The EntityUid of the sending entity</param>
-    /// <param name="address">The address of the entity that the packet gets sent to. If null, the message is broadcast to all devices on that frequency (except the sender)</param>
-    /// <param name="frequency">The frequency to send on</param>
-    /// <param name="data">The data to be sent</param>
+    /// <param name="ent">The sending entity.</param>
+    /// <param name="address">
+    /// The address of the entity that the packet gets sent to.
+    /// If null, the message is broadcast to all devices on that frequency (except the sender)
+    /// </param>
+    /// <param name="frequency">The frequency to send on.</param>
+    /// <param name="data">The data to be sent.</param>
+    /// <param name="network">The network to send on.</param>
     /// <returns>Returns true when the packet was successfully enqueued.</returns>
-    public virtual bool QueuePacket(EntityUid uid,
+    [PublicAPI]
+    public virtual bool SendPacket<T>(
+        Entity<DeviceNetworkComponent?> ent,
         string? address,
-        NetworkPayload data,
+        ref T data,
         uint? frequency = null,
-        int? network = null,
-        DeviceNetworkComponent? device = null)
+        int? network = null)
+        where T : INetworkPayload
     {
         return false;
     }
diff --git a/Content.Shared/Directions/SharedDirectionExtensions.cs b/Content.Shared/Directions/SharedDirectionExtensions.cs
index 65d4ed0ea9..0aa8174cf2 100644
--- a/Content.Shared/Directions/SharedDirectionExtensions.cs
+++ b/Content.Shared/Directions/SharedDirectionExtensions.cs
@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Linq;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
diff --git a/Content.Shared/DisplacementMap/DisplacementDataPrototype.cs b/Content.Shared/DisplacementMap/DisplacementDataPrototype.cs
index 46d1b10433..b22906c8fe 100644
--- a/Content.Shared/DisplacementMap/DisplacementDataPrototype.cs
+++ b/Content.Shared/DisplacementMap/DisplacementDataPrototype.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.DisplacementMap;
 
diff --git a/Content.Shared/Disposal/Mailing/MailRequestTagPayload.cs b/Content.Shared/Disposal/Mailing/MailRequestTagPayload.cs
new file mode 100644
index 0000000000..1cfbbe8efe
--- /dev/null
+++ b/Content.Shared/Disposal/Mailing/MailRequestTagPayload.cs
@@ -0,0 +1,26 @@
+using Content.Shared.DeviceNetwork;
+
+namespace Content.Shared.Disposal.Mailing;
+
+/// <summary>
+/// Request to get all available target mailing units.
+/// </summary>
+public partial record struct MailRequestTagPayload : INetworkPayload;
+
+/// <summary>
+/// Sent as response to <see cref="MailRequestTagPayload"/>, contains tag of the sender.
+/// </summary>
+public partial record struct MailTagPayload : INetworkPayload
+{
+    [DataField]
+    public string Tag;
+}
+
+public partial record struct MailSendPayload : INetworkPayload
+{
+    [DataField]
+    public string Tag;
+
+    [DataField]
+    public string Target;
+}
diff --git a/Content.Shared/Disposal/Mailing/SharedMailingUnitSystem.cs b/Content.Shared/Disposal/Mailing/SharedMailingUnitSystem.cs
index c7e3631046..fe91115fe2 100644
--- a/Content.Shared/Disposal/Mailing/SharedMailingUnitSystem.cs
+++ b/Content.Shared/Disposal/Mailing/SharedMailingUnitSystem.cs
@@ -1,12 +1,10 @@
 using Content.Shared.Configurable;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.DeviceNetwork.Systems;
 using Content.Shared.Disposal.Components;
 using Content.Shared.Disposal.Unit;
 using Content.Shared.Interaction;
-using Content.Shared.Power.EntitySystems;
 using Robust.Shared.Player;
 
 namespace Content.Shared.Disposal.Mailing;
@@ -14,26 +12,16 @@ namespace Content.Shared.Disposal.Mailing;
 public abstract partial class SharedMailingUnitSystem : EntitySystem
 {
     [Dependency] private SharedDeviceNetworkSystem _deviceNetwork = default!;
-    [Dependency] private SharedPowerReceiverSystem _power = default!;
     [Dependency] private SharedUserInterfaceSystem _userInterface = default!;
 
     private const string MailTag = "mail";
-
     private const string TagConfigurationKey = "tag";
 
-    private const string NetTag = "tag";
-    private const string NetSrc = "src";
-    private const string NetTarget = "target";
-    private const string NetCmdSent = "mail_sent";
-    private const string NetCmdRequest = "get_mailer_tag";
-    private const string NetCmdResponse = "mailer_tag";
-
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<MailingUnitComponent, ComponentInit>(OnComponentInit);
-        SubscribeLocalEvent<MailingUnitComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
         SubscribeLocalEvent<MailingUnitComponent, BeforeDisposalFlushEvent>(OnBeforeFlush);
         SubscribeLocalEvent<MailingUnitComponent, ConfigurationUpdatedEvent>(OnConfigurationUpdated);
         SubscribeLocalEvent<MailingUnitComponent, ActivateInWorldEvent>(HandleActivate, before: new[] { typeof(SharedDisposalUnitSystem) });
@@ -45,39 +33,25 @@ public abstract partial class SharedMailingUnitSystem : EntitySystem
         UpdateTargetList(ent);
     }
 
-    private void OnPacketReceived(Entity<MailingUnitComponent> ent, ref DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnRequestTag(Entity<MailingUnitComponent> ent, ref DeviceNetworkPacketEvent<MailRequestTagPayload> args)
     {
-        if (!args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? command) || !_power.IsPowered(ent.Owner))
+        if (ent.Comp.Tag == null)
             return;
 
-        switch (command)
+        var tagPayload = new MailTagPayload
         {
-            case NetCmdRequest:
-                SendTagRequestResponse(ent, args, ent.Comp.Tag);
-                break;
-            case NetCmdResponse when args.Data.TryGetValue(NetTag, out string? tag):
-                //Add the received tag request response to the list of targets
-                ent.Comp.TargetList.Add(tag);
-                Dirty(ent);
-                break;
-        }
-    }
-
-    /// <summary>
-    /// Sends the given tag as a response to a <see cref="NetCmdRequest"/> if it's not null
-    /// </summary>
-    private void SendTagRequestResponse(EntityUid uid, DeviceNetworkPacketEvent args, string? tag)
-    {
-        if (tag == null)
-            return;
-
-        var payload = new NetworkPayload
-        {
-            [DeviceNetworkConstants.Command] = NetCmdResponse,
-            [NetTag] = tag
+            Tag = ent.Comp.Tag,
         };
 
-        _deviceNetwork.QueuePacket(uid, args.SenderAddress, payload, args.Frequency);
+        _deviceNetwork.SendPacket(ent.Owner, args.SenderAddress, ref tagPayload, args.Frequency);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnTag(Entity<MailingUnitComponent> ent, ref DeviceNetworkPacketEvent<MailTagPayload> args)
+    {
+        ent.Comp.TargetList.Add(args.Data.Tag);
+        Dirty(ent);
     }
 
     /// <summary>
@@ -106,32 +80,27 @@ public abstract partial class SharedMailingUnitSystem : EntitySystem
         if (string.IsNullOrEmpty(ent.Comp.Tag) || string.IsNullOrEmpty(ent.Comp.Target) || !Resolve(ent, ref device))
             return;
 
-        var payload = new NetworkPayload
+        var payload = new MailSendPayload
         {
-            [DeviceNetworkConstants.Command] = NetCmdSent,
-            [NetSrc] = ent.Comp.Tag,
-            [NetTarget] = ent.Comp.Target
+            Tag = ent.Comp.Tag,
+            Target = ent.Comp.Target,
         };
 
-        _deviceNetwork.QueuePacket(ent, null, payload, null, null, device);
+        _deviceNetwork.SendPacket((ent.Owner, device), null, ref payload);
     }
 
     /// <summary>
-    /// Clears the units target list and broadcasts a <see cref="NetCmdRequest"/>.
-    /// The target list will then get populated with <see cref="NetCmdResponse"/> responses from all active mailing units on the same grid
+    /// Clears the units target list and broadcasts a <see cref="MailRequestTagPayload"/>.
+    /// The target list will then get populated with <see cref="MailTagPayload"/> responses from all active mailing units on the same grid
     /// </summary>
     private void UpdateTargetList(Entity<MailingUnitComponent> ent, DeviceNetworkComponent? device = null)
     {
         if (!Resolve(ent, ref device, false))
             return;
 
-        var payload = new NetworkPayload
-        {
-            [DeviceNetworkConstants.Command] = NetCmdRequest
-        };
-
+        var payload = new MailRequestTagPayload();
         ent.Comp.TargetList.Clear();
-        _deviceNetwork.QueuePacket(ent, null, payload, null, null, device);
+        _deviceNetwork.SendPacket((ent.Owner, device), null, ref payload);
     }
 
     /// <summary>
diff --git a/Content.Shared/Disposal/SignalRouter/DisposalSignallerSystem.cs b/Content.Shared/Disposal/SignalRouter/DisposalSignallerSystem.cs
index e6c373f3a6..468a75bbfd 100644
--- a/Content.Shared/Disposal/SignalRouter/DisposalSignallerSystem.cs
+++ b/Content.Shared/Disposal/SignalRouter/DisposalSignallerSystem.cs
@@ -21,11 +21,11 @@ public sealed partial class DisposalSignallerSystem : EntitySystem
 
     private void OnInit(Entity<DisposalSignallerComponent> ent, ref ComponentInit args)
     {
-        _link.EnsureSourcePorts(ent, ent.Comp.Port);
+        _link.EnsureSourcePorts(ent.Owner, ent.Comp.Port);
     }
 
     private void OnGetNextDirection(Entity<DisposalSignallerComponent> ent, ref GetDisposalsNextDirectionEvent args)
     {
-        _link.InvokePort(ent, ent.Comp.Port);
+        _link.InvokePort(ent.Owner, ent.Comp.Port);
     }
 }
diff --git a/Content.Shared/DoAfter/ActiveDoAfterComponent.cs b/Content.Shared/DoAfter/ActiveDoAfterComponent.cs
index 9554f9e5cf..66a3b30a3c 100644
--- a/Content.Shared/DoAfter/ActiveDoAfterComponent.cs
+++ b/Content.Shared/DoAfter/ActiveDoAfterComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.DoAfter;
 
diff --git a/Content.Shared/DoAfter/DoAfterArgs.cs b/Content.Shared/DoAfter/DoAfterArgs.cs
index 7ac5761c48..6f0b6bc6b5 100644
--- a/Content.Shared/DoAfter/DoAfterArgs.cs
+++ b/Content.Shared/DoAfter/DoAfterArgs.cs
@@ -96,6 +96,12 @@ public sealed partial class DoAfterArgs
     [DataField]
     public bool NeedFreeHand;
 
+    /// <summary>
+    /// Whether or not this do after requires you to have any empty hand,
+    /// </summary>
+    [DataField]
+    public bool NeedAnyFreeHand;
+
     /// <summary>
     ///     Whether we need to keep our active hand as is (i.e. can't change hand or change item). This also covers
     ///     requiring the hand to be free (if applicable). This does nothing if <see cref="NeedHand"/> is false.
@@ -265,6 +271,7 @@ public sealed partial class DoAfterArgs
         Broadcast = other.Broadcast;
         NeedHand = other.NeedHand;
         NeedFreeHand = other.NeedFreeHand;
+        NeedAnyFreeHand = other.NeedAnyFreeHand;
         BreakOnHandChange = other.BreakOnHandChange;
         BreakOnDropItem = other.BreakOnDropItem;
         BreakOnMove = other.BreakOnMove;
diff --git a/Content.Shared/DoAfter/DoAfterArgsComponent.cs b/Content.Shared/DoAfter/DoAfterArgsComponent.cs
index bae1d37983..de4e9cd763 100644
--- a/Content.Shared/DoAfter/DoAfterArgsComponent.cs
+++ b/Content.Shared/DoAfter/DoAfterArgsComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.FixedPoint;
+using Content.Shared.FixedPoint;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.DoAfter;
diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
index 0ca3314942..b5eed2a381 100644
--- a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
+++ b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
@@ -267,6 +267,9 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
             //If the user's hand is no longer empty, interrupt the do-after.
             if (args.NeedFreeHand & !_hands.ActiveHandIsEmpty(args.User))
                 return true;
+
+            if (args.NeedAnyFreeHand && _hands.GetEmptyHandCount((args.User, hands)) == 0)
+                return true;
         }
 
         if (args.RequireCanInteract && !_actionBlocker.CanInteract(args.User, args.Target))
diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.cs
index 2ef5eb3d82..5f4d84c422 100644
--- a/Content.Shared/DoAfter/SharedDoAfterSystem.cs
+++ b/Content.Shared/DoAfter/SharedDoAfterSystem.cs
@@ -290,10 +290,8 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
         doAfter.NetUserPosition = GetNetCoordinates(doAfter.UserPosition);
         doAfter.NetMovementEntity = GetNetEntity(doAfter.MovementEntity);
 
-        // For this we need to stay on the same hand slot and need the same item in that hand slot
-        // (or if there is no item there we need to keep it free).
-        // The NeedFreeHand arg requires us to have our active hand empty.
-        if (args.NeedHand && (args.BreakOnHandChange || args.BreakOnDropItem))
+        // Check hand statuses; whether you have one, if its free (or any), and set up for breaking on change/drop.
+        if (args.NeedHand)
         {
             if (!TryComp(args.User, out HandsComponent? handsComponent))
                 return false;
@@ -301,8 +299,14 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
             if (args.NeedFreeHand && !_hands.ActiveHandIsEmpty(args.User))
                 return false;
 
-            doAfter.InitialHand = handsComponent.ActiveHandId;
-            doAfter.InitialItem = _hands.GetActiveItem((args.User, handsComponent));
+            if (args.NeedAnyFreeHand && _hands.GetEmptyHandCount((args.User, handsComponent)) == 0)
+                return false;
+
+            if (args.BreakOnHandChange || args.BreakOnDropItem)
+            {
+                doAfter.InitialHand = handsComponent.ActiveHandId;
+                doAfter.InitialItem = _hands.GetActiveItem((args.User, handsComponent));
+            }
         }
 
         doAfter.NetInitialItem = GetNetEntity(doAfter.InitialItem);
diff --git a/Content.Shared/Doors/Components/TurnstileComponent.cs b/Content.Shared/Doors/Components/TurnstileComponent.cs
index ecde5f4748..5b5e63f3c1 100644
--- a/Content.Shared/Doors/Components/TurnstileComponent.cs
+++ b/Content.Shared/Doors/Components/TurnstileComponent.cs
@@ -43,7 +43,7 @@ public sealed partial class TurnstileComponent : Component
     /// Sound to play when the turnstile admits a mob through.
     /// </summary>
     [DataField]
-    public SoundSpecifier? TurnSound = new SoundPathSpecifier("/Audio/Items/ratchet.ogg", AudioParams.Default.WithVolume(-6));
+    public SoundSpecifier? TurnSound = new SoundPathSpecifier("/Audio/Effects/teleport_arrival.ogg", AudioParams.Default.WithVolume(-6));
 
     /// <summary>
     /// Sound to play when the turnstile denies entry
diff --git a/Content.Shared/DragDrop/SharedDragDropSystem.cs b/Content.Shared/DragDrop/SharedDragDropSystem.cs
index 8a4584a0ff..af5215b564 100644
--- a/Content.Shared/DragDrop/SharedDragDropSystem.cs
+++ b/Content.Shared/DragDrop/SharedDragDropSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.ActionBlocker;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Interaction;
 
 namespace Content.Shared.DragDrop;
diff --git a/Content.Shared/Dragon/DragonEvents.cs b/Content.Shared/Dragon/DragonEvents.cs
index e3db9c32da..255bd9ad71 100644
--- a/Content.Shared/Dragon/DragonEvents.cs
+++ b/Content.Shared/Dragon/DragonEvents.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 
 namespace Content.Shared.Dragon;
 
diff --git a/Content.Shared/Drunk/DrunkStatusEffectComponent.cs b/Content.Shared/Drunk/DrunkStatusEffectComponent.cs
index 69ad7c3ad9..c91421d1d0 100644
--- a/Content.Shared/Drunk/DrunkStatusEffectComponent.cs
+++ b/Content.Shared/Drunk/DrunkStatusEffectComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Drunk;
 
diff --git a/Content.Shared/Emoting/EmoteEvents.cs b/Content.Shared/Emoting/EmoteEvents.cs
index 931395ee7e..5d60475fd1 100644
--- a/Content.Shared/Emoting/EmoteEvents.cs
+++ b/Content.Shared/Emoting/EmoteEvents.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Emoting;
+namespace Content.Shared.Emoting;
 
 public sealed class EmoteAttemptEvent(EntityUid uid) : CancellableEntityEventArgs
 {
diff --git a/Content.Shared/Emoting/EmoteSystem.cs b/Content.Shared/Emoting/EmoteSystem.cs
index 11db796fa9..a9b8da1fd6 100644
--- a/Content.Shared/Emoting/EmoteSystem.cs
+++ b/Content.Shared/Emoting/EmoteSystem.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Emoting;
+namespace Content.Shared.Emoting;
 
 public sealed partial class EmoteSystem : EntitySystem
 {
diff --git a/Content.Shared/Engineering/Components/InflatableSafeDisassemblyComponent.cs b/Content.Shared/Engineering/Components/InflatableSafeDisassemblyComponent.cs
index 47591b6eb9..e0cf0a2e97 100644
--- a/Content.Shared/Engineering/Components/InflatableSafeDisassemblyComponent.cs
+++ b/Content.Shared/Engineering/Components/InflatableSafeDisassemblyComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Engineering.Systems;
+using Content.Shared.Engineering.Systems;
 using Content.Shared.Weapons.Melee.Balloon;
 
 namespace Content.Shared.Engineering.Components;
diff --git a/Content.Shared/Engineering/Systems/InflatableSafeDisassemblySystem.cs b/Content.Shared/Engineering/Systems/InflatableSafeDisassemblySystem.cs
index 95114cb406..dfde98873f 100644
--- a/Content.Shared/Engineering/Systems/InflatableSafeDisassemblySystem.cs
+++ b/Content.Shared/Engineering/Systems/InflatableSafeDisassemblySystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Engineering.Components;
+using Content.Shared.Engineering.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Weapons.Melee.Balloon;
diff --git a/Content.Shared/Ensnaring/Components/EnsnaringComponent.cs b/Content.Shared/Ensnaring/Components/EnsnaringComponent.cs
index 0a4f69e80e..72886bdb84 100644
--- a/Content.Shared/Ensnaring/Components/EnsnaringComponent.cs
+++ b/Content.Shared/Ensnaring/Components/EnsnaringComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Audio;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Ensnaring.Components;
diff --git a/Content.Shared/Ensnaring/EnsnareableVisuals.cs b/Content.Shared/Ensnaring/EnsnareableVisuals.cs
index ff9def0428..8c6c36b488 100644
--- a/Content.Shared/Ensnaring/EnsnareableVisuals.cs
+++ b/Content.Shared/Ensnaring/EnsnareableVisuals.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Ensnaring;
 
diff --git a/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs b/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs
index 57e5172eb7..3ecf874613 100644
--- a/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs
+++ b/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs
@@ -162,8 +162,8 @@ public abstract partial class SharedEnsnareableSystem : EntitySystem
             BreakOnDamage = false,
             NeedHand = true,
             BreakOnDropItem = false,
-            NeedFreeHand = true,
-            BreakOnHandChange = true,
+            NeedAnyFreeHand = true,
+            BreakOnHandChange = false,
         };
 
         if (!_doAfter.TryStartDoAfter(doAfterEventArgs))
diff --git a/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs b/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs
index ece979a6a8..48f5c4f80f 100644
--- a/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs
+++ b/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityConditions.Conditions.Body;
 
diff --git a/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs
index cabf731939..1a1588b3fb 100644
--- a/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Body.Components;
+using Content.Shared.Body.Components;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityConditions.Conditions.Body;
diff --git a/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityConditionSystem.cs
index ad294fc5d6..955c8901c6 100644
--- a/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityConditionSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Localizations;
 using Content.Shared.Metabolism;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs
index 19debb024a..025cbcbd0a 100644
--- a/Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mobs;
+using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityConditions/Conditions/Body/MouthUncoveredEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/MouthUncoveredEntityConditionSystem.cs
new file mode 100644
index 0000000000..4f1cc2d913
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/Body/MouthUncoveredEntityConditionSystem.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Inventory;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions.Body;
+
+/// <summary>
+/// A condition which passes if the specified entity has their mouth uncovered, generally meaning they're able to eat or drink.
+/// </summary>
+public sealed partial class MouthUncoveredEntityConditionSystem : EntityConditionSystem<InventoryComponent, MouthUncoveredCondition>
+{
+    [Dependency] private IngestionSystem _ingestion = default!;
+
+    /// <inheritdoc/>
+    protected override void Condition(Entity<InventoryComponent> entity, ref EntityConditionEvent<MouthUncoveredCondition> args)
+    {
+        args.Result = _ingestion.HasMouthAvailable(entity, args.Condition.Slots);
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class MouthUncoveredCondition : EntityConditionBase<MouthUncoveredCondition>
+{
+    /// <summary>
+    /// The slots to check for <see cref="IngestionBlockerComponent"/>.
+    /// </summary>
+    [DataField]
+    public SlotFlags Slots = SlotFlags.HEAD | SlotFlags.MASK;
+
+    /// <inheritdoc/>
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype)
+    {
+        return Loc.GetString("entity-condition-guidebook-mouth-uncovered-condition");
+    }
+}
diff --git a/Content.Shared/EntityConditions/Conditions/Mind/AntagonistEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Mind/AntagonistEntityConditionSystem.cs
index 796c4498af..e49e1b2f5b 100644
--- a/Content.Shared/EntityConditions/Conditions/Mind/AntagonistEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/Mind/AntagonistEntityConditionSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mind;
+using Content.Shared.Mind;
 using Content.Shared.Roles;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityConditions/Conditions/Mind/BodyWhitelistEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Mind/BodyWhitelistEntityConditionSystem.cs
index d8ebcdd15d..8367e36343 100644
--- a/Content.Shared/EntityConditions/Conditions/Mind/BodyWhitelistEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/Mind/BodyWhitelistEntityConditionSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mind;
+using Content.Shared.Mind;
 using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityConditions/Conditions/Mind/JobEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Mind/JobEntityConditionSystem.cs
index ccdbd53d7e..6724842865 100644
--- a/Content.Shared/EntityConditions/Conditions/Mind/JobEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/Mind/JobEntityConditionSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Localizations;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
diff --git a/Content.Shared/EntityConditions/Conditions/Mind/ObjectiveTargetEntityCondition.cs b/Content.Shared/EntityConditions/Conditions/Mind/ObjectiveTargetEntityCondition.cs
index 053d645577..6c87c64847 100644
--- a/Content.Shared/EntityConditions/Conditions/Mind/ObjectiveTargetEntityCondition.cs
+++ b/Content.Shared/EntityConditions/Conditions/Mind/ObjectiveTargetEntityCondition.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Whitelist;
+using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityConditions.Conditions.Mind;
diff --git a/Content.Shared/EntityConditions/Conditions/Mind/ObjectiveWhitelistEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Mind/ObjectiveWhitelistEntityConditionSystem.cs
index 3c42196bbd..5402f4d254 100644
--- a/Content.Shared/EntityConditions/Conditions/Mind/ObjectiveWhitelistEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/Mind/ObjectiveWhitelistEntityConditionSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mind;
+using Content.Shared.Mind;
 using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityConditions/Conditions/Mind/RoleEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Mind/RoleEntityConditionSystem.cs
index 59633031e9..a60b93321b 100644
--- a/Content.Shared/EntityConditions/Conditions/Mind/RoleEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/Mind/RoleEntityConditionSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Localizations;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
diff --git a/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs
index c721c2fc9d..c46a2a9867 100644
--- a/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs
index e873990544..3b23a98438 100644
--- a/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Localizations;
+using Content.Shared.Localizations;
 using Content.Shared.Tag;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs
index 2e2bccb35c..ecf6f98fc6 100644
--- a/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Localizations;
+using Content.Shared.Localizations;
 using Content.Shared.Tag;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs
index 8f2d553d32..3c13089d3b 100644
--- a/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Tag;
+using Content.Shared.Tag;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityConditions.Conditions.Tags;
diff --git a/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs
index 6a818a1d33..64bd8dbab9 100644
--- a/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.Temperature.Components;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityConditions/Conditions/TemplateEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/TemplateEntityConditionSystem.cs
index fbb659b54f..f044b3564e 100644
--- a/Content.Shared/EntityConditions/Conditions/TemplateEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/TemplateEntityConditionSystem.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityConditions.Conditions;
 ///<summary>
diff --git a/Content.Shared/EntityEffects/Effects/AddActionEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/AddActionEntityEffectSystem.cs
new file mode 100644
index 0000000000..6c0ca5a186
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/AddActionEntityEffectSystem.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Actions;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Adds an action unless this entity already has one from the same prototype.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class AddActionEntityEffectSystem : EntityEffectSystem<MetaDataComponent, AddAction>
+{
+    [Dependency] private SharedActionsSystem _actions = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<AddAction> args)
+    {
+        var actionPrototype = args.Effect.Action;
+        foreach (var action in _actions.GetActions(entity))
+        {
+            if (actionPrototype.Equals(MetaData(action).EntityPrototype?.ID))
+                return;
+        }
+
+        _actions.AddAction(entity, actionPrototype);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AddAction : EntityEffectBase<AddAction>
+{
+    /// <summary>
+    /// Action entity prototype to grant to this entity.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Action;
+}
diff --git a/Content.Shared/EntityEffects/Effects/AddComponentsEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/AddComponentsEntityEffectSystem.cs
new file mode 100644
index 0000000000..b9b4923bfe
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/AddComponentsEntityEffectSystem.cs
@@ -0,0 +1,31 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Adds a set of components to this entity.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class AddComponentsEntityEffectSystem : EntityEffectSystem<MetaDataComponent, AddComponents>
+{
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<AddComponents> args)
+    {
+        EntityManager.AddComponents(entity, args.Effect.Components, args.Effect.ReplaceExisting);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AddComponents : EntityEffectBase<AddComponents>
+{
+    /// <summary>
+    /// Components to add to this entity.
+    /// </summary>
+    [DataField(required: true)]
+    public ComponentRegistry Components = new();
+
+    /// <summary>
+    /// Replace existing components instead of keeping their current configuration.
+    /// </summary>
+    [DataField]
+    public bool ReplaceExisting;
+}
diff --git a/Content.Shared/EntityEffects/Effects/AddMindRoleEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/AddMindRoleEntityEffectSystem.cs
new file mode 100644
index 0000000000..82332caa8a
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/AddMindRoleEntityEffectSystem.cs
@@ -0,0 +1,40 @@
+using Content.Shared.Mind;
+using Content.Shared.Roles;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Adds a role to this entity's mind unless that role prototype is already present.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class AddMindRoleEntityEffectSystem : EntityEffectSystem<MetaDataComponent, AddMindRole>
+{
+    [Dependency] private SharedMindSystem _mind = default!;
+    [Dependency] private SharedRoleSystem _role = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<AddMindRole> args)
+    {
+        if (!_mind.TryGetMind(entity, out var mindId, out var mind))
+            return;
+
+        var rolePrototype = args.Effect.Role;
+        foreach (var role in mind.MindRoleContainer.ContainedEntities)
+        {
+            if (rolePrototype.Equals(MetaData(role).EntityPrototype?.ID))
+                return;
+        }
+
+        _role.MindAddRole(mindId, rolePrototype, mind);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AddMindRole : EntityEffectBase<AddMindRole>
+{
+    /// <summary>
+    /// Mind role entity prototype to grant to this entity's mind.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Role;
+}
diff --git a/Content.Shared/EntityEffects/Effects/AddUserInterfacesEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/AddUserInterfacesEntityEffectSystem.cs
new file mode 100644
index 0000000000..0c5d89798d
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/AddUserInterfacesEntityEffectSystem.cs
@@ -0,0 +1,30 @@
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Adds or replaces the specified user interfaces without removing other interfaces.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class AddUserInterfacesEntityEffectSystem : EntityEffectSystem<MetaDataComponent, AddUserInterfaces>
+{
+    [Dependency] private SharedUserInterfaceSystem _ui = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<AddUserInterfaces> args)
+    {
+        var userInterface = EnsureComp<UserInterfaceComponent>(entity);
+
+        foreach (var (key, data) in args.Effect.Interfaces)
+        {
+            _ui.SetUi((entity.Owner, userInterface), key, data);
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AddUserInterfaces : EntityEffectBase<AddUserInterfaces>
+{
+    /// <summary>
+    /// Interfaces to add or replace, keyed by their UI enum key.
+    /// </summary>
+    [DataField(required: true)]
+    public Dictionary<Enum, InterfaceData> Interfaces = new();
+}
diff --git a/Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs
index f2b16e21eb..49ef27bb0a 100644
--- a/Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Alert;
+using Content.Shared.Alert;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
@@ -8,7 +8,7 @@ namespace Content.Shared.EntityEffects.Effects;
 /// Adjusts a given alert on this entity.
 /// </summary>
 /// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class AdjustAlertEntityEffectSysten : EntityEffectSystem<AlertsComponent, AdjustAlert>
+public sealed partial class AdjustAlertEntityEffectSystem : EntityEffectSystem<AlertsComponent, AdjustAlert>
 {
     [Dependency] private IGameTiming _timing = default!;
     [Dependency] private AlertsSystem _alerts = default!;
diff --git a/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs
index 418730e33a..065546d7e9 100644
--- a/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Temperature.Components;
+using Content.Shared.Temperature.Components;
 using Content.Shared.Temperature.Systems;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs
index 50228b963f..11d4ead82f 100644
--- a/Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Popups;
+using Content.Shared.Popups;
 using Content.Shared.Xenoarchaeology.Artifact;
 using Content.Shared.Xenoarchaeology.Artifact.Components;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/EntityEffects/Effects/Atmos/CreateGasEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Atmos/CreateGasEntityEffect.cs
index 9614933247..ecd3b306d1 100644
--- a/Content.Shared/EntityEffects/Effects/Atmos/CreateGasEntityEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/Atmos/CreateGasEntityEffect.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos;
+using Content.Shared.Atmos;
 using Content.Shared.Atmos.EntitySystems;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityEffects/Effects/Atmos/ExtinguishEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Atmos/ExtinguishEntityEffectSystem.cs
index b4b475ec59..7a52ea7914 100644
--- a/Content.Shared/EntityEffects/Effects/Atmos/ExtinguishEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Atmos/ExtinguishEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos;
+using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityEffects/Effects/Atmos/FlammableEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Atmos/FlammableEntityEffect.cs
index 563201a40f..ff151f3324 100644
--- a/Content.Shared/EntityEffects/Effects/Atmos/FlammableEntityEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/Atmos/FlammableEntityEffect.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityEffects.Effects.Atmos;
diff --git a/Content.Shared/EntityEffects/Effects/Atmos/IgniteEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Atmos/IgniteEntityEffect.cs
index 7ca93e7c18..159f917e6f 100644
--- a/Content.Shared/EntityEffects/Effects/Atmos/IgniteEntityEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/Atmos/IgniteEntityEffect.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityEffects.Effects.Atmos;
diff --git a/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs
index db8cdf2a37..ed456f89f6 100644
--- a/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Body.Components;
+using Content.Shared.Body.Components;
 using Content.Shared.Body.Systems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
diff --git a/Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs
index e0e9d33a87..4dcf0edd74 100644
--- a/Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Eye.Blinding.Systems;
+using Content.Shared.Eye.Blinding.Systems;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityEffects.Effects.Body;
diff --git a/Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs
index 79b2e3ce49..6f311b2790 100644
--- a/Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Body.Components;
+using Content.Shared.Body.Components;
 using Content.Shared.Body.Systems;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs
index cd864fd964..3f4cb75403 100644
--- a/Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Body.Components;
+using Content.Shared.Body.Components;
 using Content.Shared.Body.Systems;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/EntityEffects/Effects/Body/ModifyLungGasEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ModifyLungGasEntityEffectSystem.cs
index 9bfa772b0f..fa4600763e 100644
--- a/Content.Shared/EntityEffects/Effects/Body/ModifyLungGasEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Body/ModifyLungGasEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos;
+using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
 
 namespace Content.Shared.EntityEffects.Effects.Body;
diff --git a/Content.Shared/EntityEffects/Effects/Body/OxygenateEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Body/OxygenateEntityEffect.cs
index 9790fced4e..88f8cb73da 100644
--- a/Content.Shared/EntityEffects/Effects/Body/OxygenateEntityEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/Body/OxygenateEntityEffect.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.EntityEffects.Effects.Body;
+namespace Content.Shared.EntityEffects.Effects.Body;
 
 /// <summary>
 /// See serverside system.
diff --git a/Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs
index ee25c76488..87f47a0a89 100644
--- a/Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos.Rotting;
+using Content.Shared.Atmos.Rotting;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityEffects.Effects.Body;
diff --git a/Content.Shared/EntityEffects/Effects/Body/RemoveOrgansEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/RemoveOrgansEntityEffectSystem.cs
new file mode 100644
index 0000000000..e739c84a71
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/RemoveOrgansEntityEffectSystem.cs
@@ -0,0 +1,93 @@
+using Content.Shared.Body;
+using Content.Shared.Whitelist;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// Drops or deletes organs matching the category and entity filters.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class RemoveOrgansEntityEffectSystem : EntityEffectSystem<BodyComponent, RemoveOrgans>
+{
+    [Dependency] private BodySystem _body = default!;
+    [Dependency] private SharedTransformSystem _transform = default!;
+    [Dependency] private EntityWhitelistSystem _whitelist = default!;
+
+    protected override void Effect(Entity<BodyComponent> entity, ref EntityEffectEvent<RemoveOrgans> args)
+    {
+        var categories = args.Effect.Categories;
+        var excludedCategories = args.Effect.ExcludedCategories;
+        var maxCount = args.Effect.MaxCount;
+        var delete = args.Effect.Delete;
+
+        if (maxCount is <= 0)
+            return;
+
+        var selected = new List<EntityUid>();
+        foreach (var organ in _body.EnumerateOrgans<TransformComponent>(entity.AsNullable()))
+        {
+            if (!_whitelist.CheckBoth(organ, args.Effect.Blacklist, args.Effect.Whitelist))
+                continue;
+
+            var category = organ.Comp1.Category;
+            if (categories != null && (category == null || !categories.Contains(category.Value)))
+                continue;
+
+            if (category != null && excludedCategories.Contains(category.Value))
+                continue;
+
+            selected.Add(organ);
+            if (selected.Count == maxCount)
+                break;
+        }
+
+        foreach (var organ in selected)
+        {
+            if (delete)
+                PredictedQueueDel(organ);
+            else
+                _transform.AttachToGridOrMap(organ);
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class RemoveOrgans : EntityEffectBase<RemoveOrgans>
+{
+    /// <summary>
+    /// Categories to remove. Null allows any category, including uncategorized organs.
+    /// </summary>
+    [DataField]
+    public HashSet<ProtoId<OrganCategoryPrototype>>? Categories;
+
+    /// <summary>
+    /// Categories to keep, even if included in Categories.
+    /// </summary>
+    [DataField]
+    public HashSet<ProtoId<OrganCategoryPrototype>> ExcludedCategories = [];
+
+    /// <summary>
+    /// Additional filter for the organs, not the body.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    /// Organs to keep regardless of the other filters.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist;
+
+    /// <summary>
+    /// Delete selected organs instead of dropping them.
+    /// </summary>
+    [DataField]
+    public bool Delete;
+
+    /// <summary>
+    /// Maximum number to remove in body enumeration order. Null removes all matches; zero or less removes none.
+    /// </summary>
+    [DataField]
+    public int? MaxCount;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs
index c0d57abb68..17ed57c8e4 100644
--- a/Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Nutrition.Prototypes;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/EntityEffects/Effects/Body/SpillBloodstreamEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/SpillBloodstreamEntityEffectSystem.cs
new file mode 100644
index 0000000000..2c405e755d
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/SpillBloodstreamEntityEffectSystem.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Systems;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// Spills all bloodstream solutions from this entity.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class SpillBloodstreamEntityEffectSystem : EntityEffectSystem<BloodstreamComponent, SpillBloodstream>
+{
+    [Dependency] private BloodstreamSystem _bloodstream = default!;
+
+    protected override void Effect(Entity<BloodstreamComponent> entity, ref EntityEffectEvent<SpillBloodstream> args)
+    {
+        _bloodstream.SpillAllSolutions(entity.AsNullable());
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class SpillBloodstream : EntityEffectBase<SpillBloodstream>;
diff --git a/Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs
index db4805db54..0d83edc190 100644
--- a/Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Medical;
+using Content.Shared.Medical;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityEffects.Effects.Body;
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs
index 8beed62797..cd6e38198b 100644
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Botany.Components;
 using Content.Shared.Botany.Systems;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
 
@@ -16,12 +17,18 @@ public sealed partial class PlantAdjustMutationLevelEntityEffectSystem : EntityE
         if (_plantHolder.IsDead(entity.Owner))
             return;
 
-        _plantHolder.AdjustsMutationLevel(entity.Owner, args.Effect.Amount);
+        _plantHolder.AdjustsMutationLevel(entity.Owner, args.Effect.MutationTable, args.Effect.Amount);
     }
 }
 
 /// <inheritdoc cref="EntityEffect"/>
 public sealed partial class PlantAdjustMutationLevel : BasePlantAdjustAttribute<PlantAdjustMutationLevel>
 {
+    /// <summary>
+    /// The mutation table whose level is adjusted.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<RandomPlantMutationListPrototype> MutationTable;
+
     public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-level";
 }
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPestsEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPestsEntityEffectSystem.cs
index 2637133b0f..4a2273e3f5 100644
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPestsEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPestsEntityEffectSystem.cs
@@ -13,7 +13,7 @@ public sealed partial class PlantAdjustPestsEntityEffectSystem : EntityEffectSys
 
     protected override void Effect(Entity<PlantTrayComponent> entity, ref EntityEffectEvent<PlantAdjustPests> args)
     {
-        if (!_plantTray.TryGetAlivePlant(entity.AsNullable()))
+        if (!_plantTray.HasAlivePlant(entity.AsNullable()))
             return;
 
         _plantTray.AdjustPest(entity.AsNullable(), args.Effect.Amount);
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxinsEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxinsEntityEffectSystem.cs
index 6254dcb5a9..cbf37a53a6 100644
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxinsEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxinsEntityEffectSystem.cs
@@ -13,7 +13,7 @@ public sealed partial class PlantAdjustToxinsEntityEffectSystem : EntityEffectSy
 
     protected override void Effect(Entity<PlantTrayComponent> entity, ref EntityEffectEvent<PlantAdjustToxins> args)
     {
-        if (!_plantTray.TryGetAlivePlant(entity.AsNullable()))
+        if (!_plantTray.HasAlivePlant(entity.AsNullable()))
             return;
 
         _plantTray.AdjustToxin(entity.AsNullable(), args.Effect.Amount);
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeedsEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeedsEntityEffectSystem.cs
index 7c94309631..12e26f284c 100644
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeedsEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeedsEntityEffectSystem.cs
@@ -13,7 +13,7 @@ public sealed partial class PlantAdjustWeedsEntityEffectSystem : EntityEffectSys
 
     protected override void Effect(Entity<PlantTrayComponent> entity, ref EntityEffectEvent<PlantAdjustWeeds> args)
     {
-        if (!_plantTray.TryGetAlivePlant(entity.AsNullable()))
+        if (!_plantTray.HasAlivePlant(entity.AsNullable()))
             return;
 
         _plantTray.AdjustWeed(entity.AsNullable(), args.Effect.Amount);
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeTraitsEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeTraitsEntityEffectSystem.cs
index 89ac66a2c1..129c16bde5 100644
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeTraitsEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeTraitsEntityEffectSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Botany.Components;
 using Content.Shared.Botany.Systems;
 using Content.Shared.Botany.Traits.Components;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
@@ -27,10 +28,23 @@ public sealed partial class PlantChangeTraitsEntityEffectSystem : EntityEffectSy
             return;
         }
 
-        if (args.Effect.Remove)
-            RemCompDeferred(entity.Owner, traitType.GetType());
-        else if (!HasComp(entity.Owner, traitType.GetType()))
-            AddComp(entity.Owner, traitType);
+        switch (args.Effect.Type)
+        {
+            case PlantChangeTraits.TraitModifyType.Add:
+                AddComp(entity.Owner, traitType);
+                break;
+            case PlantChangeTraits.TraitModifyType.Remove:
+                RemCompDeferred(entity.Owner, traitType.GetType());
+                break;
+            case PlantChangeTraits.TraitModifyType.Toggle:
+                if (HasComp(entity.Owner, traitType.GetType()))
+                    RemCompDeferred(entity.Owner, traitType.GetType());
+                else
+                    AddComp(entity.Owner, traitType);
+                break;
+            default:
+                break;
+        }
     }
 }
 
@@ -44,8 +58,37 @@ public sealed partial class PlantChangeTraits : EntityEffectBase<PlantChangeTrai
     public string Trait;
 
     /// <summary>
-    /// If true, the trait is removed. If false, the trait is added.
+    /// Defines how the trait should be modified.
     /// </summary>
     [DataField]
-    public bool Remove;
+    public TraitModifyType Type = TraitModifyType.Toggle;
+
+    public enum TraitModifyType
+    {
+        /// <summary>
+        /// Adds the trait if it is not already present.
+        /// </summary>
+        Add,
+
+        /// <summary>
+        /// Removes the trait if it is present.
+        /// </summary>
+        Remove,
+
+        /// <summary>
+        /// Adds the trait if it is not present, or removes it if it is already present.
+        /// </summary>
+        Toggle
+    }
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        var component = IoCManager.Resolve<IComponentFactory>().GetComponent(Trait);
+        if (component is not PlantTraitsComponent plantTrait || plantTrait.TraitName is not { } traitName)
+        {
+            return null;
+        }
+
+        return Loc.GetString("entity-effect-guidebook-plant-change-trait", [("change", Type.ToString()), ("chance", Probability), ("trait", Loc.GetString(traitName))]);
+    }
 }
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs
index b4f9ae27fc..eda68145dd 100644
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs
@@ -16,6 +16,7 @@ public sealed partial class PlantCryoxadoneEntityEffectSystem : EntityEffectSyst
     [Dependency] private PlantHolderSystem _plantHolder = default!;
     [Dependency] private PlantHarvestSystem _plantHarvest = default!;
     [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private BotanySystem _botany = default!;
 
     protected override void Effect(Entity<PlantComponent> entity, ref EntityEffectEvent<PlantCryoxadone> args)
     {
@@ -29,8 +30,14 @@ public sealed partial class PlantCryoxadoneEntityEffectSystem : EntityEffectSyst
         var deviation = plantHolder.Age > entity.Comp.Maturation
             ? (int)Math.Max(entity.Comp.Maturation - 1, plantHolder.Age - random.Next(7, 10))
             : (int)(entity.Comp.Maturation / entity.Comp.GrowthStages);
+        if (plantHolder.Age - deviation < 0)
+        {
+            _botany.TryRevertPlantToSeed(entity.Owner);
+            return;
+        }
 
-        _plantHarvest.AffectGrowth(entity.Owner, -deviation);
+        _plantHolder.AdjustsAge((entity.Owner, plantHolder), -deviation);
+        _plantHarvest.ResetHarvestProgress((entity.Owner, plantHolder));
         _plant.ForceUpdate(entity.AsNullable());
     }
 }
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximineEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximineEntityEffectSystem.cs
deleted file mode 100644
index c37c6876cb..0000000000
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximineEntityEffectSystem.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Content.Shared.Botany.Components;
-using Content.Shared.Botany.Systems;
-using Content.Shared.Botany.Traits.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
-
-/// <summary>
-/// Entity effect that removes the <see cref="PlantTraitUnviableComponent"/> from a plant.
-/// </summary>
-/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class PlantPhalanximineEntityEffectSystem : EntityEffectSystem<PlantComponent, PlantPhalanximine>
-{
-    [Dependency] private PlantHolderSystem _plantHolder = default!;
-
-    protected override void Effect(Entity<PlantComponent> entity, ref EntityEffectEvent<PlantPhalanximine> args)
-    {
-        if (_plantHolder.IsDead(entity.Owner))
-            return;
-
-        RemCompDeferred<PlantTraitUnviableComponent>(entity.Owner);
-    }
-}
-
-/// <inheritdoc cref="EntityEffect"/>
-public sealed partial class PlantPhalanximine : EntityEffectBase<PlantPhalanximine>
-{
-    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("entity-effect-guidebook-plant-phalanximine", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
index aef16c7bb5..7556ee2dd0 100644
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
@@ -16,8 +16,7 @@ public sealed partial class PlantMutateChemicalsEntityEffectSystem : EntityEffec
 
     protected override void Effect(Entity<PlantComponent> entity, ref EntityEffectEvent<PlantMutateChemicals> args)
     {
-        var randomChems = ProtoMan.Index(args.Effect.RandomPickBotanyReagent);
-        _plantChemicals.MutateRandomChemical(entity.Owner, randomChems);
+        _plantChemicals.MutateRandomChemical(entity.Owner, args.Effect.RandomChemTables);
     }
 }
 
@@ -25,10 +24,10 @@ public sealed partial class PlantMutateChemicalsEntityEffectSystem : EntityEffec
 public sealed partial class PlantMutateChemicals : EntityEffectBase<PlantMutateChemicals>
 {
     /// <summary>
-    /// The Reagent list this mutation draws from.
+    /// Chemical tables from which this mutation can select.
     /// </summary>
-    [DataField]
-    public ProtoId<WeightedRandomFillSolutionPrototype> RandomPickBotanyReagent = "RandomPickBotanyReagent";
+    [DataField(required: true)]
+    public List<ProtoId<WeightedRandomFillSolutionPrototype>> RandomChemTables = [];
 
     /// <inheritdoc/>
     public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
@@ -36,17 +35,20 @@ public sealed partial class PlantMutateChemicals : EntityEffectBase<PlantMutateC
         var list = new List<string>();
 
         // If your table doesn't exist, no guidebook for you!
-        if (!prototype.Resolve(RandomPickBotanyReagent, out var table))
-            return string.Empty;
-
-        foreach (var fill in table.Fills)
+        foreach (var tableId in RandomChemTables)
         {
-            foreach (var reagent in fill.Reagents)
-            {
-                if (!prototype.Resolve(reagent, out var proto))
-                    continue;
+            if (!prototype.Resolve(tableId, out var table))
+                continue;
 
-                list.Add(proto.LocalizedName);
+            foreach (var fill in table.Fills)
+            {
+                foreach (var reagent in fill.Reagents)
+                {
+                    if (!prototype.Resolve(reagent, out var reagentPrototype))
+                        continue;
+
+                    list.Add(reagentPrototype.LocalizedName);
+                }
             }
         }
 
diff --git a/Content.Shared/EntityEffects/Effects/Damage/DistributedHealthChangeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Damage/DistributedHealthChangeEntityEffectSystem.cs
index 71a0431b79..4672dc6748 100644
--- a/Content.Shared/EntityEffects/Effects/Damage/DistributedHealthChangeEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Damage/DistributedHealthChangeEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Damage.Systems;
 using Content.Shared.FixedPoint;
diff --git a/Content.Shared/EntityEffects/Effects/Damage/EvenHealthChangeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Damage/EvenHealthChangeEntityEffectSystem.cs
index a24f74b9c9..8dab5a2f54 100644
--- a/Content.Shared/EntityEffects/Effects/Damage/EvenHealthChangeEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Damage/EvenHealthChangeEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Damage.Systems;
 using Content.Shared.FixedPoint;
diff --git a/Content.Shared/EntityEffects/Effects/Damage/HealthChangeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Damage/HealthChangeEntityEffectSystem.cs
index 6b70604c55..b1d5797bee 100644
--- a/Content.Shared/EntityEffects/Effects/Damage/HealthChangeEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Damage/HealthChangeEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage;
+using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Damage.Systems;
diff --git a/Content.Shared/EntityEffects/Effects/Damage/LethalDamageEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Damage/LethalDamageEntityEffectSystem.cs
new file mode 100644
index 0000000000..8fd2289f9a
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Damage/LethalDamageEntityEffectSystem.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.Suicide;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Damage;
+
+/// <summary>
+/// Applies damage through the suicide system to reach the highest mob threshold.
+/// Has no effect on entities without mob thresholds.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class LethalDamageEntityEffectSystem : EntityEffectSystem<DamageableComponent, LethalDamage>
+{
+    [Dependency] private SharedSuicideSystem _suicide = default!;
+
+    protected override void Effect(Entity<DamageableComponent> entity, ref EntityEffectEvent<LethalDamage> args)
+    {
+        _suicide.ApplyLethalDamage(entity, args.Effect.DamageType);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class LethalDamage : EntityEffectBase<LethalDamage>
+{
+    /// <summary>
+    /// Damage type used to deal the lethal damage.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<DamageTypePrototype> DamageType;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Damage/StaminaDamageEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Damage/StaminaDamageEntityEffectSystem.cs
new file mode 100644
index 0000000000..859dd9f4b0
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Damage/StaminaDamageEntityEffectSystem.cs
@@ -0,0 +1,29 @@
+using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Systems;
+
+namespace Content.Shared.EntityEffects.Effects.Damage;
+
+/// <summary>
+/// Deals stamina damage to this entity.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class StaminaDamageEntityEffectSystem : EntityEffectSystem<StaminaComponent, StaminaDamage>
+{
+    [Dependency] private SharedStaminaSystem _stamina = default!;
+
+    protected override void Effect(Entity<StaminaComponent> entity, ref EntityEffectEvent<StaminaDamage> args)
+    {
+        _stamina.TakeStaminaDamage(entity, args.Scale * args.Effect.Damage, entity.Comp, args.User);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class StaminaDamage : EntityEffectBase<StaminaDamage>
+{
+    /// <summary>
+    /// The amount of stamina damage we're dealing.
+    /// </summary>
+    [DataField(required: true)]
+    public float Damage;
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/EmoteEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EmoteEntityEffectSystem.cs
index 97bb965827..4379fc49e7 100644
--- a/Content.Shared/EntityEffects/Effects/EmoteEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/EmoteEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chat;
+using Content.Shared.Chat;
 using Content.Shared.Chat.Prototypes;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs
index 3f5d5b3b57..c86a313d1c 100644
--- a/Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
 
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs
index 25e828495d..cde6a8266b 100644
--- a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Network;
+using Robust.Shared.Network;
 
 namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
 
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs
index 2d6b851f51..a0eed98c55 100644
--- a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Containers;
+using Robust.Shared.Containers;
 using Robust.Shared.Network;
 
 namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs
index b59eebf23a..9c22c8c7df 100644
--- a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Containers;
+using Robust.Shared.Containers;
 using Robust.Shared.Network;
 
 namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs
index 818560427b..158cffe4fb 100644
--- a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Inventory;
+using Content.Shared.Inventory;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
diff --git a/Content.Shared/EntityEffects/Effects/ExplodeEntityEffect.cs b/Content.Shared/EntityEffects/Effects/ExplodeEntityEffect.cs
index ecad4e47ad..a2f3b065bf 100644
--- a/Content.Shared/EntityEffects/Effects/ExplodeEntityEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/ExplodeEntityEffect.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 using Content.Shared.EntityEffects.Effects.Transform;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs
index 424d6ea284..775fdb5378 100644
--- a/Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Network;
+using Robust.Shared.Network;
 using Robust.Shared.Random;
 
 namespace Content.Shared.EntityEffects.Effects;
diff --git a/Content.Shared/EntityEffects/Effects/MakeSentientEntityEffect.cs b/Content.Shared/EntityEffects/Effects/MakeSentientEntityEffect.cs
index 4beb21454c..aa9b1b3eba 100644
--- a/Content.Shared/EntityEffects/Effects/MakeSentientEntityEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/MakeSentientEntityEffect.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityEffects.Effects;
 
diff --git a/Content.Shared/EntityEffects/Effects/PolymorphEntityEffect.cs b/Content.Shared/EntityEffects/Effects/PolymorphEntityEffect.cs
index c0d80dffaa..45c976854d 100644
--- a/Content.Shared/EntityEffects/Effects/PolymorphEntityEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/PolymorphEntityEffect.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Polymorph;
+using Content.Shared.Polymorph;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityEffects.Effects;
@@ -7,11 +7,18 @@ namespace Content.Shared.EntityEffects.Effects;
 public sealed partial class Polymorph : EntityEffectBase<Polymorph>
 {
     /// <summary>
-    ///     What polymorph prototype is used on effect
+    /// Polymorph configuration to apply.
     /// </summary>
     [DataField(required: true)]
     public ProtoId<PolymorphPrototype> Prototype;
 
+    /// <summary>
+    /// Allows polymorphing entities without a PolymorphableComponent.
+    /// Cooldowns and restrictions on repeated polymorphs still apply.
+    /// </summary>
+    [DataField]
+    public bool Force;
+
     public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
         => Loc.GetString("entity-effect-guidebook-make-polymorph",
             ("chance", Probability),
diff --git a/Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs
index 19d6fde731..a491737faf 100644
--- a/Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Traits.Assorted;
+using Content.Shared.Traits.Assorted;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityEffects.Effects;
diff --git a/Content.Shared/EntityEffects/Effects/ScaleEyeZoomEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/ScaleEyeZoomEntityEffectSystem.cs
new file mode 100644
index 0000000000..203d3ef88c
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ScaleEyeZoomEntityEffectSystem.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Systems;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Multiplies this entity's target eye zoom, ignoring normal zoom limits.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class ScaleEyeZoomEntityEffectSystem : EntityEffectSystem<ContentEyeComponent, ScaleEyeZoom>
+{
+    [Dependency] private SharedContentEyeSystem _contentEye = default!;
+
+    protected override void Effect(Entity<ContentEyeComponent> entity, ref EntityEffectEvent<ScaleEyeZoom> args)
+    {
+        _contentEye.SetZoom(entity, entity.Comp.TargetZoom * args.Effect.Factor, true, entity.Comp);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ScaleEyeZoom : EntityEffectBase<ScaleEyeZoom>
+{
+    /// <summary>
+    /// Multiplier for the current target zoom. Values below one zoom in; must be positive and finite.
+    /// </summary>
+    [DataField(required: true)]
+    public float Factor;
+}
diff --git a/Content.Shared/EntityEffects/Effects/SetCreamPiedEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/SetCreamPiedEntityEffectSystem.cs
new file mode 100644
index 0000000000..26e509f2cd
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/SetCreamPiedEntityEffectSystem.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Applies or removes cream pie coverage on this entity.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class SetCreamPiedEntityEffectSystem : EntityEffectSystem<CreamPiedComponent, SetCreamPied>
+{
+    [Dependency] private SharedCreamPieSystem _creamPie = default!;
+
+    protected override void Effect(Entity<CreamPiedComponent> entity, ref EntityEffectEvent<SetCreamPied> args)
+    {
+        _creamPie.SetCreamPied(entity.AsNullable(), args.Effect.Enabled);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class SetCreamPied : EntityEffectBase<SetCreamPied>
+{
+    /// <summary>
+    /// Whether to cover this entity in cream pie or clean it off.
+    /// </summary>
+    [DataField]
+    public bool Enabled = true;
+}
diff --git a/Content.Shared/EntityEffects/Effects/SetGodmodeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/SetGodmodeEntityEffectSystem.cs
new file mode 100644
index 0000000000..3602cd2b03
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/SetGodmodeEntityEffectSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Systems;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Enables or disables godmode on this entity.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class SetGodmodeEntityEffectSystem : EntityEffectSystem<MetaDataComponent, SetGodmode>
+{
+    [Dependency] private SharedGodmodeSystem _godmode = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<SetGodmode> args)
+    {
+        if (args.Effect.Enabled == HasComp<GodmodeComponent>(entity))
+            return;
+
+        if (args.Effect.Enabled)
+            _godmode.EnableGodmode(entity);
+        else
+            _godmode.DisableGodmode(entity);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class SetGodmode : EntityEffectBase<SetGodmode>
+{
+    /// <summary>
+    /// Whether to enable or disable godmode.
+    /// </summary>
+    [DataField]
+    public bool Enabled = true;
+}
diff --git a/Content.Shared/EntityEffects/Effects/SlipEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/SlipEntityEffectSystem.cs
new file mode 100644
index 0000000000..899b60012a
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/SlipEntityEffectSystem.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Slippery;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Attempts to slip this entity once, using its existing slippery settings when present.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class SlipEntityEffectSystem : EntityEffectSystem<MetaDataComponent, Slip>
+{
+    [Dependency] private SlipperySystem _slippery = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<Slip> args)
+    {
+        var hadSlipComponent = EnsureComp(entity, out SlipperyComponent slipComponent);
+        if (!hadSlipComponent)
+            slipComponent.SlipData = args.Effect.Slippery;
+
+        _slippery.TrySlip(entity, slipComponent, entity, false);
+        if (!hadSlipComponent)
+            RemComp(entity, slipComponent);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Slip : EntityEffectBase<Slip>
+{
+    /// <summary>
+    /// Slip settings to use when this entity has no existing slippery component.
+    /// </summary>
+    [DataField]
+    public SlipperyEffectEntry Slippery = new();
+}
diff --git a/Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs
index 9632a08b09..c6c28753b5 100644
--- a/Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Physics;
 using Content.Shared.Slippery;
 using Content.Shared.StepTrigger.Components;
diff --git a/Content.Shared/EntityEffects/Effects/Smite/FlingEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Smite/FlingEntityEffectSystem.cs
new file mode 100644
index 0000000000..ffa96bc2f9
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Smite/FlingEntityEffectSystem.cs
@@ -0,0 +1,84 @@
+using Content.Shared.Interaction.Components;
+using Content.Shared.Movement.Components;
+using Content.Shared.Random.Helpers;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.EntityEffects.Effects.Smite;
+
+/// <summary>
+/// Launches this entity as a spinning dynamic physics body.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class FlingEntityEffectSystem : EntityEffectSystem<PhysicsComponent, Fling>
+{
+    [Dependency] private FixtureSystem _fixtures = default!;
+    [Dependency] private SharedPhysicsSystem _physics = default!;
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private SharedTransformSystem _transform = default!;
+
+    protected override void Effect(Entity<PhysicsComponent> entity, ref EntityEffectEvent<Fling> args)
+    {
+        if (!TryComp<FixturesComponent>(entity, out var fixtures))
+            return;
+
+        // Input movers must stop using mob movement, otherwise the mover controller asserts on dynamic bodies.
+        if (HasComp<InputMoverComponent>(entity))
+            EnsureComp<BlockMovementComponent>(entity);
+
+        var fling = args.Effect;
+
+        _transform.Unanchor(entity);
+        _physics.SetBodyType(entity, BodyType.Dynamic, fixtures, entity.Comp);
+        _physics.SetBodyStatus(entity, entity.Comp, BodyStatus.InAir);
+        _physics.WakeBody(entity, manager: fixtures, body: entity.Comp);
+
+        foreach (var fixture in fixtures.Fixtures.Values)
+        {
+            if (fling.NonSolid)
+                _physics.SetHard(entity, fixture, false, fixtures);
+
+            if (fling.Restitution.HasValue && fixture.Hard)
+                _physics.SetRestitution(entity, fixture, fling.Restitution.Value, false, fixtures);
+        }
+
+        if (fling.Restitution.HasValue)
+            _fixtures.FixtureUpdate(entity, manager: fixtures, body: entity.Comp);
+
+        var random = SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(entity));
+        _physics.SetLinearVelocity(entity, random.NextVector2(fling.Speed, fling.Speed), manager: fixtures, body: entity.Comp);
+        _physics.SetAngularVelocity(entity, fling.AngularVelocity, manager: fixtures, body: entity.Comp);
+        _physics.SetLinearDamping(entity, entity.Comp, 0f);
+        _physics.SetAngularDamping(entity, entity.Comp, 0f);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Fling : EntityEffectBase<Fling>
+{
+    /// <summary>
+    /// Maximum magnitude of the random linear velocity applied on launch.
+    /// </summary>
+    [DataField]
+    public float Speed = 1.5f;
+
+    /// <summary>
+    /// Angular velocity applied on launch in radians per second.
+    /// </summary>
+    [DataField]
+    public float AngularVelocity = MathF.PI * 12f;
+
+    /// <summary>
+    /// Restitution applied to hard fixtures, making the entity bounce.
+    /// </summary>
+    [DataField]
+    public float? Restitution = 1.1f;
+
+    /// <summary>
+    /// Make all fixtures non-solid so the entity passes through obstacles.
+    /// </summary>
+    [DataField]
+    public bool NonSolid;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Smite/GhostKickEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Smite/GhostKickEntityEffect.cs
new file mode 100644
index 0000000000..4063355ebd
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Smite/GhostKickEntityEffect.cs
@@ -0,0 +1,11 @@
+namespace Content.Shared.EntityEffects.Effects.Smite;
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class GhostKickEffect : EntityEffectBase<GhostKickEffect>
+{
+    /// <summary>
+    /// Localization key of the disconnect reason shown to the kicked player.
+    /// </summary>
+    [DataField(required: true)]
+    public LocId Reason;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Smite/HomingRodEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Smite/HomingRodEntityEffect.cs
new file mode 100644
index 0000000000..851874c195
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Smite/HomingRodEntityEffect.cs
@@ -0,0 +1,31 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Smite;
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class HomingRod : EntityEffectBase<HomingRod>
+{
+    /// <summary>
+    /// Entity prototype of the rod to spawn.
+    /// </summary>
+    [DataField]
+    public EntProtoId Prototype = "ImmovableRodKeepTilesStill";
+
+    /// <summary>
+    /// Distance from the target at which the rod spawns.
+    /// </summary>
+    [DataField]
+    public float Distance = 200;
+
+    /// <summary>
+    /// Speed at which the rod chases the target.
+    /// </summary>
+    [DataField]
+    public float Speed = 20;
+
+    /// <summary>
+    /// Use the target's current sprint speed plus a small offset, falling back to Speed if unavailable.
+    /// </summary>
+    [DataField]
+    public bool MatchTargetSprintSpeed;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Smite/SiliconLawBoundEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Smite/SiliconLawBoundEntityEffect.cs
new file mode 100644
index 0000000000..437dc8aa34
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Smite/SiliconLawBoundEntityEffect.cs
@@ -0,0 +1,4 @@
+namespace Content.Shared.EntityEffects.Effects.Smite;
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class SiliconLawBound : EntityEffectBase<SiliconLawBound>;
diff --git a/Content.Shared/EntityEffects/Effects/Smite/StuffIntoLockerEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Smite/StuffIntoLockerEntityEffectSystem.cs
new file mode 100644
index 0000000000..387f4eab5e
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Smite/StuffIntoLockerEntityEffectSystem.cs
@@ -0,0 +1,37 @@
+using Content.Shared.Storage.EntitySystems;
+using Content.Shared.Tools.Systems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Smite;
+
+/// <summary>
+/// Spawns a locker, attempts to insert this entity, and welds it shut.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class StuffIntoLockerEntityEffectSystem : EntityEffectSystem<MetaDataComponent, StuffIntoLocker>
+{
+    [Dependency] private SharedEntityStorageSystem _entityStorage = default!;
+    [Dependency] private SharedTransformSystem _transform = default!;
+    [Dependency] private WeldableSystem _weldable = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<StuffIntoLocker> args)
+    {
+        var locker = PredictedSpawn(args.Effect.Prototype, _transform.GetMapCoordinates(entity));
+
+        _entityStorage.ToggleOpen(entity.Owner, locker);
+        _entityStorage.Insert(entity.Owner, locker);
+        _entityStorage.ToggleOpen(entity.Owner, locker);
+
+        _weldable.SetWeldedState(locker, true);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class StuffIntoLocker : EntityEffectBase<StuffIntoLocker>
+{
+    /// <summary>
+    /// Locker entity prototype to spawn and stuff this entity into.
+    /// </summary>
+    [DataField]
+    public EntProtoId Prototype = "ClosetMaintenance";
+}
diff --git a/Content.Shared/EntityEffects/Effects/Smite/TabletopDimensionEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Smite/TabletopDimensionEntityEffect.cs
new file mode 100644
index 0000000000..a22e676544
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Smite/TabletopDimensionEntityEffect.cs
@@ -0,0 +1,14 @@
+using Content.Shared.Tabletop.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Smite;
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class TabletopDimension : EntityEffectBase<TabletopDimension>
+{
+    /// <summary>
+    /// Tabletop game entity prototype whose board this entity is banished to.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId<TabletopGameComponent> Prototype;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs
index 28ceb59138..c97f81f555 100644
--- a/Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
diff --git a/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs
index 9fad33348c..78459db2ff 100644
--- a/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
diff --git a/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs
index 13175cfed1..a49abc1641 100644
--- a/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs
index 918f857985..6f222f4a22 100644
--- a/Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/BaseStatusEffectEntityEffect.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/BaseStatusEffectEntityEffect.cs
index b028da1595..091192ec7c 100644
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/BaseStatusEffectEntityEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/BaseStatusEffectEntityEffect.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
 
 /// <summary>
 /// Entity effect that specifically deals with new status effects.
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs
index 9a4716196b..9808c3bba3 100644
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Drunk;
+using Content.Shared.Drunk;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityEffects.Effects.StatusEffects;
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs
index 950f38e18b..07e49c3b40 100644
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Electrocution;
+using Content.Shared.Electrocution;
 using Content.Shared.StatusEffect;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs
index 73bb5d8f96..c78808524f 100644
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.StatusEffect;
+using Content.Shared.StatusEffect;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityEffects.Effects.StatusEffects;
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs
index 8cc1fd84bc..4e31c869c9 100644
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Jittering;
+using Content.Shared.Jittering;
 using Content.Shared.StatusEffect;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs
index d89f21427e..d208592d16 100644
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Standing;
+using Content.Shared.Standing;
 using Content.Shared.Stunnable;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs
index efd37bb258..316e0c6552 100644
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.StatusEffectNew;
+using Content.Shared.StatusEffectNew;
 using Content.Shared.Stunnable;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs
index ca784fc4e0..f7f20f5ccd 100644
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.StatusEffectNew;
+using Content.Shared.StatusEffectNew;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityEffects.Effects.StatusEffects;
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs
index 605c0ff727..87be19692c 100644
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.StatusEffectNew;
 using Robust.Shared.Prototypes;
@@ -17,9 +17,11 @@ public sealed partial class MovementSpeedModifierEntityEffectSystem : EntityEffe
 
     protected override void Effect(Entity<MovementSpeedModifierComponent> entity, ref EntityEffectEvent<MovementSpeedModifier> args)
     {
+        var duration = args.Effect.Time * args.Scale;
         var proto = args.Effect.EffectProto;
         var sprintMod = args.Effect.SprintSpeedModifier;
         var walkMod = args.Effect.WalkSpeedModifier;
+        var delay = args.Effect.Delay;
 
         switch (args.Effect.Type)
         {
@@ -27,35 +29,38 @@ public sealed partial class MovementSpeedModifierEntityEffectSystem : EntityEffe
                 _movementModStatus.TryUpdateMovementSpeedModDuration(
                     entity,
                     proto,
-                    args.Effect.Time * args.Scale,
+                    duration,
                     sprintMod,
-                    walkMod);
+                    walkMod,
+                    delay);
                 break;
             case StatusEffectMetabolismType.Add:
-                if (args.Effect.Time != null)
+                if (duration != null)
                 {
                     _movementModStatus.TryAddMovementSpeedModDuration(
                         entity,
                         proto,
-                        args.Effect.Time.Value * args.Scale,
+                        duration.Value,
                         sprintMod,
-                        walkMod);
+                        walkMod,
+                        delay);
                 }
                 else
                 {
                     _movementModStatus.TryUpdateMovementSpeedModDuration(
                         entity,
                         proto,
-                        args.Effect.Time * args.Scale,
+                        duration,
                         sprintMod,
-                        walkMod);
+                        walkMod,
+                        delay);
                 }
                 break;
             case StatusEffectMetabolismType.Remove:
-                _status.TryRemoveTime(entity, args.Effect.EffectProto, args.Effect.Time * args.Scale);
+                _status.TryRemoveTime(entity, args.Effect.EffectProto, duration);
                 break;
             case StatusEffectMetabolismType.Set:
-                _status.TrySetStatusEffectDuration(entity, proto, args.Effect.Time * args.Scale);
+                _status.TrySetStatusEffectDuration(entity, proto, duration, delay);
                 break;
         }
     }
diff --git a/Content.Shared/EntityEffects/Effects/SwapMovementSpeedsEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/SwapMovementSpeedsEntityEffectSystem.cs
new file mode 100644
index 0000000000..968236a9cb
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/SwapMovementSpeedsEntityEffectSystem.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Movement.Components;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Swaps this entity's base walk and sprint speeds, preserving their modifiers.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class SwapMovementSpeedsEntityEffectSystem : EntityEffectSystem<MovementSpeedModifierComponent, SwapMovementSpeeds>
+{
+    protected override void Effect(Entity<MovementSpeedModifierComponent> entity, ref EntityEffectEvent<SwapMovementSpeeds> args)
+    {
+        (entity.Comp.BaseSprintSpeed, entity.Comp.BaseWalkSpeed) =
+            (entity.Comp.BaseWalkSpeed, entity.Comp.BaseSprintSpeed);
+
+        Dirty(entity);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class SwapMovementSpeeds : EntityEffectBase<SwapMovementSpeeds>;
diff --git a/Content.Shared/EntityEffects/Effects/TemplateEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/TemplateEntityEffectSystem.cs
index ea7c2dc8d4..2ab85795d4 100644
--- a/Content.Shared/EntityEffects/Effects/TemplateEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/TemplateEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityEffects.Effects;
 
diff --git a/Content.Shared/EntityEffects/Effects/Transform/DeleteEntityEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/DeleteEntityEntityEffectSystem.cs
new file mode 100644
index 0000000000..130736e695
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Transform/DeleteEntityEntityEffectSystem.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Inventory;
+
+namespace Content.Shared.EntityEffects.Effects.Transform;
+
+/// <summary>
+/// Deletes the entity.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class DeleteEntityEntityEffectSystem : EntityEffectSystem<TransformComponent, DeleteEntity>
+{
+    [Dependency] private InventorySystem _inventory = default!;
+    [Dependency] private SharedTransformSystem _transform = default!;
+
+    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<DeleteEntity> args)
+    {
+        if (args.Effect.DropInventory)
+        {
+            foreach (var item in _inventory.GetHandOrInventoryEntities(entity.Owner))
+            {
+                _transform.DropNextTo(item, entity.Owner);
+            }
+        }
+
+        PredictedQueueDel(entity);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class DeleteEntity : EntityEffectBase<DeleteEntity>
+{
+    /// <summary>
+    /// Whether to drop the entity's inventory next to it before deleting it.
+    /// </summary>
+    [DataField]
+    public bool DropInventory = true;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs
index b5c516899e..b3b006a140 100644
--- a/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 using Content.Shared.Emp;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
index 907c4e321f..3bf77361f1 100644
--- a/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 using Content.Shared.Explosion;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs
index 917e3000a8..f314020b2f 100644
--- a/Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs
@@ -1,5 +1,6 @@
-using Content.Shared.Popups;
+using Content.Shared.Popups;
 using Robust.Shared.Network;
+using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 
@@ -23,7 +24,7 @@ public sealed partial class PopupMessageEntityEffectSystem : EntityEffectSystem<
 
         var msg = Loc.GetString(_random.Pick(args.Effect.Messages), ("entity", entity));
 
-        switch ((args.Effect.Method, args.Effect.Type))
+        switch (args.Effect.Method, args.Effect.Type)
         {
             case (PopupMethod.PopupEntity, PopupRecipients.Local):
                 _popup.PopupEntity(msg, entity, entity, args.Effect.VisualType);
@@ -37,6 +38,17 @@ public sealed partial class PopupMessageEntityEffectSystem : EntityEffectSystem<
             case (PopupMethod.PopupCoordinates, PopupRecipients.Pvs):
                 _popup.PopupCoordinates(msg, Transform(entity).Coordinates, args.Effect.VisualType);
                 break;
+            case (PopupMethod.PopupEntity, PopupRecipients.PvsExceptTarget):
+                _popup.PopupEntity(msg, entity, Filter.PvsExcept(entity), true, args.Effect.VisualType);
+                break;
+            case (PopupMethod.PopupCoordinates, PopupRecipients.PvsExceptTarget):
+                _popup.PopupCoordinates(
+                    msg,
+                    Transform(entity).Coordinates,
+                    Filter.PvsExcept(entity),
+                    true,
+                    args.Effect.VisualType);
+                break;
         }
     }
 }
@@ -76,6 +88,7 @@ public enum PopupRecipients : byte
 {
     Pvs,
     Local,
+    PvsExceptTarget,
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/EntityEffects/Effects/VariationPass/EntitySpawnVariationPassEntityEffect.cs b/Content.Shared/EntityEffects/Effects/VariationPass/EntitySpawnVariationPassEntityEffect.cs
index cdfad8e848..2a9ac1f231 100644
--- a/Content.Shared/EntityEffects/Effects/VariationPass/EntitySpawnVariationPassEntityEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/VariationPass/EntitySpawnVariationPassEntityEffect.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.EntityTable;
 using Content.Shared.EntityTable.EntitySelectors;
 using Content.Shared.Physics;
diff --git a/Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs
index 32a9863c1b..e53f808580 100644
--- a/Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityEffects/Effects/ZombieEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/ZombieEntityEffectsSystem.cs
index ea0e6f0e34..7dae4afd86 100644
--- a/Content.Shared/EntityEffects/Effects/ZombieEntityEffectsSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/ZombieEntityEffectsSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Zombies;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/EntityEffects/EntityEffectOnMapInitComponent.cs b/Content.Shared/EntityEffects/EntityEffectOnMapInitComponent.cs
index 64d51dfdb4..4339237165 100644
--- a/Content.Shared/EntityEffects/EntityEffectOnMapInitComponent.cs
+++ b/Content.Shared/EntityEffects/EntityEffectOnMapInitComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.EntityEffects;
+namespace Content.Shared.EntityEffects;
 
 /// <summary>
 /// Applies a set of EntityEffects to the entity upon map initialization.
diff --git a/Content.Shared/EntityTable/Conditions/EmptyContainerCondition.cs b/Content.Shared/EntityTable/Conditions/EmptyContainerCondition.cs
new file mode 100644
index 0000000000..a8b9bd00b2
--- /dev/null
+++ b/Content.Shared/EntityTable/Conditions/EmptyContainerCondition.cs
@@ -0,0 +1,30 @@
+using Content.Shared.EntityTable.EntitySelectors;
+using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityTable.Conditions;
+
+/// <summary>
+/// Condition that passes when a container has nothing in it.
+/// </summary>
+public sealed partial class EmptyContainerCondition : EntityTableCondition
+{
+    /// <summary>
+    /// Key for <see cref="EntityTableContext"/> to store container that should be checked by this condition.
+    /// </summary>
+    public const string ContainerContextKey = "Container";
+
+    /// <inheritdoc/>>
+    protected override bool EvaluateImplementation(
+        EntityTableSelector root,
+        IEntityManager entMan,
+        IPrototypeManager proto,
+        EntityTableContext ctx
+    )
+    {
+        if (!ctx.TryGetData<BaseContainer>(ContainerContextKey, out var container))
+            return false;
+
+        return container.Count == 0;
+    }
+}
diff --git a/Content.Shared/EntityTable/Conditions/ExcludeEntitiesFromContextCondition.cs b/Content.Shared/EntityTable/Conditions/ExcludeEntitiesFromContextCondition.cs
new file mode 100644
index 0000000000..573293ac7a
--- /dev/null
+++ b/Content.Shared/EntityTable/Conditions/ExcludeEntitiesFromContextCondition.cs
@@ -0,0 +1,34 @@
+using Content.Shared.EntityTable.EntitySelectors;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityTable.Conditions;
+
+/// <summary>
+/// Condition for checking that selector is not going to spawn entity that is marked in current context as excluded .
+/// Can be used to keep spawns unique (if no selector rolls more than 1).
+/// </summary>
+public sealed partial class ExcludeEntitiesFromContextCondition : EntityTableCondition
+{
+    /// <summary>
+    /// Context key used to track which entity prototypes should not be spawned.
+    /// Value should be <see cref="HashSet{EntityUid}"/>.
+    /// </summary>
+    public const string EntitiesToExclude = "EntitiesToExclude";
+
+    /// <inheritdoc/>>
+    protected override bool EvaluateImplementation(
+        EntityTableSelector root,
+        IEntityManager entMan,
+        IPrototypeManager proto,
+        EntityTableContext ctx
+    )
+    {
+        if (!ctx.TryGetData<HashSet<EntProtoId>>(EntitiesToExclude, out var used))
+            return true;
+
+        if (root is not EntSelector entSelector)
+            return true;
+
+        return !used.Contains(entSelector.Id);
+    }
+}
diff --git a/Content.Shared/EntityTable/Conditions/HasBudgetCondition.cs b/Content.Shared/EntityTable/Conditions/HasBudgetCondition.cs
index 0eea81f736..ef854978d6 100644
--- a/Content.Shared/EntityTable/Conditions/HasBudgetCondition.cs
+++ b/Content.Shared/EntityTable/Conditions/HasBudgetCondition.cs
@@ -1,5 +1,6 @@
 using Content.Shared.EntityTable.EntitySelectors;
 using Content.Shared.GameTicking.Rules;
+using Content.Shared.GameTicking.Rules.Components;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.EntityTable.Conditions;
diff --git a/Content.Shared/EntityTable/Conditions/MaxRuleOccurenceCondition.cs b/Content.Shared/EntityTable/Conditions/MaxRuleOccurenceCondition.cs
index 1e55feb338..852230485b 100644
--- a/Content.Shared/EntityTable/Conditions/MaxRuleOccurenceCondition.cs
+++ b/Content.Shared/EntityTable/Conditions/MaxRuleOccurenceCondition.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Shared.EntityTable.EntitySelectors;
 using Content.Shared.GameTicking;
 using Robust.Shared.Prototypes;
@@ -47,8 +46,8 @@ public sealed partial class MaxRuleOccurenceCondition : EntityTableCondition
         if (rule == string.Empty)
             return false;
 
-        var gameTicker = entMan.System<SharedGameTicker>();
+        var gameTicker = entMan.System<GameTicker>();
 
-        return gameTicker.AllPreviousGameRules.Count(p => p.Item2 == rule) < Max;
+        return gameTicker.GetOccurrences(rule) < Max;
     }
 }
diff --git a/Content.Shared/EntityTable/Conditions/ReoccurrenceDelayCondition.cs b/Content.Shared/EntityTable/Conditions/ReoccurrenceDelayCondition.cs
index 0329592a4a..d4362bf039 100644
--- a/Content.Shared/EntityTable/Conditions/ReoccurrenceDelayCondition.cs
+++ b/Content.Shared/EntityTable/Conditions/ReoccurrenceDelayCondition.cs
@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Content.Shared.EntityTable.EntitySelectors;
 using Content.Shared.GameTicking;
@@ -41,9 +41,7 @@ public sealed partial class ReoccurrenceDelayCondition : EntityTableCondition
         if (rule == string.Empty)
             return false;
 
-        var gameTicker = entMan.System<SharedGameTicker>();
-
-        return gameTicker.AllPreviousGameRules.Any(
-            p => p.Item2 == rule && p.Item1 + Delay <= gameTicker.RoundDuration());
+        var gameTicker = entMan.System<GameTicker>();
+        return gameTicker.GetLastRuleTime(rule) + Delay <= gameTicker.RoundDuration();
     }
 }
diff --git a/Content.Shared/EntityTable/Conditions/RoundDurationCondition.cs b/Content.Shared/EntityTable/Conditions/RoundDurationCondition.cs
index 518faf4bc6..f95696c577 100644
--- a/Content.Shared/EntityTable/Conditions/RoundDurationCondition.cs
+++ b/Content.Shared/EntityTable/Conditions/RoundDurationCondition.cs
@@ -26,7 +26,7 @@ public sealed partial class RoundDurationCondition : EntityTableCondition
         IPrototypeManager proto,
         EntityTableContext ctx)
     {
-        var gameTicker = entMan.System<SharedGameTicker>();
+        var gameTicker = entMan.System<GameTicker>();
         var duration = gameTicker.RoundDuration();
 
         return duration >= Min && duration <= Max;
diff --git a/Content.Shared/EntityTable/EntitySelectors/AllSelector.cs b/Content.Shared/EntityTable/EntitySelectors/AllSelector.cs
index 6dcb7eee5a..f209ef956f 100644
--- a/Content.Shared/EntityTable/EntitySelectors/AllSelector.cs
+++ b/Content.Shared/EntityTable/EntitySelectors/AllSelector.cs
@@ -6,19 +6,15 @@ namespace Content.Shared.EntityTable.EntitySelectors;
 /// <summary>
 /// Gets spawns from all of the child selectors
 /// </summary>
-public sealed partial class AllSelector : EntityTableSelector
+public sealed partial class AllSelector : EntityTableSelectorWithChildrenBase
 {
-    /// <summary>
-    /// All children selectors to pick from.
-    /// </summary>
-    [DataField(required: true)]
-    public List<EntityTableSelector> Children;
-
     protected override IEnumerable<EntProtoId> GetSpawnsImplementation(IRobustRandom rand,
         IEntityManager entMan,
         IPrototypeManager proto,
         EntityTableContext ctx)
     {
+        using var scoped = ScopedConditions(ctx);
+
         foreach (var child in Children)
         {
             foreach (var spawn in child.GetSpawns(rand, entMan, proto, ctx))
@@ -49,4 +45,10 @@ public sealed partial class AllSelector : EntityTableSelector
             }
         }
     }
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"All({string.Join(", ", Children)})";
+    }
 }
diff --git a/Content.Shared/EntityTable/EntitySelectors/EntSelector.cs b/Content.Shared/EntityTable/EntitySelectors/EntSelector.cs
index bc99f2cf83..4eec6320d2 100644
--- a/Content.Shared/EntityTable/EntitySelectors/EntSelector.cs
+++ b/Content.Shared/EntityTable/EntitySelectors/EntSelector.cs
@@ -44,4 +44,10 @@ public sealed partial class EntSelector : EntityTableSelector
     {
         yield return (Id, Amount.Average());
     }
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"{Id} x{Amount.Average()}";
+    }
 }
diff --git a/Content.Shared/EntityTable/EntitySelectors/EntityTableSelector.cs b/Content.Shared/EntityTable/EntitySelectors/EntityTableSelector.cs
index 6a0b168142..2c207e98de 100644
--- a/Content.Shared/EntityTable/EntitySelectors/EntityTableSelector.cs
+++ b/Content.Shared/EntityTable/EntitySelectors/EntityTableSelector.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.EntityTable.Conditions;
 using Content.Shared.EntityTable.ValueSelector;
 using JetBrains.Annotations;
@@ -7,9 +7,22 @@ using Robust.Shared.Random;
 
 namespace Content.Shared.EntityTable.EntitySelectors;
 
+/// <summary>
+/// An extensible table for configurable entity selection, both random and deterministic.
+/// </summary>
+/// <remarks>
+/// This is currently the favored way to select multiple entities - generally for spawning.
+/// With its children, it supports returning multiple entities, nested selectors,
+/// groups of entities, conditions, and probabilistic spawns.
+/// </remarks>
 [ImplicitDataDefinitionForInheritors, UsedImplicitly(ImplicitUseTargetFlags.WithInheritors)]
 public abstract partial class EntityTableSelector
 {
+    /// <summary>
+    /// Key for <see cref="EntityTableContext"/>, under which additional scoped conditions should be stored.
+    /// </summary>
+    public const string AdditionalConditionsKey = "AdditionalConditions";
+
     /// <summary>
     /// The number of times this selector is run
     /// </summary>
@@ -44,7 +57,8 @@ public abstract partial class EntityTableSelector
     /// <summary>
     /// Samples an output for this selector.
     /// </summary>
-    public IEnumerable<EntProtoId> GetSpawns(IRobustRandom rand,
+    public IEnumerable<EntProtoId> GetSpawns(
+        IRobustRandom rand,
         IEntityManager entMan,
         IPrototypeManager proto,
         EntityTableContext ctx)
@@ -68,13 +82,14 @@ public abstract partial class EntityTableSelector
     /// <summary>
     /// Check if the condition for this selector are met.
     /// </summary>
-    public bool CheckConditions(IEntityManager entMan, IPrototypeManager proto, EntityTableContext ctx)
+    public virtual bool CheckConditions(IEntityManager entMan, IPrototypeManager proto, EntityTableContext ctx)
     {
-        if (Conditions.Count == 0)
+        // No conditions to evaluate (own or injected into the context) => always valid.
+        if (!TryGetConditions(ctx, out var conditions))
             return true;
 
         var success = false;
-        foreach (var condition in Conditions)
+        foreach (var condition in conditions)
         {
             var res = condition.Evaluate(this, entMan, proto, ctx);
 
@@ -130,4 +145,30 @@ public abstract partial class EntityTableSelector
     protected abstract IEnumerable<(EntProtoId spawn, double)> AverageSpawnsImplementation(IEntityManager entMan,
         IPrototypeManager proto,
         EntityTableContext ctx);
+
+    /// <summary>
+    /// Gets the effective conditions for this selector, respecting conditions injected into the context.
+    /// Returns false when there are no conditions to evaluate.
+    /// </summary>
+    private bool TryGetConditions(EntityTableContext ctx, [NotNullWhen(true)] out List<EntityTableCondition>? conditions)
+    {
+        var hasAdditionalConditions = ctx.TryGetData<List<EntityTableCondition>>(AdditionalConditionsKey, out var additionalConditions);
+
+        if (Conditions.Count == 0 && !hasAdditionalConditions)
+        {
+            conditions = null;
+            return false;
+        }
+
+        if (!hasAdditionalConditions)
+        {
+            conditions = Conditions;
+            return true;
+        }
+
+        conditions = new List<EntityTableCondition>(Conditions.Count + additionalConditions!.Count);
+        conditions.AddRange(Conditions);
+        conditions.AddRange(additionalConditions);
+        return true;
+    }
 }
diff --git a/Content.Shared/EntityTable/EntitySelectors/EntityTableSelectorWithNestedBase.cs b/Content.Shared/EntityTable/EntitySelectors/EntityTableSelectorWithNestedBase.cs
new file mode 100644
index 0000000000..2517ef9247
--- /dev/null
+++ b/Content.Shared/EntityTable/EntitySelectors/EntityTableSelectorWithNestedBase.cs
@@ -0,0 +1,97 @@
+using Content.Shared.EntityTable.Conditions;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityTable.EntitySelectors;
+
+/// <summary>
+/// Base type for entity table selector that can have child selectors and properly apply entity table conditions for them.
+/// </summary>
+[ImplicitDataDefinitionForInheritors, UsedImplicitly(ImplicitUseTargetFlags.WithInheritors)]
+public abstract partial class EntityTableSelectorWithChildrenBase : EntityTableSelectorWithNestedBase
+{
+    /// <summary>
+    /// The child entries of this selector.
+    /// </summary>
+    [DataField(required: true)]
+    public List<EntityTableSelector> Children = new();
+
+    /// <inheritdoc/>
+    public override bool CheckConditions(IEntityManager entMan, IPrototypeManager proto, EntityTableContext ctx)
+    {
+        if (!base.CheckConditions(entMan, proto, ctx))
+            return false;
+
+        using var scoped = ScopedConditions(ctx);
+
+        foreach (var selector in Children)
+        {
+            // If any child succeeds this is a valid node
+            if (selector.CheckConditions(entMan, proto, ctx))
+                return true;
+        }
+
+        return false;
+    }
+}
+
+/// <summary>
+/// Base type for entity table selector that can apply list of additional entity table conditions upon
+/// nested entity table selectors.
+/// When making type, derived from this one, please remember to use <see cref="ScopedConditions"/> in your implementation of 
+/// <see cref="EntityTableSelector.GetSpawnsImplementation"/>, and inside <see cref="EntityTableSelector.CheckConditions"/>
+/// (if you override it).
+/// </summary>
+[ImplicitDataDefinitionForInheritors, UsedImplicitly(ImplicitUseTargetFlags.WithInheritors)]
+public abstract partial class EntityTableSelectorWithNestedBase : EntityTableSelector
+{
+    /// <summary>
+    /// A list of conditions that must evaluate to 'true' for the selector to apply.
+    /// </summary>
+    [DataField]
+    public List<EntityTableCondition> ConditionsForChildren = new();
+
+    /// <summary>
+    /// Temporarily injects <see cref="ConditionsForChildren"/> (merged with any conditions already
+    /// scoped in <paramref name="ctx"/>) into the context so they are evaluated for every selector
+    /// below this one. The context is restored when the returned handle is disposed.
+    /// </summary>
+    protected IDisposable ScopedConditions(EntityTableContext ctx)
+    {
+        if (ConditionsForChildren.Count == 0)
+            return default(ScopedConditionsRestore);
+
+        if (!ctx.TryGetData<List<EntityTableCondition>>(AdditionalConditionsKey, out var existingConditions))
+        {
+            // Nothing was scoped before: our own list can be used directly, no copy.
+            ctx.SetData(AdditionalConditionsKey, ConditionsForChildren);
+            return new ScopedConditionsRestore(ctx, null);
+        }
+
+        // Merge our conditions with whatever is already scoped in the context.
+        var combined = new List<EntityTableCondition>(ConditionsForChildren);
+        combined.AddRange(existingConditions);
+        ctx.SetData(AdditionalConditionsKey, combined);
+        return new ScopedConditionsRestore(ctx, existingConditions);
+    }
+
+    /// <summary>
+    /// Restores the <see cref="EntityTableContext"/> after a scoped-conditions block.
+    /// </summary>
+    protected readonly struct ScopedConditionsRestore(
+        EntityTableContext? ctx,
+        List<EntityTableCondition>? existingConditions
+    ) : IDisposable
+    {
+        public void Dispose()
+        {
+            if(ctx == null)
+                return;
+
+            if (existingConditions is null)
+                ctx.RemoveData(AdditionalConditionsKey);
+            else
+                ctx.SetData(AdditionalConditionsKey, existingConditions);
+        }
+    }
+}
diff --git a/Content.Shared/EntityTable/EntitySelectors/GroupSelector.cs b/Content.Shared/EntityTable/EntitySelectors/GroupSelector.cs
index 2cdb890139..4aa6206095 100644
--- a/Content.Shared/EntityTable/EntitySelectors/GroupSelector.cs
+++ b/Content.Shared/EntityTable/EntitySelectors/GroupSelector.cs
@@ -8,19 +8,15 @@ namespace Content.Shared.EntityTable.EntitySelectors;
 /// <summary>
 /// Gets the spawns from one of the child selectors, based on the weight of the children
 /// </summary>
-public sealed partial class GroupSelector : EntityTableSelector
+public sealed partial class GroupSelector : EntityTableSelectorWithChildrenBase
 {
-    /// <summary>
-    /// The child entries of this selector.
-    /// </summary>
-    [DataField(required: true)]
-    public List<EntityTableSelector> Children = new();
-
     protected override IEnumerable<EntProtoId> GetSpawnsImplementation(IRobustRandom rand,
         IEntityManager entMan,
         IPrototypeManager proto,
         EntityTableContext ctx)
     {
+        using var scoped = ScopedConditions(ctx);
+
         var children = new Dictionary<EntityTableSelector, float>(Children.Count);
         foreach (var child in Children)
         {
@@ -32,11 +28,14 @@ public sealed partial class GroupSelector : EntityTableSelector
         }
 
         if (children.Count == 0)
-            return Array.Empty<EntProtoId>();
+            yield break;
 
         var pick = SharedRandomExtensions.Pick(children, rand);
 
-        return pick.GetSpawns(rand, entMan, proto, ctx);
+        foreach (var spawn in pick.GetSpawns(rand, entMan, proto, ctx))
+        {
+            yield return spawn;
+        }
     }
 
     protected override IEnumerable<(EntProtoId spawn, double)> ListSpawnsImplementation(IEntityManager entMan, IPrototypeManager proto, EntityTableContext ctx)
@@ -66,4 +65,10 @@ public sealed partial class GroupSelector : EntityTableSelector
             }
         }
     }
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"Group({string.Join(", ", Children.Select(x => $"{x}: {x.Weight}"))})";
+    }
 }
diff --git a/Content.Shared/EntityTable/EntitySelectors/NestedSelector.cs b/Content.Shared/EntityTable/EntitySelectors/NestedSelector.cs
index 4bbcb8a427..5c1a4952cf 100644
--- a/Content.Shared/EntityTable/EntitySelectors/NestedSelector.cs
+++ b/Content.Shared/EntityTable/EntitySelectors/NestedSelector.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.EntityTable.EntitySelectors;
 /// Gets the spawns from the entity table prototype specified.
 /// Can be used to reuse common tables.
 /// </summary>
-public sealed partial class NestedSelector : EntityTableSelector
+public sealed partial class NestedSelector : EntityTableSelectorWithNestedBase
 {
     /// <summary>
     /// The prototype from which to draw random items.
@@ -15,21 +15,42 @@ public sealed partial class NestedSelector : EntityTableSelector
     [DataField(required: true)]
     public ProtoId<EntityTablePrototype> TableId;
 
+    /// <inheritdoc/>>
+    public override bool CheckConditions(IEntityManager entMan, IPrototypeManager proto, EntityTableContext ctx)
+    {
+        using var scoped = ScopedConditions(ctx);
+        return base.CheckConditions(entMan, proto, ctx) && proto.Index(TableId).Table.CheckConditions(entMan, proto, ctx);
+    }
+
+    /// <inheritdoc/>>
     protected override IEnumerable<EntProtoId> GetSpawnsImplementation(IRobustRandom rand,
         IEntityManager entMan,
         IPrototypeManager proto,
         EntityTableContext ctx)
     {
-        return proto.Index(TableId).Table.GetSpawns(rand, entMan, proto, ctx);
+        using var scoped = ScopedConditions(ctx);
+
+        foreach (var spawn in proto.Index(TableId).Table.GetSpawns(rand, entMan, proto, ctx))
+        {
+            yield return spawn;
+        }
     }
 
+    /// <inheritdoc/>>
     protected override IEnumerable<(EntProtoId spawn, double)> ListSpawnsImplementation(IEntityManager entMan, IPrototypeManager proto, EntityTableContext ctx)
     {
         return proto.Index(TableId).Table.ListSpawns(entMan, proto, ctx);
     }
 
+    /// <inheritdoc/>>
     protected override IEnumerable<(EntProtoId spawn, double)> AverageSpawnsImplementation(IEntityManager entMan, IPrototypeManager proto, EntityTableContext ctx)
     {
         return proto.Index(TableId).Table.AverageSpawns(entMan, proto, ctx);
     }
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"Nested({TableId})";
+    }
 }
diff --git a/Content.Shared/EntityTable/EntitySelectors/NoneSelector.cs b/Content.Shared/EntityTable/EntitySelectors/NoneSelector.cs
index 72ef181cbe..a24f74c816 100644
--- a/Content.Shared/EntityTable/EntitySelectors/NoneSelector.cs
+++ b/Content.Shared/EntityTable/EntitySelectors/NoneSelector.cs
@@ -25,4 +25,10 @@ public sealed partial class NoneSelector : EntityTableSelector
     {
         yield break;
     }
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return "None";
+    }
 }
diff --git a/Content.Shared/EntityTable/EntityTableSystem.cs b/Content.Shared/EntityTable/EntityTableSystem.cs
index cd2e83974d..7d5607e659 100644
--- a/Content.Shared/EntityTable/EntityTableSystem.cs
+++ b/Content.Shared/EntityTable/EntityTableSystem.cs
@@ -3,6 +3,7 @@ using Content.Shared.EntityTable.EntitySelectors;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.EntityTable;
 
@@ -10,6 +11,30 @@ public sealed partial class EntityTableSystem : EntitySystem
 {
     [Dependency] private IRobustRandom _random = default!;
 
+    /// <summary>
+    /// Iterates once through Entities that EntitySelector in EntityTableProto provides and picks first one.
+    /// </summary>
+    public EntProtoId? GetFirstOrNull(
+        EntityTablePrototype entTableProto,
+        IRobustRandom? rand = null,
+        EntityTableContext? ctx = null
+    )
+    {
+        return GetSpawns(entTableProto, rand, ctx).FirstOrNull();
+    }
+
+    /// <summary>
+    /// Iterates once through Entities that EntitySelector provides and picks first one.
+    /// </summary>
+    public EntProtoId? GetFirstOrNull(
+        EntityTableSelector? entTableProto,
+        IRobustRandom? rand = null,
+        EntityTableContext? ctx = null
+    )
+    {
+        return GetSpawns(entTableProto, rand, ctx).FirstOrNull();
+    }
+
     /// <summary>
     /// Compiles a random list of entity prototypes using constraints.
     /// </summary>
@@ -110,4 +135,22 @@ public sealed class EntityTableContext
         value = castValueData;
         return true;
     }
+
+    /// <summary>
+    /// Sets data into context using provided key.
+    /// </summary>
+    [PublicAPI]
+    public void SetData<T>([ForbidLiteral] string key, T data) where T : notnull
+    {
+        _data[key] = data;
+    }
+
+    /// <summary>
+    /// Removes data from the context, if the key exists.
+    /// </summary>
+    [PublicAPI]
+    public void RemoveData([ForbidLiteral] string key)
+    {
+        _data.Remove(key);
+    }
 }
diff --git a/Content.Shared/Eui/EuiMessageBase.cs b/Content.Shared/Eui/EuiMessageBase.cs
index 6ed2b7c49b..12086a8279 100644
--- a/Content.Shared/Eui/EuiMessageBase.cs
+++ b/Content.Shared/Eui/EuiMessageBase.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Eui
 {
diff --git a/Content.Shared/Eui/EuiStateBase.cs b/Content.Shared/Eui/EuiStateBase.cs
index 4c67795581..80ba33c181 100644
--- a/Content.Shared/Eui/EuiStateBase.cs
+++ b/Content.Shared/Eui/EuiStateBase.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Eui
 {
diff --git a/Content.Shared/Eui/MsgEuiCtl.cs b/Content.Shared/Eui/MsgEuiCtl.cs
index d1bac580cd..3f81085055 100644
--- a/Content.Shared/Eui/MsgEuiCtl.cs
+++ b/Content.Shared/Eui/MsgEuiCtl.cs
@@ -1,4 +1,4 @@
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs b/Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs
index 83be128d07..bdfd42fc02 100644
--- a/Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs
+++ b/Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Explosion.EntitySystems;
+using Content.Shared.Explosion.EntitySystems;
 using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
diff --git a/Content.Shared/Explosion/EntitySystems/SharedScatteringGrenadeSystem.cs b/Content.Shared/Explosion/EntitySystems/SharedScatteringGrenadeSystem.cs
index 4f05602746..39f4ab9fa0 100644
--- a/Content.Shared/Explosion/EntitySystems/SharedScatteringGrenadeSystem.cs
+++ b/Content.Shared/Explosion/EntitySystems/SharedScatteringGrenadeSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Explosion.Components;
+using Content.Shared.Explosion.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
diff --git a/Content.Shared/Fax/Components/FaxMachineComponent.cs b/Content.Shared/Fax/Components/FaxMachineComponent.cs
index bae73856a3..8111691664 100644
--- a/Content.Shared/Fax/Components/FaxMachineComponent.cs
+++ b/Content.Shared/Fax/Components/FaxMachineComponent.cs
@@ -3,6 +3,7 @@ using Content.Shared.Paper;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Fax.Components;
 
@@ -163,6 +164,7 @@ public sealed partial class FaxMachineComponent : Component
 }
 
 [DataDefinition]
+[Serializable, NetSerializable]
 public sealed partial class FaxPrintout
 {
     [DataField(required: true)]
diff --git a/Content.Shared/Fax/FaxPayloads.cs b/Content.Shared/Fax/FaxPayloads.cs
new file mode 100644
index 0000000000..7eb1b4264a
--- /dev/null
+++ b/Content.Shared/Fax/FaxPayloads.cs
@@ -0,0 +1,32 @@
+using Content.Shared.DeviceNetwork;
+using Content.Shared.Fax.Components;
+
+namespace Content.Shared.Fax;
+
+/// <summary>
+/// Broadcasted from one fax to all other available faxes.
+/// </summary>
+public partial record struct FaxPingPayload : INetworkPayload
+{
+    // TODO this should probably be made a more general system in the future
+    [DataField]
+    public bool IsSyndicate;
+}
+
+/// <summary>
+/// Sent as a response to <see cref="FaxPingPayload"/>.
+/// </summary>
+public partial record struct FaxPongPayload : INetworkPayload
+{
+    [DataField]
+    public string FaxName;
+}
+
+/// <summary>
+/// Payload to print a paper on the receiver fax.
+/// </summary>
+public partial record struct FaxPrintPayload : INetworkPayload
+{
+    [DataField]
+    public FaxPrintout Data;
+}
diff --git a/Content.Shared/FeedbackSystem/FeedbackPopupMessage.cs b/Content.Shared/FeedbackSystem/FeedbackPopupMessage.cs
index 9b5d7898e1..bcd37cf930 100644
--- a/Content.Shared/FeedbackSystem/FeedbackPopupMessage.cs
+++ b/Content.Shared/FeedbackSystem/FeedbackPopupMessage.cs
@@ -1,4 +1,4 @@
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/FeedbackSystem/FeedbackPopupPrototype.cs b/Content.Shared/FeedbackSystem/FeedbackPopupPrototype.cs
index 1ce93e8a9b..e36c6d9a8b 100644
--- a/Content.Shared/FeedbackSystem/FeedbackPopupPrototype.cs
+++ b/Content.Shared/FeedbackSystem/FeedbackPopupPrototype.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Whitelist;
+using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.FeedbackSystem;
@@ -45,11 +45,21 @@ public sealed partial class FeedbackPopupPrototype : IPrototype
     [DataField]
     public string? ResponseLink;
 
+    /// <summary>
+    /// Should this feedback always be shown upon opening the feedback window?
+    /// Ignores <see cref="ShowRoundEnd"/> and <see cref="RuleWhitelist"/>.
+    /// </summary>
+    /// <remarks>
+    /// Still requires a valid origin to display.
+    /// </remarks>
+    [DataField]
+    public bool AlwaysShow = false;
+
     /// <summary>
     /// Should this feedback be shown when the round ends.
     /// </summary>
     /// <remarks>
-    /// If this is false popups have to be shown to players by running the <pre>feedback:add</pre> command.<br />
+    /// If this and <see cref="AlwaysShow"/> are false, popups have to be shown to players by running the <pre>feedback:add</pre> command.<br />
     /// This allows admins to show popups to only specific people.
     /// </remarks>
     [DataField]
diff --git a/Content.Shared/FeedbackSystem/SharedFeedbackManager.Events.cs b/Content.Shared/FeedbackSystem/SharedFeedbackManager.Events.cs
index 4e5ce1ee4e..49192a1101 100644
--- a/Content.Shared/FeedbackSystem/SharedFeedbackManager.Events.cs
+++ b/Content.Shared/FeedbackSystem/SharedFeedbackManager.Events.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Robust.Shared.Configuration;
@@ -17,5 +17,6 @@ public abstract partial class SharedFeedbackManager : IEntityEventSubscriber
     private void OnFeedbackOriginsUpdated(string newOrigins)
     {
         _validOrigins = newOrigins.Split(' ').ToList();
+        Display(GetOriginFeedbackPrototypes(false));
     }
 }
diff --git a/Content.Shared/FeedbackSystem/SharedFeedbackManager.cs b/Content.Shared/FeedbackSystem/SharedFeedbackManager.cs
index 4182060e0a..779e9af284 100644
--- a/Content.Shared/FeedbackSystem/SharedFeedbackManager.cs
+++ b/Content.Shared/FeedbackSystem/SharedFeedbackManager.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
@@ -101,6 +101,7 @@ public abstract partial class SharedFeedbackManager : ISharedFeedbackManager
     public virtual void Initialize()
     {
         InitSubscriptions();
+        Display(GetOriginFeedbackPrototypes(false));
     }
 
     /// <inheritdoc />
@@ -137,7 +138,7 @@ public abstract partial class SharedFeedbackManager : ISharedFeedbackManager
     public List<ProtoId<FeedbackPopupPrototype>> GetOriginFeedbackPrototypes(bool roundEndOnly, bool ruleSpecific = false)
     {
         var feedbackProtypes = _proto.EnumeratePrototypes<FeedbackPopupPrototype>()
-            .Where(x => (!roundEndOnly || x.ShowRoundEnd) && ruleSpecific == (x.RuleWhitelist != null) && _validOrigins.Contains(x.PopupOrigin))
+            .Where(x => (roundEndOnly && x.ShowRoundEnd && ruleSpecific == (x.RuleWhitelist != null) || x.AlwaysShow) && _validOrigins.Contains(x.PopupOrigin))
             .Select(x => new ProtoId<FeedbackPopupPrototype>(x.ID))
             .OrderBy(x => x.Id)
             .ToList();
diff --git a/Content.Shared/FixedPoint/FixedPoint4.cs b/Content.Shared/FixedPoint/FixedPoint4.cs
index b17587f684..528c6a55ab 100644
--- a/Content.Shared/FixedPoint/FixedPoint4.cs
+++ b/Content.Shared/FixedPoint/FixedPoint4.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.Linq;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
diff --git a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs
index f61a78b3ce..7bbba77093 100644
--- a/Content.Shared/Flash/SharedFlashSystem.cs
+++ b/Content.Shared/Flash/SharedFlashSystem.cs
@@ -15,7 +15,7 @@ using Content.Shared.Random.Helpers;
 using Content.Shared.StatusEffectNew;
 using Content.Shared.Stunnable;
 using Content.Shared.Tag;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Traits.Assorted;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Audio;
diff --git a/Content.Shared/Fluids/Components/EvaporationComponent.cs b/Content.Shared/Fluids/Components/EvaporationComponent.cs
index b3b3ac12d4..b96ff69efc 100644
--- a/Content.Shared/Fluids/Components/EvaporationComponent.cs
+++ b/Content.Shared/Fluids/Components/EvaporationComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.FixedPoint;
+using Content.Shared.FixedPoint;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
diff --git a/Content.Shared/Fluids/PuddleVisuals.cs b/Content.Shared/Fluids/PuddleVisuals.cs
index b50f084ba8..60d8aec3cb 100644
--- a/Content.Shared/Fluids/PuddleVisuals.cs
+++ b/Content.Shared/Fluids/PuddleVisuals.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Fluids
 {
diff --git a/Content.Shared/Fluids/SharedAbsorbentSystem.cs b/Content.Shared/Fluids/SharedAbsorbentSystem.cs
index 9948953ae7..14185d7ae9 100644
--- a/Content.Shared/Fluids/SharedAbsorbentSystem.cs
+++ b/Content.Shared/Fluids/SharedAbsorbentSystem.cs
@@ -6,11 +6,11 @@ using Content.Shared.Fluids.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Item;
 using Content.Shared.Popups;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Weapons.Melee;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map.Components;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Fluids;
diff --git a/Content.Shared/Fluids/SharedPuddleDebugOverlaySystem.cs b/Content.Shared/Fluids/SharedPuddleDebugOverlaySystem.cs
index 6f6d56cf60..556be15500 100644
--- a/Content.Shared/Fluids/SharedPuddleDebugOverlaySystem.cs
+++ b/Content.Shared/Fluids/SharedPuddleDebugOverlaySystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.FixedPoint;
+using Content.Shared.FixedPoint;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Fluids;
diff --git a/Content.Shared/Fluids/SharedSprayComponent.cs b/Content.Shared/Fluids/SharedSprayComponent.cs
index f00d4e0c00..074662bd6b 100644
--- a/Content.Shared/Fluids/SharedSprayComponent.cs
+++ b/Content.Shared/Fluids/SharedSprayComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Fluids
 {
diff --git a/Content.Shared/Foldable/DeployFoldableComponent.cs b/Content.Shared/Foldable/DeployFoldableComponent.cs
index 4ccca6b742..b1fae4baa3 100644
--- a/Content.Shared/Foldable/DeployFoldableComponent.cs
+++ b/Content.Shared/Foldable/DeployFoldableComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Foldable;
 
diff --git a/Content.Shared/Follower/Components/OrbitVisualsComponent.cs b/Content.Shared/Follower/Components/OrbitVisualsComponent.cs
index 47ea0a523f..17259a7cb5 100644
--- a/Content.Shared/Follower/Components/OrbitVisualsComponent.cs
+++ b/Content.Shared/Follower/Components/OrbitVisualsComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Animations;
+using Robust.Shared.Animations;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Follower.Components;
diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs
index 711089c329..a598d08760 100644
--- a/Content.Shared/Follower/FollowerSystem.cs
+++ b/Content.Shared/Follower/FollowerSystem.cs
@@ -37,7 +37,7 @@ public sealed partial class FollowerSystem : EntitySystem
     [Dependency] private IRobustRandom _random = default!;
 
     private static readonly ProtoId<TagPrototype> ForceableFollowTag = "ForceableFollow";
-    private static readonly ProtoId<TagPrototype> PreventGhostnadoWarpTag = "NotGhostnadoWarpable";
+    public static readonly ProtoId<TagPrototype> PreventGhostnadoWarpTag = "NotGhostnadoWarpable";
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Forensics/Components/DnaComponent.cs b/Content.Shared/Forensics/Components/DnaComponent.cs
index a9d2f7ea8b..611f96ff58 100644
--- a/Content.Shared/Forensics/Components/DnaComponent.cs
+++ b/Content.Shared/Forensics/Components/DnaComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Forensics.Components;
 
diff --git a/Content.Shared/Friends/Systems/PettableFriendSystem.cs b/Content.Shared/Friends/Systems/PettableFriendSystem.cs
index 0b1a13bf5a..b780917bb9 100644
--- a/Content.Shared/Friends/Systems/PettableFriendSystem.cs
+++ b/Content.Shared/Friends/Systems/PettableFriendSystem.cs
@@ -4,7 +4,8 @@ using Content.Shared.Interaction.Events;
 using Content.Shared.NPC.Components;
 using Content.Shared.NPC.Systems;
 using Content.Shared.Popups;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 
 namespace Content.Shared.Friends.Systems;
 
diff --git a/Content.Shared/GameTicking/Components/ActiveGameRuleComponent.cs b/Content.Shared/GameTicking/Components/ActiveGameRuleComponent.cs
index 51bdd1c037..c9b5da2bb2 100644
--- a/Content.Shared/GameTicking/Components/ActiveGameRuleComponent.cs
+++ b/Content.Shared/GameTicking/Components/ActiveGameRuleComponent.cs
@@ -1,8 +1,7 @@
-namespace Content.Shared.GameTicking.Components;
+namespace Content.Shared.GameTicking.Components;
 
 /// <summary>
 ///     Added to game rules before <see cref="GameRuleStartedEvent"/> and removed before <see cref="GameRuleEndedEvent"/>.
-///     Mutually exclusive with <seealso cref="EndedGameRuleComponent"/>.
 /// </summary>
 [RegisterComponent]
 public sealed partial class ActiveGameRuleComponent : Component;
diff --git a/Content.Shared/GameTicking/Components/EndedGameRuleComponent.cs b/Content.Shared/GameTicking/Components/EndedGameRuleComponent.cs
deleted file mode 100644
index 5e209ed78a..0000000000
--- a/Content.Shared/GameTicking/Components/EndedGameRuleComponent.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Content.Shared.GameTicking.Components;
-
-/// <summary>
-///     Added to game rules before <see cref="GameRuleEndedEvent"/>.
-///     Mutually exclusive with <seealso cref="ActiveGameRuleComponent"/>.
-/// </summary>
-[RegisterComponent]
-public sealed partial class EndedGameRuleComponent : Component;
diff --git a/Content.Shared/GameTicking/Components/GameRuleComponent.cs b/Content.Shared/GameTicking/Components/GameRuleComponent.cs
index 87a5822d47..bc36c95aa0 100644
--- a/Content.Shared/GameTicking/Components/GameRuleComponent.cs
+++ b/Content.Shared/GameTicking/Components/GameRuleComponent.cs
@@ -30,6 +30,13 @@ public sealed partial class GameRuleComponent : Component
     [DataField]
     public bool CancelPresetOnTooFewPlayers = true;
 
+    /// <summary>
+    /// Marks a gamerule as "Silent" meaning that it will run and then proceed to delete itself without logging.
+    /// This WILL throw a debug assert if it still exists when it's supposed to start!
+    /// </summary>
+    [DataField]
+    public bool Silent;
+
     /// <summary>
     /// A delay for when the rule the is started and when the starting logic actually runs.
     /// </summary>
@@ -42,18 +49,110 @@ public sealed partial class GameRuleComponent : Component
 /// Good for announcing station events and other such things.
 /// </summary>
 [ByRefEvent]
-public readonly record struct GameRuleAddedEvent(EntityUid RuleEntity, string RuleId);
+public readonly record struct GameRuleAddedEvent(Entity<GameRuleComponent> Rule);
 
 /// <summary>
 /// Raised when the rule actually begins.
 /// Player-facing logic should begin here.
 /// </summary>
 [ByRefEvent]
-public readonly record struct GameRuleStartedEvent(EntityUid RuleEntity, string RuleId);
+public readonly record struct GameRuleStartedEvent(Entity<GameRuleComponent> Rule, EntProtoId? RuleId);
 
 /// <summary>
 /// Raised when the rule ends.
 /// Do cleanup and other such things here.
 /// </summary>
 [ByRefEvent]
-public readonly record struct GameRuleEndedEvent(EntityUid RuleEntity, string RuleId);
+public readonly record struct GameRuleEndedEvent(EntityUid Rule);
+
+/// <summary>
+/// A simple struct to keep track of the Lifespan of a Gamerule in an organized fashion.
+/// </summary>
+/// <param name="StartTime">Time that this game rule was added, or started</param>
+/// <param name="Uid">EntityUid of the game rule</param>
+/// <param name="LifeStage">Current lifetime of the game rule.</param>
+[Access(typeof(GameTicker))]
+public record struct GameRule(TimeSpan StartTime, EntityUid Uid, GameRuleLifeStage LifeStage = GameRuleLifeStage.Added) : IComparable<GameRuleLifeStage>, IComparable<GameRule>
+{
+    /// <summary>
+    /// The time that this rule has started, or was added if it hasn't started yet!
+    /// </summary>
+    public TimeSpan StartTime { get; private set; } = StartTime;
+
+    /// <summary>
+    /// EntityUid for this GameRule, it's cheaper memory wise to store an int over the whole ass ProtoId, which is available through MetaDataComp lookup...
+    /// </summary>
+    public readonly EntityUid Uid = Uid;
+
+    /// <summary>
+    /// The time that this rule has started, or was added if it hasn't started yet!
+    /// </summary>
+    public GameRuleLifeStage LifeStage { get; private set; } = LifeStage;
+
+    /// <summary>
+    /// Marks that this GameRule has been started.
+    /// </summary>
+    /// <param name="time">Timespan which we started the rule.</param>
+    /// <returns>True if the game rule successfully started, false if was already started or ended.</returns>
+    public bool StartRule(TimeSpan time)
+    {
+        if (LifeStage > GameRuleLifeStage.Added)
+            return false;
+
+        LifeStage = GameRuleLifeStage.Started;
+        StartTime = time;
+        return true;
+    }
+
+    /// <summary>
+    /// Marks that this GameRule has ended.
+    /// </summary>
+    public bool EndRule()
+    {
+        if (LifeStage == GameRuleLifeStage.Ended)
+            return false;
+
+        LifeStage = GameRuleLifeStage.Ended;
+        return true;
+    }
+
+    public int CompareTo(GameRule other)
+    {
+        return CompareTo(other.LifeStage);
+    }
+
+    public int CompareTo(GameRuleLifeStage other)
+    {
+        return LifeStage.CompareTo(other);
+    }
+
+    public static implicit operator GameRule((TimeSpan Time, EntityUid Rule) tuple)
+    {
+        return new GameRule(tuple.Time, tuple.Rule);
+    }
+
+    public static implicit operator GameRule((TimeSpan Time, EntityUid Rule, GameRuleLifeStage Stage) tuple)
+    {
+        return new GameRule(tuple.Time, tuple.Rule, tuple.Stage);
+    }
+
+    public readonly void Deconstruct(out TimeSpan time, out EntityUid rule)
+    {
+        time = StartTime;
+        rule = Uid;
+    }
+
+    public readonly void Deconstruct(out TimeSpan time, out EntityUid rule, out GameRuleLifeStage stage)
+    {
+        time = StartTime;
+        rule = Uid;
+        stage = LifeStage;
+    }
+}
+
+public enum GameRuleLifeStage : byte
+{
+    Added = 0,
+    Started = 1,
+    Ended = 2,
+}
diff --git a/Content.Server/GameTicking/Events/RoundStartingEvent.cs b/Content.Shared/GameTicking/Events/RoundStartingEvent.cs
similarity index 85%
rename from Content.Server/GameTicking/Events/RoundStartingEvent.cs
rename to Content.Shared/GameTicking/Events/RoundStartingEvent.cs
index cc3ada337b..541745adcc 100644
--- a/Content.Server/GameTicking/Events/RoundStartingEvent.cs
+++ b/Content.Shared/GameTicking/Events/RoundStartingEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.GameTicking.Events;
+namespace Content.Shared.GameTicking.Events;
 
 /// <summary>
 ///     Raised at the start of <see cref="GameTicker.StartRound"/>, after round id has been incremented
diff --git a/Content.Shared/GameTicking/GameTicker.CVars.cs b/Content.Shared/GameTicking/GameTicker.CVars.cs
new file mode 100644
index 0000000000..61e2048b2d
--- /dev/null
+++ b/Content.Shared/GameTicking/GameTicker.CVars.cs
@@ -0,0 +1,11 @@
+using Content.Shared.CCVar;
+
+namespace Content.Shared.GameTicking;
+
+public abstract partial class GameTicker
+{
+    protected virtual void InitializeCVars()
+    {
+        Subs.CVar(Cfg, CCVars.GameTickerIgnoredPresets, value => _ignoredRules = value.Split(","));
+    }
+}
diff --git a/Content.Shared/GameTicking/GameTicker.Chat.cs b/Content.Shared/GameTicking/GameTicker.Chat.cs
new file mode 100644
index 0000000000..7d2c3d83d0
--- /dev/null
+++ b/Content.Shared/GameTicking/GameTicker.Chat.cs
@@ -0,0 +1,57 @@
+using Content.Shared.Station.Components;
+using JetBrains.Annotations;
+using Robust.Shared.Audio;
+using Robust.Shared.Map;
+
+namespace Content.Shared.GameTicking;
+
+public abstract partial class GameTicker
+{
+    /// <summary>
+    /// Dispatches an announcement to all players in game, aka not in the lobby.
+    /// </summary>
+    /// <param name="announcement">LocId of the announcement we're sending.</param>
+    /// <param name="announcementSound">Sound that plays with the announcement.</param>
+    /// <param name="color">Optional color override for the announcement.</param>
+    [PublicAPI]
+    public virtual void GameAnnouncement(LocId announcement, SoundSpecifier? announcementSound = null, Color? color = null) { }
+
+    /// <summary>
+    /// Dispatches an announcement to all players on a given map.
+    /// </summary>
+    /// <param name="map">Map we are dispatching the announcement to.</param>
+    /// <param name="announcement">LocId of the announcement we're sending.</param>
+    /// <param name="announcementSound">Sound that plays with the announcement.</param>
+    /// <param name="color">Optional color override for the announcement.</param>
+    [PublicAPI]
+    public virtual void MapAnnouncement(MapId map, LocId announcement, SoundSpecifier? announcementSound = null, Color? color = null) { }
+
+    /// <summary>
+    /// Dispatches an announcement to all players on the same map as the given station.
+    /// </summary>
+    /// <param name="station">Station m</param>
+    /// <param name="announcement">LocId of the announcement we're sending.</param>
+    /// <param name="announcementSound">Sound that plays with the announcement.</param>
+    /// <param name="color">Optional color override for the announcement.</param>
+    [PublicAPI]
+    public virtual void StationMapAnnouncement(Entity<StationDataComponent> station, LocId announcement, SoundSpecifier? announcementSound = null, Color? color = null) { }
+
+    /// <summary>
+    /// Dispatches an announcement to all players on all station grids.
+    /// </summary>
+    /// <param name="announcement">LocId of the announcement we're sending.</param>
+    /// <param name="announcementSound">Sound that plays with the announcement.</param>
+    /// <param name="color">Optional color override for the announcement.</param>
+    [PublicAPI]
+    public virtual void StationAnnouncement(LocId announcement, SoundSpecifier? announcementSound = null, Color? color = null) { }
+
+    /// <summary>
+    /// Dispatches an announcement to all players on a given station.
+    /// </summary>
+    /// <param name="station">Station we are dispatching the announcement to.</param>
+    /// <param name="announcement">LocId of the announcement we're sending.</param>
+    /// <param name="announcementSound">Sound that plays with the announcement.</param>
+    /// <param name="color">Optional color override for the announcement.</param>
+    [PublicAPI]
+    public virtual void StationAnnouncement(EntityUid station, LocId announcement, SoundSpecifier? announcementSound = null, Color? color = null) { }
+}
diff --git a/Content.Shared/GameTicking/GameTicker.GamePreset.cs b/Content.Shared/GameTicking/GameTicker.GamePreset.cs
new file mode 100644
index 0000000000..b13f4736c6
--- /dev/null
+++ b/Content.Shared/GameTicking/GameTicker.GamePreset.cs
@@ -0,0 +1,44 @@
+using Content.Shared.GameTicking.Prototypes;
+using Content.Shared.GameTicking.Components;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.GameTicking;
+
+public abstract partial class GameTicker
+{
+
+    /// <inhereitdoc cref="GetMinimumPlayerCount(GamePresetPrototype)"/>
+    [PublicAPI]
+    public int GetMinimumPlayerCount(ProtoId<GamePresetPrototype> proto)
+    {
+        if (!ProtoMan.Resolve(proto, out var preset))
+            return 0;
+
+        return GetMinimumPlayerCount(preset);
+    }
+
+    /// <summary>
+    /// Gets the minimum number of players required for a game preset to start.
+    /// Checks both the preset itself, and all rules to find the minimum.
+    /// </summary>
+    /// <param name="proto">Game preset prototype we're checking.</param>
+    /// <returns>Minimum number of players required for the rule to start.</returns>
+    [PublicAPI]
+    public int GetMinimumPlayerCount(GamePresetPrototype proto)
+    {
+        var min = proto.MinPlayers ?? 0;
+        foreach (var entProto in proto.Rules)
+        {
+            if (!ProtoMan.Resolve(entProto, out var ent))
+                continue;
+
+            if (!ent.TryComp<GameRuleComponent>(out var rule, Factory))
+                continue;
+
+            min = Math.Max(min, rule.MinPlayers);
+        }
+
+        return min;
+    }
+}
diff --git a/Content.Shared/GameTicking/GameTicker.GameRule.cs b/Content.Shared/GameTicking/GameTicker.GameRule.cs
new file mode 100644
index 0000000000..237f22c1f5
--- /dev/null
+++ b/Content.Shared/GameTicking/GameTicker.GameRule.cs
@@ -0,0 +1,589 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.CCVar;
+using Content.Shared.Database;
+using Content.Shared.GameTicking.Components;
+using Content.Shared.Whitelist;
+using JetBrains.Annotations;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.GameTicking;
+
+public abstract partial class GameTicker
+{
+    /// <summary>
+    /// Designated game rule that spawns a fake antagonist to discourage metagaming.
+    /// Has to be a string since <see cref="EntProtoId"/> cannot be a const.
+    /// </summary>
+    public const string DummyGameRule = "DummyNonAntag";
+
+    /// <summary>
+    /// List of ignored game rules, these rules won't be spawned by normal means.
+    /// This list is populated by <see cref="CCVars.GameTickerIgnoredPresets"/>
+    /// </summary>
+    [ViewVariables] private string[] _ignoredRules = [];
+
+    [ViewVariables] protected readonly List<GameRule> AllRoundGameRules = [];
+
+    [SubscribeLocalEvent]
+    private void OnGameRuleAdded(Entity<GameRuleComponent> rule, ref MapInitEvent args)
+    {
+        // Cache it first in case the game rule is ended due to a fail state being reached!
+        if (!rule.Comp.Silent && _net.IsServer)
+            AllRoundGameRules.Add((GetRoundTime(), rule));
+
+        var ev = new GameRuleAddedEvent(rule);
+        RaiseLocalEvent(rule, ref ev, true);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnGameRuleStarted(Entity<ActiveGameRuleComponent> rule, ref MapInitEvent args)
+    {
+        var ruleComp = RuleQuery.Comp(rule);
+        Log.Info($"Started game rule {ToPrettyString(rule)}");
+        Admin.Add(LogType.EventStarted, $"Started game rule {ToPrettyString(rule)}");
+
+        if (!ruleComp.Silent)
+            StartRuleCache(rule);
+
+        var ev = new GameRuleStartedEvent((rule, ruleComp), MetaData(rule).EntityPrototype?.ID);
+        RaiseLocalEvent(rule, ref ev, true);
+
+        // If the game rule isn't cached, then it shouldn't be running past start!
+        if (ruleComp.Silent)
+            EndGameRule((rule, ruleComp));
+    }
+
+    [SubscribeLocalEvent]
+    private void OnGameRuleEnded(Entity<GameRuleComponent> rule, ref ComponentShutdown args)
+    {
+        RemComp<ActiveGameRuleComponent>(rule);
+        var ev = new GameRuleEndedEvent(rule);
+        RaiseLocalEvent(rule, ref ev, true);
+
+        if (!rule.Comp.Silent)
+            EndRuleCache(rule);
+    }
+
+    /// <summary>
+    /// Tries to add a gamerule to the current round, but ignores any <see cref="_ignoredRules"/>
+    /// </summary>
+    /// <param name="gameRule">Game rule entity that we are trying to spawn</param>
+    /// <param name="force">Forces the game rule to spawn regardless of if it's ignored or not</param>
+    /// <returns>The entityUid of the spawned game rule, if it wasn't ignored.</returns>
+    public Entity<GameRuleComponent>? AddGameRule([ForbidLiteral] EntProtoId gameRule, bool force = false)
+    {
+        if (!force && IsIgnored(gameRule))
+            return null;
+
+        return SpawnGameRule(gameRule);
+    }
+
+    /// <summary>
+    /// Checks if this GameRule should be ignored before a spawning attempt.
+    /// </summary>
+    /// <param name="gameRule">GameRule we are trying to validate</param>
+    /// <returns>True if the gamerule should be ignored and not spawned.</returns>
+    public bool IsIgnored([ForbidLiteral] EntProtoId gameRule)
+    {
+        return _ignoredRules.Contains(gameRule);
+    }
+
+    /// <summary>
+    /// Spawns a GameRule in nullspace! Protected since it ignores the rule blacklist!
+    /// </summary>
+    /// <param name="ruleId">Name of the game rule we're spawning</param>
+    /// <returns>EntityUid of the rule we spawned.</returns>
+    protected virtual Entity<GameRuleComponent> SpawnGameRule(EntProtoId ruleId)
+    {
+        var rule = Spawn(ruleId, MapCoordinates.Nullspace);
+        FlagPredicted(rule);
+        var meta = MetaData(rule);
+        Log.Info($"Added game rule {ToPrettyString((rule, meta))}");
+        Admin.Add(LogType.EventStarted, $"Added game rule {ToPrettyString((rule, meta))}");
+
+        // This should probably be a bool on the GameRuleComponent...
+        if (RuleQuery.TryComp(rule, out var ruleComp))
+            return (rule, ruleComp);
+
+        Log.Error($"Entity {ToPrettyString((rule, meta))} lacked a {nameof(GameRuleComponent)}!");
+        ruleComp = AddComp<GameRuleComponent>(rule);
+        return (rule, ruleComp);
+    }
+
+    /// <summary>
+    /// Game rules can be 'started' separately from being added. 'Starting' them usually
+    /// happens at round start while they can be added and removed before then.
+    /// </summary>
+    [PublicAPI]
+    public bool StartGameRule([ForbidLiteral] EntProtoId ruleId)
+    {
+        return StartGameRule(ruleId, out _);
+    }
+
+    /// <summary>
+    /// Game rules can be 'started' separately from being added. 'Starting' them usually
+    /// happens at round start while they can be added and removed before then.
+    /// </summary>
+    [PublicAPI]
+    public bool StartGameRule([ForbidLiteral] EntProtoId ruleId, [NotNullWhen(true)] out Entity<GameRuleComponent>? ruleEntity)
+    {
+        ruleEntity = AddGameRule(ruleId);
+        return ruleEntity != null && StartGameRule(ruleEntity.Value.AsNullable()); // Worst shit I've ever seen in C#
+    }
+
+    /// <summary>
+    /// Game rules can be 'started' separately from being added. 'Starting' them usually
+    /// happens at round start while they can be added and removed before then.
+    /// </summary>
+    [PublicAPI]
+    public bool StartGameRule(Entity<GameRuleComponent?> rule)
+    {
+        // Game rule has already ended itself, or this was never a game rule...
+        if (!RuleQuery.Resolve(rule, ref rule.Comp, false))
+            return false;
+
+        // can't start an already active rule
+        if (ActiveRuleQuery.HasComp(rule))
+            return false;
+
+        // TODO: Don't want to refactor this now, but this seems unnecessary and like it's hiding bugs...
+        // If this rule has a delay, check if the delay was already applied. If it was, then start the rule now.
+        if (rule.Comp.Delay == null || RemComp<DelayedStartRuleComponent>(rule))
+        {
+            AddComp<ActiveGameRuleComponent>(rule);
+            rule.Comp.ActivatedAt = Timing.CurTime;
+            return true;
+        }
+
+        var delayTime = TimeSpan.FromSeconds(rule.Comp.Delay.Value.Next(Random));
+
+        if (delayTime <= TimeSpan.Zero)
+            return true;
+
+        Log.Info($"Queued start for game rule {ToPrettyString(rule)} with delay {delayTime}");
+        Admin.Add(LogType.EventStarted,
+            $"Queued start for game rule {ToPrettyString(rule)} with delay {delayTime}");
+
+        var delayed = EnsureComp<DelayedStartRuleComponent>(rule);
+        delayed.RuleStartTime = Timing.CurTime + (delayTime);
+        return true;
+    }
+
+    private void StartRuleCache(EntityUid uid)
+    {
+        if (_net.IsClient)
+            return;
+
+        // Very likely to be a recently added rule, so we start from the top!
+        for (var i = AllRoundGameRules.Count - 1; i >= 0; i--)
+        {
+            var rule = AllRoundGameRules[i];
+            if (rule.Uid != uid)
+                continue;
+
+            if (!rule.StartRule(GetRoundTime()))
+                Log.Error($"Rule {ToPrettyString(uid)} tried to be started, but was already started!");
+
+            AllRoundGameRules[i] = rule;
+            return;
+        }
+
+        Log.Error($"Rule {ToPrettyString(uid)} was started but had not been added yet somehow!");
+        AllRoundGameRules.Add((GetRoundTime(), uid, GameRuleLifeStage.Started));
+    }
+
+    private void EndRuleCache(EntityUid uid)
+    {
+        if (_net.IsClient)
+            return;
+
+        // Very likely to be a recently added rule, so we start from the top!
+        for (var i = AllRoundGameRules.Count - 1; i >= 0; i--)
+        {
+            var rule = AllRoundGameRules[i];
+            if (rule.Uid != uid)
+                continue;
+
+            if (!rule.EndRule())
+                Log.Error($"Rule {ToPrettyString(uid)} tried to be ended, but was already ended!");
+
+            AllRoundGameRules[i] = rule;
+            return;
+        }
+
+        // We don't log an error here because it's possible a game rule was added before MapInit, and then removed.
+        // Removals of game rules in this scenario should already throw errors elsewhere, logging here just fails tests.
+    }
+
+    /// <summary>
+    /// Ends a game rule.
+    /// </summary>
+    [PublicAPI]
+    public bool EndGameRule(Entity<GameRuleComponent?> rule)
+    {
+        // Don't log missing because we could've already ended the rule.
+        // TODO: Maybe do log missing to ensure we only ever try to end a rule once?
+        if (!Resolve(rule, ref rule.Comp, false))
+            return false;
+
+        RemComp(rule, rule.Comp);
+
+        Log.Info($"Ended game rule {ToPrettyString(rule)}");
+        Admin.Add(LogType.EventStopped, $"Ended game rule {ToPrettyString(rule)}");
+        return true;
+    }
+
+    /// <summary>
+    ///     Returns true if a game rule with the given component has been added.
+    /// </summary>
+    [PublicAPI]
+    public bool IsGameRuleAdded<T>()
+        where T : IComponent
+    {
+        var query = EntityQueryEnumerator<T, GameRuleComponent>();
+        return query.MoveNext(out _, out _, out _);
+    }
+
+    /// <summary>
+    /// Returns if a game rule entity has been added yet.
+    /// </summary>
+    /// <param name="rule">Game Rule entity</param>
+    /// <returns>True if the rule has been added, and has not ended yet.</returns>
+    [PublicAPI]
+    public bool IsGameRuleAdded(Entity<GameRuleComponent?> rule)
+    {
+        return Resolve(rule, ref rule.Comp);
+    }
+
+    /// <summary>
+    /// Checks if a game rule of a specific prototype has been added yet.
+    /// </summary>
+    /// <param name="rule">Rule prototype we're checking for</param>
+    /// <returns>True if a game rule exists with this prototype, that has not ended yet.</returns>
+    [PublicAPI]
+    [Obsolete($"Use generic {nameof(IsGameRuleAdded)} instead.")]
+    public bool IsGameRuleAdded([ForbidLiteral] string rule)
+    {
+        foreach (var ruleEntity in GetAddedGameRules())
+        {
+            if (MetaData(ruleEntity).EntityPrototype?.ID == rule)
+                return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Returns true if a game rule that passes the whitelist and blacklist has been added.
+    /// </summary>
+    /// <param name="ruleWhitelist">whitelist for the game rules</param>
+    /// <param name="ruleBlacklist">blacklist for the game rules</param>
+    [PublicAPI]
+    public bool IsGameRuleAdded(EntityWhitelist? ruleWhitelist, EntityWhitelist? ruleBlacklist = null)
+    {
+        foreach (var ruleEntity in GetAddedGameRules())
+        {
+            if (Whitelist.CheckBoth(ruleEntity, ruleBlacklist, ruleWhitelist))
+                return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    ///     Returns true if a game rule with the given component is active..
+    /// </summary>
+    [PublicAPI]
+    public bool IsGameRuleActive<T>()
+        where T : IComponent
+    {
+        var query = EntityQueryEnumerator<T, ActiveGameRuleComponent, GameRuleComponent>();
+        // out, damned underscore!!!
+        while (query.MoveNext(out _, out _, out _, out _))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Checks if a game rule entity has been added, and has been started.
+    /// </summary>
+    /// <param name="entity">Entity we are checking.</param>
+    /// <returns>True if the game rule has been added, and has been started.</returns>
+    [PublicAPI]
+    public bool IsGameRuleActive(Entity<GameRuleComponent?> entity)
+    {
+        return Resolve(entity, ref entity.Comp) && ActiveRuleQuery.HasComp(entity);
+    }
+
+    /// <summary>
+    /// Checks if a game rule with a given prototype has been added, and has been started.
+    /// </summary>
+    /// <param name="rule">Prototype we are looking for.</param>
+    /// <returns>True if the game rule has been added, and has been started.</returns>
+    [PublicAPI]
+    [Obsolete($"Use generic {nameof(IsGameRuleActive)} instead.")]
+    public bool IsGameRuleActive([ForbidLiteral] string rule)
+    {
+        foreach (var ruleEntity in GetActiveGameRules())
+        {
+            if (MetaData(ruleEntity).EntityPrototype?.ID == rule)
+                return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Returns true if a game rule that passes the whitelist and blacklist is active.
+    /// </summary>
+    /// <param name="ruleWhitelist">whitelist for the game rules</param>
+    /// <param name="ruleBlacklist">blacklist for the game rules</param>
+    [PublicAPI]
+    public bool IsGameRuleActive(EntityWhitelist? ruleWhitelist, EntityWhitelist? ruleBlacklist = null)
+    {
+        foreach (var ruleEntity in GetActiveGameRules())
+        {
+            if (Whitelist.CheckBoth(ruleEntity, ruleBlacklist, ruleWhitelist))
+                return true;
+        }
+
+        return false;
+    }
+
+
+    /// <summary>
+    /// Gets all the game rule entities that have been added.
+    /// </summary>
+    [PublicAPI]
+    public IEnumerable<EntityUid> GetAddedGameRules()
+    {
+        var query = EntityQueryEnumerator<GameRuleComponent>();
+        while (query.MoveNext(out var uid, out var ruleData))
+        {
+            if (IsGameRuleAdded((uid, ruleData)))
+                yield return uid;
+        }
+    }
+
+    /// <summary>
+    /// Gets all the game rule entities which have not ended and match the given prototype.
+    /// </summary>
+    [PublicAPI]
+    public IEnumerable<EntityUid> GetAddedGameRules(EntProtoId stationEvent)
+    {
+        var query = EntityQueryEnumerator<GameRuleComponent, MetaDataComponent>();
+        while (query.MoveNext(out var uid, out var ruleData, out var meta))
+        {
+            if (IsGameRuleAdded((uid, ruleData)) && meta.EntityPrototype is { } id && id == stationEvent)
+                yield return uid;
+        }
+    }
+
+    /// <summary>
+    /// Gets all the gamerule entities with {T} component that have been added.
+    /// </summary>
+    [PublicAPI]
+    public IEnumerable<Entity<T>> GetAddedGameRules<T>() where T : Component
+    {
+        var query = EntityQueryEnumerator<T, GameRuleComponent>();
+        while (query.MoveNext(out var uid, out var comp, out var ruleData))
+        {
+            if (IsGameRuleAdded((uid, ruleData)))
+                yield return (uid, comp);
+        }
+    }
+
+    /// <summary>
+    /// Gets all the game rule entities with {T} which have not ended and match the given prototype.
+    /// </summary>
+    [PublicAPI]
+    public IEnumerable<Entity<T>> GetAddedGameRules<T>(EntProtoId stationEvent) where T : Component
+    {
+        var query = EntityQueryEnumerator<T, GameRuleComponent, MetaDataComponent>();
+        while (query.MoveNext(out var uid, out var comp, out var ruleData, out var meta))
+        {
+            if (IsGameRuleAdded((uid, ruleData)) && meta.EntityPrototype is { } id && id == stationEvent)
+                yield return (uid, comp);
+        }
+    }
+
+    /// <summary>
+    /// Gets all the gamerule entities which are currently active.
+    /// </summary>
+    [PublicAPI]
+    public IEnumerable<EntityUid> GetActiveGameRules()
+    {
+        var query = EntityQueryEnumerator<ActiveGameRuleComponent, GameRuleComponent>();
+        while (query.MoveNext(out var uid, out _, out _))
+        {
+            yield return uid;
+        }
+    }
+
+    /// <summary>
+    /// Gets all the game rule entities which are currently active and match the given prototype.
+    /// </summary>
+    [PublicAPI]
+    public IEnumerable<EntityUid> GetActiveGameRules(EntProtoId stationEvent)
+    {
+        var query = EntityQueryEnumerator<ActiveGameRuleComponent, GameRuleComponent, MetaDataComponent>();
+        while (query.MoveNext(out var uid, out _, out _, out var meta))
+        {
+            if (meta.EntityPrototype is { } id && id == stationEvent)
+                yield return uid;
+        }
+    }
+
+    /// <summary>
+    /// Gets all the gamerule entities with {T} component that are currently active.
+    /// </summary>
+    [PublicAPI]
+    public IEnumerable<Entity<T>> GetActiveGameRules<T>() where T : Component
+    {
+        var query = EntityQueryEnumerator<T, ActiveGameRuleComponent, GameRuleComponent>();
+        while (query.MoveNext(out var uid, out var comp, out _, out _))
+        {
+            yield return (uid, comp);
+        }
+    }
+
+    /// <summary>
+    /// Gets all the game rule entities with {T} component that are currently active and have the given prototype.
+    /// </summary>
+    [PublicAPI]
+    public IEnumerable<Entity<T>> GetActiveGameRules<T>(EntProtoId stationEvent) where T : Component
+    {
+        var query = EntityQueryEnumerator<T, ActiveGameRuleComponent, GameRuleComponent, MetaDataComponent>();
+        while (query.MoveNext(out var uid, out var comp, out _, out _, out var meta))
+        {
+            if (meta.EntityPrototype is { } id && id == stationEvent)
+                yield return (uid, comp);
+        }
+    }
+
+    /// <summary>
+    /// Gets all gamerule prototypes
+    /// </summary>
+    [PublicAPI]
+    public IEnumerable<EntityPrototype> GetAllGameRulePrototypes()
+    {
+        foreach (var proto in ProtoMan.EnumeratePrototypes<EntityPrototype>())
+        {
+            if (proto.Abstract)
+                continue;
+
+            if (HasComp<GameRuleComponent>(proto))
+                yield return proto;
+        }
+    }
+
+
+    [PublicAPI]
+    public int GetOccurrences(EntityPrototype stationEvent)
+    {
+        return GetOccurrences(stationEvent.ID);
+    }
+
+    /// <summary>
+    /// Gets the total number of game rule entities which match the inputted prototype!
+    /// </summary>
+    /// <param name="stationEvent">Event prototype we are looking for.</param>
+    /// <returns>Number of already existing events which match this prototype.</returns>
+    [PublicAPI]
+    public int GetOccurrences(EntProtoId stationEvent)
+    {
+        var count = 0;
+        var ruleQuery = EntityQueryEnumerator<GameRuleComponent, MetaDataComponent>();
+        while (ruleQuery.MoveNext(out _, out var meta))
+        {
+            if (meta.EntityPrototype is { } id && id == stationEvent)
+                count++;
+        }
+
+        return count;
+    }
+
+    /// <summary>
+    /// Gets the last added game rule or null if there are no game rules!
+    /// </summary>
+    [PublicAPI]
+    public GameRule? GetLastGameRule()
+    {
+        if (AllRoundGameRules.Count == 0)
+            return null;
+
+        return AllRoundGameRules[^1];
+    }
+
+    /// <summary>
+    /// Gets the last added game rule or null if there are no game rules!
+    /// </summary>
+    [PublicAPI]
+    public TimeSpan GetLastRuleTime()
+    {
+        return GetLastGameRule() is not { } rule ? TimeSpan.Zero : rule.StartTime;
+    }
+
+    /// <summary>
+    /// Gets the last added game rule or null if there are no game rules!
+    /// </summary>
+    [PublicAPI]
+    public GameRule? GetLastGameRule(EntProtoId proto)
+    {
+        for (var i = AllRoundGameRules.Count - 1; i >= 0; i--)
+        {
+            var rule = AllRoundGameRules[i];
+            if (Deleted(rule.Uid) || MetaData(rule.Uid).EntityPrototype is not { } id || id != proto)
+                continue;
+
+            return rule;
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Gets the last added game rule or null if there are no game rules!
+    /// </summary>
+    [PublicAPI]
+    public TimeSpan GetLastRuleTime(EntProtoId proto)
+    {
+        return GetLastGameRule(proto) is not { } rule ? TimeSpan.Zero : rule.StartTime;
+    }
+
+    /// <summary>
+    /// Returns a readable string for this Game Rule.
+    /// </summary>
+    /// <param name="rule">GameRule struct we're searching for.</param>
+    /// <returns>A readable string representing this gamerule and its status.</returns>
+    [PublicAPI]
+    public string RuleToString(GameRule rule)
+    {
+        return RuleToString(rule.Uid, rule.LifeStage);
+    }
+
+    /// <inheritdoc cref="RuleToString(GameRule)"/>
+    [PublicAPI]
+    public string RuleToString(EntityUid rule, GameRuleLifeStage stage)
+    {
+        if (!TryComp(rule, out MetaDataComponent? meta))
+            return "Deleted Rule";
+
+        var str = $"{meta.EntityPrototype?.ID ?? "Unknown Rule"} ({rule.Id})";
+        switch (stage)
+        {
+            case GameRuleLifeStage.Added:
+                str += " - Pending";
+                break;
+            case GameRuleLifeStage.Ended:
+                str += " - Ended";
+                break;
+        }
+
+        return str;
+    }
+}
diff --git a/Content.Shared/GameTicking/GameTicker.Lobby.cs b/Content.Shared/GameTicking/GameTicker.Lobby.cs
new file mode 100644
index 0000000000..af4f6e14ba
--- /dev/null
+++ b/Content.Shared/GameTicking/GameTicker.Lobby.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+
+namespace Content.Shared.GameTicking;
+
+public abstract partial class GameTicker
+{
+    public bool UserHasJoinedGame(ICommonSession session) => UserHasJoinedGame(session.UserId);
+
+    /// <summary>
+    /// Returns if a given session has currently joined the game.
+    /// </summary>
+    /// <param name="userId">User</param>
+    /// <returns>Returns true if the player has joined the game. Only can return true on server!</returns>
+    public virtual bool UserHasJoinedGame(NetUserId userId) => false;
+}
diff --git a/Content.Shared/GameTicking/GameTicker.Player.cs b/Content.Shared/GameTicking/GameTicker.Player.cs
new file mode 100644
index 0000000000..ef00e7092c
--- /dev/null
+++ b/Content.Shared/GameTicking/GameTicker.Player.cs
@@ -0,0 +1,8 @@
+using Robust.Shared.Player;
+
+namespace Content.Shared.GameTicking;
+
+public abstract partial class GameTicker
+{
+    public abstract void PlayerJoinGame(ICommonSession session, bool silent = false);
+}
diff --git a/Content.Shared/GameTicking/GameTicker.RoundFlow.cs b/Content.Shared/GameTicking/GameTicker.RoundFlow.cs
new file mode 100644
index 0000000000..9796196597
--- /dev/null
+++ b/Content.Shared/GameTicking/GameTicker.RoundFlow.cs
@@ -0,0 +1,169 @@
+using System.Numerics;
+using Content.Shared.Maps;
+using Content.Shared.Preferences;
+using Robust.Shared.EntitySerialization;
+using Robust.Shared.EntitySerialization.Systems;
+using Robust.Shared.Map;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+
+namespace Content.Shared.GameTicking;
+
+public abstract partial class GameTicker
+{
+    /// <summary>
+    /// Game's current run level.
+    /// </summary>
+    [ViewVariables]
+    public GameRunLevel RunLevel
+    {
+        get;
+        protected set
+        {
+            var old = field;
+            field = value;
+
+            var gameRunLevelChangedEvent = new GameRunLevelChangedEvent(old, value);
+            RaiseLocalEvent(gameRunLevelChangedEvent);
+        }
+    }
+
+    /// <summary>
+    /// Ends the current round, with custom end of round text.
+    /// </summary>
+    /// <param name="text">Text displayed at the end of round scoreboard.</param>
+    public virtual void EndRound(string text = "") { }
+
+    /// <summary>
+    /// Restarts the current round, sending the game to the lobby or starting a new round if lobby is disabled.
+    /// </summary>
+    public virtual void RestartRound() { }
+
+    /// <summary>
+    ///     Loads a new map, allowing systems interested in it to handle loading events.
+    ///     In the base game, this is required to be used if you want to load a station.
+    ///     This does not initialze maps, unles specified via the <see cref="DeserializationOptions"/>.
+    /// </summary>
+    /// <remarks>
+    /// This is basically a wrapper around a <see cref="MapLoaderSystem"/> method that auto generate
+    /// some <see cref="MapLoadOptions"/> using information in a prototype, and raise some events to allow content
+    /// to modify the options and react to the map creation.
+    /// </remarks>
+    /// <param name="proto">Game map prototype to load in.</param>
+    /// <param name="mapId">The id of the map that was loaded.</param>
+    /// <param name="options">Entity loading options, including whether the maps should be initialized.</param>
+    /// <param name="stationName">Name to assign to the loaded station.</param>
+    /// <param name="offset">Coordinate offset for spawning grids within this map</param>
+    /// <param name="rot">Rotation offset for spawning grids within this map</param>
+    /// <returns>All loaded entities and grids.</returns>
+    public abstract IReadOnlyList<EntityUid> LoadGameMap(
+        GameMapPrototype proto,
+        out MapId mapId,
+        DeserializationOptions? options = null,
+        string? stationName = null,
+        Vector2? offset = null,
+        Angle? rot = null);
+
+    /// <summary>
+    /// Gets the current round duration, returning zero if the round has not started.
+    /// </summary>
+    public TimeSpan GetRoundTime()
+    {
+        return RunLevel == GameRunLevel.PreRoundLobby ? TimeSpan.Zero : RoundDuration();
+    }
+
+    /// <summary>
+    /// Gets the current number of readied up players.
+    /// </summary>
+    public abstract int ReadyPlayerCount();
+}
+
+public enum GameRunLevel
+{
+    PreRoundLobby = 0,
+    InRound = 1,
+    PostRound = 2
+}
+
+public sealed class GameRunLevelChangedEvent
+{
+    public GameRunLevel Old { get; }
+    public GameRunLevel New { get; }
+
+    public GameRunLevelChangedEvent(GameRunLevel old, GameRunLevel @new)
+    {
+        Old = old;
+        New = @new;
+    }
+}
+
+/// <summary>
+///     Event raised to allow subscribers to add text to the round end summary screen.
+/// </summary>
+[ByRefEvent]
+public record struct RoundEndTextAppendEvent
+{
+    private bool _doNewLine;
+
+    public RoundEndTextAppendEvent() { }
+
+    /// <summary>
+    ///     Text to display in the round end summary screen.
+    /// </summary>
+    public string Text { get; private set; } = string.Empty;
+
+    /// <summary>
+    ///     Invoke this method to add text to the round end summary screen.
+    /// </summary>
+    /// <param name="text"></param>
+    public void AddLine(string text)
+    {
+        if (_doNewLine)
+            Text += "\n";
+
+        Text += text;
+        _doNewLine = true;
+    }
+}
+
+/// <summary>
+///     Event raised before readied up players are spawned and given jobs by the GameTicker.
+///     You can use this to spawn people off-station, like in the case of nuke ops or wizard.
+///     Remove the players you spawned from the PlayerPool and call <see cref="Shared.GameTicking.GameTicker.PlayerJoinGame"/> on them.
+/// </summary>
+public sealed class RulePlayerSpawningEvent
+{
+    /// <summary>
+    ///     Pool of players to be spawned.
+    ///     If you want to handle a specific player being spawned, remove it from this list and do what you need.
+    /// </summary>
+    /// <remarks>If you spawn a player by yourself from this event, don't forget to call <see cref="Shared.GameTicking.GameTicker.PlayerJoinGame"/> on them.</remarks>
+    public List<ICommonSession> PlayerPool { get; }
+    public IReadOnlyDictionary<NetUserId, HumanoidCharacterProfile> Profiles { get; }
+    public bool Forced { get; }
+
+    public RulePlayerSpawningEvent(List<ICommonSession> playerPool, IReadOnlyDictionary<NetUserId, HumanoidCharacterProfile> profiles, bool forced)
+    {
+        PlayerPool = playerPool;
+        Profiles = profiles;
+        Forced = forced;
+    }
+}
+
+/// <summary>
+///     Event raised after players were assigned jobs by the GameTicker and have been spawned in.
+///     You can give on-station people special roles by listening to this event.
+/// </summary>
+public sealed class RulePlayerJobsAssignedEvent
+{
+    public ICommonSession[] Players { get; }
+    public IReadOnlyDictionary<NetUserId, HumanoidCharacterProfile> Profiles { get; }
+    public bool Forced { get; }
+
+    public RulePlayerJobsAssignedEvent(ICommonSession[] players, IReadOnlyDictionary<NetUserId, HumanoidCharacterProfile> profiles, bool forced)
+    {
+        Players = players;
+        Profiles = profiles;
+        Forced = forced;
+    }
+}
diff --git a/Content.Shared/GameTicking/GameTicker.Spawning.cs b/Content.Shared/GameTicking/GameTicker.Spawning.cs
new file mode 100644
index 0000000000..258fbacb60
--- /dev/null
+++ b/Content.Shared/GameTicking/GameTicker.Spawning.cs
@@ -0,0 +1,15 @@
+using Robust.Shared.Player;
+
+namespace Content.Shared.GameTicking;
+
+public abstract partial class GameTicker
+{
+    /// <summary>
+    /// Makes a player join into the game and spawn on a station.
+    /// </summary>
+    /// <param name="player">The player joining</param>
+    /// <param name="station">The station they're spawning on</param>
+    /// <param name="jobId">An optional job for them to spawn as</param>
+    /// <param name="silent">Whether or not the player should be greeted upon joining</param>
+    public virtual void MakeJoinGame(ICommonSession player, EntityUid station, string? jobId = null, bool silent = false) { }
+}
diff --git a/Content.Shared/GameTicking/GameTicker.cs b/Content.Shared/GameTicking/GameTicker.cs
new file mode 100644
index 0000000000..36675a5437
--- /dev/null
+++ b/Content.Shared/GameTicking/GameTicker.cs
@@ -0,0 +1,258 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Chat;
+using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Prototypes;
+using Content.Shared.Mind;
+using Content.Shared.Roles;
+using Content.Shared.Station.Systems;
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Configuration;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Robust.Shared.Replays;
+using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.Markdown.Mapping;
+using Robust.Shared.Serialization.Markdown.Value;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.GameTicking;
+
+public abstract partial class GameTicker : EntitySystem
+{
+    // Behold! My massive wall of dependencies!!!
+    [Dependency] protected IConfigurationManager Cfg = default!;
+    [Dependency] protected IGameTiming Timing = default!;
+    [Dependency] private INetManager _net = default!;
+    [Dependency] protected ISharedAdminLogManager Admin = default!;
+    [Dependency] protected IReplayRecordingManager Replay = default!;
+    [Dependency] protected IRobustRandom Random = default!;
+    [Dependency] protected EntityWhitelistSystem Whitelist = default!;
+    [Dependency] protected MetaDataSystem Meta = default!;
+    [Dependency] protected SharedAudioSystem Audio = default!;
+    [Dependency] protected SharedChatSystem Chat = default!;
+    [Dependency] protected SharedMapSystem Map = default!;
+    [Dependency] protected SharedMindSystem Mind = default!;
+    [Dependency] protected SharedRoleSystem Role = default!;
+    [Dependency] protected StationSystem Station = default!;
+    [Dependency] protected SharedTransformSystem XForm = default!;
+
+    // A second wall of dependencies has hit the GameTicker...
+    [Dependency] protected EntityQuery<GameRuleComponent> RuleQuery;
+    [Dependency] protected EntityQuery<ActiveGameRuleComponent> ActiveRuleQuery;
+
+    // See ideally these would be pulled from the job definition or something.
+    // But this is easier, and at least it isn't hardcoded.
+    //TODO: Move these, they really belong in StationJobsSystem or a cvar.
+    public static readonly ProtoId<JobPrototype> FallbackOverflowJob = "Passenger";
+
+    public const string FallbackOverflowJobName = "job-name-passenger";
+
+    // TODO network.
+    // Probably most useful for replays, round end info, and probably things like lobby menus.
+    [ViewVariables]
+    public int RoundId { get; protected set; }
+    [ViewVariables] public TimeSpan RoundStartTimeSpan { get; protected set; }
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        Replay.RecordingStarted += OnRecordingStart;
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+        Replay.RecordingStarted -= OnRecordingStart;
+    }
+
+    private void OnRecordingStart(MappingDataNode metadata, List<object> events)
+    {
+        if (RoundId != 0)
+        {
+            metadata["roundId"] = new ValueDataNode(RoundId.ToString());
+        }
+    }
+
+    public TimeSpan RoundDuration()
+    {
+        return Timing.CurTime.Subtract(RoundStartTimeSpan);
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class TickerJoinLobbyEvent : EntityEventArgs
+{
+}
+
+[Serializable, NetSerializable]
+public sealed class TickerJoinGameEvent : EntityEventArgs
+{
+}
+
+[Serializable, NetSerializable]
+public sealed class TickerLateJoinStatusEvent : EntityEventArgs
+{
+    // TODO: Make this a replicated CVar, honestly.
+    public bool Disallowed { get; }
+
+    public TickerLateJoinStatusEvent(bool disallowed)
+    {
+        Disallowed = disallowed;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class TickerConnectionStatusEvent : EntityEventArgs
+{
+    public TimeSpan RoundStartTimeSpan { get; }
+    public TickerConnectionStatusEvent(TimeSpan roundStartTimeSpan)
+    {
+        RoundStartTimeSpan = roundStartTimeSpan;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class TickerLobbyStatusEvent : EntityEventArgs
+{
+    public bool IsRoundStarted { get; }
+    public ProtoId<LobbyBackgroundPrototype>? LobbyBackground { get; }
+    public bool YouAreReady { get; }
+    // UTC.
+    public TimeSpan StartTime { get; }
+    public TimeSpan RoundStartTimeSpan { get; }
+    public bool Paused { get; }
+
+    public TickerLobbyStatusEvent(bool isRoundStarted, ProtoId<LobbyBackgroundPrototype>? lobbyBackground, bool youAreReady, TimeSpan startTime, TimeSpan preloadTime, TimeSpan roundStartTimeSpan, bool paused)
+    {
+        IsRoundStarted = isRoundStarted;
+        LobbyBackground = lobbyBackground;
+        YouAreReady = youAreReady;
+        StartTime = startTime;
+        RoundStartTimeSpan = roundStartTimeSpan;
+        Paused = paused;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class TickerLobbyInfoEvent : EntityEventArgs
+{
+    public string TextBlob { get; }
+
+    public TickerLobbyInfoEvent(string textBlob)
+    {
+        TextBlob = textBlob;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class TickerLobbyCountdownEvent : EntityEventArgs
+{
+    /// <summary>
+    /// The game time that the game will start at.
+    /// </summary>
+    public TimeSpan StartTime { get; }
+
+    /// <summary>
+    /// Whether or not the countdown is paused
+    /// </summary>
+    public bool Paused { get; }
+
+    public TickerLobbyCountdownEvent(TimeSpan startTime, bool paused)
+    {
+        StartTime = startTime;
+        Paused = paused;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class TickerJobsAvailableEvent(
+    Dictionary<NetEntity, string> stationNames,
+    Dictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>> jobsAvailableByStation,
+    Dictionary<NetEntity, ProtoId<JobWeightPrototype>?> jobWeightsByStation)
+    : EntityEventArgs
+{
+    /// <summary>
+    /// The Status of the Player in the lobby (ready, observer, ...)
+    /// </summary>
+    public Dictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>> JobsAvailableByStation { get; } = jobsAvailableByStation;
+
+    public Dictionary<NetEntity, string> StationNames { get; } = stationNames;
+
+    public Dictionary<NetEntity, ProtoId<JobWeightPrototype>?> JobWeightsByStation { get; } = jobWeightsByStation;
+}
+
+[Serializable, NetSerializable, DataDefinition]
+public sealed partial class RoundEndMessageEvent : EntityEventArgs
+{
+    [Serializable, NetSerializable, DataDefinition]
+    public partial struct RoundEndPlayerInfo
+    {
+        [DataField]
+        public string PlayerOOCName;
+
+        [DataField]
+        public string? PlayerICName;
+
+        [DataField, NonSerialized]
+        public NetUserId? PlayerGuid;
+
+        public string Role;
+
+        [DataField, NonSerialized]
+        public string[] JobPrototypes;
+
+        [DataField, NonSerialized]
+        public string[] AntagPrototypes;
+
+        public NetEntity? PlayerNetEntity;
+
+        [DataField]
+        public bool Antag;
+
+        [DataField]
+        public bool Observer;
+
+        public bool Connected;
+    }
+
+    public string GamemodeTitle { get; }
+    public string RoundEndText { get; }
+    public TimeSpan RoundDuration { get; }
+    public int RoundId { get; }
+    public int PlayerCount { get; }
+    public RoundEndPlayerInfo[] AllPlayersEndInfo { get; }
+
+    /// <summary>
+    /// Sound gets networked due to how entity lifecycle works between client / server and to avoid clipping.
+    /// </summary>
+    public ResolvedSoundSpecifier? RestartSound;
+
+    public RoundEndMessageEvent(
+        string gamemodeTitle,
+        string roundEndText,
+        TimeSpan roundDuration,
+        int roundId,
+        int playerCount,
+        RoundEndPlayerInfo[] allPlayersEndInfo,
+        ResolvedSoundSpecifier? restartSound)
+    {
+        GamemodeTitle = gamemodeTitle;
+        RoundEndText = roundEndText;
+        RoundDuration = roundDuration;
+        RoundId = roundId;
+        PlayerCount = playerCount;
+        AllPlayersEndInfo = allPlayersEndInfo;
+        RestartSound = restartSound;
+    }
+}
+
+[Serializable, NetSerializable]
+public enum PlayerGameStatus : sbyte
+{
+    NotReadyToPlay = 0,
+    ReadyToPlay,
+    JoinedGame,
+}
diff --git a/Content.Shared/GameTicking/PlayerBeforeSpawnEvent.cs b/Content.Shared/GameTicking/PlayerBeforeSpawnEvent.cs
index 48623ecf8e..efcaba389d 100644
--- a/Content.Shared/GameTicking/PlayerBeforeSpawnEvent.cs
+++ b/Content.Shared/GameTicking/PlayerBeforeSpawnEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Preferences;
+using Content.Shared.Preferences;
 using JetBrains.Annotations;
 using Robust.Shared.Player;
 
diff --git a/Content.Shared/GameTicking/PlayerSpawnCompleteEvent.cs b/Content.Shared/GameTicking/PlayerSpawnCompleteEvent.cs
index 034b76beeb..2b19194331 100644
--- a/Content.Shared/GameTicking/PlayerSpawnCompleteEvent.cs
+++ b/Content.Shared/GameTicking/PlayerSpawnCompleteEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Preferences;
+using Content.Shared.Preferences;
 using JetBrains.Annotations;
 using Robust.Shared.Player;
 
diff --git a/Content.Shared/GameTicking/Prototypes/GamePresetPrototype.cs b/Content.Shared/GameTicking/Prototypes/GamePresetPrototype.cs
new file mode 100644
index 0000000000..307abf2970
--- /dev/null
+++ b/Content.Shared/GameTicking/Prototypes/GamePresetPrototype.cs
@@ -0,0 +1,42 @@
+using Content.Shared.Maps;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.GameTicking.Prototypes;
+
+/// <summary>
+///     A round-start setup preset, such as which antagonists to spawn.
+/// </summary>
+[Prototype]
+public sealed partial class GamePresetPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    [DataField]
+    public string[] Alias = Array.Empty<string>();
+
+    [DataField("name")]
+    public string ModeTitle = "????";
+
+    [DataField]
+    public string Description = string.Empty;
+
+    [DataField]
+    public bool ShowInVote;
+
+    [DataField]
+    public int? MinPlayers;
+
+    [DataField]
+    public int? MaxPlayers;
+
+    [DataField]
+    public IReadOnlyList<EntProtoId> Rules { get; private set; } = Array.Empty<EntProtoId>();
+
+    /// <summary>
+    /// If specified, the gamemode will only be run with these maps.
+    /// If none are elligible, the global fallback will be used.
+    /// </summary>
+    [DataField("supportedMaps")]
+    public ProtoId<GameMapPoolPrototype>? MapPool;
+}
diff --git a/Content.Shared/GameTicking/RoundRestartCleanupEvent.cs b/Content.Shared/GameTicking/RoundRestartCleanupEvent.cs
index 8dae533129..d754704a93 100644
--- a/Content.Shared/GameTicking/RoundRestartCleanupEvent.cs
+++ b/Content.Shared/GameTicking/RoundRestartCleanupEvent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 
 namespace Content.Shared.GameTicking
diff --git a/Content.Server/GameTicking/Rules/Components/ChangelingRuleComponent.cs b/Content.Shared/GameTicking/Rules/Components/ChangelingRuleComponent.cs
similarity index 75%
rename from Content.Server/GameTicking/Rules/Components/ChangelingRuleComponent.cs
rename to Content.Shared/GameTicking/Rules/Components/ChangelingRuleComponent.cs
index 13891c1988..b1f339fa2e 100644
--- a/Content.Server/GameTicking/Rules/Components/ChangelingRuleComponent.cs
+++ b/Content.Shared/GameTicking/Rules/Components/ChangelingRuleComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.GameTicking.Rules.Components;
+namespace Content.Shared.GameTicking.Rules.Components;
 
 /// <summary>
 /// Gamerule component for handling a changeling antagonist.
diff --git a/Content.Server/GameTicking/Rules/Components/DragonRuleComponent.cs b/Content.Shared/GameTicking/Rules/Components/DragonRuleComponent.cs
similarity index 59%
rename from Content.Server/GameTicking/Rules/Components/DragonRuleComponent.cs
rename to Content.Shared/GameTicking/Rules/Components/DragonRuleComponent.cs
index e3fab85f2d..a20107d401 100644
--- a/Content.Server/GameTicking/Rules/Components/DragonRuleComponent.cs
+++ b/Content.Shared/GameTicking/Rules/Components/DragonRuleComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.GameTicking.Rules.Components;
+namespace Content.Shared.GameTicking.Rules.Components;
 
 [RegisterComponent]
 public sealed partial class DragonRuleComponent : Component;
diff --git a/Content.Shared/GameTicking/Rules/DynamicRuleComponent.cs b/Content.Shared/GameTicking/Rules/Components/DynamicRuleComponent.cs
similarity index 97%
rename from Content.Shared/GameTicking/Rules/DynamicRuleComponent.cs
rename to Content.Shared/GameTicking/Rules/Components/DynamicRuleComponent.cs
index 7782717758..b1d21e6082 100644
--- a/Content.Shared/GameTicking/Rules/DynamicRuleComponent.cs
+++ b/Content.Shared/GameTicking/Rules/Components/DynamicRuleComponent.cs
@@ -1,7 +1,7 @@
 using Content.Shared.EntityTable.EntitySelectors;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Shared.GameTicking.Rules;
+namespace Content.Shared.GameTicking.Rules.Components;
 
 /// <summary>
 /// Gamerule the spawns multiple antags at intervals based on a budget
diff --git a/Content.Shared/GameTicking/Rules/DynamicRuleCostComponent.cs b/Content.Shared/GameTicking/Rules/Components/DynamicRuleCostComponent.cs
similarity index 85%
rename from Content.Shared/GameTicking/Rules/DynamicRuleCostComponent.cs
rename to Content.Shared/GameTicking/Rules/Components/DynamicRuleCostComponent.cs
index 180b168dc1..458334d862 100644
--- a/Content.Shared/GameTicking/Rules/DynamicRuleCostComponent.cs
+++ b/Content.Shared/GameTicking/Rules/Components/DynamicRuleCostComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.GameTicking.Rules;
+namespace Content.Shared.GameTicking.Rules.Components;
 
 /// <summary>
 /// Component that tracks how much a rule "costs" for Dynamic
diff --git a/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs b/Content.Shared/GameTicking/Rules/Components/NukeopsRuleComponent.cs
similarity index 96%
rename from Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs
rename to Content.Shared/GameTicking/Rules/Components/NukeopsRuleComponent.cs
index dc118e9bb7..037a17584d 100644
--- a/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs
+++ b/Content.Shared/GameTicking/Rules/Components/NukeopsRuleComponent.cs
@@ -1,12 +1,10 @@
-using Content.Server.RoundEnd;
-using Content.Shared.Dataset;
 using Content.Shared.NPC.Prototypes;
-using Content.Shared.Roles;
+using Content.Shared.RoundEnd;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.GameTicking.Rules.Components;
+namespace Content.Shared.GameTicking.Rules.Components;
 
 [RegisterComponent, Access(typeof(NukeopsRuleSystem))]
 public sealed partial class NukeopsRuleComponent : Component
diff --git a/Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs b/Content.Shared/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
similarity index 96%
rename from Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
rename to Content.Shared/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
index f1e8e41258..6856eb4cd4 100644
--- a/Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
+++ b/Content.Shared/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
@@ -2,7 +2,7 @@ using Content.Shared.Cloning;
 using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.GameTicking.Rules.Components;
+namespace Content.Shared.GameTicking.Rules.Components;
 
 /// <summary>
 ///     Gamerule component for spawning a paradox clone antagonist.
diff --git a/Content.Server/GameTicking/Rules/Components/RevolutionaryRuleComponent.cs b/Content.Shared/GameTicking/Rules/Components/RevolutionaryRuleComponent.cs
similarity index 90%
rename from Content.Server/GameTicking/Rules/Components/RevolutionaryRuleComponent.cs
rename to Content.Shared/GameTicking/Rules/Components/RevolutionaryRuleComponent.cs
index 3b19bbffb6..69b62183d1 100644
--- a/Content.Server/GameTicking/Rules/Components/RevolutionaryRuleComponent.cs
+++ b/Content.Shared/GameTicking/Rules/Components/RevolutionaryRuleComponent.cs
@@ -1,8 +1,6 @@
-using Content.Shared.Roles;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.GameTicking.Rules.Components;
+namespace Content.Shared.GameTicking.Rules.Components;
 
 /// <summary>
 /// Component for the RevolutionaryRuleSystem that stores info about winning/losing, player counts required for starting, as well as prototypes for Revolutionaries and their gear.
diff --git a/Content.Server/GameTicking/Rules/Components/RoundstartStationVariationRuleComponent.cs b/Content.Shared/GameTicking/Rules/Components/RoundstartStationVariationRuleComponent.cs
similarity index 83%
rename from Content.Server/GameTicking/Rules/Components/RoundstartStationVariationRuleComponent.cs
rename to Content.Shared/GameTicking/Rules/Components/RoundstartStationVariationRuleComponent.cs
index 44ae89f7b3..7cc4f163ff 100644
--- a/Content.Server/GameTicking/Rules/Components/RoundstartStationVariationRuleComponent.cs
+++ b/Content.Shared/GameTicking/Rules/Components/RoundstartStationVariationRuleComponent.cs
@@ -1,7 +1,6 @@
-using Content.Shared.Storage;
-using Robust.Shared.Prototypes;
+using Content.Shared.Storage;
 
-namespace Content.Server.GameTicking.Rules.Components;
+namespace Content.Shared.GameTicking.Rules.Components;
 
 /// <summary>
 /// This handles starting various roundstart variation rules after a station has been loaded.
diff --git a/Content.Server/GameTicking/Rules/Components/StationVariationPassRuleComponent.cs b/Content.Shared/GameTicking/Rules/Components/StationVariationPassRuleComponent.cs
similarity index 75%
rename from Content.Server/GameTicking/Rules/Components/StationVariationPassRuleComponent.cs
rename to Content.Shared/GameTicking/Rules/Components/StationVariationPassRuleComponent.cs
index 9fdc62a7e0..c35e7f4c81 100644
--- a/Content.Server/GameTicking/Rules/Components/StationVariationPassRuleComponent.cs
+++ b/Content.Shared/GameTicking/Rules/Components/StationVariationPassRuleComponent.cs
@@ -1,9 +1,7 @@
-namespace Content.Server.GameTicking.Rules.Components;
+namespace Content.Shared.GameTicking.Rules.Components;
 
 /// <summary>
 /// This is a marker component placed on rule entities which are a single "pass" of station variation.
 /// </summary>
 [RegisterComponent]
-public sealed partial class StationVariationPassRuleComponent : Component
-{
-}
+public sealed partial class StationVariationPassRuleComponent : Component;
diff --git a/Content.Server/GameTicking/Rules/Components/SurvivorRuleComponent.cs b/Content.Shared/GameTicking/Rules/Components/SurvivorRuleComponent.cs
similarity index 85%
rename from Content.Server/GameTicking/Rules/Components/SurvivorRuleComponent.cs
rename to Content.Shared/GameTicking/Rules/Components/SurvivorRuleComponent.cs
index 5e6cc203d2..f3572ce4bc 100644
--- a/Content.Server/GameTicking/Rules/Components/SurvivorRuleComponent.cs
+++ b/Content.Shared/GameTicking/Rules/Components/SurvivorRuleComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.GameTicking.Rules.Components;
+namespace Content.Shared.GameTicking.Rules.Components;
 
 /// <summary>
 /// Component for the SurvivorRuleSystem. Game rule that turns everyone into a survivor and gives them the objective to escape centcom alive.
diff --git a/Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs b/Content.Shared/GameTicking/Rules/Components/ThiefRuleComponent.cs
similarity index 57%
rename from Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
rename to Content.Shared/GameTicking/Rules/Components/ThiefRuleComponent.cs
index 6ad1e17775..c46edbc00e 100644
--- a/Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
+++ b/Content.Shared/GameTicking/Rules/Components/ThiefRuleComponent.cs
@@ -1,8 +1,4 @@
-using Content.Shared.Random;
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.GameTicking.Rules.Components;
+namespace Content.Shared.GameTicking.Rules.Components;
 
 /// <summary>
 /// Stores data for <see cref="ThiefRuleSystem"/>.
diff --git a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs b/Content.Shared/GameTicking/Rules/Components/TraitorRuleComponent.cs
similarity index 95%
rename from Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
rename to Content.Shared/GameTicking/Rules/Components/TraitorRuleComponent.cs
index 092f4b71c2..2c84307c7c 100644
--- a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
+++ b/Content.Shared/GameTicking/Rules/Components/TraitorRuleComponent.cs
@@ -1,14 +1,13 @@
-using Content.Server.Codewords;
+using Content.Shared.Codewords;
 using Content.Shared.Dataset;
 using Content.Shared.FixedPoint;
 using Content.Shared.NPC.Prototypes;
-using Content.Shared.Random;
 using Content.Shared.Roles;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.GameTicking.Rules.Components;
+namespace Content.Shared.GameTicking.Rules.Components;
 
 [RegisterComponent, Access(typeof(TraitorRuleSystem))]
 public sealed partial class TraitorRuleComponent : Component
diff --git a/Content.Server/GameTicking/Rules/Components/XenoborgsRuleComponent.cs b/Content.Shared/GameTicking/Rules/Components/XenoborgsRuleComponent.cs
similarity index 96%
rename from Content.Server/GameTicking/Rules/Components/XenoborgsRuleComponent.cs
rename to Content.Shared/GameTicking/Rules/Components/XenoborgsRuleComponent.cs
index 4a018d7e6c..b343e53f1e 100644
--- a/Content.Server/GameTicking/Rules/Components/XenoborgsRuleComponent.cs
+++ b/Content.Shared/GameTicking/Rules/Components/XenoborgsRuleComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.GameTicking.Rules.Components;
+namespace Content.Shared.GameTicking.Rules.Components;
 
 [RegisterComponent, Access(typeof(XenoborgsRuleSystem))]
 [AutoGenerateComponentPause]
diff --git a/Content.Server/GameTicking/Rules/Components/ZombieRuleComponent.cs b/Content.Shared/GameTicking/Rules/Components/ZombieRuleComponent.cs
similarity index 63%
rename from Content.Server/GameTicking/Rules/Components/ZombieRuleComponent.cs
rename to Content.Shared/GameTicking/Rules/Components/ZombieRuleComponent.cs
index 59d1940eaf..eceebdfa1d 100644
--- a/Content.Server/GameTicking/Rules/Components/ZombieRuleComponent.cs
+++ b/Content.Shared/GameTicking/Rules/Components/ZombieRuleComponent.cs
@@ -1,9 +1,7 @@
-using Content.Shared.Roles;
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
+using Content.Shared.RoundEnd;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.GameTicking.Rules.Components;
+namespace Content.Shared.GameTicking.Rules.Components;
 
 [RegisterComponent, Access(typeof(ZombieRuleSystem))]
 public sealed partial class ZombieRuleComponent : Component
@@ -25,4 +23,16 @@ public sealed partial class ZombieRuleComponent : Component
     /// </summary>
     [DataField]
     public float ZombieShuttleCallPercentage = 0.7f;
+
+    /// <summary>
+    /// What will happen if zombies get more than 80%
+    /// </summary>
+    [DataField]
+    public RoundEndBehavior ZombieRoundEndBehavior = RoundEndBehavior.ShuttleCall;
+
+    /// <summary>
+    /// Shuttle timer for when shuttle is called
+    /// </summary>
+    [DataField]
+    public TimeSpan ZombieEvacShuttleTime = TimeSpan.FromMinutes(5);
 }
diff --git a/Content.Server/GameTicking/Rules/DragonRuleSystem.cs b/Content.Shared/GameTicking/Rules/DragonRuleSystem.cs
similarity index 71%
rename from Content.Server/GameTicking/Rules/DragonRuleSystem.cs
rename to Content.Shared/GameTicking/Rules/DragonRuleSystem.cs
index 1992fc2793..132a8fc418 100644
--- a/Content.Server/GameTicking/Rules/DragonRuleSystem.cs
+++ b/Content.Shared/GameTicking/Rules/DragonRuleSystem.cs
@@ -1,30 +1,22 @@
-using Content.Server.Antag;
-using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Mind;
-using Content.Server.Roles;
-using Content.Server.Station.Systems;
+using Content.Shared.Antag;
+using Content.Shared.GameTicking.Rules.Components;
 using Content.Shared.Localizations;
+using Content.Shared.Mind;
+using Content.Shared.Roles;
 using Content.Shared.Roles.Components;
-using Robust.Server.GameObjects;
+using Content.Shared.Station.Systems;
 
-namespace Content.Server.GameTicking.Rules;
+namespace Content.Shared.GameTicking.Rules;
 
 public sealed partial class DragonRuleSystem : GameRuleSystem<DragonRuleComponent>
 {
-    [Dependency] private TransformSystem _transform = default!;
     [Dependency] private AntagSelectionSystem _antag = default!;
     [Dependency] private StationSystem _station = default!;
-    [Dependency] private RoleSystem _roleSystem = default!;
-    [Dependency] private MindSystem _mind = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<DragonRuleComponent, AfterAntagEntitySelectedEvent>(AfterAntagEntitySelected);
-        SubscribeLocalEvent<DragonRoleComponent, GetBriefingEvent>(UpdateBriefing);
-    }
+    [Dependency] private SharedMindSystem _mind = default!;
+    [Dependency] private SharedRoleSystem _roleSystem = default!;
+    [Dependency] private SharedTransformSystem _transform = default!;
 
+    [SubscribeLocalEvent]
     private void UpdateBriefing(Entity<DragonRoleComponent> entity, ref GetBriefingEvent args)
     {
         var ent = args.Mind.Comp.OwnedEntity;
@@ -35,9 +27,10 @@ public sealed partial class DragonRuleSystem : GameRuleSystem<DragonRuleComponen
         args.Append(MakeBriefing(ent.Value));
     }
 
+    [SubscribeLocalEvent]
     private void AfterAntagEntitySelected(Entity<DragonRuleComponent> ent, ref AfterAntagEntitySelectedEvent args)
     {
-        if (!_mind.TryGetMind(args.EntityUid, out var mindId, out var mind))
+        if (!_mind.TryGetMind(args.EntityUid, out var mindId, out _))
             return;
 
         _roleSystem.MindHasRole<DragonRoleComponent>(mindId, out var dragonRole);
diff --git a/Content.Shared/GameTicking/Rules/GameRuleSystem.Utility.cs b/Content.Shared/GameTicking/Rules/GameRuleSystem.Utility.cs
new file mode 100644
index 0000000000..e1efea9964
--- /dev/null
+++ b/Content.Shared/GameTicking/Rules/GameRuleSystem.Utility.cs
@@ -0,0 +1,37 @@
+using Content.Shared.GameTicking.Components;
+
+namespace Content.Shared.GameTicking.Rules;
+
+// TODO: Someone should probably make this virtual and make it into a "GameRuleSystem" with all GameRules in it.
+// TODO: Then move GameTicker.GameRule into here and have GameRuleSystem<T> inherit, since it already uses it as a dependency...
+public abstract partial class GameRuleSystem<T> where T: IComponent
+{
+    protected EntityQueryEnumerator<T, ActiveGameRuleComponent, GameRuleComponent> QueryActiveRules()
+    {
+        return EntityQueryEnumerator<T, ActiveGameRuleComponent, GameRuleComponent>();
+    }
+
+    protected EntityQueryEnumerator<T, DelayedStartRuleComponent, GameRuleComponent> QueryDelayedRules()
+    {
+        return EntityQueryEnumerator<T, DelayedStartRuleComponent, GameRuleComponent>();
+    }
+
+    /// <summary>
+    /// Queries all gamerules, regardless of if they're active or not.
+    /// </summary>
+    protected EntityQueryEnumerator<T, GameRuleComponent> QueryAllRules()
+    {
+        return EntityQueryEnumerator<T, GameRuleComponent>();
+    }
+
+    protected void ForceEndSelf(Entity<GameRuleComponent?> entity)
+    {
+        GameTicker.EndGameRule(entity);
+    }
+
+    [Obsolete("Use Entity<T> typed version of this method instead!")]
+    protected void ForceEndSelf(EntityUid uid, GameRuleComponent? component = null)
+    {
+        ForceEndSelf((uid, component));
+    }
+}
diff --git a/Content.Shared/GameTicking/Rules/GameRuleSystem.cs b/Content.Shared/GameTicking/Rules/GameRuleSystem.cs
new file mode 100644
index 0000000000..1fb44b309c
--- /dev/null
+++ b/Content.Shared/GameTicking/Rules/GameRuleSystem.cs
@@ -0,0 +1,117 @@
+using Content.Shared.GameTicking.Components;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.GameTicking.Rules;
+
+public abstract partial class GameRuleSystem<T> : EntitySystem where T : IComponent
+{
+    [Dependency] protected IGameTiming Timing = default!;
+    [Dependency] protected IRobustRandom RobustRandom = default!;
+    [Dependency] protected GameTicker GameTicker = default!;
+    [Dependency] protected EntityQuery<T> RuleQuery = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<T, GameRuleAddedEvent>(OnGameRuleAdded);
+        SubscribeLocalEvent<T, GameRuleStartedEvent>(OnGameRuleStarted);
+        SubscribeLocalEvent<T, GameRuleEndedEvent>(OnGameRuleEnded);
+    }
+
+    private void OnGameRuleAdded(Entity<T> entity, ref GameRuleAddedEvent args)
+    {
+        Added((entity, entity, args.Rule), ref args);
+    }
+
+    private void OnGameRuleStarted(Entity<T> entity, ref GameRuleStartedEvent args)
+    {
+        Started((entity, entity, args.Rule), ref args);
+    }
+
+    private void OnGameRuleEnded(Entity<T> entity, ref GameRuleEndedEvent args)
+    {
+        Ended((entity, entity), ref args);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnRoundEndTextAppend(ref RoundEndTextAppendEvent ev)
+    {
+        // We don't query GameRuleComponent since the rule may have ended!
+        var query = EntityQueryEnumerator<T>();
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            AppendRoundEndText((uid, comp), ref ev);
+        }
+    }
+
+    /// <summary>
+    /// Called when the gamerule is added
+    /// </summary>
+    [Obsolete("Use Entity<T,GameRuleComponent> version instead")]
+    protected virtual void Added(EntityUid uid, T component, GameRuleComponent gameRule, GameRuleAddedEvent args)
+    {
+
+    }
+
+    /// <summary>
+    /// Called when the gamerule is added
+    /// </summary>
+    protected virtual void Added(Entity<T,GameRuleComponent> rule, ref GameRuleAddedEvent args)
+    {
+        Added(rule.Owner, rule.Comp1, rule.Comp2, args);
+    }
+
+    /// <summary>
+    /// Called when the gamerule begins
+    /// </summary>
+    [Obsolete("Use Entity<T,GameRuleComponent> version instead")]
+    protected virtual void Started(EntityUid uid, T component, GameRuleComponent gameRule, GameRuleStartedEvent args)
+    {
+
+    }
+
+    /// <summary>
+    /// Called when the gamerule is added
+    /// </summary>
+    protected virtual void Started(Entity<T,GameRuleComponent> rule, ref GameRuleStartedEvent args)
+    {
+        Started(rule.Owner, rule.Comp1, rule.Comp2, args);
+    }
+
+    /// <summary>
+    /// Called when the gamerule is added
+    /// </summary>
+    protected virtual void Ended(Entity<T> rule, ref GameRuleEndedEvent args) { }
+
+    /// <summary>w
+    /// Called at the end of a round when text needs to be added for a game rule.
+    /// </summary>
+    protected virtual void AppendRoundEndText(Entity<T> rule, ref RoundEndTextAppendEvent args)
+    {
+
+    }
+
+    /// <summary>
+    /// Called on an active gamerule entity in the Update function
+    /// </summary>
+    protected virtual void ActiveTick(EntityUid uid, T component, GameRuleComponent gameRule, float frameTime)
+    {
+
+    }
+
+    // TODO: We probably should move this to its own rule system that way we aren't doing an Enumerator for EVERY SINGLE GameRule.
+    // TODO: Or have GameTicker query over all GameRules once and then raise to each one :P
+    // TODO: Either way something that isn't this...
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<T, ActiveGameRuleComponent, GameRuleComponent>();
+        while (query.MoveNext(out var uid, out var comp1, out _, out var comp2))
+        {
+            ActiveTick(uid, comp1, comp2, frameTime);
+        }
+    }
+}
diff --git a/Content.Shared/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Shared/GameTicking/Rules/NukeopsRuleSystem.cs
new file mode 100644
index 0000000000..25a5f4f94f
--- /dev/null
+++ b/Content.Shared/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -0,0 +1,90 @@
+using Content.Shared.Antag;
+using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules.Components;
+using Content.Shared.NPC.Components;
+using Content.Shared.NPC.Systems;
+using Content.Shared.Roles;
+using Content.Shared.Roles.Components;
+using Content.Shared.Station.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Content.Shared.CombatMode.Pacification;//Corvax-DionaPacifist
+
+namespace Content.Shared.GameTicking.Rules;
+
+/// <summary>
+/// This handles the game rule logic for the <see cref="NukeopsGameRule"/> and <see cref="NukeopsRuleComponent"/>
+/// If you do not know what NukeOps is you should try playing the game.
+/// </summary>
+public abstract partial class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
+{
+    [Dependency] protected AntagSelectionSystem Antag = default!;
+    [Dependency] private NpcFactionSystem _npcFaction = default!;
+
+    // TODO: This shouldn't be matching by ProtoId.
+    // It would be better if this were checked by component or something,
+    // but it needs to be distinct between the full Nukeops and Loneops rules,
+    // which NukeopsRuleComponent currently isn't.
+    // Better yet, maybe the behaviors this is used for could be moved to the rule component.
+    public static readonly EntProtoId NukeopsGameRule = "Nukeops";
+
+    protected override void Started(Entity<NukeopsRuleComponent, GameRuleComponent> rule, ref GameRuleStartedEvent args)
+    {
+        var eligible = new List<Entity<StationEventEligibleComponent, NpcFactionMemberComponent>>();
+        var eligibleQuery = EntityQueryEnumerator<StationEventEligibleComponent, NpcFactionMemberComponent>();
+        while (eligibleQuery.MoveNext(out var eligibleUid, out var eligibleComp, out var member))
+        {
+            if (!_npcFaction.IsFactionHostile(rule.Comp1.Faction, (eligibleUid, member)))
+                continue;
+
+            eligible.Add((eligibleUid, eligibleComp, member));
+        }
+
+        if (eligible.Count == 0)
+            return;
+
+        rule.Comp1.TargetStation = RobustRandom.Pick(eligible);
+        var ev = new NukeopsTargetStationSelectedEvent(rule, rule.Comp1.TargetStation);
+        RaiseLocalEvent(ref ev);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnGetBriefing(Entity<NukeopsRoleComponent> role, ref GetBriefingEvent args)
+    {
+        // TODO Different character screen briefing for the 3 nukie types
+        args.Append(Loc.GetString("nukeops-briefing"));
+    }
+
+    [SubscribeLocalEvent]
+    private void OnAfterAntagEntSelected(Entity<NukeopsRuleComponent> ent, ref AfterAntagEntitySelectedEvent args)
+    {
+        var target = (ent.Comp.TargetStation is not null) ? Name(ent.Comp.TargetStation.Value) : "the target";
+
+        RemComp<PacifiedComponent>(args.EntityUid); // Corvax-DionaPacifist: Allow dionas nukes to harm
+        Antag.SendBriefing(args.Session,
+            Loc.GetString("nukeops-welcome",
+                ("station", target),
+                ("name", Name(ent))),
+            Color.Red,
+            ent.Comp.GreetSoundNotification);
+    }
+}
+
+
+/// <summary>
+/// Raised when a station has been assigned as a target for the NukeOps rule.
+/// </summary>
+[ByRefEvent]
+public readonly struct NukeopsTargetStationSelectedEvent(EntityUid ruleEntity, EntityUid? targetStation)
+{
+    /// <summary>
+    /// The entity containing the NukeOps gamerule.
+    /// </summary>
+    public readonly EntityUid RuleEntity = ruleEntity;
+
+    /// <summary>
+    /// The target station, if it exists.
+    /// </summary>
+    public readonly EntityUid? TargetStation = targetStation;
+}
+
diff --git a/Content.Server/GameTicking/Rules/ParadoxCloneRuleSystem.cs b/Content.Shared/GameTicking/Rules/ParadoxCloneRuleSystem.cs
similarity index 79%
rename from Content.Server/GameTicking/Rules/ParadoxCloneRuleSystem.cs
rename to Content.Shared/GameTicking/Rules/ParadoxCloneRuleSystem.cs
index e9107e9851..9a713334ba 100644
--- a/Content.Server/GameTicking/Rules/ParadoxCloneRuleSystem.cs
+++ b/Content.Shared/GameTicking/Rules/ParadoxCloneRuleSystem.cs
@@ -1,36 +1,27 @@
-using Content.Server.Antag;
-using Content.Server.Cloning;
-using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Medical.SuitSensors;
-using Content.Server.Objectives.Components;
+using Content.Shared.Antag;
+using Content.Shared.Cloning;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules.Components;
 using Content.Shared.Gibbing.Components;
-using Content.Shared.Medical.SuitSensor;
+using Content.Shared.Medical.SuitSensors;
 using Content.Shared.Mind;
+using Content.Shared.Objectives.Components;
 using Content.Shared.Objectives.Systems;
 using Robust.Shared.Random;
 
-namespace Content.Server.GameTicking.Rules;
+namespace Content.Shared.GameTicking.Rules;
 
 public sealed partial class ParadoxCloneRuleSystem : GameRuleSystem<ParadoxCloneRuleComponent>
 {
     [Dependency] private IRobustRandom _random = default!;
-    [Dependency] private CloningSystem _cloning = default!;
+    [Dependency] private SharedCloningSystem _cloning = default!;
     [Dependency] private SharedMindSystem _mind = default!;
-    [Dependency] private SuitSensorSystem _sensor = default!;
+    [Dependency] private SharedSuitSensorSystem _sensor = default!;
     [Dependency] private AliveHumanoidTargetSystem _target = default!;
 
-    public override void Initialize()
+    protected override void Started(Entity<ParadoxCloneRuleComponent, GameRuleComponent> rule, ref GameRuleStartedEvent args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<ParadoxCloneRuleComponent, AntagSelectEntityEvent>(OnAntagSelectEntity);
-        SubscribeLocalEvent<ParadoxCloneRuleComponent, AfterAntagEntitySelectedEvent>(AfterAntagEntitySelected);
-    }
-
-    protected override void Started(EntityUid uid, ParadoxCloneRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
-    {
-        base.Started(uid, component, gameRule, args);
+        base.Started(rule, ref args);
 
         // check if we got enough potential cloning targets, otherwise cancel the gamerule so that the ghost role does not show up
         var allHumans = _target.GetMinds();
@@ -38,11 +29,12 @@ public sealed partial class ParadoxCloneRuleSystem : GameRuleSystem<ParadoxClone
         if (allHumans.Count == 0)
         {
             Log.Info("Could not find any alive players to create a paradox clone from! Ending gamerule.");
-            ForceEndSelf(uid, gameRule);
+            ForceEndSelf((rule, rule.Comp2));
         }
     }
 
     // we have to do the spawning here so we can transfer the mind to the correct entity and can assign the objectives correctly
+    [SubscribeLocalEvent]
     private void OnAntagSelectEntity(Entity<ParadoxCloneRuleComponent> ent, ref AntagSelectEntityEvent args)
     {
         if (ent.Comp.OriginalBody != null) // target was overridden, for example by admin antag control
@@ -92,6 +84,7 @@ public sealed partial class ParadoxCloneRuleSystem : GameRuleSystem<ParadoxClone
         args.Entity = clone;
     }
 
+    [SubscribeLocalEvent]
     private void AfterAntagEntitySelected(Entity<ParadoxCloneRuleComponent> ent, ref AfterAntagEntitySelectedEvent args)
     {
         if (ent.Comp.OriginalMind == null)
diff --git a/Content.Shared/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Shared/GameTicking/Rules/RevolutionaryRuleSystem.cs
new file mode 100644
index 0000000000..4d75ce0daa
--- /dev/null
+++ b/Content.Shared/GameTicking/Rules/RevolutionaryRuleSystem.cs
@@ -0,0 +1,20 @@
+using Content.Shared.GameTicking.Rules.Components;
+using Content.Shared.Revolutionary.Components;
+using Content.Shared.Roles;
+using Content.Shared.Roles.Components;
+
+namespace Content.Shared.GameTicking.Rules;
+
+/// <summary>
+/// Where all the main stuff for Revolutionaries happens (Assigning Head Revs, Command on station, and checking for the game to end.)
+/// </summary>
+public abstract partial class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleComponent>
+{
+    [SubscribeLocalEvent]
+    private void OnGetBriefing(Entity<RevolutionaryRoleComponent> comp, ref GetBriefingEvent args)
+    {
+        var ent = args.Mind.Comp.OwnedEntity;
+        var head = HasComp<HeadRevolutionaryComponent>(ent);
+        args.Append(Loc.GetString(head ? "head-rev-briefing" : "rev-briefing"));
+    }
+}
diff --git a/Content.Server/GameTicking/Rules/SurvivorRuleSystem.cs b/Content.Shared/GameTicking/Rules/SurvivorRuleSystem.cs
similarity index 76%
rename from Content.Server/GameTicking/Rules/SurvivorRuleSystem.cs
rename to Content.Shared/GameTicking/Rules/SurvivorRuleSystem.cs
index 80bab5a499..21792b6b46 100644
--- a/Content.Server/GameTicking/Rules/SurvivorRuleSystem.cs
+++ b/Content.Shared/GameTicking/Rules/SurvivorRuleSystem.cs
@@ -1,42 +1,34 @@
-using Content.Server.Antag;
-using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Roles;
-using Content.Server.Shuttles.Systems;
+using Content.Shared.Antag;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules.Components;
 using Content.Shared.Mind;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Objectives.Systems;
+using Content.Shared.Roles;
 using Content.Shared.Roles.Components;
+using Content.Shared.Shuttles.Systems;
 using Content.Shared.Survivor.Components;
 using Content.Shared.Tag;
-using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.GameTicking.Rules;
+namespace Content.Shared.GameTicking.Rules;
 
 public sealed partial class SurvivorRuleSystem : GameRuleSystem<SurvivorRuleComponent>
 {
-    [Dependency] private AntagSelectionSystem _antag = default!;
-    [Dependency] private EmergencyShuttleSystem _eShuttle = default!;
-    [Dependency] private MobStateSystem _mobState = default!;
-    [Dependency] private RoleSystem _role = default!;
-    [Dependency] private TagSystem _tag = default!;
     [Dependency] private AliveHumanoidTargetSystem _target = default!;
-    [Dependency] private TransformSystem _xform = default!;
+    [Dependency] private AntagSelectionSystem _antag = default!;
+    [Dependency] private MobStateSystem _mobState = default!;
+    [Dependency] private SharedEmergencyShuttleSystem _eShuttle = default!;
+    [Dependency] private SharedRoleSystem _role = default!;
+    [Dependency] private SharedTransformSystem _xform = default!;
+    [Dependency] private TagSystem _tag = default!;
 
     private static readonly ProtoId<TagPrototype> InvalidForSurvivorAntagTag = "InvalidForSurvivorAntag";
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SurvivorRoleComponent, GetBriefingEvent>(OnGetBriefing);
-    }
-
     // TODO: Planned rework post wizard release when RandomGlobalSpawnSpell becomes a gamerule
-    protected override void Started(EntityUid uid, SurvivorRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
+    protected override void Started(Entity<SurvivorRuleComponent, GameRuleComponent> rule, ref GameRuleStartedEvent args)
     {
-        base.Started(uid, component, gameRule, args);
+        base.Started(rule, ref args);
 
         var allAliveHumanMinds = _target.GetMinds();
 
@@ -57,17 +49,16 @@ public sealed partial class SurvivorRuleSystem : GameRuleSystem<SurvivorRuleComp
         }
     }
 
+    [SubscribeLocalEvent]
     private void OnGetBriefing(Entity<SurvivorRoleComponent> ent, ref GetBriefingEvent args)
     {
         args.Append(Loc.GetString("survivor-role-greeting"));
     }
 
-    protected override void AppendRoundEndText(EntityUid uid,
-        SurvivorRuleComponent component,
-        GameRuleComponent gameRule,
+    protected override void AppendRoundEndText(Entity<SurvivorRuleComponent> rule,
         ref RoundEndTextAppendEvent args)
     {
-        base.AppendRoundEndText(uid, component, gameRule, ref args);
+        base.AppendRoundEndText(rule, ref args);
 
         // Using this instead of alive antagonists to make checking for shuttle & if the ent is alive easier
         var existingSurvivors = AllEntityQuery<SurvivorComponent, MindComponent>();
diff --git a/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs b/Content.Shared/GameTicking/Rules/ThiefRuleSystem.cs
similarity index 73%
rename from Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
rename to Content.Shared/GameTicking/Rules/ThiefRuleSystem.cs
index d6239449a2..fb016d7596 100644
--- a/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
+++ b/Content.Shared/GameTicking/Rules/ThiefRuleSystem.cs
@@ -1,25 +1,17 @@
-using Content.Server.Antag;
-using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Roles;
+using Content.Shared.Antag;
+using Content.Shared.GameTicking.Rules.Components;
 using Content.Shared.Humanoid;
+using Content.Shared.Roles;
 using Content.Shared.Roles.Components;
 
-namespace Content.Server.GameTicking.Rules;
+namespace Content.Shared.GameTicking.Rules;
 
 public sealed partial class ThiefRuleSystem : GameRuleSystem<ThiefRuleComponent>
 {
     [Dependency] private AntagSelectionSystem _antag = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ThiefRuleComponent, AfterAntagEntitySelectedEvent>(AfterAntagSelected);
-
-        SubscribeLocalEvent<ThiefRoleComponent, GetBriefingEvent>(OnGetBriefing);
-    }
-
     // Greeting upon thief activation
+    [SubscribeLocalEvent]
     private void AfterAntagSelected(Entity<ThiefRuleComponent> mindId, ref AfterAntagEntitySelectedEvent args)
     {
         var ent = args.EntityUid;
@@ -27,6 +19,7 @@ public sealed partial class ThiefRuleSystem : GameRuleSystem<ThiefRuleComponent>
     }
 
     // Character screen briefing
+    [SubscribeLocalEvent]
     private void OnGetBriefing(Entity<ThiefRoleComponent> role, ref GetBriefingEvent args)
     {
         var ent = args.Mind.Comp.OwnedEntity;
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Shared/GameTicking/Rules/TraitorRuleSystem.cs
similarity index 64%
rename from Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
rename to Content.Shared/GameTicking/Rules/TraitorRuleSystem.cs
index 9d4ba46985..4b0485cb8d 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Shared/GameTicking/Rules/TraitorRuleSystem.cs
@@ -1,9 +1,9 @@
-using Content.Server.Antag;
-using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Mind;
-using Content.Server.Objectives;
-using Content.Server.Traitor.Uplink;
+using System.Linq;
+using System.Text;
+using Content.Shared.Antag;
+using Content.Shared.Codewords;
 using Content.Shared.FixedPoint;
+using Content.Shared.GameTicking.Rules.Components;
 using Content.Shared.Mind;
 using Content.Shared.NPC.Systems;
 using Content.Shared.PDA;
@@ -13,46 +13,33 @@ using Content.Shared.Roles.Components;
 using Content.Shared.Roles.Jobs;
 using Content.Shared.Roles.RoleCodeword;
 using Robust.Shared.Random;
-using System.Linq;
-using System.Text;
-using Content.Server.Codewords;
 
-namespace Content.Server.GameTicking.Rules;
+namespace Content.Shared.GameTicking.Rules;
 
-public sealed partial class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
+public abstract partial class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
 {
-    private static readonly Color TraitorCodewordColor = Color.FromHex("#cc3b3b");
-
-    [Dependency] private AntagSelectionSystem _antag = default!;
-    [Dependency] private SharedJobSystem _jobs = default!;
-    [Dependency] private MindSystem _mindSystem = default!;
-    [Dependency] private NpcFactionSystem _npcFaction = default!;
     [Dependency] private IRobustRandom _random = default!;
+    [Dependency] private AntagSelectionSystem _antag = default!;
+    [Dependency] protected CodewordSystem Codeword = default!;
+    [Dependency] private NpcFactionSystem _npcFaction = default!;
+    [Dependency] private SharedJobSystem _jobs = default!;
+    [Dependency] private SharedMindSystem _mindSystem = default!;
     [Dependency] private SharedRoleCodewordSystem _roleCodewordSystem = default!;
     [Dependency] private SharedRoleSystem _roleSystem = default!;
-    [Dependency] private UplinkSystem _uplink = default!;
-    [Dependency] private CodewordSystem _codewordSystem = default!;
 
-    public override void Initialize()
+    private static readonly Color TraitorCodewordColor = Color.FromHex("#cc3b3b");
+
+    [SubscribeLocalEvent]
+    private void AfterEntitySelected(Entity<TraitorRuleComponent> rule, ref AfterAntagEntitySelectedEvent args)
     {
-        base.Initialize();
-
-        Log.Level = LogLevel.Debug;
-
-        SubscribeLocalEvent<TraitorRuleComponent, AfterAntagEntitySelectedEvent>(AfterEntitySelected);
-        SubscribeLocalEvent<TraitorRuleComponent, ObjectivesTextPrependEvent>(OnObjectivesTextPrepend);
+        Log.Debug($"AfterAntagEntitySelected {ToPrettyString(rule)}");
+        MakeTraitor(args.EntityUid, rule);
     }
 
-    private void AfterEntitySelected(Entity<TraitorRuleComponent> ent, ref AfterAntagEntitySelectedEvent args)
-    {
-        Log.Debug($"AfterAntagEntitySelected {ToPrettyString(ent)}");
-        MakeTraitor(args.EntityUid, ent);
-    }
-
-    public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
+    public bool MakeTraitor(EntityUid traitor, Entity<TraitorRuleComponent> rule)
     {
         Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - start");
-        var factionCodewords = _codewordSystem.GetCodewords(component.CodewordFactionPrototypeId);
+        var factionCodewords = Codeword.GetCodewords(rule.Comp.CodewordFactionPrototypeId);
 
         //Grab the mind if it wasn't provided
         if (!_mindSystem.TryGetMind(traitor, out var mindId, out var mind))
@@ -63,22 +50,22 @@ public sealed partial class TraitorRuleSystem : GameRuleSystem<TraitorRuleCompon
 
         var briefing = "";
 
-        if (component.GiveCodewords)
+        if (rule.Comp.GiveCodewords)
         {
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - added codewords flufftext to briefing");
             briefing = Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", factionCodewords)));
         }
 
-        var issuer = _random.Pick(ProtoMan.Index(component.ObjectiveIssuers));
+        var issuer = _random.Pick(ProtoMan.Index(rule.Comp.ObjectiveIssuers));
 
         // Uplink code will go here if applicable, but we still need the variable if there aren't any
         Note[]? code = null;
 
-        if (component.GiveUplink)
+        if (rule.Comp.GiveUplink)
         {
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink start");
             // Calculate the amount of currency on the uplink.
-            var startingBalance = component.StartingBalance;
+            var startingBalance = rule.Comp.StartingBalance;
             if (_jobs.MindTryGetJob(mindId, out var prototype))
             {
                 if (startingBalance < prototype.AntagAdvantage) // Can't use Math functions on FixedPoint2
@@ -96,26 +83,26 @@ public sealed partial class TraitorRuleSystem : GameRuleSystem<TraitorRuleCompon
         }
 
         string[]? codewords = null;
-        if (component.GiveCodewords)
+        if (rule.Comp.GiveCodewords)
         {
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - set codewords from component");
             codewords = factionCodewords;
         }
 
-        if (component.GiveBriefing)
+        if (rule.Comp.GiveBriefing)
         {
-            _antag.SendBriefing(traitor, GenerateBriefing(codewords, code, issuer), null, component.GreetSoundNotification);
+            _antag.SendBriefing(traitor, GenerateBriefing(codewords, code, issuer), null, rule.Comp.GreetSoundNotification);
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Sent the Briefing");
         }
 
         Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Adding TraitorMind");
-        component.TraitorMinds.Add(mindId);
+        rule.Comp.TraitorMinds.Add(mindId);
 
         // Assign briefing
         //Since this provides neither an antag/job prototype, nor antag status/roletype,
         //and is intrinsically related to the traitor role
         //it does not need to be a separate Mind Role Entity
-        _roleSystem.MindHasRole<TraitorRoleComponent>(mindId, out var traitorRole);
+        _roleSystem.MindHasRole<TraitorRoleComponent>((mindId, mind), out var traitorRole);
         if (traitorRole is not null)
         {
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Add traitor briefing components");
@@ -135,50 +122,16 @@ public sealed partial class TraitorRuleSystem : GameRuleSystem<TraitorRuleCompon
 
         // Change the faction
         Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Change faction");
-        _npcFaction.RemoveFaction(traitor, component.NanoTrasenFaction, false);
-        _npcFaction.AddFaction(traitor, component.SyndicateFaction);
+        _npcFaction.RemoveFaction(traitor, rule.Comp.NanoTrasenFaction, false);
+        _npcFaction.AddFaction(traitor, rule.Comp.SyndicateFaction);
 
         Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Finished");
         return true;
     }
 
-    private (Note[]?, string) RequestUplink(EntityUid traitor, FixedPoint2 startingBalance, string briefing)
+    protected virtual (Note[]?, string) RequestUplink(EntityUid traitor, FixedPoint2 startingBalance, string briefing)
     {
-        var pda = _uplink.FindUplinkTarget(traitor);
-
-        Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink add");
-        var uplinked = _uplink.AddUplink(traitor, startingBalance, out var code, pda, giveDiscounts: true, bindToPda: false);
-
-        if (code != null && uplinked == AddUplinkResult.Pda)
-        {
-            Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink is PDA");
-
-            // If giveUplink is false the uplink code part is omitted
-            briefing = string.Format("{0}\n{1}",
-                briefing,
-                Loc.GetString("traitor-role-uplink-code-short", ("code", string.Join("-", code).Replace("sharp", "#"))));
-            return (code, briefing);
-        }
-
-        if (uplinked == AddUplinkResult.Implant)
-        {
-            Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink is implant");
-            briefing += "\n" + Loc.GetString("traitor-role-uplink-implant-short");
-        }
-        else
-        {
-            Log.Error($"MakeTraitor failed on {ToPrettyString(traitor)} - No uplink could be added");
-        }
-
-
-        return (null, briefing);
-    }
-
-    // TODO: AntagCodewordsComponent
-    private void OnObjectivesTextPrepend(EntityUid uid, TraitorRuleComponent comp, ref ObjectivesTextPrependEvent args)
-    {
-        if(comp.GiveCodewords)
-            args.Text += "\n" + Loc.GetString("traitor-round-end-codewords", ("codewords", string.Join(", ", _codewordSystem.GetCodewords(comp.CodewordFactionPrototypeId))));
+        return default;
     }
 
     // TODO: figure out how to handle this? add priority to briefing event?
diff --git a/Content.Server/GameTicking/Rules/XenoborgsRuleSystem.cs b/Content.Shared/GameTicking/Rules/XenoborgsRuleSystem.cs
similarity index 55%
rename from Content.Server/GameTicking/Rules/XenoborgsRuleSystem.cs
rename to Content.Shared/GameTicking/Rules/XenoborgsRuleSystem.cs
index bc497971da..ffdb81ac9d 100644
--- a/Content.Server/GameTicking/Rules/XenoborgsRuleSystem.cs
+++ b/Content.Shared/GameTicking/Rules/XenoborgsRuleSystem.cs
@@ -1,58 +1,42 @@
-using Content.Server.Antag;
-using Content.Server.Chat.Systems;
-using Content.Server.GameTicking.Rules.Components;
-using Content.Server.RoundEnd;
-using Content.Server.Station.Systems;
-using Content.Shared.Destructible;
+using Content.Shared.Antag;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules.Components;
 using Content.Shared.Mind;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Objectives.Systems;
 using Content.Shared.Xenoborgs.Components;
-using Robust.Shared.Timing;
 
-namespace Content.Server.GameTicking.Rules;
+namespace Content.Shared.GameTicking.Rules;
 
-public sealed partial class XenoborgsRuleSystem : GameRuleSystem<XenoborgsRuleComponent>
+public abstract partial class XenoborgsRuleSystem : GameRuleSystem<XenoborgsRuleComponent>
 {
-    [Dependency] private IGameTiming _timing = default!;
-    [Dependency] private AntagSelectionSystem _antag = default!;
-    [Dependency] private ChatSystem _chatSystem = default!;
-    [Dependency] private MobStateSystem _mobState = default!;
-    [Dependency] private RoundEndSystem _roundEnd = default!;
-    [Dependency] private SharedMindSystem _mindSystem = default!;
-    [Dependency] private StationSystem _station = default!;
     [Dependency] private AliveHumanoidTargetSystem _target = default!;
+    [Dependency] private AntagSelectionSystem _antag = default!;
+    [Dependency] private MobStateSystem _mobState = default!;
+    [Dependency] private SharedMindSystem _mindSystem = default!;
 
     private static readonly Color AnnouncmentColor = Color.Gold;
 
-    public void SendXenoborgDeathAnnouncement(Entity<XenoborgsRuleComponent> ent, bool mothershipCoreAlive)
+     public void SendXenoborgDeathAnnouncement(Entity<XenoborgsRuleComponent> ent, bool mothershipCoreAlive)
     {
         if (ent.Comp.MothershipCoreDeathAnnouncmentSent)
             return;
 
         var status = mothershipCoreAlive ? "alive" : "dead";
-        _chatSystem.DispatchGlobalAnnouncement(
-            Loc.GetString($"xenoborgs-no-more-threat-mothership-core-{status}-announcement"),
-            colorOverride: AnnouncmentColor);
+        GameTicker.GameAnnouncement($"xenoborgs-no-more-threat-mothership-core-{status}-announcement", color: AnnouncmentColor);
     }
 
     public void SendMothershipDeathAnnouncement(Entity<XenoborgsRuleComponent> ent)
     {
-        _chatSystem.DispatchGlobalAnnouncement(
-            Loc.GetString("mothership-destroyed-announcement"),
-            colorOverride: AnnouncmentColor);
-
+        GameTicker.GameAnnouncement("mothership-destroyed-announcement", color: AnnouncmentColor);
         ent.Comp.MothershipCoreDeathAnnouncmentSent = true;
     }
 
     // TODO: Refactor the end of round text
-    protected override void AppendRoundEndText(EntityUid uid,
-        XenoborgsRuleComponent component,
-        GameRuleComponent gameRule,
+    protected override void AppendRoundEndText(Entity<XenoborgsRuleComponent> rule,
         ref RoundEndTextAppendEvent args)
     {
-        base.AppendRoundEndText(uid, component, gameRule, ref args);
+        base.AppendRoundEndText(rule, ref args);
 
         var numXenoborgs = GetNumberXenoborgs();
         var numHumans = _target.GetMinds().Count;
@@ -82,11 +66,11 @@ public sealed partial class XenoborgsRuleSystem : GameRuleSystem<XenoborgsRuleCo
             args.AddLine(Loc.GetString("xenoborg-number-crew-alive-end", ("count", numHumans)));
         }
 
-        args.AddLine(Loc.GetString("xenoborg-max-number", ("count", component.MaxNumberXenoborgs)));
+        args.AddLine(Loc.GetString("xenoborg-max-number", ("count", rule.Comp.MaxNumberXenoborgs)));
 
         args.AddLine(Loc.GetString("xenoborgs-list-start"));
 
-        var antags = _antag.GetAntagIdentifiers(uid);
+        var antags = _antag.GetAntagIdentifiers(rule.Owner);
 
         foreach (var (_, sessionData, name) in antags)
         {
@@ -95,42 +79,11 @@ public sealed partial class XenoborgsRuleSystem : GameRuleSystem<XenoborgsRuleCo
         args.AddLine("");
     }
 
-    private void CheckRoundEnd(XenoborgsRuleComponent xenoborgsRuleComponent)
+    protected override void Started(Entity<XenoborgsRuleComponent, GameRuleComponent> rule, ref GameRuleStartedEvent args)
     {
-        var numXenoborgs = GetNumberXenoborgs();
-        var numHumans = _target.GetMinds().Count;
+        base.Started(rule, ref args);
 
-        xenoborgsRuleComponent.MaxNumberXenoborgs = Math.Max(xenoborgsRuleComponent.MaxNumberXenoborgs, numXenoborgs);
-
-        if (xenoborgsRuleComponent.XenoborgShuttleCalled
-            || (float)numXenoborgs / (numHumans + numXenoborgs) <= xenoborgsRuleComponent.XenoborgShuttleCallPercentage
-            || _roundEnd.IsRoundEndRequested())
-            return;
-
-        foreach (var station in _station.GetStations())
-        {
-            _chatSystem.DispatchStationAnnouncement(station, Loc.GetString("xenoborg-shuttle-call"), colorOverride: Color.BlueViolet);
-        }
-        _roundEnd.RequestRoundEnd(null, null, false, cantRecall: true);
-        xenoborgsRuleComponent.XenoborgShuttleCalled = true;
-    }
-
-    protected override void Started(EntityUid uid, XenoborgsRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
-    {
-        base.Started(uid, component, gameRule, args);
-
-        component.NextRoundEndCheck = _timing.CurTime + component.EndCheckDelay;
-    }
-
-    protected override void ActiveTick(EntityUid uid, XenoborgsRuleComponent component, GameRuleComponent gameRule, float frameTime)
-    {
-        base.ActiveTick(uid, component, gameRule, frameTime);
-
-        if (!component.NextRoundEndCheck.HasValue || component.NextRoundEndCheck > _timing.CurTime)
-            return;
-
-        CheckRoundEnd(component);
-        component.NextRoundEndCheck = _timing.CurTime + component.EndCheckDelay;
+        rule.Comp1.NextRoundEndCheck = Timing.CurTime + rule.Comp1.EndCheckDelay;
     }
 
     /// <summary>
@@ -139,7 +92,7 @@ public sealed partial class XenoborgsRuleSystem : GameRuleSystem<XenoborgsRuleCo
     /// <param name="playerControlled">if it should only include xenoborgs with a mind</param>
     /// <param name="alive">if it should only include xenoborgs that are alive</param>
     /// <returns>the number of xenoborgs</returns>
-    private int GetNumberXenoborgs(bool playerControlled = true, bool alive = true)
+    protected int GetNumberXenoborgs(bool playerControlled = true, bool alive = true)
     {
         var numberXenoborgs = 0;
 
diff --git a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs b/Content.Shared/GameTicking/Rules/ZombieRuleSystem.cs
similarity index 58%
rename from Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
rename to Content.Shared/GameTicking/Rules/ZombieRuleSystem.cs
index 80bfcd7425..d1fb49e7a7 100644
--- a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
+++ b/Content.Shared/GameTicking/Rules/ZombieRuleSystem.cs
@@ -1,12 +1,8 @@
-using Content.Server.Antag;
-using Content.Server.Chat.Systems;
-using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Popups;
-using Content.Server.Roles;
-using Content.Server.RoundEnd;
-using Content.Server.Station.Systems;
-using Content.Server.Zombies;
+using System.Globalization;
+using System.Linq;
+using Content.Shared.Antag;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Rules.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.Mind;
 using Content.Shared.Mobs;
@@ -14,55 +10,47 @@ using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Components;
+using Content.Shared.Station.Systems;
 using Content.Shared.Zombies;
 using Robust.Shared.Player;
-using Robust.Shared.Timing;
-using System.Globalization;
-using System.Linq;
 
-namespace Content.Server.GameTicking.Rules;
+namespace Content.Shared.GameTicking.Rules;
 
-public sealed partial class ZombieRuleSystem : GameRuleSystem<ZombieRuleComponent>
+public abstract partial class ZombieRuleSystem : GameRuleSystem<ZombieRuleComponent>
 {
-    [Dependency] private AntagSelectionSystem _antag = default!;
-    [Dependency] private ChatSystem _chat = default!;
-    [Dependency] private IGameTiming _timing = default!;
     [Dependency] private ISharedPlayerManager _player = default!;
+    [Dependency] private AntagSelectionSystem _antag = default!;
     [Dependency] private MobStateSystem _mobState = default!;
-    [Dependency] private PopupSystem _popup = default!;
-    [Dependency] private RoundEndSystem _roundEnd = default!;
     [Dependency] private SharedMindSystem _mindSystem = default!;
     [Dependency] private SharedRoleSystem _roles = default!;
-    [Dependency] private StationSystem _station = default!;
-    [Dependency] private ZombieSystem _zombie = default!;
-    [Dependency] private EntityQuery<ZombieComponent> _zombieQuery = default!;
+    [Dependency] protected StationSystem Station = default!;
 
-    public override void Initialize()
+    [Dependency] private EntityQuery<ZombieComponent> _zombieQuery;
+
+    protected override void Started(Entity<ZombieRuleComponent, GameRuleComponent> rule, ref GameRuleStartedEvent args)
     {
-        base.Initialize();
+        base.Started(rule, ref args);
 
-        SubscribeLocalEvent<InitialInfectedRoleComponent, GetBriefingEvent>(OnGetBriefing);
-        SubscribeLocalEvent<ZombieRoleComponent, GetBriefingEvent>(OnGetBriefing);
-        SubscribeLocalEvent<IncurableZombieComponent, ZombifySelfActionEvent>(OnZombifySelf);
+        rule.Comp1.NextRoundEndCheck = Timing.CurTime + rule.Comp1.EndCheckDelay;
     }
 
+    [SubscribeLocalEvent]
     private void OnGetBriefing(Entity<InitialInfectedRoleComponent> role, ref GetBriefingEvent args)
     {
         if (!_roles.MindHasRole<ZombieRoleComponent>(args.Mind.Owner))
             args.Append(Loc.GetString("zombie-patientzero-role-greeting"));
     }
 
+    [SubscribeLocalEvent]
     private void OnGetBriefing(Entity<ZombieRoleComponent> role, ref GetBriefingEvent args)
     {
         args.Append(Loc.GetString("zombie-infection-greeting"));
     }
 
-    protected override void AppendRoundEndText(EntityUid uid,
-        ZombieRuleComponent component,
-        GameRuleComponent gameRule,
+    protected override void AppendRoundEndText(Entity<ZombieRuleComponent> rule,
         ref RoundEndTextAppendEvent args)
     {
-        base.AppendRoundEndText(uid, component, gameRule, ref args);
+        base.AppendRoundEndText(rule, ref args);
 
         // This is just the general condition thing used for determining the win/lose text
         var fraction = GetInfectedFraction(true, true);
@@ -78,7 +66,7 @@ public sealed partial class ZombieRuleSystem : GameRuleSystem<ZombieRuleComponen
         else
             args.AddLine(Loc.GetString("zombie-round-end-amount-all"));
 
-        var antags = _antag.GetAntagIdentifiers(uid).ToList();
+        var antags = _antag.GetAntagIdentifiers(rule.Owner).ToList();
         args.AddLine(Loc.GetString("zombie-round-end-initial-count", ("initialCount", antags.Count)));
         foreach (var (_, data, entName) in antags)
         {
@@ -111,52 +99,6 @@ public sealed partial class ZombieRuleSystem : GameRuleSystem<ZombieRuleComponen
         args.AddLine("");
     }
 
-    /// <summary>
-    ///     The big kahoona function for checking if the round is gonna end
-    /// </summary>
-    private void CheckRoundEnd(ZombieRuleComponent zombieRuleComponent)
-    {
-        var healthy = GetHealthyHumans();
-        if (healthy.Count == 1) // Only one human left. spooky
-            _popup.PopupEntity(Loc.GetString("zombie-alone"), healthy[0], healthy[0]);
-
-        if (GetInfectedFraction(false) > zombieRuleComponent.ZombieShuttleCallPercentage && !_roundEnd.IsRoundEndRequested())
-        {
-            foreach (var station in _station.GetStations())
-            {
-                _chat.DispatchStationAnnouncement(station, Loc.GetString("zombie-shuttle-call"), colorOverride: Color.Crimson);
-            }
-            _roundEnd.RequestRoundEnd(checkCooldown: false);
-        }
-
-        // we include dead for this count because we don't want to end the round
-        // when everyone gets on the shuttle.
-        if (GetInfectedFraction() >= 1) // Oops, all zombies
-            _roundEnd.EndRound();
-    }
-
-    protected override void Started(EntityUid uid, ZombieRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
-    {
-        base.Started(uid, component, gameRule, args);
-
-        component.NextRoundEndCheck = _timing.CurTime + component.EndCheckDelay;
-    }
-
-    protected override void ActiveTick(EntityUid uid, ZombieRuleComponent component, GameRuleComponent gameRule, float frameTime)
-    {
-        base.ActiveTick(uid, component, gameRule, frameTime);
-        if (!component.NextRoundEndCheck.HasValue || component.NextRoundEndCheck > _timing.CurTime)
-            return;
-        CheckRoundEnd(component);
-        component.NextRoundEndCheck = _timing.CurTime + component.EndCheckDelay;
-    }
-
-    private void OnZombifySelf(EntityUid uid, IncurableZombieComponent component, ZombifySelfActionEvent args)
-    {
-        _zombie.ZombifyEntity(uid);
-        if (component.Action != null)
-            Del(component.Action.Value);
-    }
 
     /// <summary>
     /// Get the fraction of players that are infected, between 0 and 1
@@ -164,7 +106,7 @@ public sealed partial class ZombieRuleSystem : GameRuleSystem<ZombieRuleComponen
     /// <param name="includeOffStation">Include healthy players that are not on the station grid</param>
     /// <param name="includeDead">Should dead zombies be included in the count</param>
     /// <returns></returns>
-    private float GetInfectedFraction(bool includeOffStation = true, bool includeDead = false)
+    protected float GetInfectedFraction(bool includeOffStation = true, bool includeDead = false)
     {
         var players = GetHealthyHumans(includeOffStation);
         var zombieCount = 0;
@@ -184,16 +126,16 @@ public sealed partial class ZombieRuleSystem : GameRuleSystem<ZombieRuleComponen
     /// Flying off via a shuttle disqualifies you.
     /// </summary>
     /// <returns></returns>
-    private List<EntityUid> GetHealthyHumans(bool includeOffStation = true)
+    protected List<EntityUid> GetHealthyHumans(bool includeOffStation = true)
     {
         var healthy = new List<EntityUid>();
 
         var stationGrids = new HashSet<EntityUid>();
         if (!includeOffStation)
         {
-            foreach (var station in _station.GetStationsSet())
+            foreach (var station in Station.GetStationsSet())
             {
-                if (_station.GetLargestGrid(station) is { } grid)
+                if (Station.GetLargestGrid(station) is { } grid)
                     stationGrids.Add(grid);
             }
         }
diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs
deleted file mode 100644
index 878f6213cb..0000000000
--- a/Content.Shared/GameTicking/SharedGameTicker.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-using Content.Shared.Roles;
-using Robust.Shared.Network;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Replays;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.Markdown.Mapping;
-using Robust.Shared.Serialization.Markdown.Value;
-using Robust.Shared.Timing;
-using Robust.Shared.Audio;
-using Content.Shared.GameTicking.Prototypes;
-
-namespace Content.Shared.GameTicking
-{
-    public abstract partial class SharedGameTicker : EntitySystem
-    {
-        [Dependency] private IReplayRecordingManager _replay = default!;
-        [Dependency] private IGameTiming _gameTiming = default!;
-
-        /// <summary>
-        ///     A list storing the start times of all game rules that have been started this round.
-        ///     Game rules can be started and stopped at any time, including midround.
-        /// </summary>
-        public abstract IReadOnlyList<(TimeSpan, string)> AllPreviousGameRules { get; }
-
-        // See ideally these would be pulled from the job definition or something.
-        // But this is easier, and at least it isn't hardcoded.
-        //TODO: Move these, they really belong in StationJobsSystem or a cvar.
-        public static readonly ProtoId<JobPrototype> FallbackOverflowJob = "Passenger";
-
-        public const string FallbackOverflowJobName = "job-name-passenger";
-
-        // TODO network.
-        // Probably most useful for replays, round end info, and probably things like lobby menus.
-        [ViewVariables]
-        public int RoundId { get; protected set; }
-        [ViewVariables] public TimeSpan RoundStartTimeSpan { get; protected set; }
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            _replay.RecordingStarted += OnRecordingStart;
-        }
-
-        public override void Shutdown()
-        {
-            _replay.RecordingStarted -= OnRecordingStart;
-        }
-
-        private void OnRecordingStart(MappingDataNode metadata, List<object> events)
-        {
-            if (RoundId != 0)
-            {
-                metadata["roundId"] = new ValueDataNode(RoundId.ToString());
-            }
-        }
-
-        public TimeSpan RoundDuration()
-        {
-            return _gameTiming.CurTime.Subtract(RoundStartTimeSpan);
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class TickerJoinLobbyEvent : EntityEventArgs
-    {
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class TickerJoinGameEvent : EntityEventArgs
-    {
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class TickerLateJoinStatusEvent : EntityEventArgs
-    {
-        // TODO: Make this a replicated CVar, honestly.
-        public bool Disallowed { get; }
-
-        public TickerLateJoinStatusEvent(bool disallowed)
-        {
-            Disallowed = disallowed;
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class TickerConnectionStatusEvent : EntityEventArgs
-    {
-        public TimeSpan RoundStartTimeSpan { get; }
-        public TickerConnectionStatusEvent(TimeSpan roundStartTimeSpan)
-        {
-            RoundStartTimeSpan = roundStartTimeSpan;
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class TickerLobbyStatusEvent : EntityEventArgs
-    {
-        public bool IsRoundStarted { get; }
-        public ProtoId<LobbyBackgroundPrototype>? LobbyBackground { get; }
-        public bool YouAreReady { get; }
-        // UTC.
-        public TimeSpan StartTime { get; }
-        public TimeSpan RoundStartTimeSpan { get; }
-        public bool Paused { get; }
-
-        public TickerLobbyStatusEvent(bool isRoundStarted, ProtoId<LobbyBackgroundPrototype>? lobbyBackground, bool youAreReady, TimeSpan startTime, TimeSpan preloadTime, TimeSpan roundStartTimeSpan, bool paused)
-        {
-            IsRoundStarted = isRoundStarted;
-            LobbyBackground = lobbyBackground;
-            YouAreReady = youAreReady;
-            StartTime = startTime;
-            RoundStartTimeSpan = roundStartTimeSpan;
-            Paused = paused;
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class TickerLobbyInfoEvent : EntityEventArgs
-    {
-        public string TextBlob { get; }
-
-        public TickerLobbyInfoEvent(string textBlob)
-        {
-            TextBlob = textBlob;
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class TickerLobbyCountdownEvent : EntityEventArgs
-    {
-        /// <summary>
-        /// The game time that the game will start at.
-        /// </summary>
-        public TimeSpan StartTime { get; }
-
-        /// <summary>
-        /// Whether or not the countdown is paused
-        /// </summary>
-        public bool Paused { get; }
-
-        public TickerLobbyCountdownEvent(TimeSpan startTime, bool paused)
-        {
-            StartTime = startTime;
-            Paused = paused;
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class TickerJobsAvailableEvent(
-        Dictionary<NetEntity, string> stationNames,
-        Dictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>> jobsAvailableByStation,
-        Dictionary<NetEntity, ProtoId<JobWeightPrototype>?> jobWeightsByStation)
-        : EntityEventArgs
-    {
-        /// <summary>
-        /// The Status of the Player in the lobby (ready, observer, ...)
-        /// </summary>
-        public Dictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>> JobsAvailableByStation { get; } = jobsAvailableByStation;
-
-        public Dictionary<NetEntity, string> StationNames { get; } = stationNames;
-
-        public Dictionary<NetEntity, ProtoId<JobWeightPrototype>?> JobWeightsByStation { get; } = jobWeightsByStation;
-    }
-
-    [Serializable, NetSerializable, DataDefinition]
-    public sealed partial class RoundEndMessageEvent : EntityEventArgs
-    {
-        [Serializable, NetSerializable, DataDefinition]
-        public partial struct RoundEndPlayerInfo
-        {
-            [DataField]
-            public string PlayerOOCName;
-
-            [DataField]
-            public string? PlayerICName;
-
-            [DataField, NonSerialized]
-            public NetUserId? PlayerGuid;
-
-            public string Role;
-
-            [DataField, NonSerialized]
-            public string[] JobPrototypes;
-
-            [DataField, NonSerialized]
-            public string[] AntagPrototypes;
-
-            public NetEntity? PlayerNetEntity;
-
-            [DataField]
-            public bool Antag;
-
-            [DataField]
-            public bool Observer;
-
-            public bool Connected;
-        }
-
-        public string GamemodeTitle { get; }
-        public string RoundEndText { get; }
-        public TimeSpan RoundDuration { get; }
-        public int RoundId { get; }
-        public int PlayerCount { get; }
-        public RoundEndPlayerInfo[] AllPlayersEndInfo { get; }
-
-        /// <summary>
-        /// Sound gets networked due to how entity lifecycle works between client / server and to avoid clipping.
-        /// </summary>
-        public ResolvedSoundSpecifier? RestartSound;
-
-        public RoundEndMessageEvent(
-            string gamemodeTitle,
-            string roundEndText,
-            TimeSpan roundDuration,
-            int roundId,
-            int playerCount,
-            RoundEndPlayerInfo[] allPlayersEndInfo,
-            ResolvedSoundSpecifier? restartSound)
-        {
-            GamemodeTitle = gamemodeTitle;
-            RoundEndText = roundEndText;
-            RoundDuration = roundDuration;
-            RoundId = roundId;
-            PlayerCount = playerCount;
-            AllPlayersEndInfo = allPlayersEndInfo;
-            RestartSound = restartSound;
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public enum PlayerGameStatus : sbyte
-    {
-        NotReadyToPlay = 0,
-        ReadyToPlay,
-        JoinedGame,
-    }
-}
diff --git a/Content.Shared/GameWindow/RequestWindowAttentionEvent.cs b/Content.Shared/GameWindow/RequestWindowAttentionEvent.cs
index a587d7dda9..de6cf1d1b5 100644
--- a/Content.Shared/GameWindow/RequestWindowAttentionEvent.cs
+++ b/Content.Shared/GameWindow/RequestWindowAttentionEvent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.GameWindow
 {
diff --git a/Content.Shared/Ghost/ReturnToBodyEuiMessage.cs b/Content.Shared/Ghost/ReturnToBodyEuiMessage.cs
index 3e2c99cde5..38404acc13 100644
--- a/Content.Shared/Ghost/ReturnToBodyEuiMessage.cs
+++ b/Content.Shared/Ghost/ReturnToBodyEuiMessage.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Eui;
+using Content.Shared.Eui;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Ghost;
diff --git a/Content.Shared/Ghost/Roles/MakeGhostRoleEuiState.cs b/Content.Shared/Ghost/Roles/MakeGhostRoleEuiState.cs
index e17ab4aab3..e260201dea 100644
--- a/Content.Shared/Ghost/Roles/MakeGhostRoleEuiState.cs
+++ b/Content.Shared/Ghost/Roles/MakeGhostRoleEuiState.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Eui;
+using Content.Shared.Eui;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Ghost.Roles
diff --git a/Content.Shared/Ghost/Roles/Raffles/GhostRoleRaffleSettings.cs b/Content.Shared/Ghost/Roles/Raffles/GhostRoleRaffleSettings.cs
index 4f31bb7182..69bfa82588 100644
--- a/Content.Shared/Ghost/Roles/Raffles/GhostRoleRaffleSettings.cs
+++ b/Content.Shared/Ghost/Roles/Raffles/GhostRoleRaffleSettings.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Ghost.Roles.Raffles;
+namespace Content.Shared.Ghost.Roles.Raffles;
 
 /// <summary>
 /// Defines settings for a ghost role raffle.
diff --git a/Content.Shared/Ghost/Roles/Raffles/GhostRoleRaffleSettingsPrototype.cs b/Content.Shared/Ghost/Roles/Raffles/GhostRoleRaffleSettingsPrototype.cs
index 18ebff556a..6f381a36dd 100644
--- a/Content.Shared/Ghost/Roles/Raffles/GhostRoleRaffleSettingsPrototype.cs
+++ b/Content.Shared/Ghost/Roles/Raffles/GhostRoleRaffleSettingsPrototype.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Ghost.Roles.Raffles;
 
diff --git a/Content.Shared/Ghost/Systems/SharedGhostSystem.cs b/Content.Shared/Ghost/Systems/SharedGhostSystem.cs
index aa068f174c..5b90715e70 100644
--- a/Content.Shared/Ghost/Systems/SharedGhostSystem.cs
+++ b/Content.Shared/Ghost/Systems/SharedGhostSystem.cs
@@ -1,10 +1,14 @@
+using Content.Shared.Administration.Managers;
+using Content.Shared.Chat;
 using Content.Shared.Emoting;
 using Content.Shared.Examine;
+using Content.Shared.Follower;
 using Content.Shared.Ghost.Components;
 using Content.Shared.Hands;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Item;
 using Content.Shared.Popups;
+using Content.Shared.Tag;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 
@@ -16,8 +20,11 @@ namespace Content.Shared.Ghost.Systems;
 /// </summary>
 public abstract partial class SharedGhostSystem : EntitySystem
 {
+    [Dependency] protected IGameTiming GameTiming = default!;
+    [Dependency] private ISharedAdminManager _admin = default!;
+    [Dependency] private FollowerSystem _follower = default!;
     [Dependency] protected SharedPopupSystem Popup = default!;
-    [Dependency] protected IGameTiming _gameTiming = default!;
+    [Dependency] private TagSystem _tag = default!;
 
     public override void Initialize()
     {
@@ -32,7 +39,7 @@ public abstract partial class SharedGhostSystem : EntitySystem
 
     private void OnGhostExamine(EntityUid uid, GhostComponent component, ExaminedEvent args)
     {
-        var timeSinceDeath = _gameTiming.RealTime.Subtract(component.TimeOfDeath);
+        var timeSinceDeath = GameTiming.RealTime.Subtract(component.TimeOfDeath);
         var deathTimeInfo = timeSinceDeath.Minutes > 0
             ? Loc.GetString("comp-ghost-examine-time-minutes", ("minutes", timeSinceDeath.Minutes))
             : Loc.GetString("comp-ghost-examine-time-seconds", ("seconds", timeSinceDeath.Seconds));
@@ -115,6 +122,19 @@ public abstract partial class SharedGhostSystem : EntitySystem
         entity.Comp.CanGhostInteract = value;
         Dirty(entity);
     }
+
+    [SubscribeLocalEvent]
+    private void OnGhostClickMessageSenderAttempt(Entity<GhostComponent> ent, ref ClickEntityLinkEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (_admin.IsAdmin(ent) || !_tag.HasTag(args.Target, FollowerSystem.PreventGhostnadoWarpTag)) //tag is used on any ghost that shouldn't be teleported to
+            args.Handled = true;
+
+        if (!args.Pure)
+            _follower.StartFollowingEntity(ent, args.Target);
+    }
 }
 
 /// <summary>
diff --git a/Content.Shared/GhostKick/MsgGhostKick.cs b/Content.Shared/GhostKick/MsgGhostKick.cs
index 1beab4e7d8..f47aa9473c 100644
--- a/Content.Shared/GhostKick/MsgGhostKick.cs
+++ b/Content.Shared/GhostKick/MsgGhostKick.cs
@@ -1,4 +1,4 @@
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Gibbing/GibOnRoundEndComponent.cs b/Content.Shared/Gibbing/GibOnRoundEndComponent.cs
index 5ce8edbd25..787c91f800 100644
--- a/Content.Shared/Gibbing/GibOnRoundEndComponent.cs
+++ b/Content.Shared/Gibbing/GibOnRoundEndComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Gibbing.Components;
 
diff --git a/Content.Shared/GlobalUsings.cs b/Content.Shared/GlobalUsings.cs
index d380dda30f..3755778476 100644
--- a/Content.Shared/GlobalUsings.cs
+++ b/Content.Shared/GlobalUsings.cs
@@ -1,4 +1,4 @@
-// There isn't really a 'default place' to put these,
+// There isn't really a 'default place' to put these,
 // so a file in the project top level directory it is
 
 global using System;
diff --git a/Content.Shared/Gravity/GravityAffectedComponent.cs b/Content.Shared/Gravity/GravityAffectedComponent.cs
index 31651002da..87913a03e9 100644
--- a/Content.Shared/Gravity/GravityAffectedComponent.cs
+++ b/Content.Shared/Gravity/GravityAffectedComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Gravity;
 
diff --git a/Content.Shared/Guardian/GuardianToggleActionEvent.cs b/Content.Shared/Guardian/GuardianToggleActionEvent.cs
index 15328984fe..2d8c21e316 100644
--- a/Content.Shared/Guardian/GuardianToggleActionEvent.cs
+++ b/Content.Shared/Guardian/GuardianToggleActionEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 
 namespace Content.Shared.Guardian;
 
diff --git a/Content.Shared/HUD/HudThemePrototype.cs b/Content.Shared/HUD/HudThemePrototype.cs
index 17898eb756..446725cd3d 100644
--- a/Content.Shared/HUD/HudThemePrototype.cs
+++ b/Content.Shared/HUD/HudThemePrototype.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.HUD
 {
diff --git a/Content.Shared/Hands/Components/PreventForcedThrowComponent.cs b/Content.Shared/Hands/Components/PreventForcedThrowComponent.cs
new file mode 100644
index 0000000000..1b15086e44
--- /dev/null
+++ b/Content.Shared/Hands/Components/PreventForcedThrowComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Hands.Components;
+
+/// <summary>
+/// An item with this component will not be involuntarily dropped, e.g. from slips/stuns.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PreventForcedThrowComponent : Component;
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.EventListeners.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.EventListeners.cs
index ea2502331e..3e21cae7e2 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.EventListeners.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.EventListeners.cs
@@ -1,4 +1,5 @@
-using Content.Shared.Hands.Components;
+using Content.Shared.Hands.Components;
+using Content.Shared.Standing;
 using Content.Shared.Stunnable;
 
 namespace Content.Shared.Hands.EntitySystems;
@@ -42,4 +43,10 @@ public abstract partial class SharedHandsSystem
         else
             args.SpeedModifier *= (float)freeHands / totalHands;
     }
+
+    [SubscribeLocalEvent]
+    private void OnAttemptedItemDrop(Entity<PreventForcedThrowComponent> ent, ref FellDownThrowAttemptEvent args)
+    {
+        args.Cancelled = true;
+    }
 }
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Relay.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Relay.cs
index f13f63e215..0ad1c69dbc 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Relay.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Relay.cs
@@ -24,6 +24,7 @@ public abstract partial class SharedHandsSystem
         SubscribeLocalEvent<HandsComponent, WieldAttemptEvent>(RefRelayEvent);
         SubscribeLocalEvent<HandsComponent, UnwieldAttemptEvent>(RefRelayEvent);
         SubscribeLocalEvent<HandsComponent, TargetHandcuffedEvent>(RefRelayEvent);
+        SubscribeLocalEvent<HandsComponent, BeforeTargetHandcuffedEvent>(RefRelayEvent);
         SubscribeLocalEvent<HandsComponent, RefreshWeightlessModifiersEvent>(RefRelayEvent);
     }
 
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
index 54448af6ac..4c14a128b6 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
@@ -551,8 +551,11 @@ public abstract partial class SharedHandsSystem
     /// Unremoveable items will cause a hand to not be freeable.
     /// </summary>
     /// <param name="except">The hand this entity is in will be ignored when counting.</param>
-    public int CountFreeableHands(Entity<HandsComponent> hands, EntityUid? except = null)
+    public int CountFreeableHands(Entity<HandsComponent?> hands, EntityUid? except = null)
     {
+        if (!Resolve(hands, ref hands.Comp, false))
+            return 0;
+
         var freeable = 0;
         foreach (var name in hands.Comp.Hands.Keys)
         {
diff --git a/Content.Shared/HijackBeacon/ActiveHijackBeaconComponent.cs b/Content.Shared/HijackBeacon/ActiveHijackBeaconComponent.cs
index b6f1d60c79..9c7d50f641 100644
--- a/Content.Shared/HijackBeacon/ActiveHijackBeaconComponent.cs
+++ b/Content.Shared/HijackBeacon/ActiveHijackBeaconComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.HijackBeacon;
 
diff --git a/Content.Shared/Humanoid/HumanoidVisualLayers.cs b/Content.Shared/Humanoid/HumanoidVisualLayers.cs
index 885f541f70..b1df9b032b 100644
--- a/Content.Shared/Humanoid/HumanoidVisualLayers.cs
+++ b/Content.Shared/Humanoid/HumanoidVisualLayers.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Humanoid.Markings;
+using Content.Shared.Humanoid.Markings;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Humanoid
diff --git a/Content.Shared/Humanoid/Sex.cs b/Content.Shared/Humanoid/Sex.cs
index fd69c3af0c..c9dcbb1625 100644
--- a/Content.Shared/Humanoid/Sex.cs
+++ b/Content.Shared/Humanoid/Sex.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Humanoid
+namespace Content.Shared.Humanoid
 {
     // You need to update profile, profile editor, maybe voices and names if you want to expand this further.
     public enum Sex : byte
diff --git a/Content.Shared/Humanoid/Voice.cs b/Content.Shared/Humanoid/Voice.cs
index 703f43bffd..c93ecf90b0 100644
--- a/Content.Shared/Humanoid/Voice.cs
+++ b/Content.Shared/Humanoid/Voice.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chat.Prototypes;
+using Content.Shared.Chat.Prototypes;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Humanoid;
diff --git a/Content.Shared/IdentityManagement/Components/IdentityComponent.cs b/Content.Shared/IdentityManagement/Components/IdentityComponent.cs
index 778066361f..b94b7fa909 100644
--- a/Content.Shared/IdentityManagement/Components/IdentityComponent.cs
+++ b/Content.Shared/IdentityManagement/Components/IdentityComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Containers;
+using Robust.Shared.Containers;
 using Robust.Shared.Enums;
 using Robust.Shared.GameStates;
 
diff --git a/Content.Shared/IgnitionSource/IgnitionSourceComponent.cs b/Content.Shared/IgnitionSource/IgnitionSourceComponent.cs
index 636bfbb22a..8455583fba 100644
--- a/Content.Shared/IgnitionSource/IgnitionSourceComponent.cs
+++ b/Content.Shared/IgnitionSource/IgnitionSourceComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.IgnitionSource;
 
diff --git a/Content.Shared/Implants/ChameleonControllerImplantComponent.cs b/Content.Shared/Implants/ChameleonControllerImplantComponent.cs
index d1874b6985..47461f767c 100644
--- a/Content.Shared/Implants/ChameleonControllerImplantComponent.cs
+++ b/Content.Shared/Implants/ChameleonControllerImplantComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using Content.Shared.Inventory;
 using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Roles;
diff --git a/Content.Shared/Implants/Components/RadioImplantComponent.cs b/Content.Shared/Implants/Components/RadioImplantComponent.cs
index e0e7f55646..1de8b6c36d 100644
--- a/Content.Shared/Implants/Components/RadioImplantComponent.cs
+++ b/Content.Shared/Implants/Components/RadioImplantComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Radio;
+using Content.Shared.Radio;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Implants.Components;
diff --git a/Content.Shared/Implants/SharedChameleonControllerSystem.cs b/Content.Shared/Implants/SharedChameleonControllerSystem.cs
index 878bf3624e..a603f10ce4 100644
--- a/Content.Shared/Implants/SharedChameleonControllerSystem.cs
+++ b/Content.Shared/Implants/SharedChameleonControllerSystem.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Implants;
 
diff --git a/Content.Shared/Interaction/BeforeInteract.cs b/Content.Shared/Interaction/BeforeInteract.cs
index d6603f8c96..9a2a720ca3 100644
--- a/Content.Shared/Interaction/BeforeInteract.cs
+++ b/Content.Shared/Interaction/BeforeInteract.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Shared.Map;
 
 namespace Content.Shared.Interaction
diff --git a/Content.Shared/Interaction/Components/BypassInteractionChecksComponent.cs b/Content.Shared/Interaction/Components/BypassInteractionChecksComponent.cs
index ca0ff96315..e2c08d911a 100644
--- a/Content.Shared/Interaction/Components/BypassInteractionChecksComponent.cs
+++ b/Content.Shared/Interaction/Components/BypassInteractionChecksComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Interaction.Components;
 
diff --git a/Content.Shared/Interaction/Components/InteractionRelayComponent.cs b/Content.Shared/Interaction/Components/InteractionRelayComponent.cs
index 2ac9c1e4ef..155e77095f 100644
--- a/Content.Shared/Interaction/Components/InteractionRelayComponent.cs
+++ b/Content.Shared/Interaction/Components/InteractionRelayComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Interaction.Components;
 
diff --git a/Content.Shared/Interaction/Components/NoRotateOnInteractComponent.cs b/Content.Shared/Interaction/Components/NoRotateOnInteractComponent.cs
index 553c03453d..497ffc4a2a 100644
--- a/Content.Shared/Interaction/Components/NoRotateOnInteractComponent.cs
+++ b/Content.Shared/Interaction/Components/NoRotateOnInteractComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Interaction.Components;
 
diff --git a/Content.Shared/Interaction/Events/InteractionAttemptEvent.cs b/Content.Shared/Interaction/Events/InteractionAttemptEvent.cs
index a04c053635..90abba1111 100644
--- a/Content.Shared/Interaction/Events/InteractionAttemptEvent.cs
+++ b/Content.Shared/Interaction/Events/InteractionAttemptEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Interaction.Events
+namespace Content.Shared.Interaction.Events
 {
     /// <summary>
     ///     Event raised directed at a user to see if they can perform a generic interaction.
diff --git a/Content.Shared/Interaction/Events/UseAttemptEvent.cs b/Content.Shared/Interaction/Events/UseAttemptEvent.cs
index c28f2b6517..cb3716ae42 100644
--- a/Content.Shared/Interaction/Events/UseAttemptEvent.cs
+++ b/Content.Shared/Interaction/Events/UseAttemptEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Interaction.Events
+namespace Content.Shared.Interaction.Events
 {
     public sealed class UseAttemptEvent(EntityUid uid, EntityUid used) : CancellableEntityEventArgs
     {
diff --git a/Content.Shared/Interaction/Events/UseInHandEvent.cs b/Content.Shared/Interaction/Events/UseInHandEvent.cs
index 24a841c2d8..b370ef8a35 100644
--- a/Content.Shared/Interaction/Events/UseInHandEvent.cs
+++ b/Content.Shared/Interaction/Events/UseInHandEvent.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Clothing.EntitySystems;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
 using JetBrains.Annotations;
 
 namespace Content.Shared.Interaction.Events;
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.Relay.cs b/Content.Shared/Interaction/SharedInteractionSystem.Relay.cs
index 77e283b93d..4134d75953 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.Relay.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.Relay.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Interaction.Components;
+using Content.Shared.Interaction.Components;
 
 namespace Content.Shared.Interaction;
 
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 14f2b7ff42..08cd8ec085 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -25,7 +25,8 @@ using Content.Shared.Popups;
 using Content.Shared.Storage;
 using Content.Shared.Strip;
 using Content.Shared.Tag;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using Content.Shared.UserInterface;
 using Content.Shared.Verbs;
 using Content.Shared.Wall;
@@ -1181,7 +1182,7 @@ namespace Content.Shared.Interaction
                     _adminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(user):user} activated {ToPrettyString(used):used}");
 
                 if (delayComponent != null)
-                    _useDelay.TryResetDelay(used, component: delayComponent);
+                    _useDelay.TryResetDelay((used, delayComponent));
                 return true;
             }
 
@@ -1194,7 +1195,7 @@ namespace Content.Shared.Interaction
             DoContactInteraction(user, used);
             // Still need to call this even without checkUseDelay in case this gets relayed from Activate.
             if (delayComponent != null)
-                _useDelay.TryResetDelay(used, component: delayComponent);
+                _useDelay.TryResetDelay((used, delayComponent));
 
             _adminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(user):user} activated {ToPrettyString(used):used}");
             return true;
diff --git a/Content.Shared/Internals/InternalsDoAfterEvent.cs b/Content.Shared/Internals/InternalsDoAfterEvent.cs
index 66c2bd9327..ccfa8fbcca 100644
--- a/Content.Shared/Internals/InternalsDoAfterEvent.cs
+++ b/Content.Shared/Internals/InternalsDoAfterEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Alert;
+using Content.Shared.Alert;
 using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Inventory/BlockItemNameInHandComponent.cs b/Content.Shared/Inventory/BlockItemNameInHandComponent.cs
index 077a34fdd7..6128fa8223 100644
--- a/Content.Shared/Inventory/BlockItemNameInHandComponent.cs
+++ b/Content.Shared/Inventory/BlockItemNameInHandComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Inventory;
 
diff --git a/Content.Shared/Inventory/Events/BeforeEquipEvents.cs b/Content.Shared/Inventory/Events/BeforeEquipEvents.cs
index 6ea408107b..2040128795 100644
--- a/Content.Shared/Inventory/Events/BeforeEquipEvents.cs
+++ b/Content.Shared/Inventory/Events/BeforeEquipEvents.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Inventory.Events;
+namespace Content.Shared.Inventory.Events;
 
 public abstract class BeforeEquipEventBase(EntityUid user, EntityUid equipTarget, EntityUid equipment, SlotDefinition slotDefinition) : EntityEventArgs
 {
diff --git a/Content.Shared/Inventory/Events/BeforeUnequipEvents.cs b/Content.Shared/Inventory/Events/BeforeUnequipEvents.cs
index a084e1536a..eb5aceb70d 100644
--- a/Content.Shared/Inventory/Events/BeforeUnequipEvents.cs
+++ b/Content.Shared/Inventory/Events/BeforeUnequipEvents.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Inventory.Events;
+namespace Content.Shared.Inventory.Events;
 
 public abstract class BeforeUnequipEventBase(EntityUid user, EntityUid equipTarget, EntityUid equipment, SlotDefinition slotDefinition) : EntityEventArgs
 {
diff --git a/Content.Shared/Inventory/Events/EquippedEvents.cs b/Content.Shared/Inventory/Events/EquippedEvents.cs
index a152a54b44..302cd19472 100644
--- a/Content.Shared/Inventory/Events/EquippedEvents.cs
+++ b/Content.Shared/Inventory/Events/EquippedEvents.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Inventory.Events;
+namespace Content.Shared.Inventory.Events;
 
 public abstract class EquippedEventBase(EntityUid equipTarget, EntityUid equipment, SlotDefinition slotDefinition) : EntityEventArgs
 {
diff --git a/Content.Shared/Inventory/Events/InventoryEquipActEvent.cs b/Content.Shared/Inventory/Events/InventoryEquipActEvent.cs
index 59b5a3c69e..ef310b1ece 100644
--- a/Content.Shared/Inventory/Events/InventoryEquipActEvent.cs
+++ b/Content.Shared/Inventory/Events/InventoryEquipActEvent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Inventory.Events;
 
diff --git a/Content.Shared/Inventory/Events/UnequippedEvents.cs b/Content.Shared/Inventory/Events/UnequippedEvents.cs
index 3f553c9591..822bf694f8 100644
--- a/Content.Shared/Inventory/Events/UnequippedEvents.cs
+++ b/Content.Shared/Inventory/Events/UnequippedEvents.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Inventory.Events;
+namespace Content.Shared.Inventory.Events;
 
 public abstract class UnequippedEventBase(EntityUid equipTarget, EntityUid equipment, SlotDefinition slotDefinition) : EntityEventArgs
 {
diff --git a/Content.Shared/Inventory/Events/UseSlotNetworkMessage.cs b/Content.Shared/Inventory/Events/UseSlotNetworkMessage.cs
index eac214f7b9..1400159c03 100644
--- a/Content.Shared/Inventory/Events/UseSlotNetworkMessage.cs
+++ b/Content.Shared/Inventory/Events/UseSlotNetworkMessage.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Inventory.Events;
 
diff --git a/Content.Shared/Inventory/InventoryComponent.cs b/Content.Shared/Inventory/InventoryComponent.cs
index 664fdd6d56..770fa0fd48 100644
--- a/Content.Shared/Inventory/InventoryComponent.cs
+++ b/Content.Shared/Inventory/InventoryComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DisplacementMap;
+using Content.Shared.DisplacementMap;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Inventory/InventorySystem.Helpers.cs b/Content.Shared/Inventory/InventorySystem.Helpers.cs
index bfa34e12d3..10e6fa7f41 100644
--- a/Content.Shared/Inventory/InventorySystem.Helpers.cs
+++ b/Content.Shared/Inventory/InventorySystem.Helpers.cs
@@ -67,8 +67,19 @@ public partial class InventorySystem
                && (slot.SlotFlags & flags) != 0;
     }
 
-    public bool SpawnItemInSlot(EntityUid uid, string slot, string prototype, bool silent = false, bool force = false, InventoryComponent? inventory = null)
+    public bool SpawnItemInSlot(EntityUid uid,
+        string slot,
+        string prototype,
+        bool silent = false,
+        bool force = false,
+        InventoryComponent? inventory = null)
     {
+        return SpawnItemInSlot(uid, slot, prototype, out _, silent, force, inventory);
+    }
+
+    public bool SpawnItemInSlot(EntityUid uid, string slot, string prototype, [NotNullWhen(true)] out EntityUid? spawned, bool silent = false, bool force = false, InventoryComponent? inventory = null)
+    {
+        spawned = null;
         if (!Resolve(uid, ref inventory, false))
             return false;
 
@@ -87,14 +98,14 @@ public partial class InventorySystem
         // Let's spawn this first...
         var item = Spawn(prototype, Transform(uid).Coordinates);
 
-        // Helper method that deletes the item and returns false.
-        bool DeleteItem()
+        // We finally try to equip the item, otherwise we delete it.
+        if (TryEquip(uid, item, slot, silent, force))
         {
-            Del(item);
-            return false;
+            spawned = item;
+            return true;
         }
 
-        // We finally try to equip the item, otherwise we delete it.
-        return TryEquip(uid, item, slot, silent, force) || DeleteItem();
+        Del(item);
+        return false;
     }
 }
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index 94bb2e9d58..f852334f64 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -116,6 +116,7 @@ public partial class InventorySystem
         SubscribeLocalEvent<InventoryComponent, RefreshEquipmentHudEvent<BlackAndWhiteOverlayComponent>>(RefRelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, RefreshEquipmentHudEvent<NoirOverlayComponent>>(RefRelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, RefreshEquipmentHudEvent<ThermalSightComponent>>(RefRelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, RefreshEquipmentHudEvent<ImageOverlayComponent>>(RefRelayInventoryEvent);
 
         SubscribeLocalEvent<InventoryComponent, GetVerbsEvent<EquipmentVerb>>(OnGetEquipmentVerbs);
         SubscribeLocalEvent<InventoryComponent, GetVerbsEvent<InnateVerb>>(OnGetInnateVerbs);
diff --git a/Content.Shared/Inventory/RelaySubscriptionHelpers.cs b/Content.Shared/Inventory/RelaySubscriptionHelpers.cs
index e905231539..64129dd349 100644
--- a/Content.Shared/Inventory/RelaySubscriptionHelpers.cs
+++ b/Content.Shared/Inventory/RelaySubscriptionHelpers.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Hands;
+using Content.Shared.Hands;
 
 namespace Content.Shared.Inventory;
 
diff --git a/Content.Shared/Inventory/VirtualItem/VirtualItemComponent.cs b/Content.Shared/Inventory/VirtualItem/VirtualItemComponent.cs
index cda1be5b99..8c3b6be9c8 100644
--- a/Content.Shared/Inventory/VirtualItem/VirtualItemComponent.cs
+++ b/Content.Shared/Inventory/VirtualItem/VirtualItemComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Inventory.VirtualItem;
 
diff --git a/Content.Shared/IoC/SharedContentIoC.cs b/Content.Shared/IoC/SharedContentIoC.cs
index f23b9f8355..34f8c52bb5 100644
--- a/Content.Shared/IoC/SharedContentIoC.cs
+++ b/Content.Shared/IoC/SharedContentIoC.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Humanoid.Markings;
+using Content.Shared.Humanoid.Markings;
 using Content.Shared.Localizations;
 
 namespace Content.Shared.IoC
diff --git a/Content.Shared/Item/ForcedItemStatusEffectComponent.cs b/Content.Shared/Item/ForcedItemStatusEffectComponent.cs
new file mode 100644
index 0000000000..f89209682d
--- /dev/null
+++ b/Content.Shared/Item/ForcedItemStatusEffectComponent.cs
@@ -0,0 +1,73 @@
+using Content.Shared.Inventory;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Item;
+
+/// <summary>
+/// Component used for status effects.
+/// Forces an item onto the entity the status effect was applied to, either to their inventory or hands.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState]
+public sealed partial class ForcedItemStatusEffectComponent : Component
+{
+    /// <summary>
+    /// The entities to spawn in the hands of the user.
+    /// If the hands are unavailable, they will not be spawned.
+    /// </summary>
+    [DataField]
+    public List<EntProtoId> HandItems = new ();
+
+    /// <summary>
+    /// The entities to spawn in the inventory of the user.
+    /// If the slots are unavailable, they will not be spawned.
+    /// </summary>
+    [DataField]
+    public Dictionary<SlotFlags, EntProtoId> InventoryItems = new ();
+
+    /// <summary>
+    /// <see cref="EntityUid"/>s of the spawned items. Used to remove them when the status effect expires.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public HashSet<EntityUid> ItemEntities = new ();
+
+    /// <summary>
+    /// Whether the item should be unremovable from the slot it was placed in.
+    /// </summary>
+    [DataField]
+    public bool Unremovable = true;
+
+    /// <summary>
+    /// If the item in the existing slots/hands should be dropped to make space.
+    /// </summary>
+    [DataField]
+    public bool DropExisting = true;
+
+    /// <summary>
+    /// Forces the items to spawn in their respective slots, even if usually not possible to equip there.
+    /// Only affects inventory slots.
+    /// </summary>
+    [DataField]
+    public bool Force;
+
+    /// <summary>
+    /// Whether the status effect items should be removed when handcuffed.
+    /// Causes the status effect to get removed as well.
+    /// </summary>
+    [DataField]
+    public bool RemoveWhenCuffed = true;
+
+    /// <summary>
+    /// The sound to play when the item(s) spawn.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? SpawnSound;
+
+    /// <summary>
+    /// The sound to play when the item(s) disappear.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? DespawnSound;
+}
diff --git a/Content.Shared/Item/ForcedItemStatusEffectItemComponent.cs b/Content.Shared/Item/ForcedItemStatusEffectItemComponent.cs
new file mode 100644
index 0000000000..a2d4c4e4b7
--- /dev/null
+++ b/Content.Shared/Item/ForcedItemStatusEffectItemComponent.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Item;
+
+/// <summary>
+/// Marker component for the items spawned by <see cref="ForcedItemStatusEffectSystem"/>.
+/// For mutual cleanup.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState]
+public sealed partial class ForcedItemStatusEffectItemComponent : Component
+{
+    /// <summary>
+    /// The status effect that forced this item to spawn.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? StatusEffect;
+
+    /// <summary>
+    /// Whether the item should be removed when the holder is handcuffed.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool RemoveWhenCuffed;
+}
diff --git a/Content.Shared/Item/ForcedItemStatusEffectSystem.cs b/Content.Shared/Item/ForcedItemStatusEffectSystem.cs
new file mode 100644
index 0000000000..81695c0a66
--- /dev/null
+++ b/Content.Shared/Item/ForcedItemStatusEffectSystem.cs
@@ -0,0 +1,188 @@
+using Content.Shared.Cuffs;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Interaction.Components;
+using Content.Shared.Inventory;
+using Content.Shared.StatusEffectNew;
+using Content.Shared.StatusEffectNew.Components;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Item;
+
+public sealed partial class ForcedItemStatusEffectSystem : EntitySystem
+{
+    [Dependency] private INetManager _net = default!;
+    [Dependency] private SharedHandsSystem _hands = default!;
+    [Dependency] private InventorySystem _inventory = default!;
+    [Dependency] private SharedAudioSystem _audio = default!;
+    [Dependency] private StatusEffectsSystem _status = default!;
+
+    public override void Initialize()
+    {
+        Subs.SubscribeWithRelay<ForcedItemStatusEffectItemComponent, BeforeTargetHandcuffedEvent>(OnBeforeGotHandcuffed);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnEffectApplied(Entity<ForcedItemStatusEffectComponent> entity, ref StatusEffectAppliedEvent args)
+    {
+        // "Why the IsServer check? Cannot this be predicted?"
+        // Yes and no. Status effects cannot really have a "user", as such we cannot play the sound in a predicted way.
+        // It only works for the local client who had this status effect applied to them.
+        // The audio could be the only unpredicted thing, but the audio and visual being not predicted
+        // makes it extremely obvious as to this being a fake item and not for example being a real armblade or some shit.
+        // Basically, if we want to sync it up we need self-predicting audio, like how popups do it.
+        // Also container prediction makes this a nightmare too but thats a lesser issue
+        if (!_net.IsServer)
+            return;
+
+        // No reapplying
+        if (entity.Comp.ItemEntities.Count != 0)
+            return;
+
+        foreach (var item in entity.Comp.HandItems)
+        {
+            var spawned = SpawnAtPosition(item, Transform(entity).Coordinates);
+
+            var pickedUp = entity.Comp.DropExisting
+                ? _hands.TryForcePickupAnyHand(args.Target, spawned, false)
+                : _hands.TryPickupAnyHand(args.Target, spawned, false);
+
+            if (entity.Comp.Unremovable)
+                EnsureComp<UnremoveableComponent>(spawned);
+
+            if (!pickedUp)
+            {
+                QueueDel(spawned);
+                continue;
+            }
+
+            TrackItem(spawned, entity);
+        }
+
+        foreach (var slot in entity.Comp.InventoryItems)
+        {
+            var slots = _inventory.GetSlotEnumerator(args.Target, slot.Key);
+            while (slots.MoveNext(out var container))
+            {
+                if (container.ContainedEntity != null && entity.Comp.DropExisting)
+                {
+                    if (_inventory.TryUnequip(args.Target, container.ID, true, entity.Comp.Force) &&
+                        SpawnItemInInventory(entity, slot.Value, args.Target, container.ID))
+                    {
+                        continue;
+                    }
+                }
+
+                if (container.ContainedEntities.Count == 0)
+                    SpawnItemInInventory(entity, slot.Value, args.Target, container.ID);
+            }
+        }
+
+        if (entity.Comp.ItemEntities.Count == 0)
+            return;
+
+        _audio.PlayPvs(entity.Comp.SpawnSound, args.Target);
+        Dirty(entity);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnEffectRemoved(Entity<ForcedItemStatusEffectComponent> entity, ref StatusEffectRemovedEvent args)
+    {
+        // Same reason as above.
+        if (!_net.IsServer)
+            return;
+
+        if (entity.Comp.ItemEntities.Count == 0)
+            return;
+
+        foreach (var item in entity.Comp.ItemEntities)
+        {
+            DisposeItem(item, entity, args.Target, false);
+        }
+
+        _audio.PlayPvs(entity.Comp.DespawnSound, args.Target);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnItemShutdown(Entity<ForcedItemStatusEffectItemComponent> entity, ref ComponentShutdown args)
+    {
+        if (!TryComp<ForcedItemStatusEffectComponent>(entity.Comp.StatusEffect, out var effect))
+            return;
+
+        effect.ItemEntities.Remove(entity);
+        Dirty(entity.Comp.StatusEffect.Value, effect);
+    }
+
+    private void OnBeforeGotHandcuffed(Entity<ForcedItemStatusEffectItemComponent> entity, ref BeforeTargetHandcuffedEvent args)
+    {
+        if (!entity.Comp.RemoveWhenCuffed)
+            return;
+
+        if (!TryComp<ForcedItemStatusEffectComponent>(entity.Comp.StatusEffect, out var forcedItem))
+            return;
+
+        if (!TryComp<StatusEffectComponent>(entity.Comp.StatusEffect, out var status) || status.AppliedTo == null)
+            return;
+
+        DisposeItem(entity, (entity.Comp.StatusEffect.Value, forcedItem), status.AppliedTo.Value, true, args.User);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnGotHandcuffed(Entity<ForcedItemStatusEffectComponent> entity, ref StatusEffectRelayedEvent<TargetHandcuffedEvent> args)
+    {
+        if (!entity.Comp.RemoveWhenCuffed)
+            return;
+
+        if (!TryComp<StatusEffectComponent>(entity, out var status) || status.AppliedTo == null)
+            return;
+
+        if (MetaData(entity).EntityPrototype?.ID is not { } entProto)
+            return;
+
+        _status.TryRemoveStatusEffect(status.AppliedTo.Value, entProto);
+    }
+
+    private void DisposeItem(EntityUid entity, Entity<ForcedItemStatusEffectComponent> status, EntityUid holder, bool playSound = true, EntityUid? user = null)
+    {
+        // Unremovable causes issues with predicted deletion so we get rid of it first.
+        if (HasComp<UnremoveableComponent>(entity))
+            RemComp<UnremoveableComponent>(entity);
+
+        // Cleanup is handled via shutdown of the item.
+        PredictedQueueDel(entity);
+
+        if (!playSound)
+            return;
+
+        // We want to predict the audio only if we have a user.
+        if (user == null && _net.IsServer)
+            _audio.PlayPvs(status.Comp.DespawnSound, holder);
+        else if (user != null)
+            _audio.PlayPredicted(status.Comp.DespawnSound, holder, user.Value);
+    }
+
+    private bool SpawnItemInInventory(Entity<ForcedItemStatusEffectComponent> ent, EntProtoId item, EntityUid target, string slot)
+    {
+        if (!_inventory.SpawnItemInSlot(target, slot, item, out var itemUid, true, force: ent.Comp.Force))
+            return false;
+
+        if (ent.Comp.Unremovable)
+            EnsureComp<UnremoveableComponent>(itemUid.Value);
+
+        TrackItem(itemUid.Value, ent);
+
+        return true;
+    }
+
+    private void TrackItem(EntityUid item, Entity<ForcedItemStatusEffectComponent> ent)
+    {
+        EnsureComp<ForcedItemStatusEffectItemComponent>(item, out var spawnedComp);
+        spawnedComp.StatusEffect = ent;
+        spawnedComp.RemoveWhenCuffed = ent.Comp.RemoveWhenCuffed;
+        ent.Comp.ItemEntities.Add(item);
+
+        Dirty(item, spawnedComp);
+        Dirty(ent);
+    }
+}
diff --git a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
index 7be647116e..76a35ffa62 100644
--- a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
+++ b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
@@ -384,7 +384,7 @@ public sealed partial class ItemToggleSystem : EntitySystem
         if (args.Cancelled)
             return;
 
-        if (_battery.GetCharge(ent.Owner) >= ent.Comp.RequiredCharge)
+        if (_battery.GetCharge(ent.Owner).Charge >= ent.Comp.RequiredCharge)
             return;
 
         args.Popup = Loc.GetString(ent.Comp.FailPopup);
@@ -394,7 +394,7 @@ public sealed partial class ItemToggleSystem : EntitySystem
     [SubscribeLocalEvent]
     private void OnChargeChanged(Entity<ItemToggleRequiresChargeComponent> ent, ref ChargeChangedEvent args)
     {
-        if (_battery.GetCharge(ent.Owner) >= ent.Comp.RequiredCharge)
+        if (_battery.GetCharge(ent.Owner).Charge >= ent.Comp.RequiredCharge)
             return;
 
         TryDeactivate(ent.Owner);
diff --git a/Content.Shared/Item/MultiHandedItemComponent.cs b/Content.Shared/Item/MultiHandedItemComponent.cs
index e54b14f464..ec98496e73 100644
--- a/Content.Shared/Item/MultiHandedItemComponent.cs
+++ b/Content.Shared/Item/MultiHandedItemComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Item;
 
diff --git a/Content.Shared/Jaunt/JauntComponent.cs b/Content.Shared/Jaunt/JauntComponent.cs
index 6d37ab4b32..daa9c42c79 100644
--- a/Content.Shared/Jaunt/JauntComponent.cs
+++ b/Content.Shared/Jaunt/JauntComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Jaunt;
diff --git a/Content.Shared/Jaunt/JauntSystem.cs b/Content.Shared/Jaunt/JauntSystem.cs
index 21747ad984..f65c04fa8f 100644
--- a/Content.Shared/Jaunt/JauntSystem.cs
+++ b/Content.Shared/Jaunt/JauntSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 
 namespace Content.Shared.Jaunt;
 public sealed partial class JauntSystem : EntitySystem
diff --git a/Content.Shared/Kitchen/Components/ExtractableComponent.cs b/Content.Shared/Kitchen/Components/ExtractableComponent.cs
index fdf59ea19f..c1f8ac66fe 100644
--- a/Content.Shared/Kitchen/Components/ExtractableComponent.cs
+++ b/Content.Shared/Kitchen/Components/ExtractableComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Kitchen.Components;
diff --git a/Content.Shared/Kitchen/RecipeManager.cs b/Content.Shared/Kitchen/RecipeManager.cs
index 8788eb15ea..ac549ee74a 100644
--- a/Content.Shared/Kitchen/RecipeManager.cs
+++ b/Content.Shared/Kitchen/RecipeManager.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Kitchen;
diff --git a/Content.Shared/Light/Components/SharedEmergencyLightComponent.cs b/Content.Shared/Light/Components/SharedEmergencyLightComponent.cs
index cf05af19c1..ea49756e14 100644
--- a/Content.Shared/Light/Components/SharedEmergencyLightComponent.cs
+++ b/Content.Shared/Light/Components/SharedEmergencyLightComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Light.Components;
 
diff --git a/Content.Shared/Light/Components/SharedLightBehaviourComponent.cs b/Content.Shared/Light/Components/SharedLightBehaviourComponent.cs
index b93cfeef7e..91da3ee747 100644
--- a/Content.Shared/Light/Components/SharedLightBehaviourComponent.cs
+++ b/Content.Shared/Light/Components/SharedLightBehaviourComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Light.Components;
+namespace Content.Shared.Light.Components;
 
 /// <summary>
 /// A component which applies a specific behaviour to a PointLightComponent on its owner.
diff --git a/Content.Shared/Light/EntitySystems/SharedPoweredLightSystem.cs b/Content.Shared/Light/EntitySystems/SharedPoweredLightSystem.cs
index 86b0e628ce..4c8e469fbc 100644
--- a/Content.Shared/Light/EntitySystems/SharedPoweredLightSystem.cs
+++ b/Content.Shared/Light/EntitySystems/SharedPoweredLightSystem.cs
@@ -3,8 +3,8 @@ using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.DeviceLinking;
 using Content.Shared.DeviceLinking.Events;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
+using Content.Shared.DeviceNetwork.Payloads;
 using Content.Shared.DoAfter;
 using Content.Shared.Emp;
 using Content.Shared.Hands.EntitySystems;
@@ -51,7 +51,6 @@ public abstract partial class SharedPoweredLightSystem : EntitySystem
         SubscribeLocalEvent<PoweredLightComponent, InteractUsingEvent>(OnInteractUsing);
         SubscribeLocalEvent<PoweredLightComponent, InteractHandEvent>(OnInteractHand);
         SubscribeLocalEvent<PoweredLightComponent, SignalReceivedEvent>(OnSignalReceived);
-        SubscribeLocalEvent<PoweredLightComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
         SubscribeLocalEvent<PoweredLightComponent, PowerChangedEvent>(OnPowerChanged);
         SubscribeLocalEvent<PoweredLightComponent, PoweredLightDoAfterEvent>(OnDoAfter);
         SubscribeLocalEvent<PoweredLightComponent, DamageChangedEvent>(HandleLightDamaged);
@@ -130,15 +129,12 @@ public abstract partial class SharedPoweredLightSystem : EntitySystem
     }
 
     /// <summary>
-    /// Turns the light on or of when receiving a <see cref="DeviceNetworkConstants.CmdSetState"/> command.
-    /// The light is turned on or of according to the <see cref="DeviceNetworkConstants.StateEnabled"/> value
+    /// Turns the light on or of when receiving a <see cref="ApcNetTogglePayload"/>.
     /// </summary>
-    private void OnPacketReceived(EntityUid uid, PoweredLightComponent component, DeviceNetworkPacketEvent args)
+    [SubscribeLocalEvent]
+    private void OnPacketReceived(Entity<PoweredLightComponent> ent, ref DeviceNetworkPacketEvent<ApcNetTogglePayload> args)
     {
-        if (!args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? command) || command != DeviceNetworkConstants.CmdSetState) return;
-        if (!args.Data.TryGetValue(DeviceNetworkConstants.StateEnabled, out bool enabled)) return;
-
-        SetState(uid, enabled, component);
+        SetState(ent, args.Data.Enabled, ent.Comp);
     }
 
     /// <summary>
@@ -301,7 +297,7 @@ public abstract partial class SharedPoweredLightSystem : EntitySystem
                     {
                         light.LastThunk = time;
                         Dirty(uid, light);
-                        _audio.PlayPredicted(light.TurnOnSound, uid, user: user, light.TurnOnSound.Params.AddVolume(-10f));
+                        _audio.PlayPredicted(light.TurnOnSound, uid, user: user, light.TurnOnSound.Params.AddVolume(-6f));
                     }
                 }
                 else
diff --git a/Content.Shared/Light/Events/LightReplacerBUIMessages.cs b/Content.Shared/Light/Events/LightReplacerBUIMessages.cs
index e20e267a09..1e466408ce 100644
--- a/Content.Shared/Light/Events/LightReplacerBUIMessages.cs
+++ b/Content.Shared/Light/Events/LightReplacerBUIMessages.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Light.Components;
+using Content.Shared.Light.Components;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Light/PoweredLightDoAfterEvent.cs b/Content.Shared/Light/PoweredLightDoAfterEvent.cs
index 9685ee6ebe..4bf1cc862e 100644
--- a/Content.Shared/Light/PoweredLightDoAfterEvent.cs
+++ b/Content.Shared/Light/PoweredLightDoAfterEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Light;
diff --git a/Content.Shared/Lightning/SharedLightningSystem.cs b/Content.Shared/Lightning/SharedLightningSystem.cs
index 5d542ffddd..5c02e5d515 100644
--- a/Content.Shared/Lightning/SharedLightningSystem.cs
+++ b/Content.Shared/Lightning/SharedLightningSystem.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Random;
+using Robust.Shared.Random;
 
 namespace Content.Shared.Lightning;
 
diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs
index b18471c2fa..bdab23a4a3 100644
--- a/Content.Shared/Localizations/ContentLocalizationManager.cs
+++ b/Content.Shared/Localizations/ContentLocalizationManager.cs
@@ -31,7 +31,7 @@ namespace Content.Shared.Localizations
 
             _loc.LoadCulture(culture);
             _loc.LoadCulture(fallbackCulture); // Corvax-Localization
-            _loc.SetFallbackCluture(fallbackCulture); // Corvax-Localization
+            _loc.SetFallbackCulture(fallbackCulture); // Corvax-Localization
             _loc.AddFunction(culture, "MANY", FormatMany); // Corvax-Localization: To prevent problems in auto-generated locale files
             _loc.AddFunction(culture, "PRESSURE", FormatPressure);
             _loc.AddFunction(culture, "POWERWATTS", FormatPowerWatts);
diff --git a/Content.Shared/Lock/BypassLock/Components/BypassLockComponent.cs b/Content.Shared/Lock/BypassLock/Components/BypassLockComponent.cs
index 377c12cc6d..68c557ad59 100644
--- a/Content.Shared/Lock/BypassLock/Components/BypassLockComponent.cs
+++ b/Content.Shared/Lock/BypassLock/Components/BypassLockComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Lock.BypassLock.Systems;
+using Content.Shared.Lock.BypassLock.Systems;
 using Content.Shared.Tools;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Lock/BypassLock/Components/BypassLockRequiresMobStateComponent.cs b/Content.Shared/Lock/BypassLock/Components/BypassLockRequiresMobStateComponent.cs
index 7e40a8fcd5..df281b955c 100644
--- a/Content.Shared/Lock/BypassLock/Components/BypassLockRequiresMobStateComponent.cs
+++ b/Content.Shared/Lock/BypassLock/Components/BypassLockRequiresMobStateComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Lock.BypassLock.Systems;
+using Content.Shared.Lock.BypassLock.Systems;
 using Content.Shared.Mobs;
 using Robust.Shared.GameStates;
 
diff --git a/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.MobState.cs b/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.MobState.cs
index 02ec502004..1e0d46852f 100644
--- a/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.MobState.cs
+++ b/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.MobState.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Lock.BypassLock.Components;
+using Content.Shared.Lock.BypassLock.Components;
 using Content.Shared.Mobs.Components;
 
 namespace Content.Shared.Lock.BypassLock.Systems;
diff --git a/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.cs b/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.cs
index 34f2735f6d..0cfee40d62 100644
--- a/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.cs
+++ b/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration.Logs;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.Interaction;
diff --git a/Content.Shared/MachineLinking/UIKeys.cs b/Content.Shared/MachineLinking/UIKeys.cs
index 1f3f1cbbd7..b3a9e66341 100644
--- a/Content.Shared/MachineLinking/UIKeys.cs
+++ b/Content.Shared/MachineLinking/UIKeys.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.MachineLinking
 {
diff --git a/Content.Shared/Magic/Components/MagicComponent.cs b/Content.Shared/Magic/Components/MagicComponent.cs
index bcc11063b7..6d6820761e 100644
--- a/Content.Shared/Magic/Components/MagicComponent.cs
+++ b/Content.Shared/Magic/Components/MagicComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Magic.Components;
 
diff --git a/Content.Shared/Magic/Components/SpellbookComponent.cs b/Content.Shared/Magic/Components/SpellbookComponent.cs
index 69c2bac2a4..3819f7fe9d 100644
--- a/Content.Shared/Magic/Components/SpellbookComponent.cs
+++ b/Content.Shared/Magic/Components/SpellbookComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Magic.Components;
 
diff --git a/Content.Shared/Magic/Components/WizardClothesComponent.cs b/Content.Shared/Magic/Components/WizardClothesComponent.cs
index 063cf56c33..a84f896470 100644
--- a/Content.Shared/Magic/Components/WizardClothesComponent.cs
+++ b/Content.Shared/Magic/Components/WizardClothesComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Magic.Components;
 
diff --git a/Content.Shared/Magic/Events/BeforeCastSpellEvent.cs b/Content.Shared/Magic/Events/BeforeCastSpellEvent.cs
index afb5c1f090..3bb2668f6d 100644
--- a/Content.Shared/Magic/Events/BeforeCastSpellEvent.cs
+++ b/Content.Shared/Magic/Events/BeforeCastSpellEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Magic.Events;
+namespace Content.Shared.Magic.Events;
 
 [ByRefEvent]
 public struct BeforeCastSpellEvent(EntityUid performer)
diff --git a/Content.Shared/Magic/MagicInstantSpawnData.cs b/Content.Shared/Magic/MagicInstantSpawnData.cs
index 5dcc1453ed..3e417b34de 100644
--- a/Content.Shared/Magic/MagicInstantSpawnData.cs
+++ b/Content.Shared/Magic/MagicInstantSpawnData.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Magic;
+namespace Content.Shared.Magic;
 
 // TODO: If still needed, move to magic component
 [ImplicitDataDefinitionForInheritors]
diff --git a/Content.Shared/Magic/SpellbookDoAfterEvent.cs b/Content.Shared/Magic/SpellbookDoAfterEvent.cs
index 88b7514fcd..b52b232d66 100644
--- a/Content.Shared/Magic/SpellbookDoAfterEvent.cs
+++ b/Content.Shared/Magic/SpellbookDoAfterEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Magic;
diff --git a/Content.Shared/MapText/SharedMapTextComponent.cs b/Content.Shared/MapText/SharedMapTextComponent.cs
index 7b8a02da6f..a1406b46d0 100644
--- a/Content.Shared/MapText/SharedMapTextComponent.cs
+++ b/Content.Shared/MapText/SharedMapTextComponent.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/MapText/SharedMapTextSystem.cs b/Content.Shared/MapText/SharedMapTextSystem.cs
index da2adf16cf..55933f867e 100644
--- a/Content.Shared/MapText/SharedMapTextSystem.cs
+++ b/Content.Shared/MapText/SharedMapTextSystem.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.MapText;
+namespace Content.Shared.MapText;
 
 /// <summary>
 /// This handles registering the map text overlay, caching the text font and handling component state
diff --git a/Content.Shared/Mapping/MappingMapDataMessage.cs b/Content.Shared/Mapping/MappingMapDataMessage.cs
index a3961a6809..46f4029edf 100644
--- a/Content.Shared/Mapping/MappingMapDataMessage.cs
+++ b/Content.Shared/Mapping/MappingMapDataMessage.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using Lidgren.Network;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Mapping/MappingSaveMapErrorMessage.cs b/Content.Shared/Mapping/MappingSaveMapErrorMessage.cs
index e30e257305..e5dede3be3 100644
--- a/Content.Shared/Mapping/MappingSaveMapErrorMessage.cs
+++ b/Content.Shared/Mapping/MappingSaveMapErrorMessage.cs
@@ -1,4 +1,4 @@
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Mapping/MappingSaveMapMessage.cs b/Content.Shared/Mapping/MappingSaveMapMessage.cs
index f80b866121..e8daee2e28 100644
--- a/Content.Shared/Mapping/MappingSaveMapMessage.cs
+++ b/Content.Shared/Mapping/MappingSaveMapMessage.cs
@@ -1,4 +1,4 @@
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Mapping/StartPlacementActionEvent.cs b/Content.Shared/Mapping/StartPlacementActionEvent.cs
index 2091068b63..ba4a5e9b94 100644
--- a/Content.Shared/Mapping/StartPlacementActionEvent.cs
+++ b/Content.Shared/Mapping/StartPlacementActionEvent.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Actions;
-using Content.Shared.Maps;
+using Content.Shared.Maps;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Mapping;
diff --git a/Content.Server/Maps/GameMapPoolPrototype.cs b/Content.Shared/Maps/GameMapPoolPrototype.cs
similarity index 90%
rename from Content.Server/Maps/GameMapPoolPrototype.cs
rename to Content.Shared/Maps/GameMapPoolPrototype.cs
index 567570c0d5..f828f05703 100644
--- a/Content.Server/Maps/GameMapPoolPrototype.cs
+++ b/Content.Shared/Maps/GameMapPoolPrototype.cs
@@ -1,8 +1,7 @@
-using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Maps;
+namespace Content.Shared.Maps;
 
 /// <summary>
 /// Prototype that holds a pool of maps that can be indexed based on the map pool CCVar.
diff --git a/Content.Shared/MassMedia/Components/StationNewsComponent.cs b/Content.Shared/MassMedia/Components/StationNewsComponent.cs
index 055b332255..9915250387 100644
--- a/Content.Shared/MassMedia/Components/StationNewsComponent.cs
+++ b/Content.Shared/MassMedia/Components/StationNewsComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.MassMedia.Systems;
+using Content.Shared.MassMedia.Systems;
 
 namespace Content.Shared.MassMedia.Components;
 
diff --git a/Content.Shared/Materials/ActiveMaterialReclaimerComponent.cs b/Content.Shared/Materials/ActiveMaterialReclaimerComponent.cs
index 2beeed5d1e..9e1b8a6ccf 100644
--- a/Content.Shared/Materials/ActiveMaterialReclaimerComponent.cs
+++ b/Content.Shared/Materials/ActiveMaterialReclaimerComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Containers;
+using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
diff --git a/Content.Shared/Materials/CollideMaterialReclaimerComponent.cs b/Content.Shared/Materials/CollideMaterialReclaimerComponent.cs
index b59f21eef2..be19c56c42 100644
--- a/Content.Shared/Materials/CollideMaterialReclaimerComponent.cs
+++ b/Content.Shared/Materials/CollideMaterialReclaimerComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Materials;
+namespace Content.Shared.Materials;
 
 /// <summary>
 /// Valid items that collide with an entity with this component
diff --git a/Content.Shared/Materials/InsertingMaterialStorageComponent.cs b/Content.Shared/Materials/InsertingMaterialStorageComponent.cs
index 8ff96c17a7..60a3b8693b 100644
--- a/Content.Shared/Materials/InsertingMaterialStorageComponent.cs
+++ b/Content.Shared/Materials/InsertingMaterialStorageComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Materials;
diff --git a/Content.Shared/Materials/MaterialReclaimerComponent.cs b/Content.Shared/Materials/MaterialReclaimerComponent.cs
index e526e1cd61..fe8f10225e 100644
--- a/Content.Shared/Materials/MaterialReclaimerComponent.cs
+++ b/Content.Shared/Materials/MaterialReclaimerComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage;
+using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 using Content.Shared.Whitelist;
diff --git a/Content.Shared/Mech/Equipment/Components/MechEquipmentComponent.cs b/Content.Shared/Mech/Equipment/Components/MechEquipmentComponent.cs
index 3933f12284..b0adc68a0e 100644
--- a/Content.Shared/Mech/Equipment/Components/MechEquipmentComponent.cs
+++ b/Content.Shared/Mech/Equipment/Components/MechEquipmentComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Content.Shared.Mech.Components;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Mech/Equipment/Systems/MechSoundboardSystem.cs b/Content.Shared/Mech/Equipment/Systems/MechSoundboardSystem.cs
index 738c300ffe..d709bd9e60 100644
--- a/Content.Shared/Mech/Equipment/Systems/MechSoundboardSystem.cs
+++ b/Content.Shared/Mech/Equipment/Systems/MechSoundboardSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Mech.Equipment.Components;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
@@ -51,8 +52,7 @@ public sealed partial class MechSoundboardSystem : EntitySystem
         if (msg.Sound >= comp.Sounds.Count)
             return;
 
-        if (TryComp(uid, out UseDelayComponent? useDelay)
-            && !_useDelay.TryResetDelay((uid, useDelay), true))
+        if (!_useDelay.TryResetDelay(uid, true))
             return;
 
         // honk!!!!!
diff --git a/Content.Shared/Mech/SharedMech.cs b/Content.Shared/Mech/SharedMech.cs
index 94af4453d4..bd335c3474 100644
--- a/Content.Shared/Mech/SharedMech.cs
+++ b/Content.Shared/Mech/SharedMech.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Mech;
diff --git a/Content.Shared/Medical/CrewMonitoring/BroadcastSuitSensorStatePayload.cs b/Content.Shared/Medical/CrewMonitoring/BroadcastSuitSensorStatePayload.cs
new file mode 100644
index 0000000000..94baf88fd2
--- /dev/null
+++ b/Content.Shared/Medical/CrewMonitoring/BroadcastSuitSensorStatePayload.cs
@@ -0,0 +1,13 @@
+using Content.Shared.DeviceNetwork;
+using Content.Shared.Medical.SuitSensors;
+
+namespace Content.Shared.Medical.CrewMonitoring;
+
+/// <summary>
+/// Broadcast payoad from the crew monitoring server to all crew monitors.
+/// </summary>
+public partial record struct BroadcastSuitSensorStatePayload : INetworkPayload
+{
+    [DataField]
+    public Dictionary<string, SuitSensorStatus> SensorStatus = new();
+}
diff --git a/Content.Shared/Medical/CrewMonitoring/CrewMonitoringShared.cs b/Content.Shared/Medical/CrewMonitoring/CrewMonitoringShared.cs
index 5b78839678..9ce87f0f83 100644
--- a/Content.Shared/Medical/CrewMonitoring/CrewMonitoringShared.cs
+++ b/Content.Shared/Medical/CrewMonitoring/CrewMonitoringShared.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Medical.SuitSensor;
+using Content.Shared.Medical.SuitSensors;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Medical.CrewMonitoring;
diff --git a/Content.Shared/Medical/Cryogenics/ActiveCryoPodComponent.cs b/Content.Shared/Medical/Cryogenics/ActiveCryoPodComponent.cs
index d017ef73aa..8a2dac9921 100644
--- a/Content.Shared/Medical/Cryogenics/ActiveCryoPodComponent.cs
+++ b/Content.Shared/Medical/Cryogenics/ActiveCryoPodComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Medical.Cryogenics;
 
diff --git a/Content.Shared/Medical/Cryogenics/CryoPodWireStatus.cs b/Content.Shared/Medical/Cryogenics/CryoPodWireStatus.cs
index dfd3ada235..e232e0f288 100644
--- a/Content.Shared/Medical/Cryogenics/CryoPodWireStatus.cs
+++ b/Content.Shared/Medical/Cryogenics/CryoPodWireStatus.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Medical.Cryogenics
 {
diff --git a/Content.Shared/Medical/Cryogenics/InsideCryoPodComponent.cs b/Content.Shared/Medical/Cryogenics/InsideCryoPodComponent.cs
index 033a79e3ff..245fd61be3 100644
--- a/Content.Shared/Medical/Cryogenics/InsideCryoPodComponent.cs
+++ b/Content.Shared/Medical/Cryogenics/InsideCryoPodComponent.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Medical.Cryogenics;
diff --git a/Content.Shared/Medical/Cryogenics/SharedInsideCryoPodSystem.cs b/Content.Shared/Medical/Cryogenics/SharedInsideCryoPodSystem.cs
index 76fd6034e8..5ebf350f62 100644
--- a/Content.Shared/Medical/Cryogenics/SharedInsideCryoPodSystem.cs
+++ b/Content.Shared/Medical/Cryogenics/SharedInsideCryoPodSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Standing;
+using Content.Shared.Standing;
 using Content.Shared.Temperature;
 using Robust.Shared.Containers;
 
diff --git a/Content.Shared/Medical/DefibrillatorComponent.cs b/Content.Shared/Medical/DefibrillatorComponent.cs
index bb22a9809b..7860ab16df 100644
--- a/Content.Shared/Medical/DefibrillatorComponent.cs
+++ b/Content.Shared/Medical/DefibrillatorComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage;
+using Content.Shared.Damage;
 using Content.Shared.DoAfter;
 using Content.Shared.Item.ItemToggle.Components;
 using Robust.Shared.Audio;
diff --git a/Content.Shared/Medical/HealingDoAfterEvent.cs b/Content.Shared/Medical/HealingDoAfterEvent.cs
index 96f61a1d67..d20d5010e0 100644
--- a/Content.Shared/Medical/HealingDoAfterEvent.cs
+++ b/Content.Shared/Medical/HealingDoAfterEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Medical;
diff --git a/Content.Shared/Medical/ReclaimerDoAfterEvent.cs b/Content.Shared/Medical/ReclaimerDoAfterEvent.cs
index 87d96c7609..2a45ec2617 100644
--- a/Content.Shared/Medical/ReclaimerDoAfterEvent.cs
+++ b/Content.Shared/Medical/ReclaimerDoAfterEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Medical;
diff --git a/Content.Shared/Medical/SharedDefibrillatorSystem.cs b/Content.Shared/Medical/SharedDefibrillatorSystem.cs
index 9d290d2c28..8dd418cb0e 100644
--- a/Content.Shared/Medical/SharedDefibrillatorSystem.cs
+++ b/Content.Shared/Medical/SharedDefibrillatorSystem.cs
@@ -13,7 +13,8 @@ using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
 using Content.Shared.PowerCell;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Traits.Assorted;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
@@ -46,7 +47,7 @@ public abstract partial class SharedDefibrillatorSystem : EntitySystem
     [SubscribeLocalEvent]
     private void OnAfterInteract(Entity<DefibrillatorComponent> ent, ref AfterInteractEvent args)
     {
-        if (args.Handled || args.Target is not { } target)
+        if (args.Handled || args.Target is not { } target || !args.CanReach)
             return;
 
         args.Handled = TryStartZap(ent.AsNullable(), target, args.User);
@@ -189,13 +190,14 @@ public abstract partial class SharedDefibrillatorSystem : EntitySystem
     private bool TryRevive(Entity<DefibrillatorComponent> ent, EntityUid user, EntityUid target, bool isOriginal)
     {
         bool failedRevive = true;
+        string? message = null;
         if (_rotting.IsRotten(target))
         {
-            _chat.TrySendInGameICMessage(ent.Owner, Loc.GetString("defibrillator-rotten"), InGameICChatType.Speak, true);
+            message = Loc.GetString("defibrillator-rotten");
         }
         else if (TryComp<UnrevivableComponent>(target, out var unrevivable))
         {
-            _chat.TrySendInGameICMessage(ent.Owner, Loc.GetString(unrevivable.ReasonMessage), InGameICChatType.Speak, true);
+            message = Loc.GetString(unrevivable.ReasonMessage);
         }
         else
         {
@@ -222,12 +224,17 @@ public abstract partial class SharedDefibrillatorSystem : EntitySystem
             else
             {
                 if (HasComp<MindContainerComponent>(target))
-                    _chat.TrySendInGameICMessage(ent.Owner, Loc.GetString("defibrillator-no-mind"), InGameICChatType.Speak, true); //target can host a mind but doesn't
+                    message = Loc.GetString("defibrillator-no-mind"); //target can host a mind but doesn't
                 else
-                    _chat.TrySendInGameICMessage(ent.Owner, Loc.GetString("defibrillator-not-living"), InGameICChatType.Speak, true); //target couldn't have hosted a mind
+                    message = Loc.GetString("defibrillator-not-living"); //target couldn't have hosted a mind
             }
         }
 
+        // Only report on the entity the pads were actually placed on. Everything else caught in the chain
+        // (the bed the patient is strapped to, whoever is pulling them) still gets zapped, just silently.
+        if (isOriginal && message != null)
+            _chat.TrySendInGameICMessage(ent.Owner, message, InGameICChatType.Speak, true);
+
         _electrocution.TryDoElectrocution(
             target,
             ent.Owner,
diff --git a/Content.Shared/Medical/StethoscopeDoAfterEvent.cs b/Content.Shared/Medical/StethoscopeDoAfterEvent.cs
index d3f3962958..e416f3dad0 100644
--- a/Content.Shared/Medical/StethoscopeDoAfterEvent.cs
+++ b/Content.Shared/Medical/StethoscopeDoAfterEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Medical;
diff --git a/Content.Shared/Medical/SuitSensors/SharedSuitSensor.cs b/Content.Shared/Medical/SuitSensors/SharedSuitSensor.cs
index f0a552c7ec..a6e556dd9e 100644
--- a/Content.Shared/Medical/SuitSensors/SharedSuitSensor.cs
+++ b/Content.Shared/Medical/SuitSensors/SharedSuitSensor.cs
@@ -1,11 +1,21 @@
+using Content.Shared.DeviceNetwork;
 using Content.Shared.DoAfter;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Medical.SuitSensor;
+namespace Content.Shared.Medical.SuitSensors;
 
-[Serializable, NetSerializable]
-public sealed class SuitSensorStatus
+/// <summary>
+/// A network payload that contains <see cref="SuitSensorStatus"/>.
+/// </summary>
+public partial record struct SuitSensorStatusPayload : INetworkPayload
+{
+    [DataField]
+    public SuitSensorStatus Data;
+}
+
+[DataDefinition, Serializable, NetSerializable]
+public partial struct SuitSensorStatus : IEquatable<SuitSensorStatus>
 {
     public SuitSensorStatus(NetEntity ownerUid, NetEntity suitSensorUid, string name, string job, string jobIcon, List<string> jobDepartments)
     {
@@ -29,6 +39,51 @@ public sealed class SuitSensorStatus
     public int? TotalDamageThreshold;
     public float? DamagePercentage => TotalDamageThreshold == null || TotalDamage == null ? null : TotalDamage / (float) TotalDamageThreshold;
     public NetCoordinates? Coordinates;
+
+    public bool Equals(SuitSensorStatus other)
+    {
+        return Timestamp.Equals(other.Timestamp)
+               && SuitSensorUid.Equals(other.SuitSensorUid)
+               && OwnerUid.Equals(other.OwnerUid)
+               && Name == other.Name
+               && Job == other.Job
+               && JobIcon == other.JobIcon
+               && IsAlive == other.IsAlive
+               && TotalDamage == other.TotalDamage
+               && TotalDamageThreshold == other.TotalDamageThreshold
+               && Nullable.Equals(Coordinates, other.Coordinates);
+    }
+
+    public override bool Equals(object? obj)
+    {
+        return obj is SuitSensorStatus other && Equals(other);
+    }
+
+    public override int GetHashCode()
+    {
+        var hashCode = new HashCode();
+        hashCode.Add(Timestamp);
+        hashCode.Add(SuitSensorUid);
+        hashCode.Add(OwnerUid);
+        hashCode.Add(Name);
+        hashCode.Add(Job);
+        hashCode.Add(JobIcon);
+        hashCode.Add(IsAlive);
+        hashCode.Add(TotalDamage);
+        hashCode.Add(TotalDamageThreshold);
+        hashCode.Add(Coordinates);
+        return hashCode.ToHashCode();
+    }
+
+    public static bool operator ==(SuitSensorStatus left, SuitSensorStatus right)
+    {
+        return left.Equals(right);
+    }
+
+    public static bool operator !=(SuitSensorStatus left, SuitSensorStatus right)
+    {
+        return !left.Equals(right);
+    }
 }
 
 [Serializable, NetSerializable]
@@ -55,23 +110,6 @@ public enum SuitSensorMode : byte
     SensorCords = 3
 }
 
-public static class SuitSensorConstants
-{
-    public const string NET_OWNER_UID = "ownerUid";
-    public const string NET_NAME = "name";
-    public const string NET_JOB = "job";
-    public const string NET_JOB_ICON = "jobIcon";
-    public const string NET_JOB_DEPARTMENTS = "jobDepartments";
-    public const string NET_IS_ALIVE = "alive";
-    public const string NET_TOTAL_DAMAGE = "vitals";
-    public const string NET_TOTAL_DAMAGE_THRESHOLD = "vitalsThreshold";
-    public const string NET_COORDINATES = "coords";
-    public const string NET_SUIT_SENSOR_UID = "uid";
-
-    ///Used by the CrewMonitoringServerSystem to send the status of all connected suit sensors to each crew monitor
-    public const string NET_STATUS_COLLECTION = "suit-status-collection";
-}
-
 [Serializable, NetSerializable]
 public sealed partial class SuitSensorChangeDoAfterEvent : DoAfterEvent
 {
diff --git a/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs b/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs
index 0bc91d25af..7ca15ae590 100644
--- a/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs
+++ b/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs
@@ -2,25 +2,21 @@ using System.Numerics;
 using Content.Shared.Access.Systems;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Clothing;
-using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DoAfter;
 using Content.Shared.Emp;
 using Content.Shared.Examine;
 using Content.Shared.GameTicking;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
-using Content.Shared.Medical.SuitSensor;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
-using Content.Shared.Station;
+using Content.Shared.Station.Systems;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
@@ -28,7 +24,7 @@ namespace Content.Shared.Medical.SuitSensors;
 
 public abstract partial class SharedSuitSensorSystem : EntitySystem
 {
-    [Dependency] private SharedStationSystem _stationSystem = default!;
+    [Dependency] private StationSystem _stationSystem = default!;
     [Dependency] private MobStateSystem _mobStateSystem = default!;
     [Dependency] private SharedPopupSystem _popupSystem = default!;
     [Dependency] private SharedTransformSystem _transform = default!;
@@ -319,7 +315,7 @@ public abstract partial class SharedSuitSensorSystem : EntitySystem
 
     /// <summary>
     /// Sets mode of the <see cref="SuitSensorComponent"/> of the chosen entity.
-    /// Makes popup when <param name="userUid"> not null
+    /// Makes popup when <param name="userUid"/> not null
     /// </summary>
     /// <param name="sensors">Entity and it's component that should be changed</param>
     /// <param name="mode">Selected mode</param>
@@ -356,7 +352,7 @@ public abstract partial class SharedSuitSensorSystem : EntitySystem
     /// <summary>
     /// Attempts to get full <see cref="SuitSensorStatus"/> from the <see cref="SuitSensorComponent"/>
     /// </summary>
-    /// <param name="uid">Entity to get status</param>
+    /// <param name="ent">Entity to get status</param>
     /// <returns>Full <see cref="SuitSensorStatus"/> of the chosen uid</returns>
     public SuitSensorStatus? GetSensorState(Entity<SuitSensorComponent?, TransformComponent?> ent)
     {
@@ -441,66 +437,4 @@ public abstract partial class SharedSuitSensorSystem : EntitySystem
 
         return status;
     }
-
-    /// <summary>
-    /// Create a device network package from the suit sensors status.
-    /// </summary>
-    public NetworkPayload SuitSensorToPacket(SuitSensorStatus status)
-    {
-        var payload = new NetworkPayload()
-        {
-            [DeviceNetworkConstants.Command] = DeviceNetworkConstants.CmdUpdatedState,
-            [SuitSensorConstants.NET_NAME] = status.Name,
-            [SuitSensorConstants.NET_JOB] = status.Job,
-            [SuitSensorConstants.NET_JOB_ICON] = status.JobIcon,
-            [SuitSensorConstants.NET_JOB_DEPARTMENTS] = status.JobDepartments,
-            [SuitSensorConstants.NET_IS_ALIVE] = status.IsAlive,
-            [SuitSensorConstants.NET_SUIT_SENSOR_UID] = status.SuitSensorUid,
-            [SuitSensorConstants.NET_OWNER_UID] = status.OwnerUid,
-        };
-
-        if (status.TotalDamage != null)
-            payload.Add(SuitSensorConstants.NET_TOTAL_DAMAGE, status.TotalDamage);
-        if (status.TotalDamageThreshold != null)
-            payload.Add(SuitSensorConstants.NET_TOTAL_DAMAGE_THRESHOLD, status.TotalDamageThreshold);
-        if (status.Coordinates != null)
-            payload.Add(SuitSensorConstants.NET_COORDINATES, status.Coordinates);
-
-        return payload;
-    }
-
-    /// <summary>
-    /// Try to create the suit sensors status from the device network message.
-    /// </summary>
-    public SuitSensorStatus? PacketToSuitSensor(NetworkPayload payload)
-    {
-        // check command
-        if (!payload.TryGetValue(DeviceNetworkConstants.Command, out string? command))
-            return null;
-        if (command != DeviceNetworkConstants.CmdUpdatedState)
-            return null;
-
-        // check name, job and alive
-        if (!payload.TryGetValue(SuitSensorConstants.NET_NAME, out string? name)) return null;
-        if (!payload.TryGetValue(SuitSensorConstants.NET_JOB, out string? job)) return null;
-        if (!payload.TryGetValue(SuitSensorConstants.NET_JOB_ICON, out string? jobIcon)) return null;
-        if (!payload.TryGetValue(SuitSensorConstants.NET_JOB_DEPARTMENTS, out List<string>? jobDepartments)) return null;
-        if (!payload.TryGetValue(SuitSensorConstants.NET_IS_ALIVE, out bool? isAlive)) return null;
-        if (!payload.TryGetValue(SuitSensorConstants.NET_SUIT_SENSOR_UID, out NetEntity suitSensorUid)) return null;
-        if (!payload.TryGetValue(SuitSensorConstants.NET_OWNER_UID, out NetEntity ownerUid)) return null;
-
-        // try get total damage and cords (optionals)
-        payload.TryGetValue(SuitSensorConstants.NET_TOTAL_DAMAGE, out int? totalDamage);
-        payload.TryGetValue(SuitSensorConstants.NET_TOTAL_DAMAGE_THRESHOLD, out int? totalDamageThreshold);
-        payload.TryGetValue(SuitSensorConstants.NET_COORDINATES, out NetCoordinates? coords);
-
-        var status = new SuitSensorStatus(ownerUid, suitSensorUid, name, job, jobIcon, jobDepartments)
-        {
-            IsAlive = isAlive.Value,
-            TotalDamage = totalDamage,
-            TotalDamageThreshold = totalDamageThreshold,
-            Coordinates = coords,
-        };
-        return status;
-    }
 }
diff --git a/Content.Shared/Medical/SuitSensors/SuitSensorComponent.cs b/Content.Shared/Medical/SuitSensors/SuitSensorComponent.cs
index 19bee1b017..dfdaa1f18a 100644
--- a/Content.Shared/Medical/SuitSensors/SuitSensorComponent.cs
+++ b/Content.Shared/Medical/SuitSensors/SuitSensorComponent.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Medical.SuitSensor;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
diff --git a/Content.Shared/MedicalScanner/HealthAnalyzerDoAfterEvent.cs b/Content.Shared/MedicalScanner/HealthAnalyzerDoAfterEvent.cs
index cf5bd4f397..5578284cad 100644
--- a/Content.Shared/MedicalScanner/HealthAnalyzerDoAfterEvent.cs
+++ b/Content.Shared/MedicalScanner/HealthAnalyzerDoAfterEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.MedicalScanner;
diff --git a/Content.Shared/MedicalScanner/HealthAnalyzerUiKey.cs b/Content.Shared/MedicalScanner/HealthAnalyzerUiKey.cs
index 3b42d5e5fc..7dc4164b90 100644
--- a/Content.Shared/MedicalScanner/HealthAnalyzerUiKey.cs
+++ b/Content.Shared/MedicalScanner/HealthAnalyzerUiKey.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.MedicalScanner;
 
diff --git a/Content.Shared/Mind/Components/TransferMindOnGibComponent.cs b/Content.Shared/Mind/Components/TransferMindOnGibComponent.cs
index 233354834d..beed9d0443 100644
--- a/Content.Shared/Mind/Components/TransferMindOnGibComponent.cs
+++ b/Content.Shared/Mind/Components/TransferMindOnGibComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Tag;
+using Content.Shared.Tag;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Mind.Components;
diff --git a/Content.Shared/Mind/MindVisuals.cs b/Content.Shared/Mind/MindVisuals.cs
index 9e60a6c2f9..0a39388dcf 100644
--- a/Content.Shared/Mind/MindVisuals.cs
+++ b/Content.Shared/Mind/MindVisuals.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Mind;
 
diff --git a/Content.Shared/Mindshield/Components/FakeMindshieldComponent.cs b/Content.Shared/Mindshield/Components/FakeMindshieldComponent.cs
index 5705398d5b..8210992ef4 100644
--- a/Content.Shared/Mindshield/Components/FakeMindshieldComponent.cs
+++ b/Content.Shared/Mindshield/Components/FakeMindshieldComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Tag;
+using Content.Shared.Tag;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/Mindshield/FakeMindshieldSystem.cs b/Content.Shared/Mindshield/FakeMindshieldSystem.cs
index 64783d56a3..744f6f90bb 100644
--- a/Content.Shared/Mindshield/FakeMindshieldSystem.cs
+++ b/Content.Shared/Mindshield/FakeMindshieldSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using Content.Shared.Actions.Components;
 using Content.Shared.Clothing;
 using Content.Shared.Implants;
diff --git a/Content.Shared/Mobs/Components/ActionRequireMobStateComponent.cs b/Content.Shared/Mobs/Components/ActionRequireMobStateComponent.cs
deleted file mode 100644
index 96e66ade2d..0000000000
--- a/Content.Shared/Mobs/Components/ActionRequireMobStateComponent.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Popups;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Mobs.Components;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-[Access(typeof(MobStateSystem))]
-public sealed partial class ActionRequireMobStateComponent : Component
-{
-    /// <summary>
-    /// The required MobState for the action.
-    /// </summary>
-    [DataField(required: true), AutoNetworkedField]
-    public HashSet<MobState> States = new();
-
-    /// <summary>
-    /// The type of Popup to be used.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public LocId? FailReason = "mob-state-action-requires-state";
-
-    /// <summary>
-    /// The type of the popup the fail reason should show as.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public PopupType FailReasonPopupType = PopupType.SmallCaution;
-}
diff --git a/Content.Shared/Mobs/Components/MobStateActionsComponent.cs b/Content.Shared/Mobs/Components/MobStateActionsComponent.cs
index 2fae0b046a..6a63bb0237 100644
--- a/Content.Shared/Mobs/Components/MobStateActionsComponent.cs
+++ b/Content.Shared/Mobs/Components/MobStateActionsComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mobs.Systems;
+using Content.Shared.Mobs.Systems;
 
 namespace Content.Shared.Mobs.Components;
 
diff --git a/Content.Shared/Mobs/CritMobActions.cs b/Content.Shared/Mobs/CritMobActions.cs
index 763915e559..565cb27586 100644
--- a/Content.Shared/Mobs/CritMobActions.cs
+++ b/Content.Shared/Mobs/CritMobActions.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 
 namespace Content.Shared.Mobs;
 
diff --git a/Content.Shared/Mobs/MobState.cs b/Content.Shared/Mobs/MobState.cs
index 1846232f4e..3c573a0ad8 100644
--- a/Content.Shared/Mobs/MobState.cs
+++ b/Content.Shared/Mobs/MobState.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Components;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Mobs;
diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs b/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs
index 66d6e7413d..bbc5c47253 100644
--- a/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs
+++ b/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 using Content.Shared.Humanoid;
 using Content.Shared.Mobs.Components;
 using Robust.Shared.Player;
diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
index 6490476115..af345fd35d 100644
--- a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
+++ b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
@@ -222,25 +222,6 @@ public partial class MobStateSystem
         args.Damage *= _damageable.UniversalMobDamageModifier;
     }
 
-    [SubscribeLocalEvent]
-    private void OnMobStateActionAttempt(Entity<ActionRequireMobStateComponent> ent, ref ActionAttemptEvent args)
-    {
-        if (_mobStateQuery.TryComp(args.User, out var mobState) &&
-            ent.Comp.States.Contains(mobState.CurrentState))
-        {
-            return;
-        }
-
-        if (ent.Comp.FailReason != null)
-        {
-            var states = string.Join(", ", ent.Comp.States.Order().Select(s => Loc.GetString($"mob-state-{s}")));
-            args.Reason = Loc.GetString(ent.Comp.FailReason, ("states", states));
-            args.Type = ent.Comp.FailReasonPopupType;
-        }
-
-        args.Cancelled = true;
-    }
-
     [SubscribeLocalEvent]
     private void OnIncapCuffCheck(Entity<MobStateComponent> ent, ref CheckIncapacitatedCuffEvent args)
     {
diff --git a/Content.Shared/Mobs/Systems/SharedDeathgaspSystem.cs b/Content.Shared/Mobs/Systems/SharedDeathgaspSystem.cs
index 1e3da5f415..0d56dbc1d7 100644
--- a/Content.Shared/Mobs/Systems/SharedDeathgaspSystem.cs
+++ b/Content.Shared/Mobs/Systems/SharedDeathgaspSystem.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Mobs;
+namespace Content.Shared.Mobs;
 
 /// <see cref="DeathgaspComponent"/>
 public abstract partial class SharedDeathgaspSystem : EntitySystem
diff --git a/Content.Shared/MouseRotator/MouseRotatorComponent.cs b/Content.Shared/MouseRotator/MouseRotatorComponent.cs
index 1f399b31f9..671daf358a 100644
--- a/Content.Shared/MouseRotator/MouseRotatorComponent.cs
+++ b/Content.Shared/MouseRotator/MouseRotatorComponent.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs b/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs
index db449021d9..caa8edab95 100644
--- a/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs
+++ b/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Interaction;
+using Content.Shared.Interaction;
 
 namespace Content.Shared.MouseRotator;
 
diff --git a/Content.Shared/Movement/Components/CanMoveInAirComponent.cs b/Content.Shared/Movement/Components/CanMoveInAirComponent.cs
index 9d24661700..c4d1756d16 100644
--- a/Content.Shared/Movement/Components/CanMoveInAirComponent.cs
+++ b/Content.Shared/Movement/Components/CanMoveInAirComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Physics.Components;
 
 namespace Content.Shared.Movement.Components;
diff --git a/Content.Shared/Movement/Components/FrictionStatusEffectComponent.cs b/Content.Shared/Movement/Components/FrictionStatusEffectComponent.cs
index 33c5389fd3..57925ca569 100644
--- a/Content.Shared/Movement/Components/FrictionStatusEffectComponent.cs
+++ b/Content.Shared/Movement/Components/FrictionStatusEffectComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Movement.Systems;
+using Content.Shared.Movement.Systems;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Movement.Components;
diff --git a/Content.Shared/Movement/Components/NoRotateOnMoveComponent.cs b/Content.Shared/Movement/Components/NoRotateOnMoveComponent.cs
index c6a20726ff..169a970520 100644
--- a/Content.Shared/Movement/Components/NoRotateOnMoveComponent.cs
+++ b/Content.Shared/Movement/Components/NoRotateOnMoveComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Movement.Components;
 
diff --git a/Content.Shared/Movement/Components/WormComponent.cs b/Content.Shared/Movement/Components/WormComponent.cs
index a717659fef..9d6f9efbd7 100644
--- a/Content.Shared/Movement/Components/WormComponent.cs
+++ b/Content.Shared/Movement/Components/WormComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Movement.Components;
 
diff --git a/Content.Shared/Movement/Pulling/Components/PullerComponent.cs b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
index 172ab449b4..3031d6cc85 100644
--- a/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
+++ b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Alert;
+using Content.Shared.Alert;
 using Content.Shared.Movement.Pulling.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Movement/Pulling/Events/AttemptPullEvent.cs b/Content.Shared/Movement/Pulling/Events/AttemptPullEvent.cs
index b0101c4699..1d6ae7cf9f 100644
--- a/Content.Shared/Movement/Pulling/Events/AttemptPullEvent.cs
+++ b/Content.Shared/Movement/Pulling/Events/AttemptPullEvent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Components;
 
 namespace Content.Shared.Movement.Pulling.Events;
 
diff --git a/Content.Shared/Movement/Pulling/Events/PullMessage.cs b/Content.Shared/Movement/Pulling/Events/PullMessage.cs
index a427e448d5..809decb9e3 100644
--- a/Content.Shared/Movement/Pulling/Events/PullMessage.cs
+++ b/Content.Shared/Movement/Pulling/Events/PullMessage.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Movement.Pulling.Events;
+namespace Content.Shared.Movement.Pulling.Events;
 
 public abstract class PullMessage : EntityEventArgs
 {
diff --git a/Content.Shared/Movement/Pulling/Events/PullStartedMessage.cs b/Content.Shared/Movement/Pulling/Events/PullStartedMessage.cs
index c0775b4ce2..779c7a6b0c 100644
--- a/Content.Shared/Movement/Pulling/Events/PullStartedMessage.cs
+++ b/Content.Shared/Movement/Pulling/Events/PullStartedMessage.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Movement.Pulling.Events;
+namespace Content.Shared.Movement.Pulling.Events;
 
 /// <summary>
 /// Event raised directed BOTH at the puller and pulled entity when a pull starts.
diff --git a/Content.Shared/Movement/Systems/MovementIgnoreGravitySystem.cs b/Content.Shared/Movement/Systems/MovementIgnoreGravitySystem.cs
index 615cc44fbc..c8c1113f7f 100644
--- a/Content.Shared/Movement/Systems/MovementIgnoreGravitySystem.cs
+++ b/Content.Shared/Movement/Systems/MovementIgnoreGravitySystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Gravity;
+using Content.Shared.Gravity;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Events;
 
diff --git a/Content.Shared/Movement/Systems/MovementModStatusSystem.cs b/Content.Shared/Movement/Systems/MovementModStatusSystem.cs
index 30702b26a2..ef60e6f82e 100644
--- a/Content.Shared/Movement/Systems/MovementModStatusSystem.cs
+++ b/Content.Shared/Movement/Systems/MovementModStatusSystem.cs
@@ -108,16 +108,17 @@ public sealed partial class MovementModStatusSystem : EntitySystem
     /// <param name="duration">Duration of speed modifying effect.</param>
     /// <param name="walkSpeedModifier">Multiplier by which walking speed should be modified.</param>
     /// <param name="sprintSpeedModifier">Multiplier by which sprinting speed should be modified.</param>
+    /// <param name="delay">How long should this effect be delayed?</param>
     /// <returns>True if entity have slowdown effect applied now or previously and duration was modified.</returns>
     public bool TryAddMovementSpeedModDuration(
         EntityUid uid,
         EntProtoId effectProtoId,
         TimeSpan duration,
         float walkSpeedModifier,
-        float sprintSpeedModifier
-    )
+        float sprintSpeedModifier,
+        TimeSpan? delay = null)
     {
-        return _status.TryAddStatusEffectDuration(uid, effectProtoId, out var status, duration)
+        return _status.TryAddStatusEffectDuration(uid, effectProtoId, out var status, duration, delay)
                && TryUpdateMovementStatus(uid, status!.Value, walkSpeedModifier, sprintSpeedModifier);
     }
 
@@ -129,13 +130,14 @@ public sealed partial class MovementModStatusSystem : EntitySystem
     /// <param name="effectProtoId">Slowdown effect to be used.</param>
     /// <param name="duration">Duration of speed modifying effect.</param>
     /// <param name="speedModifier">Multiplier by which walking/sprinting speed should be modified.</param>
+    /// <param name="delay">How long should this effect be delayed?</param>
     /// <returns>True if entity have slowdown effect applied now or previously and duration was modified.</returns>
     public bool TryUpdateMovementSpeedModDuration(
         EntityUid uid,
         EntProtoId effectProtoId,
         TimeSpan duration,
-        float speedModifier
-    )
+        float speedModifier,
+        TimeSpan? delay = null)
     {
         return TryUpdateMovementSpeedModDuration(uid, effectProtoId, duration, speedModifier, speedModifier);
     }
@@ -149,14 +151,15 @@ public sealed partial class MovementModStatusSystem : EntitySystem
     /// <param name="duration">Duration of speed modifying effect.</param>
     /// <param name="walkSpeedModifier">Multiplier by which walking speed should be modified.</param>
     /// <param name="sprintSpeedModifier">Multiplier by which sprinting speed should be modified.</param>
+    /// <param name="delay">How long should this effect be delayed?</param>
     /// <returns>True if entity have slowdown effect applied now or previously and duration was modified.</returns>
     public bool TryUpdateMovementSpeedModDuration(
         EntityUid uid,
         EntProtoId effectProtoId,
         TimeSpan? duration,
         float walkSpeedModifier,
-        float sprintSpeedModifier
-    )
+        float sprintSpeedModifier,
+        TimeSpan? delay = null)
     {
         return _status.TryUpdateStatusEffectDuration(uid, effectProtoId, out var status, duration)
                && TryUpdateMovementStatus(uid, status!.Value, walkSpeedModifier, sprintSpeedModifier);
@@ -170,11 +173,12 @@ public sealed partial class MovementModStatusSystem : EntitySystem
     /// <param name="status">Status effect entity whose modifiers we are updating</param>
     /// <param name="walkSpeedModifier">New walkSpeedModifer we're applying</param>
     /// <param name="sprintSpeedModifier">New sprintSpeedModifier we're applying</param>
+    /// <param name="delay">How long should this effect be delayed?</param>
     public bool TryUpdateMovementStatus(EntityUid uid,
         Entity<MovementModStatusEffectComponent?> status,
         float walkSpeedModifier,
-        float sprintSpeedModifier
-    )
+        float sprintSpeedModifier,
+        TimeSpan? delay = null)
     {
         if (!Resolve(status, ref status.Comp))
             return false;
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
index 72bc619eeb..523aefec7b 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
@@ -33,13 +33,6 @@ public abstract partial class SharedMoverController
 
     protected virtual void OnInputMoverCanMoveUpdated(Entity<InputMoverComponent> ent, ref CanMoveUpdatedEvent args)
     {
-        if (!args.CanMove)
-        {
-            // Remove from active mover query when entity cannot move
-            RemCompDeferred<ActiveInputMoverComponent>(ent);
-            return;
-        }
-
         UpdateMoverStatus((ent, ent.Comp));
     }
 
diff --git a/Content.Shared/Movement/Systems/SharedSpriteMovementSystem.cs b/Content.Shared/Movement/Systems/SharedSpriteMovementSystem.cs
index eb4bbc1be6..e7dd91b8f6 100644
--- a/Content.Shared/Movement/Systems/SharedSpriteMovementSystem.cs
+++ b/Content.Shared/Movement/Systems/SharedSpriteMovementSystem.cs
@@ -3,16 +3,10 @@ using Content.Shared.Movement.Events;
 
 namespace Content.Shared.Movement.Systems;
 
-public abstract class SharedSpriteMovementSystem : EntitySystem
+public abstract partial class SharedSpriteMovementSystem : EntitySystem
 {
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SpriteMovementComponent, SpriteMoveEvent>(OnSpriteMoveInput);
-    }
-
-    private void OnSpriteMoveInput(Entity<SpriteMovementComponent> ent, ref SpriteMoveEvent args)
+    [SubscribeLocalEvent]
+    protected virtual void OnSpriteMoveInput(Entity<SpriteMovementComponent> ent, ref SpriteMoveEvent args)
     {
         if (ent.Comp.IsMoving == args.IsMoving)
             return;
diff --git a/Content.Shared/Movement/Systems/WormSystem.cs b/Content.Shared/Movement/Systems/WormSystem.cs
index f081914ff9..41cd39e3a9 100644
--- a/Content.Shared/Movement/Systems/WormSystem.cs
+++ b/Content.Shared/Movement/Systems/WormSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Alert;
+using Content.Shared.Alert;
 using Content.Shared.Movement.Components;
 using Content.Shared.Popups;
 using Content.Shared.Rejuvenate;
diff --git a/Content.Shared/NameIdentifier/NameIdentifierComponent.cs b/Content.Shared/NameIdentifier/NameIdentifierComponent.cs
index c8b42d29db..3842f696e5 100644
--- a/Content.Shared/NameIdentifier/NameIdentifierComponent.cs
+++ b/Content.Shared/NameIdentifier/NameIdentifierComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.NameIdentifier;
diff --git a/Content.Shared/NameIdentifier/NameIdentifierGroupPrototype.cs b/Content.Shared/NameIdentifier/NameIdentifierGroupPrototype.cs
index 98e1c7a539..e1a802c88c 100644
--- a/Content.Shared/NameIdentifier/NameIdentifierGroupPrototype.cs
+++ b/Content.Shared/NameIdentifier/NameIdentifierGroupPrototype.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Dataset;
+using Content.Shared.Dataset;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.NameIdentifier;
diff --git a/Content.Shared/NightVision/SharedNightVisionSystem.cs b/Content.Shared/NightVision/SharedNightVisionSystem.cs
index 7864ecfa77..c555e28cc8 100644
--- a/Content.Shared/NightVision/SharedNightVisionSystem.cs
+++ b/Content.Shared/NightVision/SharedNightVisionSystem.cs
@@ -2,6 +2,7 @@ using Content.Shared.Actions;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Overlays;
+using Content.Shared.StatusEffectNew;
 
 namespace Content.Shared.NightVision;
 
@@ -23,6 +24,15 @@ public abstract partial class SharedNightVisionSystem : EntitySystem
         _actions.AddAction(ent, ref ent.Comp.ActionEntity, ent.Comp.Action);
     }
 
+    [SubscribeLocalEvent]
+    private void OnRefreshStatusEffect(Entity<NightVisionComponent> ent, ref StatusEffectRelayedEvent<RefreshNightVisionEvent> args)
+    {
+        if (!ent.Comp.Enabled)
+            return;
+
+        args.Args.Entities.Add(ent);
+    }
+
     [SubscribeLocalEvent]
     private void OnRemove(Entity<NightVisionComponent> ent, ref ComponentShutdown args)
     {
diff --git a/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs b/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs
index e58c74f72f..a518b1fbb3 100644
--- a/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs
+++ b/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs
@@ -1,13 +1,13 @@
 using Content.Shared.Actions;
 using Content.Shared.Clothing;
 using Content.Shared.Clothing.Components;
-using Content.Shared.Emp;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Item.ItemToggle;
 using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Ninja.Components;
 using Content.Shared.Popups;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Shared.Ninja.Systems;
diff --git a/Content.Shared/NodeContainer/NodeGroups/INodeGroup.cs b/Content.Shared/NodeContainer/NodeGroups/INodeGroup.cs
index da52d39e58..3ef138f6b2 100644
--- a/Content.Shared/NodeContainer/NodeGroups/INodeGroup.cs
+++ b/Content.Shared/NodeContainer/NodeGroups/INodeGroup.cs
@@ -30,4 +30,4 @@ public interface INodeGroup
     ///     Return any additional data to display for the node-visualizer debug overlay.
     /// </summary>
     string? GetDebugData();
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/NodeContainer/NodeGroups/IPipeNet.cs b/Content.Shared/NodeContainer/NodeGroups/IPipeNet.cs
index e1777f05f2..60f7409b77 100644
--- a/Content.Shared/NodeContainer/NodeGroups/IPipeNet.cs
+++ b/Content.Shared/NodeContainer/NodeGroups/IPipeNet.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos;
+using Content.Shared.Atmos;
 
 namespace Content.Shared.NodeContainer.NodeGroups;
 
diff --git a/Content.Shared/NodeContainer/NodeVis.cs b/Content.Shared/NodeContainer/NodeVis.cs
index 24982f272a..1bedbd5ccc 100644
--- a/Content.Shared/NodeContainer/NodeVis.cs
+++ b/Content.Shared/NodeContainer/NodeVis.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.NodeContainer
 {
diff --git a/Content.Shared/NukeOps/WarDeclaratorEvents.cs b/Content.Shared/NukeOps/WarDeclaratorEvents.cs
index 0f521c14b1..79832d2869 100644
--- a/Content.Shared/NukeOps/WarDeclaratorEvents.cs
+++ b/Content.Shared/NukeOps/WarDeclaratorEvents.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.NukeOps;
 
diff --git a/Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs b/Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs
index 06c533e646..6a247ab459 100644
--- a/Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs
+++ b/Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
diff --git a/Content.Shared/Nutrition/AnimalHusbandry/ReproductiveComponent.cs b/Content.Shared/Nutrition/AnimalHusbandry/ReproductiveComponent.cs
index f54cf05bd8..0bec0bee74 100644
--- a/Content.Shared/Nutrition/AnimalHusbandry/ReproductiveComponent.cs
+++ b/Content.Shared/Nutrition/AnimalHusbandry/ReproductiveComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Nutrition.Prototypes;
+using Content.Shared.Nutrition.Prototypes;
 using Content.Shared.Storage;
 using Content.Shared.Whitelist;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
diff --git a/Content.Shared/Nutrition/AnimalHusbandry/ReproductivePartnerComponent.cs b/Content.Shared/Nutrition/AnimalHusbandry/ReproductivePartnerComponent.cs
index ec1d62012d..673cc49086 100644
--- a/Content.Shared/Nutrition/AnimalHusbandry/ReproductivePartnerComponent.cs
+++ b/Content.Shared/Nutrition/AnimalHusbandry/ReproductivePartnerComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Nutrition.AnimalHusbandry;
+namespace Content.Shared.Nutrition.AnimalHusbandry;
 
 /// <summary>
 /// This is used for denoting entities which are
diff --git a/Content.Shared/Nutrition/Components/ActionRequireMouthUncoveredComponent.cs b/Content.Shared/Nutrition/Components/ActionRequireMouthUncoveredComponent.cs
deleted file mode 100644
index 9071433de0..0000000000
--- a/Content.Shared/Nutrition/Components/ActionRequireMouthUncoveredComponent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Shared.Inventory;
-using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Nutrition.Components;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-[Access(typeof(IngestionSystem))]
-public sealed partial class ActionRequireMouthUncoveredComponent : Component
-{
-    /// <summary>
-    /// The slots that must be free for the action to be used.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public SlotFlags Slots = SlotFlags.HEAD | SlotFlags.MASK;
-}
diff --git a/Content.Shared/Nutrition/Components/ActionRequireSatiationComponent.cs b/Content.Shared/Nutrition/Components/ActionRequireSatiationComponent.cs
deleted file mode 100644
index c3f84fa91f..0000000000
--- a/Content.Shared/Nutrition/Components/ActionRequireSatiationComponent.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Content.Shared.FixedPoint;
-using Content.Shared.Nutrition.EntitySystems;
-using Content.Shared.Nutrition.Prototypes;
-using Content.Shared.Popups;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Nutrition.Components;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-[Access(typeof(SatiationSystem))]
-public sealed partial class ActionRequireSatiationComponent : Component
-{
-    /// <summary>
-    /// The required satiation type for this ability.
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<SatiationTypePrototype> Satiation = SatiationSystem.Hunger;
-
-    /// <summary>
-    /// The amount of satiation needed for this ability.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public FixedPoint2 Amount = 10f;
-
-    /// <summary>
-    /// Whether the satiation should be spent once the action is handled.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool Spend = true;
-
-    /// <summary>
-    /// The popup to show when we don't have enough of the specified satiation type.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public LocId? FailReason = "satiation-not-enough-hunger";
-
-    /// <summary>
-    /// The type the popup should show as.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public PopupType FailReasonType = PopupType.SmallCaution;
-}
diff --git a/Content.Shared/Nutrition/Components/EdibleComponent.cs b/Content.Shared/Nutrition/Components/EdibleComponent.cs
index bff56984a1..fc9d1d6c76 100644
--- a/Content.Shared/Nutrition/Components/EdibleComponent.cs
+++ b/Content.Shared/Nutrition/Components/EdibleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Body.Components;
+using Content.Shared.Body.Components;
 using Content.Shared.FixedPoint;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Nutrition.Prototypes;
diff --git a/Content.Shared/Nutrition/Components/SharedFatExtractor.cs b/Content.Shared/Nutrition/Components/SharedFatExtractor.cs
index b52e1a9022..1a0c91bfac 100644
--- a/Content.Shared/Nutrition/Components/SharedFatExtractor.cs
+++ b/Content.Shared/Nutrition/Components/SharedFatExtractor.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Nutrition.Components;
 
diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs
index 7740d9b1c5..28a0a94437 100644
--- a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs
+++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.EntityEffects.Effects.Body;
@@ -150,27 +150,20 @@ public sealed partial class IngestionSystem
 
     #region EdibleComponent
 
+    /// <summary>
+    /// Spawns trash for the edible entity, placing it in the same hand if held, otherwise spawning it nearby.
+    /// </summary>
+    /// <param name="entity">Edible entity that will spawn trash.</param>
+    /// <param name="user">Optional user that will attempt to pickup spawned trash.</param>
     public void SpawnTrash(Entity<EdibleComponent> entity, EntityUid? user = null)
     {
-        if (entity.Comp.Trash.Count == 0)
-            return;
-
-        var position = _transform.GetMapCoordinates(entity);
-        var trashes = entity.Comp.Trash;
-        var pickup = user != null && _hands.IsHolding(user.Value, entity, out _);
-
-        foreach (var trash in trashes)
+        var pickup = user is not null && _hands.TryDrop(user.Value, entity);
+        foreach (var trash in entity.Comp.Trash)
         {
-            var spawnedTrash = EntityManager.PredictedSpawn(trash, position);
+            var spawnedTrash = PredictedSpawnNextToOrDrop(trash, entity);
 
-            // If the user is holding the item
-            if (!pickup)
-                continue;
-
-            // Put the trash in the user's hand
-            // I am 100% confident we don't need this check but rider gets made at me if it's not here.
-            if (user != null)
-                _hands.TryPickupAnyHand(user.Value, spawnedTrash);
+            if (pickup)
+                _hands.TryPickupAnyHand(user!.Value, spawnedTrash);
         }
     }
 
diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs
index 30425740a9..cab6a65190 100644
--- a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs
@@ -91,9 +91,6 @@ public sealed partial class IngestionSystem : EntitySystem
         SubscribeLocalEvent<EdibleComponent, AttemptShakeEvent>(OnAttemptShake);
         SubscribeLocalEvent<EdibleComponent, BeforeToolRefinedEvent>(OnBeforeToolRefined);
 
-        // Actions
-        SubscribeLocalEvent<ActionRequireMouthUncoveredComponent, ActionAttemptEvent>(OnMouthUncoveredActionAttempt);
-
         InitializeBlockers();
         InitializeUtensils();
     }
@@ -535,10 +532,4 @@ public sealed partial class IngestionSystem : EntitySystem
         if (IsEmpty(entity))
             args.Cancelled = true;
     }
-
-    private void OnMouthUncoveredActionAttempt(Entity<ActionRequireMouthUncoveredComponent> ent, ref ActionAttemptEvent args)
-    {
-        if (!HasMouthAvailable(args.User, ent.Comp.Slots))
-            args.Cancelled = true;
-    }
 }
diff --git a/Content.Shared/Nutrition/EntitySystems/SatiationSystem.Subscribers.cs b/Content.Shared/Nutrition/EntitySystems/SatiationSystem.Subscribers.cs
deleted file mode 100644
index 500160cf41..0000000000
--- a/Content.Shared/Nutrition/EntitySystems/SatiationSystem.Subscribers.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Shared.Actions.Events;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Popups;
-
-namespace Content.Shared.Nutrition.EntitySystems;
-
-public abstract partial class SatiationSystem
-{
-    [Dependency] private EntityQuery<SatiationComponent> _satiationQuery = default!;
-
-    [SubscribeLocalEvent]
-    private void OnActionAttempt(Entity<ActionRequireSatiationComponent> ent, ref ActionAttemptEvent args)
-    {
-        if (_satiationQuery.TryComp(args.User, out var satiation)
-            && GetValueOrNull((args.User, satiation), ent.Comp.Satiation) is {} value
-            && value >= ent.Comp.Amount)
-            return;
-
-        if (ent.Comp.FailReason != null)
-        {
-            args.Reason = Loc.GetString(ent.Comp.FailReason);
-            args.Type = ent.Comp.FailReasonType;
-        }
-
-        args.Cancelled = true;
-    }
-
-    [SubscribeLocalEvent]
-    private void OnActionPerformed(Entity<ActionRequireSatiationComponent> ent, ref ActionPerformedEvent args)
-    {
-        if (!ent.Comp.Spend)
-            return;
-
-        if (!_satiationQuery.TryComp(args.Performer, out var satiation))
-            return;
-
-        ModifyValue((args.Performer, satiation), ent.Comp.Satiation, -ent.Comp.Amount.Float());
-    }
-}
diff --git a/Content.Shared/Nutrition/Events.cs b/Content.Shared/Nutrition/Events.cs
index 9a600a7641..53e0104012 100644
--- a/Content.Shared/Nutrition/Events.cs
+++ b/Content.Shared/Nutrition/Events.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.Prototypes;
diff --git a/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs b/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs
index 864383610c..2e610c7aaf 100644
--- a/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs
+++ b/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Audio;
+using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
diff --git a/Content.Server/Objectives/Components/TargetOverrideComponent.cs b/Content.Shared/Objectives/Components/TargetOverrideComponent.cs
similarity index 90%
rename from Content.Server/Objectives/Components/TargetOverrideComponent.cs
rename to Content.Shared/Objectives/Components/TargetOverrideComponent.cs
index faa402012c..145dc1bbe3 100644
--- a/Content.Server/Objectives/Components/TargetOverrideComponent.cs
+++ b/Content.Shared/Objectives/Components/TargetOverrideComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Objectives.Components;
+namespace Content.Shared.Objectives.Components;
 
 /// <summary>
 /// Sets a target objective to a specific target when receiving it.
diff --git a/Content.Shared/Objectives/Systems/AliveAiTargetSystem.cs b/Content.Shared/Objectives/Systems/AliveAiTargetSystem.cs
index 4cf24095ff..ae3928d949 100644
--- a/Content.Shared/Objectives/Systems/AliveAiTargetSystem.cs
+++ b/Content.Shared/Objectives/Systems/AliveAiTargetSystem.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Mind;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Silicons.StationAi;
diff --git a/Content.Shared/Objectives/Systems/AliveHumanoidTargetSystem.cs b/Content.Shared/Objectives/Systems/AliveHumanoidTargetSystem.cs
index 7298a9a9ff..5727be5cb9 100644
--- a/Content.Shared/Objectives/Systems/AliveHumanoidTargetSystem.cs
+++ b/Content.Shared/Objectives/Systems/AliveHumanoidTargetSystem.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Humanoid;
 using Content.Shared.Mind;
 using Content.Shared.Mobs.Systems;
diff --git a/Content.Shared/Objectives/Systems/GenericTargetSystem.Entity.cs b/Content.Shared/Objectives/Systems/GenericTargetSystem.Entity.cs
index e116f6715c..9d8f935d8c 100644
--- a/Content.Shared/Objectives/Systems/GenericTargetSystem.Entity.cs
+++ b/Content.Shared/Objectives/Systems/GenericTargetSystem.Entity.cs
@@ -1,4 +1,4 @@
-using Content.Shared.EntityConditions;
+using Content.Shared.EntityConditions;
 
 namespace Content.Shared.Objectives.Systems;
 
diff --git a/Content.Shared/Objectives/Systems/GenericTargetSystem.Mind.cs b/Content.Shared/Objectives/Systems/GenericTargetSystem.Mind.cs
index 50343e85e6..cf17af5267 100644
--- a/Content.Shared/Objectives/Systems/GenericTargetSystem.Mind.cs
+++ b/Content.Shared/Objectives/Systems/GenericTargetSystem.Mind.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.EntityConditions;
 using Content.Shared.Mind;
 
diff --git a/Content.Shared/Objectives/Systems/GenericTargetSystem.cs b/Content.Shared/Objectives/Systems/GenericTargetSystem.cs
index b0c94b7bff..e22d52cd83 100644
--- a/Content.Shared/Objectives/Systems/GenericTargetSystem.cs
+++ b/Content.Shared/Objectives/Systems/GenericTargetSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.EntityConditions;
+using Content.Shared.EntityConditions;
 
 namespace Content.Shared.Objectives.Systems;
 
diff --git a/Content.Shared/Overlays/ImageOverlayComponent.cs b/Content.Shared/Overlays/ImageOverlayComponent.cs
new file mode 100644
index 0000000000..ccbf6a2abd
--- /dev/null
+++ b/Content.Shared/Overlays/ImageOverlayComponent.cs
@@ -0,0 +1,43 @@
+using System.Numerics;
+using Robust.Shared.GameStates;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Overlays;
+
+/// <summary>
+/// Adds a image overlay on screen when wearing an entity with this component.
+/// The border pixels of the image get stretched out to cover the rest of the viewport.
+/// </summary>
+/// <remarks>
+/// Need a blurred texture? Check out <see cref="Robust.Shared.Graphics.TextureLoadParameters"/> to include a filter sample.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+public sealed partial class ImageOverlayComponent : Component
+{
+    /// <summary>
+    /// Path to image overlaid on the screen.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public ResPath PathToOverlayImage = default!;
+
+    /// <summary>
+    /// The additional Color that can be overlaid over whole screen.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Color AdditionalColorOverlay = new(0, 0, 0, 0);
+
+    /// <summary>
+    /// Scales the texture in x/y after it has been scaled to fit the user's viewport.
+    /// </summary>
+    /// <remarks>
+    /// Avoid using large textures unless you really have to!
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public Vector2 Scale = Vector2.One;
+
+    /// <summary>
+    /// Is this overlay active
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Active = true;
+}
diff --git a/Content.Shared/PDA/SharedPdaSystem.cs b/Content.Shared/PDA/SharedPdaSystem.cs
index 6eb665747d..055acc0653 100644
--- a/Content.Shared/PDA/SharedPdaSystem.cs
+++ b/Content.Shared/PDA/SharedPdaSystem.cs
@@ -84,5 +84,19 @@ namespace Content.Shared.PDA
             // This does nothing yet while I finish up PDA prediction
             // Overriden by the server
         }
+
+        /// <summary>
+        /// Sets the owner of a PDA to a given entity, with a given name.
+        /// </summary>
+        /// <param name="uid">Pda Entity</param>
+        /// <param name="pda">Pda Component</param>
+        /// <param name="owner">New entity owner of the PDA, this is probably an ID card</param>
+        /// <param name="ownerName">Name of the new owner, this is probably the name on the ID card</param>
+        public void SetOwner(EntityUid uid, PdaComponent pda, EntityUid owner, string ownerName)
+        {
+            pda.OwnerName = ownerName;
+            pda.PdaOwner = owner;
+            UpdatePdaUi(uid, pda);
+        }
     }
 }
diff --git a/Content.Shared/ParcelWrap/Components/WrappedParcelComponent.cs b/Content.Shared/ParcelWrap/Components/WrappedParcelComponent.cs
index 17c6ef46cb..6d597c64d1 100644
--- a/Content.Shared/ParcelWrap/Components/WrappedParcelComponent.cs
+++ b/Content.Shared/ParcelWrap/Components/WrappedParcelComponent.cs
@@ -61,6 +61,13 @@ public sealed partial class WrappedParcelComponent : Component
     [DataField, AutoNetworkedField]
     public bool GetsShapeFromContent;
 
+    /// <summary>
+    /// If true, the owner of this entity has <see cref="MultiHandedItemComponent"/> added if any item inserted into
+    /// <see cref="Container"/> has that component.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool GetsMultiHandednessFromContent = true;
+
     /// <summary>
     /// If a player trapped inside this parcel can escape from it by unwrapping it.
     /// This is set by the <see cref="ParcelWrapComponent" /> used to create the parcel.
diff --git a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.ParcelWrap.cs b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.ParcelWrap.cs
index a2d47f9f59..a95de6794a 100644
--- a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.ParcelWrap.cs
+++ b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.ParcelWrap.cs
@@ -88,7 +88,7 @@ public sealed partial class ParcelWrappingSystem
     {
         var duration = wrapper.Comp.WrapDelay;
 
-        if (TryComp<ParcelWrapOverrideComponent>(target, out var overrideComp) &&
+        if (_parcelWrapOverrideQuery.TryComp(target, out var overrideComp) &&
             overrideComp.WrapDelay is { } wrapDelayOverride)
             duration = wrapDelayOverride;
 
diff --git a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs
index 8a5a8f4fc3..7374fdd682 100644
--- a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs
+++ b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs
@@ -32,7 +32,10 @@ public sealed partial class ParcelWrappingSystem
         entity.Comp.Contents = _container.EnsureContainer<ContainerSlot>(entity, entity.Comp.ContainerId);
     }
 
-    private void OnEntInsertedIntoContainer(Entity<WrappedParcelComponent> entity, ref EntInsertedIntoContainerMessage args)
+    private void OnEntInsertedIntoContainer(
+        Entity<WrappedParcelComponent> entity,
+        ref EntInsertedIntoContainerMessage args
+    )
     {
         // If the entity was inserted because of a server state application, assume that the item's state is applied
         // correctly as well and that deriving them from the contents is unneeded.
@@ -40,12 +43,10 @@ public sealed partial class ParcelWrappingSystem
             return;
 
         if (args.Container != entity.Comp.Contents ||
-            !TryComp<ItemComponent>(entity, out var parcelItemComp))
+            !_itemQuery.TryComp(entity, out var parcelItemComp))
             return;
 
-        // If this wrap maintains the size when wrapping, set the parcel's size to the target's size, or the fallback
-        // size if the target does not have a size.
-        var targetItemComp = CompOrNull<ItemComponent>(args.Entity);
+        var targetItemComp = _itemQuery.CompOrNull(args.Entity);
         if (entity.Comp.GetsSizeFromContent)
         {
             var size = targetItemComp?.Size ?? _fallbackParcelSize;
@@ -53,12 +54,16 @@ public sealed partial class ParcelWrappingSystem
             _appearance.SetData(entity, WrappedParcelVisuals.Size, size.Id);
         }
 
-        // If this wrap maintains the shape when wrapping and the item has a shape override, copy the shape override to
-        // the parcel.
         if (entity.Comp.GetsShapeFromContent)
         {
             _item.SetShape(entity, targetItemComp?.Shape, parcelItemComp);
         }
+
+        if (entity.Comp.GetsMultiHandednessFromContent &&
+            _multiHandedItemQuery.TryComp(args.Entity, out var multiHandedItemComp))
+        {
+            EnsureComp<MultiHandedItemComponent>(entity).HandsNeeded = multiHandedItemComp.HandsNeeded;
+        }
     }
 
     private void OnUseInHand(Entity<WrappedParcelComponent> entity, ref UseInHandEvent args)
@@ -69,8 +74,10 @@ public sealed partial class ParcelWrappingSystem
         args.Handled = TryStartUnwrapDoAfter(args.User, entity);
     }
 
-    private void OnGetVerbsForWrappedParcel(Entity<WrappedParcelComponent> entity,
-        ref GetVerbsEvent<InteractionVerb> args)
+    private void OnGetVerbsForWrappedParcel(
+        Entity<WrappedParcelComponent> entity,
+        ref GetVerbsEvent<InteractionVerb> args
+    )
     {
         if (!args.CanAccess || !args.CanComplexInteract)
             return;
@@ -93,7 +100,7 @@ public sealed partial class ParcelWrappingSystem
         if (args.Handled || args.Cancelled)
             return;
 
-        if (args.Target is { } target && TryComp<WrappedParcelComponent>(target, out var parcel))
+        if (args.Target is { } target && _wrappedParcelQuery.TryComp(target, out var parcel))
         {
             UnwrapInternal(args.User, (target, parcel));
             args.Handled = true;
diff --git a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs
index 84856ac73d..ea9fa0d8a1 100644
--- a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs
+++ b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs
@@ -4,8 +4,11 @@ using Content.Shared.Item;
 using Content.Shared.ParcelWrap.Components;
 using Content.Shared.Popups;
 using Content.Shared.Whitelist;
+using JetBrains.Annotations;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
 
 namespace Content.Shared.ParcelWrap.Systems;
 
@@ -27,6 +30,12 @@ public sealed partial class ParcelWrappingSystem : EntitySystem
     [Dependency] private SharedTransformSystem _transform = default!;
     [Dependency] private EntityWhitelistSystem _whitelist = default!;
 
+    [Dependency] private EntityQuery<ItemComponent> _itemQuery = default!;
+    [Dependency] private EntityQuery<MultiHandedItemComponent> _multiHandedItemQuery = default!;
+    [Dependency] private EntityQuery<ParcelWrapOverrideComponent> _parcelWrapOverrideQuery = default!;
+    [Dependency] private EntityQuery<PhysicsComponent> _physicsQuery = default!;
+    [Dependency] private EntityQuery<WrappedParcelComponent> _wrappedParcelQuery = default!;
+
     /// <inheritdoc/>
     public override void Initialize()
     {
@@ -42,6 +51,7 @@ public sealed partial class ParcelWrappingSystem : EntitySystem
     /// <param name="wrapper">The entity doing the wrapping.</param>
     /// <param name="target">The entity to be wrapped.</param>
     /// <returns>True if <paramref name="wrapper"/> can be used to wrap <paramref name="target"/>, false otherwise.</returns>
+    [PublicAPI]
     public bool IsWrappable(Entity<ParcelWrapComponent> wrapper, EntityUid target)
     {
         return
@@ -49,6 +59,8 @@ public sealed partial class ParcelWrappingSystem : EntitySystem
             wrapper.Owner != target &&
             // Wrapper should never be empty, but may as well make sure.
             !_charges.IsEmpty(wrapper.Owner) &&
-            _whitelist.CheckBoth(target, wrapper.Comp.Blacklist, wrapper.Comp.Whitelist);
+            _whitelist.CheckBoth(target, wrapper.Comp.Blacklist, wrapper.Comp.Whitelist) &&
+            // If it can't be moved, it shouldn't be able to go into a parcel and picked up.
+            _physicsQuery.TryComp(target, out var physics) && physics.BodyType != BodyType.Static;
     }
 }
diff --git a/Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs b/Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs
index 9b52a73522..13233d6341 100644
--- a/Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs
+++ b/Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.ParticleAccelerator.Components;
 
diff --git a/Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorEndCapComponent.cs b/Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorEndCapComponent.cs
index 20615321d1..165f82cb7b 100644
--- a/Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorEndCapComponent.cs
+++ b/Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorEndCapComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.ParticleAccelerator.Components;
+namespace Content.Shared.ParticleAccelerator.Components;
 
 [RegisterComponent]
 public sealed partial class ParticleAcceleratorEndCapComponent : Component
diff --git a/Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorFuelChamberComponent.cs b/Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorFuelChamberComponent.cs
index 9e0da68b96..7277b9da34 100644
--- a/Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorFuelChamberComponent.cs
+++ b/Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorFuelChamberComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.ParticleAccelerator.Components;
+namespace Content.Shared.ParticleAccelerator.Components;
 
 [RegisterComponent]
 public sealed partial class ParticleAcceleratorFuelChamberComponent : Component
diff --git a/Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs b/Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs
index 3da6b76f2f..0fa13e8ae7 100644
--- a/Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs
+++ b/Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.ParticleAccelerator.Components;
+namespace Content.Shared.ParticleAccelerator.Components;
 
 [RegisterComponent]
 public sealed partial class ParticleAcceleratorPowerBoxComponent : Component
diff --git a/Content.Shared/Physics/PreventCollideComponent.cs b/Content.Shared/Physics/PreventCollideComponent.cs
index af59d36773..3165ef63bf 100644
--- a/Content.Shared/Physics/PreventCollideComponent.cs
+++ b/Content.Shared/Physics/PreventCollideComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Physics;
 
diff --git a/Content.Shared/Physics/SharedPreventCollideSystem.cs b/Content.Shared/Physics/SharedPreventCollideSystem.cs
index d6475201ae..e7a093974f 100644
--- a/Content.Shared/Physics/SharedPreventCollideSystem.cs
+++ b/Content.Shared/Physics/SharedPreventCollideSystem.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Physics.Events;
+using Robust.Shared.Physics.Events;
 
 namespace Content.Shared.Physics;
 
diff --git a/Content.Shared/Placeable/ItemPlacerComponent.cs b/Content.Shared/Placeable/ItemPlacerComponent.cs
index 84df2e395a..7723d8fcd0 100644
--- a/Content.Shared/Placeable/ItemPlacerComponent.cs
+++ b/Content.Shared/Placeable/ItemPlacerComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Whitelist;
+using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Placeable;
diff --git a/Content.Shared/Players/ContentPlayerData.cs b/Content.Shared/Players/ContentPlayerData.cs
index edf0228df2..c7a393cc0c 100644
--- a/Content.Shared/Players/ContentPlayerData.cs
+++ b/Content.Shared/Players/ContentPlayerData.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using Content.Shared.GameTicking;
 using Content.Shared.Mind;
 using Robust.Shared.Network;
@@ -29,7 +29,7 @@ public sealed class ContentPlayerData
     ///     The currently occupied mind of the player owning this data.
     ///     DO NOT DIRECTLY SET THIS UNLESS YOU KNOW WHAT YOU'RE DOING.
     /// </summary>
-    [ViewVariables, Access(typeof(SharedMindSystem), typeof(SharedGameTicker))]
+    [ViewVariables, Access(typeof(SharedMindSystem), typeof(GameTicker))]
     public EntityUid? Mind { get; set; }
 
     /// <summary>
diff --git a/Content.Shared/Players/JobWhitelist/MsgJobWhitelist.cs b/Content.Shared/Players/JobWhitelist/MsgJobWhitelist.cs
index 8347e2d706..27b0b6c614 100644
--- a/Content.Shared/Players/JobWhitelist/MsgJobWhitelist.cs
+++ b/Content.Shared/Players/JobWhitelist/MsgJobWhitelist.cs
@@ -1,4 +1,4 @@
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Players/PlayTimeTracking/MsgPlayTime.cs b/Content.Shared/Players/PlayTimeTracking/MsgPlayTime.cs
index ad057f0792..1c798c6097 100644
--- a/Content.Shared/Players/PlayTimeTracking/MsgPlayTime.cs
+++ b/Content.Shared/Players/PlayTimeTracking/MsgPlayTime.cs
@@ -1,4 +1,4 @@
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Players/PlayTimeTracking/PlayTimeTrackingShared.cs b/Content.Shared/Players/PlayTimeTracking/PlayTimeTrackingShared.cs
index d02a22171a..bc59dafcab 100644
--- a/Content.Shared/Players/PlayTimeTracking/PlayTimeTrackingShared.cs
+++ b/Content.Shared/Players/PlayTimeTracking/PlayTimeTrackingShared.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Dataset;
+using Content.Shared.Dataset;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Players.PlayTimeTracking;
diff --git a/Content.Shared/Players/PlayerDataExt.cs b/Content.Shared/Players/PlayerDataExt.cs
index eba4d8339d..0fd94c97fc 100644
--- a/Content.Shared/Players/PlayerDataExt.cs
+++ b/Content.Shared/Players/PlayerDataExt.cs
@@ -27,4 +27,4 @@ public static class PlayerDataExt
     {
         return session.Data.ContentData()?.Mind;
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Players/RateLimiting/RateLimitRegistration.cs b/Content.Shared/Players/RateLimiting/RateLimitRegistration.cs
index 6bcf15d30b..117dd704dc 100644
--- a/Content.Shared/Players/RateLimiting/RateLimitRegistration.cs
+++ b/Content.Shared/Players/RateLimiting/RateLimitRegistration.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 using Robust.Shared.Configuration;
 using Robust.Shared.Player;
 
diff --git a/Content.Shared/Players/RateLimiting/SharedPlayerRateLimitManager.cs b/Content.Shared/Players/RateLimiting/SharedPlayerRateLimitManager.cs
index addb1dee37..d0d77ec9dd 100644
--- a/Content.Shared/Players/RateLimiting/SharedPlayerRateLimitManager.cs
+++ b/Content.Shared/Players/RateLimiting/SharedPlayerRateLimitManager.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Player;
+using Robust.Shared.Player;
 
 namespace Content.Shared.Players.RateLimiting;
 
diff --git a/Content.Shared/Players/SharedPlayerSystem.cs b/Content.Shared/Players/SharedPlayerSystem.cs
index 7271c5688a..7f8d6c60fb 100644
--- a/Content.Shared/Players/SharedPlayerSystem.cs
+++ b/Content.Shared/Players/SharedPlayerSystem.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Player;
+using Robust.Shared.Player;
 
 namespace Content.Shared.Players;
 
diff --git a/Content.Shared/PneumaticCannon/SharedPneumaticCannonSystem.cs b/Content.Shared/PneumaticCannon/SharedPneumaticCannonSystem.cs
index 6df8428ede..9724d522dc 100644
--- a/Content.Shared/PneumaticCannon/SharedPneumaticCannonSystem.cs
+++ b/Content.Shared/PneumaticCannon/SharedPneumaticCannonSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Popups;
+using Content.Shared.Popups;
 using Content.Shared.Weapons.Ranged.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs b/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs
index 72579caa35..9aa46956e0 100644
--- a/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs
+++ b/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Pointing.Components
diff --git a/Content.Shared/Points/SharedPointSystem.cs b/Content.Shared/Points/SharedPointSystem.cs
index 978f4bca42..f6691dd574 100644
--- a/Content.Shared/Points/SharedPointSystem.cs
+++ b/Content.Shared/Points/SharedPointSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.FixedPoint;
+using Content.Shared.FixedPoint;
 using Robust.Shared.Network;
 using Robust.Shared.Utility;
 
diff --git a/Content.Shared/Polymorph/PolymorphActions.cs b/Content.Shared/Polymorph/PolymorphActions.cs
index 13e00f55e2..f44cfc575f 100644
--- a/Content.Shared/Polymorph/PolymorphActions.cs
+++ b/Content.Shared/Polymorph/PolymorphActions.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Polymorph;
diff --git a/Content.Shared/Power/ApcToolFinishedEvent.cs b/Content.Shared/Power/ApcToolFinishedEvent.cs
index fcf3940171..fb29de5e41 100644
--- a/Content.Shared/Power/ApcToolFinishedEvent.cs
+++ b/Content.Shared/Power/ApcToolFinishedEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Power;
diff --git a/Content.Shared/Power/Components/ApcPowerReceiverComponentState.cs b/Content.Shared/Power/Components/ApcPowerReceiverComponentState.cs
index 31456c86f2..3ce2fbae60 100644
--- a/Content.Shared/Power/Components/ApcPowerReceiverComponentState.cs
+++ b/Content.Shared/Power/Components/ApcPowerReceiverComponentState.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Power.Components;
 
diff --git a/Content.Shared/Power/Components/SharedApcPowerReceiverComponent.cs b/Content.Shared/Power/Components/SharedApcPowerReceiverComponent.cs
index 18309803f8..0feb43a53c 100644
--- a/Content.Shared/Power/Components/SharedApcPowerReceiverComponent.cs
+++ b/Content.Shared/Power/Components/SharedApcPowerReceiverComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Power.Components;
 
diff --git a/Content.Shared/Power/EntitySystems/SharedBatterySystem.API.cs b/Content.Shared/Power/EntitySystems/SharedBatterySystem.API.cs
index d51023f3eb..168af3ee6d 100644
--- a/Content.Shared/Power/EntitySystems/SharedBatterySystem.API.cs
+++ b/Content.Shared/Power/EntitySystems/SharedBatterySystem.API.cs
@@ -10,6 +10,25 @@ namespace Content.Shared.Power.EntitySystems;
 /// </summary>
 public abstract partial class SharedBatterySystem
 {
+    /// <summary>
+    /// Changes the charge of this entity by raising the <see cref="ChangeChargeEvent"/>
+    /// in hopes of finding a battery which has charge.
+    /// Returns the amount of charge removed.
+    /// </summary>
+    /// <param name="gun">The entity we want to take charge from.</param>
+    /// <param name="amount">The amount of charge we're taking.</param>
+    [PublicAPI]
+    public float ChangeCharge(EntityUid gun, float amount)
+    {
+        if (amount == 0)
+            return 0f;
+
+        // Take charge from either the BatteryComponent or PowerCellSlotComponent.
+        var ev = new ChangeChargeEvent(amount);
+        RaiseLocalEvent(gun, ref ev);
+        return ev.Amount - ev.ResidualValue;
+    }
+
     /// <summary>
     /// Changes the battery's charge by the given amount
     /// and resets the self-recharge cooldown if it exists.
@@ -159,10 +178,24 @@ public abstract partial class SharedBatterySystem
         RaiseLocalEvent(ent, ref changedEv);
     }
 
+    /// <summary>
+    /// Gets the total battery charge from an entity that is available, including the min and max.
+    /// </summary>
+    /// <param name="ent">Entity we want the total charge from.</param>
+    /// <returns>a tuple of the current charge, and maximum charge</returns>
+    [PublicAPI]
+    public (float Charge, float MaxCharge) GetCharge(EntityUid ent)
+    {
+        var ev = new GetChargeEvent();
+        RaiseLocalEvent(ent, ref ev);
+        return (ev.CurrentCharge, ev.MaxCharge);
+    }
+
     /// <summary>
     /// Gets the battery's current charge.
     /// </summary>
     [PublicAPI]
+    [Obsolete($"Use Tuple version that raises {nameof(GetChargeEvent)} instead.")]
     public float GetCharge(Entity<BatteryComponent?> ent)
     {
         if (!Resolve(ent, ref ent.Comp, false))
diff --git a/Content.Shared/Power/Generation/Teg/SharedTeg.cs b/Content.Shared/Power/Generation/Teg/SharedTeg.cs
index b534ff1fc3..cce5804910 100644
--- a/Content.Shared/Power/Generation/Teg/SharedTeg.cs
+++ b/Content.Shared/Power/Generation/Teg/SharedTeg.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Power.Generation.Teg;
 
diff --git a/Content.Shared/Power/Generation/Teg/TegSensorPayload.cs b/Content.Shared/Power/Generation/Teg/TegSensorPayload.cs
new file mode 100644
index 0000000000..afa432f9e2
--- /dev/null
+++ b/Content.Shared/Power/Generation/Teg/TegSensorPayload.cs
@@ -0,0 +1,63 @@
+using Content.Shared.DeviceNetwork;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Power.Generation.Teg;
+
+/// <summary>
+/// Information for a single TEG circulator.
+/// </summary>
+/// <param name="InletPressure">Pressure measured at the circulator's input pipe</param>
+/// <param name="OutletPressure">Pressure measured at the circulator's output pipe</param>
+/// <param name="InletTemperature">Temperature measured at the circulator's input pipe</param>
+/// <param name="OutletTemperature">Temperature measured at the circulator's output pipe</param>
+[DataRecord]
+[Serializable, NetSerializable]
+public partial record struct Circulator(
+    float InletPressure,
+    float OutletPressure,
+    float InletTemperature,
+    float OutletTemperature);
+
+/// <summary>
+/// Sensor data reported by the <see cref="TegGeneratorComponent"/> when queried over the device network.
+/// </summary>
+public partial record struct TegSensorPayload : INetworkPayload
+{
+    /// <summary>
+    /// Information for the A-side circulator.
+    /// </summary>
+    [DataField]
+    public Circulator CirculatorA;
+
+    /// <summary>
+    /// Information for the B-side circulator.
+    /// </summary>
+    [DataField]
+    public Circulator CirculatorB;
+
+    /// <summary>
+    /// The amount of energy (Joules) generated by the TEG last atmos tick.
+    /// </summary>
+    /// <seealso cref="TegGeneratorComponent.LastGeneration"/>
+    [DataField]
+    public float LastGeneration;
+
+    /// <summary>
+    /// Ramping position for the TEG power generation.
+    /// </summary>
+    /// <seealso cref="TegGeneratorComponent.RampPosition"/>
+    [DataField]
+    public float RampPosition;
+
+    /// <summary>
+    /// Power (Watts) actually being supplied by the TEG to connected power network.
+    /// </summary>
+    /// <seealso cref="PowerSupplierComponent.CurrentSupply"/>
+    [DataField]
+    public float PowerOutput;
+}
+
+/// <summary>
+/// Request to get <see cref="TegSensorPayload"/>.
+/// </summary>
+public partial record struct TegSensorSyncPayload : INetworkPayload;
diff --git a/Content.Shared/Power/Generator/FuelGeneratorComponent.cs b/Content.Shared/Power/Generator/FuelGeneratorComponent.cs
index 1cdb22a109..534c3fa2a3 100644
--- a/Content.Shared/Power/Generator/FuelGeneratorComponent.cs
+++ b/Content.Shared/Power/Generator/FuelGeneratorComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Guidebook;
+using Content.Shared.Guidebook;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Power.Generator;
diff --git a/Content.Shared/Power/Generator/GeneratorExhaustGasComponent.cs b/Content.Shared/Power/Generator/GeneratorExhaustGasComponent.cs
index c2e1d24891..3f86f1cc84 100644
--- a/Content.Shared/Power/Generator/GeneratorExhaustGasComponent.cs
+++ b/Content.Shared/Power/Generator/GeneratorExhaustGasComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos;
+using Content.Shared.Atmos;
 
 namespace Content.Shared.Power.Generator;
 
diff --git a/Content.Shared/Power/Generator/PowerSwitchableComponent.cs b/Content.Shared/Power/Generator/PowerSwitchableComponent.cs
index 39118b21e5..10ed1412b9 100644
--- a/Content.Shared/Power/Generator/PowerSwitchableComponent.cs
+++ b/Content.Shared/Power/Generator/PowerSwitchableComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Audio;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Power/Generator/SharedGeneratorSystem.cs b/Content.Shared/Power/Generator/SharedGeneratorSystem.cs
index 2cb3aa0b70..fc7aa06467 100644
--- a/Content.Shared/Power/Generator/SharedGeneratorSystem.cs
+++ b/Content.Shared/Power/Generator/SharedGeneratorSystem.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Power.Generator;
+namespace Content.Shared.Power.Generator;
 
 /// <summary>
 /// This handles small, portable generators that run off a material fuel.
diff --git a/Content.Shared/Power/Generator/SharedPortableGeneratorComponent.cs b/Content.Shared/Power/Generator/SharedPortableGeneratorComponent.cs
index a771802670..7960a0512a 100644
--- a/Content.Shared/Power/Generator/SharedPortableGeneratorComponent.cs
+++ b/Content.Shared/Power/Generator/SharedPortableGeneratorComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Audio;
+using Robust.Shared.Audio;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Power.Generator;
diff --git a/Content.Shared/Power/Generator/SharedPortableGeneratorSystem.cs b/Content.Shared/Power/Generator/SharedPortableGeneratorSystem.cs
index 4ed911c296..468c53de2b 100644
--- a/Content.Shared/Power/Generator/SharedPortableGeneratorSystem.cs
+++ b/Content.Shared/Power/Generator/SharedPortableGeneratorSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Power.Generator;
diff --git a/Content.Shared/Power/Generator/SharedPowerSwitchableSystem.cs b/Content.Shared/Power/Generator/SharedPowerSwitchableSystem.cs
index 00d2b1d7a0..a473c1bdc4 100644
--- a/Content.Shared/Power/Generator/SharedPowerSwitchableSystem.cs
+++ b/Content.Shared/Power/Generator/SharedPowerSwitchableSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Examine;
+using Content.Shared.Examine;
 using Content.Shared.Verbs;
 using Robust.Shared.Utility;
 
diff --git a/Content.Shared/Power/PowerChangedEvent.cs b/Content.Shared/Power/PowerChangedEvent.cs
index 578a34142a..2fb2ed9b4b 100644
--- a/Content.Shared/Power/PowerChangedEvent.cs
+++ b/Content.Shared/Power/PowerChangedEvent.cs
@@ -5,4 +5,4 @@ namespace Content.Shared.Power;
 /// Does nothing on the client.
 /// </summary>
 [ByRefEvent]
-public readonly record struct PowerChangedEvent(bool Powered, float ReceivingPower);
\ No newline at end of file
+public readonly record struct PowerChangedEvent(bool Powered, float ReceivingPower);
diff --git a/Content.Shared/Power/SharedBattery.cs b/Content.Shared/Power/SharedBattery.cs
index 750fc6cb01..1691f889ed 100644
--- a/Content.Shared/Power/SharedBattery.cs
+++ b/Content.Shared/Power/SharedBattery.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Power;
 
diff --git a/Content.Shared/Power/SharedPowerCharge.cs b/Content.Shared/Power/SharedPowerCharge.cs
index 5599930f37..1a1a96b1c8 100644
--- a/Content.Shared/Power/SharedPowerCharge.cs
+++ b/Content.Shared/Power/SharedPowerCharge.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Power;
 
diff --git a/Content.Shared/Power/SharedPowerChargeComponent.cs b/Content.Shared/Power/SharedPowerChargeComponent.cs
index 96f26a7903..5c6eb24bcf 100644
--- a/Content.Shared/Power/SharedPowerChargeComponent.cs
+++ b/Content.Shared/Power/SharedPowerChargeComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Power;
+namespace Content.Shared.Power;
 
 /// <summary>
 /// Component for a powered machine that slowly powers on and off over a period of time.
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 0188122c7e..788963fb46 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -47,7 +47,7 @@ namespace Content.Shared.Preferences
         private Dictionary<ProtoId<JobPrototype>, JobPriority> _jobPriorities = new()
         {
             {
-                SharedGameTicker.FallbackOverflowJob, JobPriority.High
+                GameTicker.FallbackOverflowJob, JobPriority.High
             }
         };
 
@@ -354,6 +354,7 @@ namespace Content.Shared.Preferences
             if (ignoredSpecies != null)
             {
                 baseProfile.Species = RandomSpecies(ignoredSpecies);
+                config ^= RandomizeCfg.Species;
             }
             var profile = Random(config, baseProfile);
             return profile;
diff --git a/Content.Shared/Preferences/MsgDeleteCharacter.cs b/Content.Shared/Preferences/MsgDeleteCharacter.cs
index 92b59e5eb7..d5b3f00abc 100644
--- a/Content.Shared/Preferences/MsgDeleteCharacter.cs
+++ b/Content.Shared/Preferences/MsgDeleteCharacter.cs
@@ -1,4 +1,4 @@
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Preferences/MsgSelectCharacter.cs b/Content.Shared/Preferences/MsgSelectCharacter.cs
index 938a5e710e..0b5e0eaf23 100644
--- a/Content.Shared/Preferences/MsgSelectCharacter.cs
+++ b/Content.Shared/Preferences/MsgSelectCharacter.cs
@@ -1,4 +1,4 @@
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Prototypes/EntityPrototypeHelpers.cs b/Content.Shared/Prototypes/EntityPrototypeHelpers.cs
index 484dd4ad1d..d2e5387d17 100644
--- a/Content.Shared/Prototypes/EntityPrototypeHelpers.cs
+++ b/Content.Shared/Prototypes/EntityPrototypeHelpers.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Prototypes
diff --git a/Content.Shared/ProximityDetection/Components/ProximityDetectorComponent.cs b/Content.Shared/ProximityDetection/Components/ProximityDetectorComponent.cs
index 8f8d37a27d..6956e62e4f 100644
--- a/Content.Shared/ProximityDetection/Components/ProximityDetectorComponent.cs
+++ b/Content.Shared/ProximityDetection/Components/ProximityDetectorComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.ProximityDetection.Systems;
+using Content.Shared.ProximityDetection.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
diff --git a/Content.Shared/ProximityDetection/ProximityDetectionEvents.cs b/Content.Shared/ProximityDetection/ProximityDetectionEvents.cs
index 1c235f6ce4..1761d5fb91 100644
--- a/Content.Shared/ProximityDetection/ProximityDetectionEvents.cs
+++ b/Content.Shared/ProximityDetection/ProximityDetectionEvents.cs
@@ -1,4 +1,4 @@
-using Content.Shared.ProximityDetection.Components;
+using Content.Shared.ProximityDetection.Components;
 
 namespace Content.Shared.ProximityDetection;
 
diff --git a/Content.Shared/ProximityDetection/Systems/ProximityDetectionSystem.cs b/Content.Shared/ProximityDetection/Systems/ProximityDetectionSystem.cs
index 167a95964d..5b7672c958 100644
--- a/Content.Shared/ProximityDetection/Systems/ProximityDetectionSystem.cs
+++ b/Content.Shared/ProximityDetection/Systems/ProximityDetectionSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle;
 using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.ProximityDetection.Components;
 using Robust.Shared.Timing;
diff --git a/Content.Shared/Puppet/VentriloquistPuppetComponent.cs b/Content.Shared/Puppet/VentriloquistPuppetComponent.cs
index 8f9239d50f..401fbf9bcf 100644
--- a/Content.Shared/Puppet/VentriloquistPuppetComponent.cs
+++ b/Content.Shared/Puppet/VentriloquistPuppetComponent.cs
@@ -5,4 +5,4 @@ namespace Content.Shared.Puppet;
 [RegisterComponent, NetworkedComponent]
 public sealed partial class VentriloquistPuppetComponent : Component
 {
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/RCD/RCDPrototype.cs b/Content.Shared/RCD/RCDPrototype.cs
index 67c2f839f4..ba9c93251d 100644
--- a/Content.Shared/RCD/RCDPrototype.cs
+++ b/Content.Shared/RCD/RCDPrototype.cs
@@ -124,6 +124,14 @@ public sealed partial class RCDPrototype : IPrototype
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadOnly)]
     public RcdRotation Rotation { get; private set; } = RcdRotation.User;
+
+    /// <summary>
+    /// The relative order to use in the rotary menu.
+    /// Lower numbers appear before higher numbers, which appear before null.
+    /// Defaults to null.
+    /// </summary>
+    [DataField]
+    public int? MenuOrder { get; private set; }
 }
 
 public enum RcdMode : byte
diff --git a/Content.Shared/Radiation/Systems/SharedRadiationSystem.cs b/Content.Shared/Radiation/Systems/SharedRadiationSystem.cs
index d618084672..f2b522847d 100644
--- a/Content.Shared/Radiation/Systems/SharedRadiationSystem.cs
+++ b/Content.Shared/Radiation/Systems/SharedRadiationSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Radiation.Components;
+using Content.Shared.Radiation.Components;
 
 namespace Content.Shared.Radiation.Systems;
 
diff --git a/Content.Shared/Radio/Components/IntercomComponent.cs b/Content.Shared/Radio/Components/IntercomComponent.cs
index 8d7b87597b..3afbfc52fe 100644
--- a/Content.Shared/Radio/Components/IntercomComponent.cs
+++ b/Content.Shared/Radio/Components/IntercomComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Radio.Components;
diff --git a/Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs b/Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs
index 5b928edc08..0322d9a3d5 100644
--- a/Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs
+++ b/Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
@@ -33,7 +34,7 @@ public abstract partial class SharedJammerSystem : EntitySystem
             EnsureComp<ActiveRadioJammerComponent>(entity);
             EnsureComp<DeviceNetworkJammerComponent>(entity, out var jammingComp);
             _jammer.SetRange((entity, jammingComp), GetCurrentRange(entity));
-            _jammer.AddJammableNetwork((entity, jammingComp), DeviceNetworkComponent.DeviceNetIdDefaults.Wireless.ToString());
+            _jammer.AddJammableNetwork((entity, jammingComp), (int) DeviceNetIdDefaults.Wireless);
 
             // Add excluded frequencies using the system method
             foreach (var freq in entity.Comp.FrequenciesExcluded)
diff --git a/Content.Shared/Radio/RadioVisuals.cs b/Content.Shared/Radio/RadioVisuals.cs
index a43828716d..754a88c2ff 100644
--- a/Content.Shared/Radio/RadioVisuals.cs
+++ b/Content.Shared/Radio/RadioVisuals.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Radio;
 
diff --git a/Content.Shared/Radio/SharedIntercom.cs b/Content.Shared/Radio/SharedIntercom.cs
index f697add8b9..3146a6272d 100644
--- a/Content.Shared/Radio/SharedIntercom.cs
+++ b/Content.Shared/Radio/SharedIntercom.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Radio;
diff --git a/Content.Shared/RatKing/Components/RummageableComponent.cs b/Content.Shared/RatKing/Components/RummageableComponent.cs
index ea92b55805..ef52d5944a 100644
--- a/Content.Shared/RatKing/Components/RummageableComponent.cs
+++ b/Content.Shared/RatKing/Components/RummageableComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.EntityTable.EntitySelectors;
+using Content.Shared.EntityTable.EntitySelectors;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 
diff --git a/Content.Shared/RatKing/RatKingActions.cs b/Content.Shared/RatKing/RatKingActions.cs
index e2031e972b..a195c9823d 100644
--- a/Content.Shared/RatKing/RatKingActions.cs
+++ b/Content.Shared/RatKing/RatKingActions.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 
 namespace Content.Shared.RatKing;
 
diff --git a/Content.Shared/RatKing/RatKingServantComponent.cs b/Content.Shared/RatKing/RatKingServantComponent.cs
index f6e8d0110e..1aa09a1c17 100644
--- a/Content.Shared/RatKing/RatKingServantComponent.cs
+++ b/Content.Shared/RatKing/RatKingServantComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.RatKing;
 
diff --git a/Content.Shared/Repairable/RepairableComponent.cs b/Content.Shared/Repairable/RepairableComponent.cs
index 60eb57581a..619f943878 100644
--- a/Content.Shared/Repairable/RepairableComponent.cs
+++ b/Content.Shared/Repairable/RepairableComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage;
+using Content.Shared.Damage;
 using Content.Shared.Tools;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/RepulseAttract/Events/RepulseAttractActionEvent.cs b/Content.Shared/RepulseAttract/Events/RepulseAttractActionEvent.cs
index ac164d4327..461f1c906f 100644
--- a/Content.Shared/RepulseAttract/Events/RepulseAttractActionEvent.cs
+++ b/Content.Shared/RepulseAttract/Events/RepulseAttractActionEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 
 namespace Content.Shared.RepulseAttract.Events;
 
diff --git a/Content.Shared/RepulseAttract/RepulseAttractComponent.cs b/Content.Shared/RepulseAttract/RepulseAttractComponent.cs
index c167d81ec6..eb6cdb83c4 100644
--- a/Content.Shared/RepulseAttract/RepulseAttractComponent.cs
+++ b/Content.Shared/RepulseAttract/RepulseAttractComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Physics;
+using Content.Shared.Physics;
 using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
 
diff --git a/Content.Shared/RepulseAttract/RepulseAttractSystem.cs b/Content.Shared/RepulseAttract/RepulseAttractSystem.cs
index 29be516e1e..0b7ca79183 100644
--- a/Content.Shared/RepulseAttract/RepulseAttractSystem.cs
+++ b/Content.Shared/RepulseAttract/RepulseAttractSystem.cs
@@ -1,6 +1,5 @@
-using Content.Shared.Physics;
+using Content.Shared.Physics;
 using Content.Shared.Throwing;
-using Content.Shared.Timing;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Whitelist;
 using Content.Shared.Wieldable;
@@ -8,6 +7,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Physics.Components;
 using System.Numerics;
 using Content.Shared.RepulseAttract.Events;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Weapons.Melee;
 
 namespace Content.Shared.RepulseAttract;
diff --git a/Content.Shared/Research/Components/ResearchClientComponent.cs b/Content.Shared/Research/Components/ResearchClientComponent.cs
index 7ab47ad260..00b5c53dc5 100644
--- a/Content.Shared/Research/Components/ResearchClientComponent.cs
+++ b/Content.Shared/Research/Components/ResearchClientComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Research.Components
 {
diff --git a/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs b/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs
index 06245927de..4dc08225ec 100644
--- a/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs
+++ b/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Research.Prototypes;
diff --git a/Content.Shared/Research/Prototypes/TechnologyPrototype.cs b/Content.Shared/Research/Prototypes/TechnologyPrototype.cs
index 3e75969cca..64d91f04ae 100644
--- a/Content.Shared/Research/Prototypes/TechnologyPrototype.cs
+++ b/Content.Shared/Research/Prototypes/TechnologyPrototype.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Research.Prototypes;
diff --git a/Content.Shared/Research/SharedDiskConsole.cs b/Content.Shared/Research/SharedDiskConsole.cs
index 2b44799f99..b57a8c9a73 100644
--- a/Content.Shared/Research/SharedDiskConsole.cs
+++ b/Content.Shared/Research/SharedDiskConsole.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Research;
 
diff --git a/Content.Shared/Research/TechnologyDisk/Components/TechnologyDiskComponent.cs b/Content.Shared/Research/TechnologyDisk/Components/TechnologyDiskComponent.cs
index 0afb845a9f..f2696b123c 100644
--- a/Content.Shared/Research/TechnologyDisk/Components/TechnologyDiskComponent.cs
+++ b/Content.Shared/Research/TechnologyDisk/Components/TechnologyDiskComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Random;
+using Content.Shared.Random;
 using Content.Shared.Research.Prototypes;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Resist/EscapeInventoryEvent.cs b/Content.Shared/Resist/EscapeInventoryEvent.cs
index c77545fcb0..01b0c521b9 100644
--- a/Content.Shared/Resist/EscapeInventoryEvent.cs
+++ b/Content.Shared/Resist/EscapeInventoryEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Resist;
diff --git a/Content.Shared/Resist/ResistLockerDoAfterEvent.cs b/Content.Shared/Resist/ResistLockerDoAfterEvent.cs
index 2acf160b80..d789d25fa0 100644
--- a/Content.Shared/Resist/ResistLockerDoAfterEvent.cs
+++ b/Content.Shared/Resist/ResistLockerDoAfterEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Resist;
diff --git a/Content.Shared/Respawn/SharedSpecialRespawnSystem.cs b/Content.Shared/Respawn/SharedSpecialRespawnSystem.cs
index 6c738e4489..f1321fa175 100644
--- a/Content.Shared/Respawn/SharedSpecialRespawnSystem.cs
+++ b/Content.Shared/Respawn/SharedSpecialRespawnSystem.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Respawn;
+namespace Content.Shared.Respawn;
 
 public abstract class SharedSpecialRespawnSystem : EntitySystem
 {
diff --git a/Content.Shared/RetractableItemAction/RetractableItemActionSystem.cs b/Content.Shared/RetractableItemAction/RetractableItemActionSystem.cs
index 47595ea25c..5d08e6eef1 100644
--- a/Content.Shared/RetractableItemAction/RetractableItemActionSystem.cs
+++ b/Content.Shared/RetractableItemAction/RetractableItemActionSystem.cs
@@ -29,7 +29,7 @@ public sealed partial class RetractableItemActionSystem : EntitySystem
         SubscribeLocalEvent<RetractableItemActionComponent, OnRetractableItemActionEvent>(OnRetractableItemAction);
 
         SubscribeLocalEvent<ActionRetractableItemComponent, ComponentShutdown>(OnActionSummonedShutdown);
-        Subs.SubscribeWithRelay<ActionRetractableItemComponent, HeldRelayedEvent<TargetHandcuffedEvent>>(OnItemHandcuffed, inventory: false);
+        Subs.SubscribeWithRelay<ActionRetractableItemComponent, BeforeTargetHandcuffedEvent>(OnItemHandcuffed, inventory: false);
     }
 
     private void OnActionInit(Entity<RetractableItemActionComponent> ent, ref MapInitEvent args)
@@ -54,9 +54,7 @@ public sealed partial class RetractableItemActionSystem : EntitySystem
             return;
 
         // Don't allow to summon an item if holding an unremoveable item unless that item is summoned by the action.
-        if (_hands.GetActiveItem(ent.Owner) != null
-            && !_hands.IsHolding(args.Performer, ent.Comp.ActionItemUid)
-            && !_hands.CanDropHeld(args.Performer, activeHand, false))
+        if (_hands.GetActiveItem(ent.Owner) != null && !_hands.IsHolding(args.Performer, ent.Comp.ActionItemUid) && !_hands.CanDropHeld(args.Performer, activeHand, false))
         {
             _popups.PopupEntity(Loc.GetString("retractable-item-hand-cannot-drop"), args.Performer, args.Performer);
             return;
@@ -86,7 +84,7 @@ public sealed partial class RetractableItemActionSystem : EntitySystem
         PopulateActionItem(action.Owner);
     }
 
-    private void OnItemHandcuffed(Entity<ActionRetractableItemComponent> ent, ref HeldRelayedEvent<TargetHandcuffedEvent> args)
+    private void OnItemHandcuffed(Entity<ActionRetractableItemComponent> ent, ref BeforeTargetHandcuffedEvent args)
     {
         if (_actions.GetAction(ent.Comp.SummoningAction) is not { } action)
             return;
@@ -97,7 +95,7 @@ public sealed partial class RetractableItemActionSystem : EntitySystem
         if (_hands.GetActiveHand(action.Comp.AttachedEntity.Value) is not { })
             return;
 
-        RetractRetractableItem(action.Comp.AttachedEntity.Value, ent, action.Owner);
+        RetractRetractableItem(args.User, ent, action.Owner);
     }
 
     private void PopulateActionItem(Entity<RetractableItemActionComponent?> ent)
@@ -118,7 +116,7 @@ public sealed partial class RetractableItemActionSystem : EntitySystem
         Dirty(ent);
     }
 
-    private void RetractRetractableItem(EntityUid holder, EntityUid item, Entity<RetractableItemActionComponent?> action)
+    private void RetractRetractableItem(EntityUid user, EntityUid item, Entity<RetractableItemActionComponent?> action)
     {
         if (!Resolve(action, ref action.Comp, false))
             return;
@@ -126,7 +124,7 @@ public sealed partial class RetractableItemActionSystem : EntitySystem
         RemComp<UnremoveableComponent>(item);
         var container = _containers.GetContainer(action, RetractableItemActionComponent.ContainerId);
         _containers.Insert(item, container);
-        _audio.PlayPredicted(action.Comp.RetractSounds, holder, holder);
+        _audio.PlayPredicted(action.Comp.RetractSounds, user, user);
     }
 
     private void SummonRetractableItem(EntityUid holder, EntityUid item, string hand, Entity<RetractableItemActionComponent?> action)
diff --git a/Content.Shared/Revenant/EntitySystems/SharedRevenantOverloadedLightsSystem.cs b/Content.Shared/Revenant/EntitySystems/SharedRevenantOverloadedLightsSystem.cs
index 7fa2ef51e8..7f1c541ea7 100644
--- a/Content.Shared/Revenant/EntitySystems/SharedRevenantOverloadedLightsSystem.cs
+++ b/Content.Shared/Revenant/EntitySystems/SharedRevenantOverloadedLightsSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Revenant.Components;
+using Content.Shared.Revenant.Components;
 
 namespace Content.Shared.Revenant.EntitySystems;
 
diff --git a/Content.Shared/Robotics/RoboticsConsoleUi.cs b/Content.Shared/Robotics/RoboticsConsoleUi.cs
index 01ecb3f598..ecf273c646 100644
--- a/Content.Shared/Robotics/RoboticsConsoleUi.cs
+++ b/Content.Shared/Robotics/RoboticsConsoleUi.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Content.Shared.DeviceNetwork;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 using Robust.Shared.Utility;
@@ -136,12 +136,21 @@ public partial record struct CyborgControlData
     }
 }
 
-public static class RoboticsConsoleConstants
-{
-    // broadcast by cyborgs on Robotics Console frequency
-    public const string NET_CYBORG_DATA = "cyborg-data";
+/// <summary>
+/// Disables a borg when received.
+/// </summary>
+public partial record struct RoboticsCyborgDisablePayload : INetworkPayload;
 
-    // sent by robotics console to cyborgs on Cyborg Control frequency
-    public const string NET_DISABLE_COMMAND = "cyborg-disable";
-    public const string NET_DESTROY_COMMAND = "cyborg-destroy";
+/// <summary>
+/// Destroys a borg when received.
+/// </summary>
+public partial record struct RoboticsCyborgDestroyPayload : INetworkPayload;
+
+/// <summary>
+/// A wrapper for <see cref="CyborgControlData"/>
+/// </summary>
+public partial record struct RoboticsCyborgDataPayload : INetworkPayload
+{
+    [DataField]
+    public CyborgControlData Data;
 }
diff --git a/Content.Shared/Robotics/Systems/SharedRoboticsConsoleSystem.cs b/Content.Shared/Robotics/Systems/SharedRoboticsConsoleSystem.cs
index 25b3c5d07a..554dad46e9 100644
--- a/Content.Shared/Robotics/Systems/SharedRoboticsConsoleSystem.cs
+++ b/Content.Shared/Robotics/Systems/SharedRoboticsConsoleSystem.cs
@@ -3,6 +3,4 @@ namespace Content.Shared.Robotics.Systems;
 /// <summary>
 /// Does nothing, only exists for access right now.
 /// </summary>
-public abstract class SharedRoboticsConsoleSystem : EntitySystem
-{
-}
+public abstract class SharedRoboticsConsoleSystem : EntitySystem;
diff --git a/Content.Shared/Roles/Components/ChangelingRoleComponent.cs b/Content.Shared/Roles/Components/ChangelingRoleComponent.cs
index fb9bc05af3..50ba6876af 100644
--- a/Content.Shared/Roles/Components/ChangelingRoleComponent.cs
+++ b/Content.Shared/Roles/Components/ChangelingRoleComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Roles.Components;
 
diff --git a/Content.Shared/Roles/Components/GhostRoleMarkerRoleComponent.cs b/Content.Shared/Roles/Components/GhostRoleMarkerRoleComponent.cs
index 623f298474..33381fb879 100644
--- a/Content.Shared/Roles/Components/GhostRoleMarkerRoleComponent.cs
+++ b/Content.Shared/Roles/Components/GhostRoleMarkerRoleComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Roles.Components;
 
diff --git a/Content.Shared/Roles/Components/JobRoleComponent.cs b/Content.Shared/Roles/Components/JobRoleComponent.cs
index c62c0ea1f4..09ca5f2c18 100644
--- a/Content.Shared/Roles/Components/JobRoleComponent.cs
+++ b/Content.Shared/Roles/Components/JobRoleComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Roles.Components;
 
diff --git a/Content.Shared/Roles/Components/ObserverRoleComponent.cs b/Content.Shared/Roles/Components/ObserverRoleComponent.cs
index c7a451eac3..d7abd686a0 100644
--- a/Content.Shared/Roles/Components/ObserverRoleComponent.cs
+++ b/Content.Shared/Roles/Components/ObserverRoleComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Roles.Components;
 
diff --git a/Content.Shared/Roles/Components/RoleBriefingComponent.cs b/Content.Shared/Roles/Components/RoleBriefingComponent.cs
index 99eccf8a34..0dab6b6655 100644
--- a/Content.Shared/Roles/Components/RoleBriefingComponent.cs
+++ b/Content.Shared/Roles/Components/RoleBriefingComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Roles.Components;
 
diff --git a/Content.Shared/Roles/Components/SiliconBrainRoleComponent.cs b/Content.Shared/Roles/Components/SiliconBrainRoleComponent.cs
index d8eaebbe1f..872feab9ba 100644
--- a/Content.Shared/Roles/Components/SiliconBrainRoleComponent.cs
+++ b/Content.Shared/Roles/Components/SiliconBrainRoleComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Roles.Components;
 
diff --git a/Content.Shared/Roles/Components/SubvertedSiliconRoleComponent.cs b/Content.Shared/Roles/Components/SubvertedSiliconRoleComponent.cs
index 6b62f458ce..0f7e2881e5 100644
--- a/Content.Shared/Roles/Components/SubvertedSiliconRoleComponent.cs
+++ b/Content.Shared/Roles/Components/SubvertedSiliconRoleComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Roles.Components;
 
diff --git a/Content.Shared/Roles/Components/SurvivorRoleComponent.cs b/Content.Shared/Roles/Components/SurvivorRoleComponent.cs
index 1eee04d9e5..442e922aa3 100644
--- a/Content.Shared/Roles/Components/SurvivorRoleComponent.cs
+++ b/Content.Shared/Roles/Components/SurvivorRoleComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Roles.Components;
 
diff --git a/Content.Shared/Roles/Components/WizardRoleComponent.cs b/Content.Shared/Roles/Components/WizardRoleComponent.cs
index 0d24897216..45e6a1bab4 100644
--- a/Content.Shared/Roles/Components/WizardRoleComponent.cs
+++ b/Content.Shared/Roles/Components/WizardRoleComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Roles.Components;
 
diff --git a/Content.Shared/Roles/MindGetAllRoleInfoEvent.cs b/Content.Shared/Roles/MindGetAllRoleInfoEvent.cs
index a2f2820b5c..14c3d87ca2 100644
--- a/Content.Shared/Roles/MindGetAllRoleInfoEvent.cs
+++ b/Content.Shared/Roles/MindGetAllRoleInfoEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Players.PlayTimeTracking;
 
 namespace Content.Shared.Roles;
 
diff --git a/Content.Shared/Roles/RoleAddedEvent.cs b/Content.Shared/Roles/RoleAddedEvent.cs
index feb4d1bf1f..301c5b86b6 100644
--- a/Content.Shared/Roles/RoleAddedEvent.cs
+++ b/Content.Shared/Roles/RoleAddedEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mind;
+using Content.Shared.Mind;
 
 namespace Content.Shared.Roles;
 
diff --git a/Content.Shared/Roles/RoleEvent.cs b/Content.Shared/Roles/RoleEvent.cs
index 80dd33e1c7..eb6b325a9f 100644
--- a/Content.Shared/Roles/RoleEvent.cs
+++ b/Content.Shared/Roles/RoleEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mind;
+using Content.Shared.Mind;
 
 namespace Content.Shared.Roles;
 
diff --git a/Content.Shared/Roles/RoleRemovedEvent.cs b/Content.Shared/Roles/RoleRemovedEvent.cs
index 41a7f7bcc3..5b212c9a6d 100644
--- a/Content.Shared/Roles/RoleRemovedEvent.cs
+++ b/Content.Shared/Roles/RoleRemovedEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mind;
+using Content.Shared.Mind;
 
 namespace Content.Shared.Roles;
 
diff --git a/Content.Shared/Roles/SharedRoleSystem.cs b/Content.Shared/Roles/SharedRoleSystem.cs
index a7d8e18c28..f82257b2d1 100644
--- a/Content.Shared/Roles/SharedRoleSystem.cs
+++ b/Content.Shared/Roles/SharedRoleSystem.cs
@@ -775,7 +775,45 @@ public abstract partial class SharedRoleSystem : EntitySystem
 /// Raised on the client to update Role Type on the character window, in case it happened to be open.
 /// </summary>
 [Serializable, NetSerializable]
-public sealed class MindRoleTypeChangedEvent : EntityEventArgs
-{
+public sealed class MindRoleTypeChangedEvent : EntityEventArgs;
 
+/// <summary>
+/// Event raised on the mind to get its briefing.
+/// Handlers can either replace or append to the briefing, whichever is more appropriate.
+/// </summary>
+[ByRefEvent]
+public record struct GetBriefingEvent
+{
+    /// <summary>
+    /// The text that will be shown on the Character Screen
+    /// </summary>
+    public string? Briefing;
+
+    /// <summary>
+    /// The Mind to whose Mind Role Entities the briefing is sent to
+    /// </summary>
+    public Entity<MindComponent> Mind;
+
+    public GetBriefingEvent() { }
+
+    public GetBriefingEvent(string? briefing)
+    {
+        Briefing = briefing;
+    }
+
+    /// <summary>
+    /// If there is no briefing, sets it to the string.
+    /// If there is a briefing, adds a new line to separate it from the appended string.
+    /// </summary>
+    public void Append(string text)
+    {
+        if (Briefing == null)
+        {
+            Briefing = text;
+        }
+        else
+        {
+            Briefing += "\n" + text;
+        }
+    }
 }
diff --git a/Content.Shared/Rootable/RootableComponent.cs b/Content.Shared/Rootable/RootableComponent.cs
index 94f8dbcea9..657483d0f6 100644
--- a/Content.Shared/Rootable/RootableComponent.cs
+++ b/Content.Shared/Rootable/RootableComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Alert;
+using Content.Shared.Alert;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
diff --git a/Content.Shared/Rootable/RootableSystem.cs b/Content.Shared/Rootable/RootableSystem.cs
index 62c52ef13f..792b1e5c53 100644
--- a/Content.Shared/Rootable/RootableSystem.cs
+++ b/Content.Shared/Rootable/RootableSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using Content.Shared.Actions.Components;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Alert;
diff --git a/Content.Shared/RoundEnd/RoundEndBehavior.cs b/Content.Shared/RoundEnd/RoundEndBehavior.cs
new file mode 100644
index 0000000000..449c79fb8a
--- /dev/null
+++ b/Content.Shared/RoundEnd/RoundEndBehavior.cs
@@ -0,0 +1,19 @@
+namespace Content.Shared.RoundEnd;
+
+public enum RoundEndBehavior : byte
+{
+    /// <summary>
+    /// Instantly end round
+    /// </summary>
+    InstantEnd,
+
+    /// <summary>
+    /// Call shuttle with custom announcement
+    /// </summary>
+    ShuttleCall,
+
+    /// <summary>
+    /// Do nothing
+    /// </summary>
+    Nothing
+}
diff --git a/Content.Shared/RoundEnd/ScreenShuttlePayload.cs b/Content.Shared/RoundEnd/ScreenShuttlePayload.cs
new file mode 100644
index 0000000000..cfcb8bde92
--- /dev/null
+++ b/Content.Shared/RoundEnd/ScreenShuttlePayload.cs
@@ -0,0 +1,36 @@
+using Content.Shared.DeviceNetwork;
+
+namespace Content.Shared.RoundEnd;
+
+/// <summary>
+/// A network payload to broadcast data to shuttle screens.
+/// </summary>
+public partial record struct ScreenShuttlePayload : INetworkPayload
+{
+    [DataField]
+    public EntityUid? Shuttle;
+
+    [DataField]
+    public EntityUid? SourceMap;
+
+    [DataField]
+    public EntityUid? DestinationMap;
+
+    [DataField]
+    public TimeSpan ShuttleTime;
+
+    [DataField]
+    public TimeSpan SourceTime;
+
+    [DataField]
+    public TimeSpan DestinationTime;
+
+    [DataField]
+    public bool Docked;
+
+    [DataField]
+    public string? OverrideText;
+
+    [DataField]
+    public Color? OverrideColor;
+}
diff --git a/Content.Shared/Rounding/ContentHelpers.cs b/Content.Shared/Rounding/ContentHelpers.cs
index 9ecee22998..493b409298 100644
--- a/Content.Shared/Rounding/ContentHelpers.cs
+++ b/Content.Shared/Rounding/ContentHelpers.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Rounding
+namespace Content.Shared.Rounding
 {
     public static class ContentHelpers
     {
diff --git a/Content.Shared/SMES/SharedSmesComponent.cs b/Content.Shared/SMES/SharedSmesComponent.cs
index 3fe9dd8f5f..85f5897bc2 100644
--- a/Content.Shared/SMES/SharedSmesComponent.cs
+++ b/Content.Shared/SMES/SharedSmesComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.SMES;
 
diff --git a/Content.Shared/Salvage/Expeditions/ExpeditionStage.cs b/Content.Shared/Salvage/Expeditions/ExpeditionStage.cs
index a92d6c292a..ea985238df 100644
--- a/Content.Shared/Salvage/Expeditions/ExpeditionStage.cs
+++ b/Content.Shared/Salvage/Expeditions/ExpeditionStage.cs
@@ -7,4 +7,4 @@ public enum ExpeditionStage : byte
     Countdown,
     MusicCountdown,
     FinalCountdown,
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Salvage/Magnet/ISalvageMagnetOffering.cs b/Content.Shared/Salvage/Magnet/ISalvageMagnetOffering.cs
index 7d002fe679..551f7e0eb5 100644
--- a/Content.Shared/Salvage/Magnet/ISalvageMagnetOffering.cs
+++ b/Content.Shared/Salvage/Magnet/ISalvageMagnetOffering.cs
@@ -3,4 +3,4 @@ namespace Content.Shared.Salvage.Magnet;
 public interface ISalvageMagnetOffering
 {
 
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Screens/ScreenTextPayload.cs b/Content.Shared/Screens/ScreenTextPayload.cs
new file mode 100644
index 0000000000..5a8560b6f1
--- /dev/null
+++ b/Content.Shared/Screens/ScreenTextPayload.cs
@@ -0,0 +1,12 @@
+using Content.Shared.DeviceNetwork;
+
+namespace Content.Shared.Screens;
+
+/// <summary>
+/// Broadcasts text to screens.
+/// </summary>
+public partial record struct ScreenTextPayload : INetworkPayload
+{
+    [DataField]
+    public string? Text;
+}
diff --git a/Content.Shared/Security/SecurityStatus.cs b/Content.Shared/Security/SecurityStatus.cs
index afcbd00fd4..00fe5bd39b 100644
--- a/Content.Shared/Security/SecurityStatus.cs
+++ b/Content.Shared/Security/SecurityStatus.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Security;
 
diff --git a/Content.Shared/Security/Systems/DeployableBarrierSystem.cs b/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
index f82d791f6d..806be6d268 100644
--- a/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
+++ b/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Lock;
+using Content.Shared.Lock;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Pulling.Systems;
 using Content.Shared.Security.Components;
diff --git a/Content.Shared/SensorMonitoring/BatterySensorPayloads.cs b/Content.Shared/SensorMonitoring/BatterySensorPayloads.cs
new file mode 100644
index 0000000000..2fdbcd242a
--- /dev/null
+++ b/Content.Shared/SensorMonitoring/BatterySensorPayloads.cs
@@ -0,0 +1,36 @@
+using Content.Shared.DeviceNetwork;
+
+namespace Content.Shared.SensorMonitoring;
+
+/// <summary>
+/// Data about a battery sent to the power monitoring console.
+/// </summary>
+public partial record struct BatterySensorDataPayload : INetworkPayload
+{
+    [DataField]
+    public BatterySensorData Data;
+}
+
+/// <summary>
+/// A request for <see cref="BatterySensorDataPayload"/>.
+/// </summary>
+public partial record struct BatterySensorSyncPayload : INetworkPayload;
+
+/// <summary>
+/// Device network data sent by a <see cref="BatterySensorComponent"/>.
+/// </summary>
+/// <param name="Charge">The current energy charge of the battery, in joules (J).</param>
+/// <param name="MaxCharge">The maximum energy capacity of the battery, in joules (J).</param>
+/// <param name="Receiving">The current amount of power being received by the battery, in watts (W).</param>
+/// <param name="MaxReceiving">The maximum amount of power that can be received by the battery, in watts (W).</param>
+/// <param name="Supplying">The current amount of power being supplied by the battery, in watts (W).</param>
+/// <param name="MaxSupplying">The maximum amount of power that can be received by the battery, in watts (W).</param>
+[DataRecord]
+public partial record struct BatterySensorData(
+    float Charge,
+    float MaxCharge,
+    float Receiving,
+    float MaxReceiving,
+    float Supplying,
+    float MaxSupplying
+);
diff --git a/Content.Shared/SensorMonitoring/SharedSensorMonitoringConsoleComponent.cs b/Content.Shared/SensorMonitoring/SharedSensorMonitoringConsoleComponent.cs
index 472697d974..d578117c8e 100644
--- a/Content.Shared/SensorMonitoring/SharedSensorMonitoringConsoleComponent.cs
+++ b/Content.Shared/SensorMonitoring/SharedSensorMonitoringConsoleComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 using ConsoleUIState = Content.Shared.SensorMonitoring.SensorMonitoringConsoleBoundInterfaceState;
 
 namespace Content.Shared.SensorMonitoring;
diff --git a/Content.Shared/SharedArrayExtension.cs b/Content.Shared/SharedArrayExtension.cs
index dd02e3784e..181c0d62a2 100644
--- a/Content.Shared/SharedArrayExtension.cs
+++ b/Content.Shared/SharedArrayExtension.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Random;
+using Robust.Shared.Random;
 
 namespace Content.Shared;
 
diff --git a/Content.Server/Shuttles/Components/ArrivalsBlacklistComponent.cs b/Content.Shared/Shuttles/Components/ArrivalsBlacklistComponent.cs
similarity index 79%
rename from Content.Server/Shuttles/Components/ArrivalsBlacklistComponent.cs
rename to Content.Shared/Shuttles/Components/ArrivalsBlacklistComponent.cs
index 1d5b88d482..d2b298e05e 100644
--- a/Content.Server/Shuttles/Components/ArrivalsBlacklistComponent.cs
+++ b/Content.Shared/Shuttles/Components/ArrivalsBlacklistComponent.cs
@@ -1,9 +1,7 @@
-namespace Content.Server.Shuttles.Components;
+namespace Content.Shared.Shuttles.Components;
 
 /// <summary>
 /// This is used for blacklisting entities from being on the arrivals shuttle when it goes FTL.
 /// </summary>
 [RegisterComponent]
-public sealed partial class ArrivalsBlacklistComponent : Component
-{
-}
+public sealed partial class ArrivalsBlacklistComponent : Component;
diff --git a/Content.Server/Shuttles/Components/ArrivalsShuttleComponent.cs b/Content.Shared/Shuttles/Components/ArrivalsShuttleComponent.cs
similarity index 89%
rename from Content.Server/Shuttles/Components/ArrivalsShuttleComponent.cs
rename to Content.Shared/Shuttles/Components/ArrivalsShuttleComponent.cs
index b9ff375507..bb9a74e188 100644
--- a/Content.Server/Shuttles/Components/ArrivalsShuttleComponent.cs
+++ b/Content.Shared/Shuttles/Components/ArrivalsShuttleComponent.cs
@@ -1,7 +1,7 @@
-using Content.Server.Shuttles.Systems;
+using Content.Shared.Shuttles.Systems;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.Shuttles.Components;
+namespace Content.Shared.Shuttles.Components;
 
 [RegisterComponent, Access(typeof(ArrivalsSystem)), AutoGenerateComponentPause]
 public sealed partial class ArrivalsShuttleComponent : Component
diff --git a/Content.Server/Shuttles/Components/ArrivalsSourceComponent.cs b/Content.Shared/Shuttles/Components/ArrivalsSourceComponent.cs
similarity index 51%
rename from Content.Server/Shuttles/Components/ArrivalsSourceComponent.cs
rename to Content.Shared/Shuttles/Components/ArrivalsSourceComponent.cs
index c7ed634b28..ab526db216 100644
--- a/Content.Server/Shuttles/Components/ArrivalsSourceComponent.cs
+++ b/Content.Shared/Shuttles/Components/ArrivalsSourceComponent.cs
@@ -1,12 +1,9 @@
-using Content.Server.Shuttles.Systems;
+using Content.Shared.Shuttles.Systems;
 
-namespace Content.Server.Shuttles.Components;
+namespace Content.Shared.Shuttles.Components;
 
 /// <summary>
 /// Added to a designated arrivals station for players to spawn at, if enabled.
 /// </summary>
 [RegisterComponent, Access(typeof(ArrivalsSystem))]
-public sealed partial class ArrivalsSourceComponent : Component
-{
-
-}
+public sealed partial class ArrivalsSourceComponent : Component;
diff --git a/Content.Server/Shuttles/Components/EmergencyShuttleComponent.cs b/Content.Shared/Shuttles/Components/EmergencyShuttleComponent.cs
similarity index 72%
rename from Content.Server/Shuttles/Components/EmergencyShuttleComponent.cs
rename to Content.Shared/Shuttles/Components/EmergencyShuttleComponent.cs
index aa3d2fbb7f..1dc0fe095d 100644
--- a/Content.Server/Shuttles/Components/EmergencyShuttleComponent.cs
+++ b/Content.Shared/Shuttles/Components/EmergencyShuttleComponent.cs
@@ -1,13 +1,8 @@
-using Content.Server.Shuttles.Systems;
-
-namespace Content.Server.Shuttles.Components;
+namespace Content.Shared.Shuttles.Components;
 
 /// <summary>
 /// Added to station emergency shuttles by <see cref="EmergencyShuttleSystem.AddEmergencyShuttle"/>,
 /// for FTL event handlers
 /// </summary>
 [RegisterComponent]
-public sealed partial class EmergencyShuttleComponent : Component
-{
-
-}
+public sealed partial class EmergencyShuttleComponent : Component;
diff --git a/Content.Server/Shuttles/Components/PendingClockInComponent.cs b/Content.Shared/Shuttles/Components/PendingClockInComponent.cs
similarity index 51%
rename from Content.Server/Shuttles/Components/PendingClockInComponent.cs
rename to Content.Shared/Shuttles/Components/PendingClockInComponent.cs
index 62cd1e8548..50dbfa8c2a 100644
--- a/Content.Server/Shuttles/Components/PendingClockInComponent.cs
+++ b/Content.Shared/Shuttles/Components/PendingClockInComponent.cs
@@ -1,10 +1,7 @@
-namespace Content.Server.Shuttles.Components;
+namespace Content.Shared.Shuttles.Components;
 
 /// <summary>
 /// Added to arrivals latejoins until they have arrived at the station.
 /// </summary>
 [RegisterComponent]
-public sealed partial class PendingClockInComponent : Component
-{
-
-}
+public sealed partial class PendingClockInComponent : Component;
diff --git a/Content.Shared/Shuttles/Components/ShuttleComponent.cs b/Content.Shared/Shuttles/Components/ShuttleComponent.cs
new file mode 100644
index 0000000000..3d128bf505
--- /dev/null
+++ b/Content.Shared/Shuttles/Components/ShuttleComponent.cs
@@ -0,0 +1,81 @@
+using System.Numerics;
+
+namespace Content.Shared.Shuttles.Components;
+
+[RegisterComponent]
+public sealed partial class ShuttleComponent : Component
+{
+    [ViewVariables]
+    public bool Enabled = true;
+
+    [ViewVariables]
+    public Vector2[] CenterOfThrust = new Vector2[4];
+
+    /// <summary>
+    /// Thrust gets multiplied by this value if it's for braking.
+    /// </summary>
+    [DataField]
+    public const float BrakeCoefficient = 1.5f;
+
+    /// <summary>
+    /// Maximum velocity.
+    /// </summary>
+    [DataField]
+    public float BaseMaxLinearVelocity = 60f;
+
+    [DataField]
+    public const float MaxAngularVelocity = 4f;
+
+    /// <summary>
+    /// The cached thrust available for each cardinal direction
+    /// </summary>
+    [ViewVariables]
+    public readonly float[] LinearThrust = new float[4];
+
+    /// <summary>
+    /// The thrusters contributing to each direction for impulse.
+    /// </summary>
+    // No touchy
+    public readonly List<EntityUid>[] LinearThrusters = new List<EntityUid>[]
+    {
+        new(),
+        new(),
+        new(),
+        new(),
+    };
+
+    /// <summary>
+    /// The thrusters contributing to the angular impulse of the shuttle.
+    /// </summary>
+    public readonly List<EntityUid> AngularThrusters = new();
+
+    [ViewVariables]
+    public float AngularThrust = 0f;
+
+    /// <summary>
+    /// A bitmask of all the directions we are considered thrusting.
+    /// </summary>
+    [ViewVariables]
+    public DirectionFlag ThrustDirections = DirectionFlag.None;
+
+    /// <summary>
+    /// Base damping modifier applied to the shuttle's physics component when not in FTL.
+    /// </summary>
+    [DataField]
+    public float BodyModifier = 0.25f;
+
+    /// <summary>
+    /// Final Damping Modifier for a shuttle.
+    /// This value is set to 0 during FTL. And to BodyModifier when not in FTL.
+    /// </summary>
+    [DataField]
+    public float DampingModifier;
+
+    /// <summary>
+    /// Optional override for the FTL cooldown for this shuttle.
+    /// If not null, then the value will be used instead of the shuttle.cooldown CCVar.
+    /// </summary>
+    [DataField]
+    public TimeSpan? FTLCooldownOverride = null;
+}
+
diff --git a/Content.Server/Shuttles/Components/StationArrivalsComponent.cs b/Content.Shared/Shuttles/Components/StationArrivalsComponent.cs
similarity index 82%
rename from Content.Server/Shuttles/Components/StationArrivalsComponent.cs
rename to Content.Shared/Shuttles/Components/StationArrivalsComponent.cs
index 1d469f9bff..6a5a6e1508 100644
--- a/Content.Server/Shuttles/Components/StationArrivalsComponent.cs
+++ b/Content.Shared/Shuttles/Components/StationArrivalsComponent.cs
@@ -1,7 +1,7 @@
-using Content.Server.Shuttles.Systems;
+using Content.Shared.Shuttles.Systems;
 using Robust.Shared.Utility;
 
-namespace Content.Server.Shuttles.Components;
+namespace Content.Shared.Shuttles.Components;
 
 /// <summary>
 /// Added to a station that is available for arrivals shuttles.
diff --git a/Content.Shared/Shuttles/Systems/ArrivalsSystem.cs b/Content.Shared/Shuttles/Systems/ArrivalsSystem.cs
new file mode 100644
index 0000000000..3bd1d2baed
--- /dev/null
+++ b/Content.Shared/Shuttles/Systems/ArrivalsSystem.cs
@@ -0,0 +1,152 @@
+using Content.Shared.CCVar;
+using Content.Shared.Damage.Components;
+using Content.Shared.GameTicking;
+using Content.Shared.Movement.Components;
+using Content.Shared.Shuttles.Components;
+using Content.Shared.Spawners.Components;
+using Content.Shared.Spawners.EntitySystems;
+using Content.Shared.Station.Systems;
+using JetBrains.Annotations;
+using Robust.Shared.Configuration;
+using Robust.Shared.Map;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+namespace Content.Shared.Shuttles.Systems;
+
+/// <summary>
+/// Handles the arrivals shuttle spawning system, and the arrivals shuttle.
+/// </summary>
+public abstract partial class ArrivalsSystem : EntitySystem
+{
+    [Dependency] protected IConfigurationManager Cfg = default!;
+    [Dependency] protected IGameTiming Timing = default!;
+    [Dependency] protected IRobustRandom Random = default!;
+    [Dependency] protected GameTicker Ticker = default!;
+    [Dependency] private StationSpawningSystem _stationSpawning = default!;
+
+    /// <summary>
+    /// If enabled then spawns players on an alternate map so they can take a shuttle to the station.
+    /// </summary>
+    public bool Enabled { get; protected set; }
+
+    /// <summary>
+    /// Flags if all players spawning at the departure terminal have godmode until they leave the terminal.
+    /// </summary>
+    public bool ArrivalsGodmode { get; private set; }
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ArrivalsShuttleComponent, ComponentStartup>(OnShuttleStartup);
+
+        // Don't invoke immediately as it will get set in the natural course of things.
+        Enabled = Cfg.GetCVar(CCVars.ArrivalsShuttles);
+        ArrivalsGodmode = Cfg.GetCVar(CCVars.GodmodeArrivals);
+
+        Cfg.OnValueChanged(CCVars.GodmodeArrivals, b => ArrivalsGodmode = b);
+    }
+
+    [SubscribeLocalEvent(before: new []{typeof(SpawnPointSystem)}, after: new []{typeof(ContainerSpawnPointSystem)})]
+    public void HandlePlayerSpawning(PlayerSpawningEvent ev)
+    {
+        if (ev.SpawnResult != null)
+            return;
+
+        // We use arrivals as the default spawn so don't check for job prio.
+
+        // Only works on latejoin even if enabled.
+        if (!Enabled || Ticker.RunLevel != GameRunLevel.InRound)
+            return;
+
+        if (!HasComp<StationArrivalsComponent>(ev.Station))
+            return;
+
+        TryGetArrivals(out var arrivals);
+
+        if (!TryComp(arrivals, out TransformComponent? arrivalsXform))
+            return;
+
+        var mapId = arrivalsXform.MapID;
+
+        var points = EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
+        var possiblePositions = new List<EntityCoordinates>();
+        while (points.MoveNext(out _, out var spawnPoint, out var xform))
+        {
+            if (spawnPoint.SpawnType != SpawnPointType.LateJoin || xform.MapID != mapId)
+                continue;
+
+            possiblePositions.Add(xform.Coordinates);
+        }
+
+        if (possiblePositions.Count <= 0)
+            return;
+
+        var spawnLoc = Random.Pick(possiblePositions);
+        ev.SpawnResult = _stationSpawning.SpawnPlayerMob(
+            spawnLoc,
+            ev.Job,
+            ev.HumanoidCharacterProfile,
+            ev.Station);
+
+        EnsureComp<PendingClockInComponent>(ev.SpawnResult.Value);
+        EnsureComp<AutoOrientComponent>(ev.SpawnResult.Value);
+
+        // If you're forced to spawn, you're invincible until you leave wherever you were forced to spawn.
+        if (ArrivalsGodmode)
+            EnsureComp<GodmodeComponent>(ev.SpawnResult.Value);
+    }
+
+    private void OnShuttleStartup(EntityUid uid, ArrivalsShuttleComponent component, ComponentStartup args)
+    {
+        EnsureComp<PreventPilotComponent>(uid);
+    }
+
+    [PublicAPI]
+    public bool TryGetArrivals(out EntityUid uid)
+    {
+        var arrivalsQuery = EntityQueryEnumerator<ArrivalsSourceComponent>();
+
+        while (arrivalsQuery.MoveNext(out uid, out _))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Check if an entity is on the arrivals grid.
+    /// </summary>
+    /// <param name="entity">Entity to check.</param>
+    /// <returns>True if the entity is on the arrivals grid. Returns false if not on arrivals, or there is no arrivals grid.</returns>
+    [PublicAPI]
+    public bool IsOnArrivals(Entity<TransformComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return false;
+
+        if (!TryGetArrivals(out var arrivals))
+            return false;
+
+        var arrivalsGridUid = Transform(arrivals).GridUid;
+        if (!arrivalsGridUid.HasValue)
+            return false;
+
+        return entity.Comp.GridUid == Transform(arrivals).GridUid;
+    }
+
+    public TimeSpan? NextShuttleArrival()
+    {
+        var query = EntityQueryEnumerator<ArrivalsShuttleComponent>();
+        var time = TimeSpan.MaxValue;
+        while (query.MoveNext(out _, out var comp))
+        {
+            if (comp.NextArrivalsTime < time)
+                time = comp.NextArrivalsTime;
+        }
+
+        var duration = Timing.CurTime;
+        return (time < duration) ? null : time - duration;
+    }
+}
diff --git a/Content.Shared/Shuttles/Systems/SharedEmergencyShuttleSystem.cs b/Content.Shared/Shuttles/Systems/SharedEmergencyShuttleSystem.cs
index 794f4d8ae3..5fbbd30d51 100644
--- a/Content.Shared/Shuttles/Systems/SharedEmergencyShuttleSystem.cs
+++ b/Content.Shared/Shuttles/Systems/SharedEmergencyShuttleSystem.cs
@@ -13,6 +13,11 @@ public abstract partial class SharedEmergencyShuttleSystem : EntitySystem
 
     private bool _emergencyEarlyLaunchAllowed;
 
+    /// <summary>
+    /// Has the emergency shuttle arrived?
+    /// </summary>
+    public bool EmergencyShuttleArrived { get; protected set; }
+
     public override void Initialize()
     {
         base.Initialize();
@@ -33,4 +38,13 @@ public abstract partial class SharedEmergencyShuttleSystem : EntitySystem
         if (!args.Silent)
             Popup.PopupEntity(Loc.GetString("emergency-shuttle-console-no-early-launches"), ent, args.User);
     }
+
+    /// <summary>
+    ///     Attempts to get the EntityUid of the emergency shuttle
+    /// </summary>
+    public EntityUid? GetShuttle()
+    {
+        AllEntityQuery<EmergencyShuttleComponent>().MoveNext(out var shuttle, out _);
+        return shuttle;
+    }
 }
diff --git a/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs b/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs
index 221cf9992f..ec5ab60a33 100644
--- a/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs
+++ b/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Interaction.Components;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Inventory;
 using Content.Shared.Radio;
 using Content.Shared.Silicons.Borgs.Components;
diff --git a/Content.Shared/Silicons/Borgs/BorgUI.cs b/Content.Shared/Silicons/Borgs/BorgUI.cs
index 9d843d4046..0b9db6da94 100644
--- a/Content.Shared/Silicons/Borgs/BorgUI.cs
+++ b/Content.Shared/Silicons/Borgs/BorgUI.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Silicons.Borgs;
 
diff --git a/Content.Shared/Silicons/Borgs/Components/BorgBrainComponent.cs b/Content.Shared/Silicons/Borgs/Components/BorgBrainComponent.cs
index adbd57cab7..6f33b44442 100644
--- a/Content.Shared/Silicons/Borgs/Components/BorgBrainComponent.cs
+++ b/Content.Shared/Silicons/Borgs/Components/BorgBrainComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Silicons.Borgs.Components;
 
diff --git a/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs b/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
index d7b90a1ac2..d97816916d 100644
--- a/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
+++ b/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Alert;
+using Content.Shared.Alert;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
diff --git a/Content.Shared/Silicons/Borgs/Components/BorgModuleComponent.cs b/Content.Shared/Silicons/Borgs/Components/BorgModuleComponent.cs
index f826bd0ad1..8fb9d1774a 100644
--- a/Content.Shared/Silicons/Borgs/Components/BorgModuleComponent.cs
+++ b/Content.Shared/Silicons/Borgs/Components/BorgModuleComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Silicons.Borgs.Components;
 
diff --git a/Content.Shared/Silicons/Borgs/Components/BorgModuleIconComponent.cs b/Content.Shared/Silicons/Borgs/Components/BorgModuleIconComponent.cs
index ff38a40f48..a82e0c6cdc 100644
--- a/Content.Shared/Silicons/Borgs/Components/BorgModuleIconComponent.cs
+++ b/Content.Shared/Silicons/Borgs/Components/BorgModuleIconComponent.cs
@@ -1,4 +1,4 @@
-//using Robust.Shared.GameObjects;
+//using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
 using Robust.Shared.Utility;
 
@@ -17,4 +17,4 @@ public sealed partial class BorgModuleIconComponent : Component
     [DataField]
     public SpriteSpecifier.Rsi Icon = default!;
 
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Silicons/Borgs/Components/BorgSwitchableTypeComponent.cs b/Content.Shared/Silicons/Borgs/Components/BorgSwitchableTypeComponent.cs
index 9a783d19aa..a6aa2f5df9 100644
--- a/Content.Shared/Silicons/Borgs/Components/BorgSwitchableTypeComponent.cs
+++ b/Content.Shared/Silicons/Borgs/Components/BorgSwitchableTypeComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using Content.Shared.Radio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Silicons/Borgs/Components/ComponentBorgModuleComponent.cs b/Content.Shared/Silicons/Borgs/Components/ComponentBorgModuleComponent.cs
index 856211a596..a1b002c27a 100644
--- a/Content.Shared/Silicons/Borgs/Components/ComponentBorgModuleComponent.cs
+++ b/Content.Shared/Silicons/Borgs/Components/ComponentBorgModuleComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Silicons.Borgs.Components;
diff --git a/Content.Shared/Silicons/Borgs/Components/MMIComponent.cs b/Content.Shared/Silicons/Borgs/Components/MMIComponent.cs
index 51031c930e..45f1ec63e0 100644
--- a/Content.Shared/Silicons/Borgs/Components/MMIComponent.cs
+++ b/Content.Shared/Silicons/Borgs/Components/MMIComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Containers.ItemSlots;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
@@ -29,31 +29,68 @@ public sealed partial class MMIComponent : Component
     /// The sprite state when the brain inserted has a mind.
     /// </summary>
     [DataField]
-    public string HasMindState = "mmi_alive";
+    public string HasMindState = "mmi_on";
 
     /// <summary>
     /// The sprite state when the brain inserted doesn't have a mind.
     /// </summary>
     [DataField]
-    public string NoMindState = "mmi_dead";
+    public string NoMindState = "mmi_on";
 
     /// <summary>
     /// The sprite state when there is no brain inserted.
     /// </summary>
     [DataField]
     public string NoBrainState = "mmi_off";
+
+    /// <summary>
+    /// The color of the <see cref="MMIVisualLayers.Unlit"/> layer when the brain inserted has a mind.
+    /// </summary>
+    [DataField]
+    public Color HasMindLightColor = Color.FromHex("#0094ff");
+
+    /// <summary>
+    /// The color of the <see cref="MMIVisualLayers.Unlit"/> layer when the brain inserted doesn't have a mind.
+    /// </summary>
+    [DataField]
+    public Color NoMindLightColor = Color.FromHex("#ff3033");
 }
 
+/// <summary>
+/// AppearanceData keys for the MMI.
+/// </summary>
 [Serializable, NetSerializable]
 public enum MMIVisuals : byte
 {
+    /// <summary>
+    /// bool: Whether or not there is a brain in the MMI.
+    /// </summary>
     BrainPresent,
+
+    /// <summary>
+    /// bool: Whether or not there is an active mind (a player) in the MMI.
+    /// </summary>
     HasMind
 }
 
+/// <summary>
+/// Sprite map keys for MMI visuals.
+/// </summary>
 [Serializable, NetSerializable]
 public enum MMIVisualLayers : byte
 {
+    /// <summary>
+    /// The layer of the brain.
+    /// </summary>
     Brain,
-    Base
+
+    /// <summary>
+    /// The layer of the housing.
+    /// </summary>
+    Base,
+
+    /// <summary>
+    /// The optional layer of an indicator light.
+    /// </summary>
+    Unlit,
 }
diff --git a/Content.Shared/Silicons/Borgs/Components/SelectableBorgModuleComponent.cs b/Content.Shared/Silicons/Borgs/Components/SelectableBorgModuleComponent.cs
index 69e58caa28..24d23da553 100644
--- a/Content.Shared/Silicons/Borgs/Components/SelectableBorgModuleComponent.cs
+++ b/Content.Shared/Silicons/Borgs/Components/SelectableBorgModuleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.Relay.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.Relay.cs
index c88432fe0f..36e0b3dd17 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.Relay.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.Relay.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage;
+using Content.Shared.Damage;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Silicons.Borgs.Components;
 
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.Ui.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.Ui.cs
index e5e8fa8cd8..996a775671 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.Ui.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.Ui.cs
@@ -1,4 +1,4 @@
-using Content.Shared.CCVar;
+using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.PowerCell.Components;
 using Content.Shared.Silicons.Borgs.Components;
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
index d0e4f2fd91..223b0645c7 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Events;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
+using Content.Shared.DeviceNetwork.Systems;
 using Content.Shared.Gibbing;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.IdentityManagement;
diff --git a/Content.Shared/Silicons/Bots/HugBotComponent.cs b/Content.Shared/Silicons/Bots/HugBotComponent.cs
index 64281b6316..c357ab1674 100644
--- a/Content.Shared/Silicons/Bots/HugBotComponent.cs
+++ b/Content.Shared/Silicons/Bots/HugBotComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Silicons.Bots;
+namespace Content.Shared.Silicons.Bots;
 
 /// <summary>
 /// This component describes how a HugBot hugs.
diff --git a/Content.Shared/Silicons/Bots/SharedHugBotSystem.cs b/Content.Shared/Silicons/Bots/SharedHugBotSystem.cs
index 30937d0e64..bc0e00070f 100644
--- a/Content.Shared/Silicons/Bots/SharedHugBotSystem.cs
+++ b/Content.Shared/Silicons/Bots/SharedHugBotSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Emag.Systems;
+using Content.Shared.Emag.Systems;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Silicons.Bots;
diff --git a/Content.Shared/Silicons/Laws/Components/SiliconLawProviderComponent.cs b/Content.Shared/Silicons/Laws/Components/SiliconLawProviderComponent.cs
index d78e539aa9..a12c727ac7 100644
--- a/Content.Shared/Silicons/Laws/Components/SiliconLawProviderComponent.cs
+++ b/Content.Shared/Silicons/Laws/Components/SiliconLawProviderComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Audio;
 
 namespace Content.Shared.Silicons.Laws.Components;
diff --git a/Content.Shared/Silicons/Laws/IonLawPrototype.cs b/Content.Shared/Silicons/Laws/IonLawPrototype.cs
index 87586f45df..bf03de6b9a 100644
--- a/Content.Shared/Silicons/Laws/IonLawPrototype.cs
+++ b/Content.Shared/Silicons/Laws/IonLawPrototype.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Dataset;
+using Content.Shared.Dataset;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Silicons.Laws;
diff --git a/Content.Shared/Silicons/Laws/SiliconLawEditEuiState.cs b/Content.Shared/Silicons/Laws/SiliconLawEditEuiState.cs
index b5b3583715..b17776e551 100644
--- a/Content.Shared/Silicons/Laws/SiliconLawEditEuiState.cs
+++ b/Content.Shared/Silicons/Laws/SiliconLawEditEuiState.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Eui;
+using Content.Shared.Eui;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Silicons.Laws;
diff --git a/Content.Shared/Silicons/Laws/SiliconLawPrototype.cs b/Content.Shared/Silicons/Laws/SiliconLawPrototype.cs
index 7b19205f47..e539741411 100644
--- a/Content.Shared/Silicons/Laws/SiliconLawPrototype.cs
+++ b/Content.Shared/Silicons/Laws/SiliconLawPrototype.cs
@@ -1,4 +1,4 @@
-using Content.Shared.FixedPoint;
+using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Silicons/Laws/SiliconLawsetPrototype.cs b/Content.Shared/Silicons/Laws/SiliconLawsetPrototype.cs
index 2bf5ecba1a..3a20ec1ea7 100644
--- a/Content.Shared/Silicons/Laws/SiliconLawsetPrototype.cs
+++ b/Content.Shared/Silicons/Laws/SiliconLawsetPrototype.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Silicons.Laws;
diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs
index 13ec05762a..4c8859cfba 100644
--- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs
+++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs
@@ -9,6 +9,7 @@ using System.Diagnostics.CodeAnalysis;
 
 namespace Content.Shared.Silicons.StationAi;
 
+// Interaction handlers between the AI's held entity (its player-controlled entity within the frame) and the world.
 public abstract partial class SharedStationAiSystem
 {
     /*
@@ -115,7 +116,7 @@ public abstract partial class SharedStationAiSystem
             return;
 
         ev.Event.User = ev.Actor;
-        RaiseLocalEvent(target.Value, (object) ev.Event);
+        RaiseLocalEvent(target.Value, (object)ev.Event);
     }
 
     private void OnMessageAttempt(Entity<StationAiWhitelistComponent> ent, ref BoundUserInterfaceMessageAttempt ev)
@@ -220,11 +221,25 @@ public sealed class StationAiRadialMessage : BoundUserInterfaceMessage
 /// </summary>
 public sealed class StationAiRadial : BaseStationAiAction
 {
+    /// <summary>
+    /// The sprite to use as the icon for this menu item.
+    /// </summary>
     public SpriteSpecifier? Sprite;
 
+    /// <summary>
+    /// The string to display when the item is selected.
+    /// </summary>
     public string? Tooltip;
 
+    /// <summary>
+    /// The event type to raise when this action is selected.
+    /// </summary>
     public BaseStationAiAction Event = default!;
+
+    /// <summary>
+    /// The relative order to show this item in the menu.
+    /// </summary>
+    public int? Order;
 }
 
 /// <summary>
@@ -234,20 +249,26 @@ public sealed class StationAiRadial : BaseStationAiAction
 [Serializable, NetSerializable]
 public abstract class BaseStationAiAction
 {
-    [field:NonSerialized]
+    [field: NonSerialized]
     public EntityUid User { get; set; }
 }
 
-// No idea if there's a better way to do this.
 /// <summary>
 /// Grab actions possible for an AI on the target entity.
 /// </summary>
 [ByRefEvent]
 public record struct GetStationAiRadialEvent()
 {
+    /// <summary>
+    /// The actions this interaction supports.
+    /// Handlers should add their own actions here.
+    /// </summary>
     public List<StationAiRadial> Actions = new();
 }
 
+/// <summary>
+/// Interface keys for the radial AI menu.
+/// </summary>
 [Serializable, NetSerializable]
 public enum AiUi : byte
 {
diff --git a/Content.Shared/Singularity/Components/SharedParticleAcceleratorComponent.cs b/Content.Shared/Singularity/Components/SharedParticleAcceleratorComponent.cs
index 19ed21c853..84254d9e8f 100644
--- a/Content.Shared/Singularity/Components/SharedParticleAcceleratorComponent.cs
+++ b/Content.Shared/Singularity/Components/SharedParticleAcceleratorComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Singularity.Components
 {
diff --git a/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs b/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs
index 97ceae6b82..ef1db99c69 100644
--- a/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs
+++ b/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 using Content.Shared.Examine;
 using Content.Shared.Lock;
 using Content.Shared.Popups;
diff --git a/Content.Shared/Singularity/SingularityVisualKeys.cs b/Content.Shared/Singularity/SingularityVisualKeys.cs
index d9c9d631b7..71ea304e71 100644
--- a/Content.Shared/Singularity/SingularityVisualKeys.cs
+++ b/Content.Shared/Singularity/SingularityVisualKeys.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Singularity
 {
diff --git a/Content.Shared/Smoking/SmokeVisuals.cs b/Content.Shared/Smoking/SmokeVisuals.cs
index 5617942357..faf963e791 100644
--- a/Content.Shared/Smoking/SmokeVisuals.cs
+++ b/Content.Shared/Smoking/SmokeVisuals.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Smoking
 {
diff --git a/Content.Shared/Smoking/SmokingVisuals.cs b/Content.Shared/Smoking/SmokingVisuals.cs
index 0d12292c83..fb9b06540b 100644
--- a/Content.Shared/Smoking/SmokingVisuals.cs
+++ b/Content.Shared/Smoking/SmokingVisuals.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Smoking
 {
diff --git a/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs b/Content.Shared/Spawners/Components/ContainerSpawnPointComponent.cs
similarity index 91%
rename from Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs
rename to Content.Shared/Spawners/Components/ContainerSpawnPointComponent.cs
index 210904b567..09d44e2e30 100644
--- a/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs
+++ b/Content.Shared/Spawners/Components/ContainerSpawnPointComponent.cs
@@ -1,8 +1,8 @@
-using Content.Server.Spawners.EntitySystems;
 using Content.Shared.Roles;
+using Content.Shared.Spawners.EntitySystems;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Spawners.Components;
+namespace Content.Shared.Spawners.Components;
 
 /// <summary>
 /// A spawn point that spawns a player into a target container rather than simply spawning them at a position.
diff --git a/Content.Server/Spawners/Components/ISpawnPoint.cs b/Content.Shared/Spawners/Components/ISpawnPoint.cs
similarity index 62%
rename from Content.Server/Spawners/Components/ISpawnPoint.cs
rename to Content.Shared/Spawners/Components/ISpawnPoint.cs
index e01841ef99..e44a36be3d 100644
--- a/Content.Server/Spawners/Components/ISpawnPoint.cs
+++ b/Content.Shared/Spawners/Components/ISpawnPoint.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Spawners.Components;
+namespace Content.Shared.Spawners.Components;
 
 public interface ISpawnPoint
 {
diff --git a/Content.Server/Spawners/Components/SpawnPointComponent.cs b/Content.Shared/Spawners/Components/SpawnPointComponent.cs
similarity index 94%
rename from Content.Server/Spawners/Components/SpawnPointComponent.cs
rename to Content.Shared/Spawners/Components/SpawnPointComponent.cs
index c48b7ec598..0bbebf81d2 100644
--- a/Content.Server/Spawners/Components/SpawnPointComponent.cs
+++ b/Content.Shared/Spawners/Components/SpawnPointComponent.cs
@@ -1,7 +1,7 @@
 using Content.Shared.Roles;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Spawners.Components;
+namespace Content.Shared.Spawners.Components;
 
 [RegisterComponent]
 public sealed partial class SpawnPointComponent : Component, ISpawnPoint
diff --git a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs b/Content.Shared/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
similarity index 88%
rename from Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
rename to Content.Shared/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
index 7af415147a..eee357f2c7 100644
--- a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
+++ b/Content.Shared/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
@@ -1,27 +1,21 @@
-using Content.Server.GameTicking;
-using Content.Server.Spawners.Components;
-using Content.Server.Station.Systems;
+using Content.Shared.GameTicking;
 using Content.Shared.Preferences;
-using Robust.Server.Containers;
+using Content.Shared.Spawners.Components;
+using Content.Shared.Station.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Random;
 
-namespace Content.Server.Spawners.EntitySystems;
+namespace Content.Shared.Spawners.EntitySystems;
 
 public sealed partial class ContainerSpawnPointSystem : EntitySystem
 {
-    [Dependency] private ContainerSystem _container = default!;
+    [Dependency] private SharedContainerSystem _container = default!;
     [Dependency] private GameTicker _gameTicker = default!;
     [Dependency] private IRobustRandom _random = default!;
     [Dependency] private StationSystem _station = default!;
     [Dependency] private StationSpawningSystem _stationSpawning = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<PlayerSpawningEvent>(HandlePlayerSpawning, before: new []{ typeof(SpawnPointSystem) });
-    }
-
+    [SubscribeLocalEvent(before: new []{typeof(SpawnPointSystem)})]
     public void HandlePlayerSpawning(PlayerSpawningEvent args)
     {
         if (args.SpawnResult != null)
diff --git a/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs b/Content.Shared/Spawners/EntitySystems/SpawnPointSystem.cs
similarity index 89%
rename from Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
rename to Content.Shared/Spawners/EntitySystems/SpawnPointSystem.cs
index bf5327cc5d..955e8cbf30 100644
--- a/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
+++ b/Content.Shared/Spawners/EntitySystems/SpawnPointSystem.cs
@@ -1,10 +1,10 @@
-using Content.Server.GameTicking;
-using Content.Server.Spawners.Components;
-using Content.Server.Station.Systems;
+using Content.Shared.GameTicking;
+using Content.Shared.Spawners.Components;
+using Content.Shared.Station.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
 
-namespace Content.Server.Spawners.EntitySystems;
+namespace Content.Shared.Spawners.EntitySystems;
 
 public sealed partial class SpawnPointSystem : EntitySystem
 {
@@ -13,11 +13,7 @@ public sealed partial class SpawnPointSystem : EntitySystem
     [Dependency] private StationSystem _stationSystem = default!;
     [Dependency] private StationSpawningSystem _stationSpawning = default!;
 
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<PlayerSpawningEvent>(OnPlayerSpawning);
-    }
-
+    [SubscribeLocalEvent]
     private void OnPlayerSpawning(PlayerSpawningEvent args)
     {
         if (args.SpawnResult != null)
diff --git a/Content.Shared/Speech/AccentEvent.cs b/Content.Shared/Speech/AccentEvent.cs
index 4404404246..6fc4218c30 100644
--- a/Content.Shared/Speech/AccentEvent.cs
+++ b/Content.Shared/Speech/AccentEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Inventory;
+using Content.Shared.Inventory;
 
 namespace Content.Shared.Speech;
 
diff --git a/Content.Shared/Speech/Components/BaseAccentComponent.cs b/Content.Shared/Speech/Components/BaseAccentComponent.cs
index 6eb5b326ca..d6bb514323 100644
--- a/Content.Shared/Speech/Components/BaseAccentComponent.cs
+++ b/Content.Shared/Speech/Components/BaseAccentComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Speech.Components;
+namespace Content.Shared.Speech.Components;
 
 /// <summary>
 /// Base class for accent components.
diff --git a/Content.Shared/Speech/EmoteActionEvent.cs b/Content.Shared/Speech/EmoteActionEvent.cs
index 2a4d359e5c..2bfaa18a28 100644
--- a/Content.Shared/Speech/EmoteActionEvent.cs
+++ b/Content.Shared/Speech/EmoteActionEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using Content.Shared.Chat.Prototypes;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/Speech/EntitySystems/EmotesMenuSystem.cs b/Content.Shared/Speech/EntitySystems/EmotesMenuSystem.cs
index 978c75b2d9..be4e98e4e0 100644
--- a/Content.Shared/Speech/EntitySystems/EmotesMenuSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/EmotesMenuSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chat;
+using Content.Shared.Chat;
 
 namespace Content.Shared.Speech.EntitySystems;
 
diff --git a/Content.Shared/Speech/EntitySystems/RatvarianLanguageSystem.cs b/Content.Shared/Speech/EntitySystems/RatvarianLanguageSystem.cs
index 73447ff5f1..2864d8acde 100644
--- a/Content.Shared/Speech/EntitySystems/RatvarianLanguageSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/RatvarianLanguageSystem.cs
@@ -1,4 +1,4 @@
-using System.Text;
+using System.Text;
 using System.Text.RegularExpressions;
 using Content.Shared.Speech.Components;
 using Content.Shared.StatusEffectNew;
diff --git a/Content.Shared/Speech/EntitySystems/ReplacementAccentSystem.cs b/Content.Shared/Speech/EntitySystems/ReplacementAccentSystem.cs
index 854e37b958..bcaf885ade 100644
--- a/Content.Shared/Speech/EntitySystems/ReplacementAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/ReplacementAccentSystem.cs
@@ -19,6 +19,11 @@ public sealed partial class ReplacementAccentSystem : RelayAccentSystem<Replacem
     [Dependency] private IGameTiming _timing = default!;
     [Dependency] private IRobustRandom _random = default!;
 
+    /// <summary>
+    /// Matches between 1 and 3 .?! punctuation marks at the end of a string.
+    /// </summary>
+    private static readonly Regex PunctuationRegex = new("[!?.]{1,3}$", RegexOptions.Compiled);
+
     private readonly Dictionary<ProtoId<ReplacementAccentPrototype>, (Regex regex, string replacement)[]>
         _cachedReplacements = new();
 
@@ -74,7 +79,17 @@ public sealed partial class ReplacementAccentSystem : RelayAccentSystem<Replacem
         // ideally both aren't used at the same time (but we don't have a way to enforce that in serialization yet)
         if (prototype.FullReplacements != null)
         {
-            return prototype.FullReplacements.Length != 0 ? Loc.GetString(random.Pick(prototype.FullReplacements)) : "";
+            if (prototype.FullReplacements.Length == 0)
+                return "";
+
+            var replacement = Loc.GetString(random.Pick(prototype.FullReplacements));
+            var punctuation = PunctuationRegex.Match(message).Value;
+
+            // no special punctuation
+            if (string.IsNullOrEmpty(punctuation) || punctuation == ".")
+                return replacement + prototype.DefaultPunctuation;
+
+            return replacement + punctuation;
         }
 
         // Prohibition of repeated word replacements.
diff --git a/Content.Shared/Speech/EntitySystems/SharedDamagedSiliconAccentSystem.cs b/Content.Shared/Speech/EntitySystems/SharedDamagedSiliconAccentSystem.cs
index 8369ad1425..5ae8064355 100644
--- a/Content.Shared/Speech/EntitySystems/SharedDamagedSiliconAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/SharedDamagedSiliconAccentSystem.cs
@@ -1,4 +1,4 @@
-using System.Text;
+using System.Text;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.FixedPoint;
diff --git a/Content.Shared/Speech/EntitySystems/SkeletonAccentSystem.cs b/Content.Shared/Speech/EntitySystems/SkeletonAccentSystem.cs
index 852f18ee79..45c6873c1f 100644
--- a/Content.Shared/Speech/EntitySystems/SkeletonAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/SkeletonAccentSystem.cs
@@ -1,4 +1,4 @@
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 using Content.Shared.Random.Helpers;
 using Content.Shared.Speech.Components;
 using Robust.Shared.Random;
diff --git a/Content.Shared/Speech/Prototypes/ReplacementAccentPrototype.cs b/Content.Shared/Speech/Prototypes/ReplacementAccentPrototype.cs
index dc541e0a1b..0faa129290 100644
--- a/Content.Shared/Speech/Prototypes/ReplacementAccentPrototype.cs
+++ b/Content.Shared/Speech/Prototypes/ReplacementAccentPrototype.cs
@@ -16,6 +16,12 @@ public sealed partial class ReplacementAccentPrototype : IPrototype
     [DataField]
     public string[]? FullReplacements;
 
+    /// <summary>
+    /// Default to use with <see cref="FullReplacements"/> if the text doesn't end with special punctuation.
+    /// </summary>
+    [DataField]
+    public string DefaultPunctuation = ".";
+
     /// <summary>
     /// If this dictionary is non-null and <see cref="FullReplacements"/> is null, any keys surrounded by spaces
     /// (words) will be replaced by the value, attempting to intelligently keep capitalization.
diff --git a/Content.Shared/Speech/SpeakAttemptEvent.cs b/Content.Shared/Speech/SpeakAttemptEvent.cs
index c76ef4df25..27d425f0b3 100644
--- a/Content.Shared/Speech/SpeakAttemptEvent.cs
+++ b/Content.Shared/Speech/SpeakAttemptEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Speech
+namespace Content.Shared.Speech
 {
     public sealed class SpeakAttemptEvent : CancellableEntityEventArgs
     {
diff --git a/Content.Shared/Speech/SpeechVerbPrototype.cs b/Content.Shared/Speech/SpeechVerbPrototype.cs
index 6400abfe5e..2c140e036d 100644
--- a/Content.Shared/Speech/SpeechVerbPrototype.cs
+++ b/Content.Shared/Speech/SpeechVerbPrototype.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Speech;
 
diff --git a/Content.Shared/Spillable/SpillDoAfterEvent.cs b/Content.Shared/Spillable/SpillDoAfterEvent.cs
index ff01801617..954876be65 100644
--- a/Content.Shared/Spillable/SpillDoAfterEvent.cs
+++ b/Content.Shared/Spillable/SpillDoAfterEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Spillable;
diff --git a/Content.Shared/Sprite/SimpleSpriteOverlayComponent.cs b/Content.Shared/Sprite/SimpleSpriteOverlayComponent.cs
index cfba3eb5f3..a6ed62b8aa 100644
--- a/Content.Shared/Sprite/SimpleSpriteOverlayComponent.cs
+++ b/Content.Shared/Sprite/SimpleSpriteOverlayComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Sprite;
diff --git a/Content.Shared/Stacks/StackEvents.cs b/Content.Shared/Stacks/StackEvents.cs
index 9cb421ccc1..e0ab72ebe6 100644
--- a/Content.Shared/Stacks/StackEvents.cs
+++ b/Content.Shared/Stacks/StackEvents.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Stacks;
+namespace Content.Shared.Stacks;
 
 /// <summary>
 ///     Raised on the original stack entity when it is split to create another.
diff --git a/Content.Shared/Stacks/StackPrototype.cs b/Content.Shared/Stacks/StackPrototype.cs
index dfc9d4a997..7fb4d0de80 100644
--- a/Content.Shared/Stacks/StackPrototype.cs
+++ b/Content.Shared/Stacks/StackPrototype.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 using Robust.Shared.Utility;
 
diff --git a/Content.Shared/Station/Components/BecomesStationComponent.cs b/Content.Shared/Station/Components/BecomesStationComponent.cs
index cd6191ef38..dad5a1c197 100644
--- a/Content.Shared/Station/Components/BecomesStationComponent.cs
+++ b/Content.Shared/Station/Components/BecomesStationComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.Station.Components;
 ///     Added to grids saved in maps to designate that they are the 'main station' grid.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-[Access(typeof(SharedGameTicker))]
+[Access(typeof(GameTicker))]
 public sealed partial class BecomesStationComponent : Component
 {
     /// <summary>
diff --git a/Content.Shared/Station/Components/FlingTowardStationComponent.cs b/Content.Shared/Station/Components/FlingTowardStationComponent.cs
new file mode 100644
index 0000000000..1f14569785
--- /dev/null
+++ b/Content.Shared/Station/Components/FlingTowardStationComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Station.Components;
+
+/// <summary>
+/// Entities with this component get flung toward the station on MapInit.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(FlingTowardStationSystem))]
+public sealed partial class FlingTowardStationComponent : Component
+{
+    /// <summary>
+    /// Speed at which you are thrown toward the station.
+    /// </summary>
+    [DataField]
+    public float Speed = 10f;
+}
diff --git a/Content.Shared/Station/Components/StationDataComponent.cs b/Content.Shared/Station/Components/StationDataComponent.cs
index 97136f3ba8..7d7cf5b2e7 100644
--- a/Content.Shared/Station/Components/StationDataComponent.cs
+++ b/Content.Shared/Station/Components/StationDataComponent.cs
@@ -1,4 +1,5 @@
-using Content.Shared.Roles;
+using Content.Shared.Roles;
+using Content.Shared.Station.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
@@ -8,7 +9,7 @@ namespace Content.Shared.Station.Components;
 /// Stores core information about a station, namely its config and associated grids.
 /// All station entities will have this component.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedStationSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(StationSystem))]
 public sealed partial class StationDataComponent : Component
 {
     /// <summary>
diff --git a/Content.Server/Station/Components/StationEventEligibleComponent.cs b/Content.Shared/Station/Components/StationEventEligibleComponent.cs
similarity index 72%
rename from Content.Server/Station/Components/StationEventEligibleComponent.cs
rename to Content.Shared/Station/Components/StationEventEligibleComponent.cs
index 0a899446a0..b6ccdf3b9a 100644
--- a/Content.Server/Station/Components/StationEventEligibleComponent.cs
+++ b/Content.Shared/Station/Components/StationEventEligibleComponent.cs
@@ -1,10 +1,7 @@
-namespace Content.Server.Station.Components;
+namespace Content.Shared.Station.Components;
 
 /// <summary>
 /// This is used for event eligibility.
 /// </summary>
 [RegisterComponent]
-public sealed partial class StationEventEligibleComponent : Component
-{
-
-}
+public sealed partial class StationEventEligibleComponent : Component;
diff --git a/Content.Server/Station/Components/StationJobsComponent.cs b/Content.Shared/Station/Components/StationJobsComponent.cs
similarity index 96%
rename from Content.Server/Station/Components/StationJobsComponent.cs
rename to Content.Shared/Station/Components/StationJobsComponent.cs
index 9addc8a016..6f2f7831c0 100644
--- a/Content.Server/Station/Components/StationJobsComponent.cs
+++ b/Content.Shared/Station/Components/StationJobsComponent.cs
@@ -1,11 +1,10 @@
-using System.Linq;
-using Content.Server.Station.Systems;
 using Content.Shared.Roles;
+using Content.Shared.Station.Systems;
 using JetBrains.Annotations;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Station.Components;
+namespace Content.Shared.Station.Components;
 
 /// <summary>
 /// Stores information about a station's job selection.
diff --git a/Content.Server/Station/Components/StationSpawningComponent.cs b/Content.Shared/Station/Components/StationSpawningComponent.cs
similarity index 71%
rename from Content.Server/Station/Components/StationSpawningComponent.cs
rename to Content.Shared/Station/Components/StationSpawningComponent.cs
index 81e68d7684..afa4ae9a37 100644
--- a/Content.Server/Station/Components/StationSpawningComponent.cs
+++ b/Content.Shared/Station/Components/StationSpawningComponent.cs
@@ -1,11 +1,9 @@
-using Content.Server.Station.Systems;
+using Content.Shared.Station.Systems;
 
-namespace Content.Server.Station.Components;
+namespace Content.Shared.Station.Components;
 
 /// <summary>
 /// Controls spawning on the given station, tracking spawners present on it.
 /// </summary>
 [RegisterComponent, Access(typeof(StationSpawningSystem))]
-public sealed partial class StationSpawningComponent : Component
-{
-}
+public sealed partial class StationSpawningComponent : Component;
diff --git a/Content.Shared/Station/Components/StationTrackerComponent.cs b/Content.Shared/Station/Components/StationTrackerComponent.cs
index 6272b28de4..05bff975c8 100644
--- a/Content.Shared/Station/Components/StationTrackerComponent.cs
+++ b/Content.Shared/Station/Components/StationTrackerComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Station.Systems;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Station.Components;
@@ -6,7 +7,7 @@ namespace Content.Shared.Station.Components;
 /// Component that tracks which station an entity is currently on.
 /// Mainly used for UI purposes on the client to easily get station-specific data like alert levels.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedStationSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(StationSystem))]
 public sealed partial class StationTrackerComponent : Component
 {
     /// <summary>
diff --git a/Content.Shared/Station/FlingTowardStationSystem.cs b/Content.Shared/Station/FlingTowardStationSystem.cs
new file mode 100644
index 0000000000..5ce48ab2b2
--- /dev/null
+++ b/Content.Shared/Station/FlingTowardStationSystem.cs
@@ -0,0 +1,44 @@
+using Content.Shared.Station.Components;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Random;
+using Robust.Shared.Physics.Components;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Station.Systems;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Station;
+
+public sealed partial class FlingTowardStationSystem : EntitySystem
+{
+    [Dependency] private SharedPhysicsSystem _physics = default!;
+    [Dependency] private StationSystem _station = default!;
+    [Dependency] private SharedTransformSystem _transform = default!;
+    [Dependency] private IGameTiming _timing = default!;
+
+    [SubscribeLocalEvent]
+    private void OnMapInit(Entity<FlingTowardStationComponent> ent, ref MapInitEvent args)
+    {
+        if (_station.GetStations().Count == 0)
+            return;
+
+        // fetch the station's grid
+        var random = SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(ent.Owner));
+        var station = random.Pick(_station.GetStations());
+        var grid = _station.GetLargestGrid(station.AsNullable());
+        if (grid == null)
+            return;
+
+        var stationPosition = _transform.GetMapCoordinates(grid.Value);
+        var entPosition = _transform.GetMapCoordinates(ent.Owner);
+        if (!TryComp<PhysicsComponent>(grid.Value, out var gridPhys))
+            return;
+
+        // calculate the offset from the center of mass of the station to the body
+        var offset = entPosition.Position - _transform.GetWorldRotation(grid.Value).RotateVec(gridPhys.LocalCenter) - stationPosition.Position;
+
+        if (!TryComp<PhysicsComponent>(ent.Owner, out var physics))
+            return;
+
+        _physics.ApplyLinearImpulse(ent.Owner, -offset.Normalized() * ent.Comp.Speed * physics.Mass, body: physics);
+    }
+}
diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs
deleted file mode 100644
index fea37ac85f..0000000000
--- a/Content.Shared/Station/SharedStationSpawningSystem.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-using System.Linq;
-using Content.Shared.Hands.Components;
-using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Inventory;
-using Content.Shared.Preferences.Loadouts;
-using Content.Shared.Roles;
-using Content.Shared.Storage;
-using Content.Shared.Storage.EntitySystems;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared.Station;
-
-public abstract partial class SharedStationSpawningSystem : EntitySystem
-{
-    [Dependency] private IRobustRandom _random = default!;
-    [Dependency] protected InventorySystem InventorySystem = default!;
-    [Dependency] private SharedHandsSystem _handsSystem = default!;
-    [Dependency] private MetaDataSystem _metadata = default!;
-    [Dependency] private SharedStorageSystem _storage = default!;
-    [Dependency] private SharedTransformSystem _xformSystem = default!;
-
-    [Dependency] private EntityQuery<HandsComponent> _handsQuery = default!;
-    [Dependency] private EntityQuery<InventoryComponent> _inventoryQuery = default!;
-    [Dependency] private EntityQuery<StorageComponent> _storageQuery = default!;
-    [Dependency] private EntityQuery<TransformComponent> _xformQuery = default!;
-
-    /// <summary>
-    ///     Equips the data from a `RoleLoadout` onto an entity.
-    /// </summary>
-    public void EquipRoleLoadout(EntityUid entity, RoleLoadout loadout, RoleLoadoutPrototype roleProto)
-    {
-        // Order loadout selections by the order they appear on the prototype.
-        foreach (var group in loadout.SelectedLoadouts.OrderBy(x => roleProto.Groups.FindIndex(e => e == x.Key)))
-        {
-            foreach (var items in group.Value)
-            {
-                if (!ProtoMan.TryIndex(items.Prototype, out var loadoutProto))
-                {
-                    Log.Error($"Unable to find loadout prototype for {items.Prototype}");
-                    continue;
-                }
-
-                EquipStartingGear(entity, loadoutProto, raiseEvent: false);
-            }
-        }
-
-        EquipRoleName(entity, loadout, roleProto);
-    }
-
-    /// <summary>
-    /// Applies the role's name as applicable to the entity.
-    /// </summary>
-    public void EquipRoleName(EntityUid entity, RoleLoadout loadout, RoleLoadoutPrototype roleProto)
-    {
-        string? name = null;
-
-        if (roleProto.CanCustomizeName)
-        {
-            name = loadout.EntityName;
-        }
-
-        if (string.IsNullOrEmpty(name) && ProtoMan.Resolve(roleProto.NameDataset, out var nameData))
-        {
-            name = Loc.GetString(_random.Pick(nameData.Values));
-        }
-
-        if (!string.IsNullOrEmpty(name))
-        {
-            _metadata.SetEntityName(entity, name);
-        }
-    }
-
-    public void EquipStartingGear(EntityUid entity, LoadoutPrototype loadout, bool raiseEvent = true)
-    {
-        EquipStartingGear(entity, loadout.StartingGear, raiseEvent);
-        EquipStartingGear(entity, (IEquipmentLoadout) loadout, raiseEvent);
-    }
-
-    /// <summary>
-    /// <see cref="EquipStartingGear(Robust.Shared.GameObjects.EntityUid,System.Nullable{Robust.Shared.Prototypes.ProtoId{Content.Shared.Roles.StartingGearPrototype}},bool)"/>
-    /// </summary>
-    public void EquipStartingGear(EntityUid entity, ProtoId<StartingGearPrototype>? startingGear, bool raiseEvent = true)
-    {
-        ProtoMan.Resolve(startingGear, out var gearProto);
-        EquipStartingGear(entity, gearProto, raiseEvent);
-    }
-
-    /// <summary>
-    /// <see cref="EquipStartingGear(Robust.Shared.GameObjects.EntityUid,System.Nullable{Robust.Shared.Prototypes.ProtoId{Content.Shared.Roles.StartingGearPrototype}},bool)"/>
-    /// </summary>
-    public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingGear, bool raiseEvent = true)
-    {
-        EquipStartingGear(entity, (IEquipmentLoadout?) startingGear, raiseEvent);
-    }
-
-    /// <summary>
-    /// Equips starting gear onto the given entity.
-    /// </summary>
-    /// <param name="entity">Entity to load out.</param>
-    /// <param name="startingGear">Starting gear to use.</param>
-    /// <param name="raiseEvent">Should we raise the event for equipped. Set to false if you will call this manually</param>
-    public void EquipStartingGear(EntityUid entity, IEquipmentLoadout? startingGear, bool raiseEvent = true)
-    {
-        if (startingGear == null)
-            return;
-
-        var xform = _xformQuery.GetComponent(entity);
-
-        if (InventorySystem.TryGetSlots(entity, out var slotDefinitions))
-        {
-            foreach (var slot in slotDefinitions)
-            {
-                var equipmentStr = startingGear.GetGear(slot.Name);
-                if (!string.IsNullOrEmpty(equipmentStr))
-                {
-                    var equipmentEntity = Spawn(equipmentStr, xform.Coordinates);
-                    InventorySystem.TryEquip(entity, equipmentEntity, slot.Name, silent: true, force: true);
-                }
-            }
-        }
-
-        if (_handsQuery.TryComp(entity, out var handsComponent))
-        {
-            var inhand = startingGear.Inhand;
-            var coords = xform.Coordinates;
-            foreach (var prototype in inhand)
-            {
-                var inhandEntity = Spawn(prototype, coords);
-
-                if (_handsSystem.TryGetEmptyHand((entity, handsComponent), out var emptyHand))
-                {
-                    _handsSystem.TryPickup(entity, inhandEntity, emptyHand, checkActionBlocker: false, handsComp: handsComponent);
-                }
-            }
-        }
-
-        if (startingGear.Storage.Count > 0)
-        {
-            var coords = _xformSystem.GetMapCoordinates(entity);
-            _inventoryQuery.TryComp(entity, out var inventoryComp);
-
-            foreach (var (slotName, entProtos) in startingGear.Storage)
-            {
-                if (entProtos == null || entProtos.Count == 0)
-                    continue;
-
-                if (inventoryComp != null &&
-                    InventorySystem.TryGetSlotEntity(entity, slotName, out var slotEnt, inventoryComponent: inventoryComp) &&
-                    _storageQuery.TryComp(slotEnt, out var storage))
-                {
-
-                    foreach (var entProto in entProtos)
-                    {
-                        var spawnedEntity = Spawn(entProto, coords);
-
-                        _storage.Insert(slotEnt.Value, spawnedEntity, out _, storageComp: storage, playSound: false);
-                    }
-                }
-            }
-        }
-
-        if (raiseEvent)
-        {
-            var ev = new StartingGearEquippedEvent(entity);
-            RaiseLocalEvent(entity, ref ev);
-        }
-    }
-
-    /// <summary>
-    ///     Gets all the gear for a given slot when passed a loadout.
-    /// </summary>
-    /// <param name="loadout">The loadout to look through.</param>
-    /// <param name="slot">The slot that you want the clothing for.</param>
-    /// <returns>
-    ///     If there is a value for the given slot, it will return the proto id for that slot.
-    ///     If nothing was found, will return null
-    /// </returns>
-    public string? GetGearForSlot(RoleLoadout? loadout, string slot)
-    {
-        if (loadout == null)
-            return null;
-
-        foreach (var group in loadout.SelectedLoadouts)
-        {
-            foreach (var items in group.Value)
-            {
-                if (!ProtoMan.Resolve(items.Prototype, out var loadoutPrototype))
-                    return null;
-
-                var gear = ((IEquipmentLoadout) loadoutPrototype).GetGear(slot);
-                if (gear != string.Empty)
-                    return gear;
-            }
-        }
-
-        return null;
-    }
-}
diff --git a/Content.Shared/Station/StationConfig.cs b/Content.Shared/Station/StationConfig.cs
index 5bdbf77422..b680495ff8 100644
--- a/Content.Shared/Station/StationConfig.cs
+++ b/Content.Shared/Station/StationConfig.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Station;
 
diff --git a/Content.Shared/Station/StationsUpdatedEvent.cs b/Content.Shared/Station/StationsUpdatedEvent.cs
index 488e2b8e20..c403623380 100644
--- a/Content.Shared/Station/StationsUpdatedEvent.cs
+++ b/Content.Shared/Station/StationsUpdatedEvent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Station;
 
diff --git a/Content.Shared/Station/Systems/StationJobsSystem.cs b/Content.Shared/Station/Systems/StationJobsSystem.cs
new file mode 100644
index 0000000000..1beea35576
--- /dev/null
+++ b/Content.Shared/Station/Systems/StationJobsSystem.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.Station.Systems;
+
+/// <summary>
+/// Handles the assignment and tracking of Station jobs and their associated role entities.
+/// </summary>
+public abstract partial class StationJobsSystem : EntitySystem;
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Shared/Station/Systems/StationSpawningSystem.cs
similarity index 53%
rename from Content.Server/Station/Systems/StationSpawningSystem.cs
rename to Content.Shared/Station/Systems/StationSpawningSystem.cs
index 2e04d6d142..3a1a970fc0 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Shared/Station/Systems/StationSpawningSystem.cs
@@ -1,48 +1,234 @@
-using Content.Server.Access.Systems;
-using Content.Server.Humanoid;
-using Content.Server.Mind;
-using Content.Server.PDA;
-using Content.Server.Station.Components;
+using System.Linq;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Body;
 using Content.Shared.CCVar;
 using Content.Shared.Clothing;
 using Content.Shared.DetailExaminable;
+using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Inventory;
+using Content.Shared.Mind;
 using Content.Shared.PDA;
 using Content.Shared.Preferences;
 using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Roles;
-using Content.Shared.Station;
+using Content.Shared.Station.Components;
+using Content.Shared.Storage;
+using Content.Shared.Storage.EntitySystems;
 using JetBrains.Annotations;
 using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
-namespace Content.Server.Station.Systems;
+namespace Content.Shared.Station.Systems;
 
-/// <summary>
-/// Manages spawning into the game, tracking available spawn points.
-/// Also provides helpers for spawning in the player's mob.
-/// </summary>
-[PublicAPI]
-public sealed partial class StationSpawningSystem : SharedStationSpawningSystem
+public sealed partial class StationSpawningSystem : EntitySystem
 {
-    [Dependency] private SharedAccessSystem _accessSystem = default!;
-    [Dependency] private ActorSystem _actors = default!;
-    [Dependency] private IdCardSystem _cardSystem = default!;
     [Dependency] private IConfigurationManager _configurationManager = default!;
+    [Dependency] private IRobustRandom _random = default!;
+    [Dependency] private ActorSystem _actors = default!;
     [Dependency] private HumanoidProfileSystem _humanoidProfile = default!;
-    [Dependency] private SharedVisualBodySystem _visualBody = default!;
     [Dependency] private IdentitySystem _identity = default!;
-    [Dependency] private MetaDataSystem _metaSystem = default!;
-    [Dependency] private PdaSystem _pdaSystem = default!;
-    [Dependency] private MindSystem _mindSystem = default!;
+    [Dependency] private InventorySystem _inventory = default!;
+    [Dependency] private MetaDataSystem _metadata = default!;
+    [Dependency] private SharedHandsSystem _handsSystem = default!;
+    [Dependency] private SharedMindSystem _mindSystem = default!;
+    [Dependency] private SharedStorageSystem _storage = default!;
+    [Dependency] private SharedTransformSystem _xformSystem = default!;
+    [Dependency] private SharedVisualBodySystem _visualBody = default!;
+    [Dependency] private SharedAccessSystem _accessSystem = default!;
+    [Dependency] private SharedIdCardSystem _cardSystem = default!;
+    [Dependency] private SharedPdaSystem _pdaSystem = default!;
+
+    [Dependency] private EntityQuery<HandsComponent> _handsQuery;
+    [Dependency] private EntityQuery<InventoryComponent> _inventoryQuery;
+    [Dependency] private EntityQuery<StorageComponent> _storageQuery;
+    [Dependency] private EntityQuery<TransformComponent> _xformQuery;
+
+    /// <summary>
+    ///     Equips the data from a `RoleLoadout` onto an entity.
+    /// </summary>
+    [PublicAPI]
+    public void EquipRoleLoadout(EntityUid entity, RoleLoadout loadout, RoleLoadoutPrototype roleProto)
+    {
+        // Order loadout selections by the order they appear on the prototype.
+        foreach (var group in loadout.SelectedLoadouts.OrderBy(x => roleProto.Groups.FindIndex(e => e == x.Key)))
+        {
+            foreach (var items in group.Value)
+            {
+                if (!ProtoMan.TryIndex(items.Prototype, out var loadoutProto))
+                {
+                    Log.Error($"Unable to find loadout prototype for {items.Prototype}");
+                    continue;
+                }
+
+                EquipStartingGear(entity, loadoutProto, raiseEvent: false);
+            }
+        }
+
+        EquipRoleName(entity, loadout, roleProto);
+    }
+
+    /// <summary>
+    /// Applies the role's name as applicable to the entity.
+    /// </summary>
+    [PublicAPI]
+    public void EquipRoleName(EntityUid entity, RoleLoadout loadout, RoleLoadoutPrototype roleProto)
+    {
+        string? name = null;
+
+        if (roleProto.CanCustomizeName)
+        {
+            name = loadout.EntityName;
+        }
+
+        if (string.IsNullOrEmpty(name) && ProtoMan.Resolve(roleProto.NameDataset, out var nameData))
+        {
+            name = Loc.GetString(_random.Pick(nameData.Values));
+        }
+
+        if (!string.IsNullOrEmpty(name))
+        {
+            _metadata.SetEntityName(entity, name);
+        }
+    }
+
+    public void EquipStartingGear(EntityUid entity, LoadoutPrototype loadout, bool raiseEvent = true)
+    {
+        EquipStartingGear(entity, loadout.StartingGear, raiseEvent);
+        EquipStartingGear(entity, (IEquipmentLoadout) loadout, raiseEvent);
+    }
+
+    /// <summary>
+    /// <see cref="EquipStartingGear(Robust.Shared.GameObjects.EntityUid,System.Nullable{Robust.Shared.Prototypes.ProtoId{Content.Shared.Roles.StartingGearPrototype}},bool)"/>
+    /// </summary>
+    [PublicAPI]
+    public void EquipStartingGear(EntityUid entity, ProtoId<StartingGearPrototype>? startingGear, bool raiseEvent = true)
+    {
+        ProtoMan.Resolve(startingGear, out var gearProto);
+        EquipStartingGear(entity, gearProto, raiseEvent);
+    }
+
+    /// <summary>
+    /// <see cref="EquipStartingGear(Robust.Shared.GameObjects.EntityUid,System.Nullable{Robust.Shared.Prototypes.ProtoId{Content.Shared.Roles.StartingGearPrototype}},bool)"/>
+    /// </summary>
+    [PublicAPI]
+    public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingGear, bool raiseEvent = true)
+    {
+        EquipStartingGear(entity, (IEquipmentLoadout?) startingGear, raiseEvent);
+    }
+
+    /// <summary>
+    /// Equips starting gear onto the given entity.
+    /// </summary>
+    /// <param name="entity">Entity to load out.</param>
+    /// <param name="startingGear">Starting gear to use.</param>
+    /// <param name="raiseEvent">Should we raise the event for equipped. Set to false if you will call this manually</param>
+    [PublicAPI]
+    public void EquipStartingGear(EntityUid entity, IEquipmentLoadout? startingGear, bool raiseEvent = true)
+    {
+        if (startingGear == null)
+            return;
+
+        var xform = _xformQuery.GetComponent(entity);
+
+        if (_inventory.TryGetSlots(entity, out var slotDefinitions))
+        {
+            foreach (var slot in slotDefinitions)
+            {
+                var equipmentStr = startingGear.GetGear(slot.Name);
+                if (!string.IsNullOrEmpty(equipmentStr))
+                {
+                    var equipmentEntity = Spawn(equipmentStr, xform.Coordinates);
+                    _inventory.TryEquip(entity, equipmentEntity, slot.Name, silent: true, force: true);
+                }
+            }
+        }
+
+        if (_handsQuery.TryComp(entity, out var handsComponent))
+        {
+            var inhand = startingGear.Inhand;
+            var coords = xform.Coordinates;
+            foreach (var prototype in inhand)
+            {
+                var inhandEntity = Spawn(prototype, coords);
+
+                if (_handsSystem.TryGetEmptyHand((entity, handsComponent), out var emptyHand))
+                {
+                    _handsSystem.TryPickup(entity, inhandEntity, emptyHand, checkActionBlocker: false, handsComp: handsComponent);
+                }
+            }
+        }
+
+        if (startingGear.Storage.Count > 0)
+        {
+            var coords = _xformSystem.GetMapCoordinates(entity);
+            _inventoryQuery.TryComp(entity, out var inventoryComp);
+
+            foreach (var (slotName, entProtos) in startingGear.Storage)
+            {
+                if (entProtos.Count == 0)
+                    continue;
+
+                if (inventoryComp != null &&
+                    _inventory.TryGetSlotEntity(entity, slotName, out var slotEnt, inventoryComponent: inventoryComp) &&
+                    _storageQuery.TryComp(slotEnt, out var storage))
+                {
+
+                    foreach (var entProto in entProtos)
+                    {
+                        var spawnedEntity = Spawn(entProto, coords);
+
+                        _storage.Insert(slotEnt.Value, spawnedEntity, out _, storageComp: storage, playSound: false);
+                    }
+                }
+            }
+        }
+
+        if (raiseEvent)
+        {
+            var ev = new StartingGearEquippedEvent(entity);
+            RaiseLocalEvent(entity, ref ev);
+        }
+    }
+
+    /// <summary>
+    ///     Gets all the gear for a given slot when passed a loadout.
+    /// </summary>
+    /// <param name="loadout">The loadout to look through.</param>
+    /// <param name="slot">The slot that you want the clothing for.</param>
+    /// <returns>
+    ///     If there is a value for the given slot, it will return the proto id for that slot.
+    ///     If nothing was found, will return null
+    /// </returns>
+    [PublicAPI]
+    public string? GetGearForSlot(RoleLoadout? loadout, string slot)
+    {
+        if (loadout == null)
+            return null;
+
+        foreach (var group in loadout.SelectedLoadouts)
+        {
+            foreach (var items in group.Value)
+            {
+                if (!ProtoMan.Resolve(items.Prototype, out var loadoutPrototype))
+                    return null;
+
+                var gear = ((IEquipmentLoadout) loadoutPrototype).GetGear(slot);
+                if (gear != string.Empty)
+                    return gear;
+            }
+        }
+
+        return null;
+    }
 
     /// <summary>
     /// Attempts to spawn a player character onto the given station.
@@ -69,6 +255,48 @@ public sealed partial class StationSpawningSystem : SharedStationSpawningSystem
         return ev.SpawnResult;
     }
 
+    /// <summary>
+    /// Sets the ID card and PDA name, job, and access data.
+    /// </summary>
+    /// <param name="entity">Entity to load out.</param>
+    /// <param name="characterName">Character name to use for the ID.</param>
+    /// <param name="jobPrototype">Job prototype to use for the PDA and ID.</param>
+    /// <param name="station">The station this player is being spawned on.</param>
+    [PublicAPI]
+    public void SetPdaAndIdCardData(EntityUid entity,
+        string characterName,
+        JobPrototype jobPrototype,
+        EntityUid? station)
+    {
+        if (!_inventory.TryGetSlotEntity(entity, "id", out var idUid))
+            return;
+
+        var cardId = idUid.Value;
+        if (TryComp<PdaComponent>(idUid, out var pdaComponent) && pdaComponent.ContainedId != null)
+            cardId = pdaComponent.ContainedId.Value;
+
+        if (!TryComp<IdCardComponent>(cardId, out var card))
+            return;
+
+        _cardSystem.TryChangeFullName(cardId, characterName, card);
+        _cardSystem.TryChangeJobTitle(cardId, jobPrototype.LocalizedName, card);
+
+        if (ProtoMan.Resolve(jobPrototype.Icon, out var jobIcon))
+            _cardSystem.TryChangeJobIcon(cardId, jobIcon, card);
+
+        var extendedAccess = false;
+        if (station != null)
+        {
+            var data = Comp<StationJobsComponent>(station.Value);
+            extendedAccess = data.ExtendedAccess;
+        }
+
+        _accessSystem.SetAccessToJob(cardId, jobPrototype, extendedAccess);
+
+        if (pdaComponent != null)
+            _pdaSystem.SetOwner(idUid.Value, pdaComponent, entity, characterName);
+    }
+
     //TODO: Figure out if everything in the player spawning region belongs somewhere else.
     #region Player spawning helpers
 
@@ -136,7 +364,7 @@ public sealed partial class StationSpawningSystem : SharedStationSpawningSystem
         {
             _visualBody.ApplyProfileTo(entity.Value, profile);
             _humanoidProfile.ApplyProfileTo(entity.Value, profile);
-            _metaSystem.SetEntityName(entity.Value, profile.Name);
+            _metadata.SetEntityName(entity.Value, profile.Name);
 
             if (profile.FlavorText != "" && _configurationManager.GetCVar(CCVars.FlavorText))
             {
@@ -178,46 +406,6 @@ public sealed partial class StationSpawningSystem : SharedStationSpawningSystem
             jobSpecial.AfterEquip(entity);
         }
     }
-
-    /// <summary>
-    /// Sets the ID card and PDA name, job, and access data.
-    /// </summary>
-    /// <param name="entity">Entity to load out.</param>
-    /// <param name="characterName">Character name to use for the ID.</param>
-    /// <param name="jobPrototype">Job prototype to use for the PDA and ID.</param>
-    /// <param name="station">The station this player is being spawned on.</param>
-    public void SetPdaAndIdCardData(EntityUid entity, string characterName, JobPrototype jobPrototype, EntityUid? station)
-    {
-        if (!InventorySystem.TryGetSlotEntity(entity, "id", out var idUid))
-            return;
-
-        var cardId = idUid.Value;
-        if (TryComp<PdaComponent>(idUid, out var pdaComponent) && pdaComponent.ContainedId != null)
-            cardId = pdaComponent.ContainedId.Value;
-
-        if (!TryComp<IdCardComponent>(cardId, out var card))
-            return;
-
-        _cardSystem.TryChangeFullName(cardId, characterName, card);
-        _cardSystem.TryChangeJobTitle(cardId, jobPrototype.LocalizedName, card);
-
-        if (ProtoMan.Resolve(jobPrototype.Icon, out var jobIcon))
-            _cardSystem.TryChangeJobIcon(cardId, jobIcon, card);
-
-        var extendedAccess = false;
-        if (station != null)
-        {
-            var data = Comp<StationJobsComponent>(station.Value);
-            extendedAccess = data.ExtendedAccess;
-        }
-
-        _accessSystem.SetAccessToJob(cardId, jobPrototype, extendedAccess);
-
-        if (pdaComponent != null)
-            _pdaSystem.SetOwner(idUid.Value, pdaComponent, entity, characterName);
-    }
-
-
     #endregion Player spawning helpers
 }
 
@@ -227,7 +415,6 @@ public sealed partial class StationSpawningSystem : SharedStationSpawningSystem
 /// You should not make this event's success rely on random chance.
 /// This event is designed to use ordered handling. You probably want SpawnPointSystem to be the last handler.
 /// </summary>
-[PublicAPI]
 public sealed class PlayerSpawningEvent : EntityEventArgs
 {
     /// <summary>
diff --git a/Content.Shared/Station/Systems/StationSystem.Event.cs b/Content.Shared/Station/Systems/StationSystem.Event.cs
new file mode 100644
index 0000000000..247ce407a5
--- /dev/null
+++ b/Content.Shared/Station/Systems/StationSystem.Event.cs
@@ -0,0 +1,136 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Station.Components;
+using JetBrains.Annotations;
+using Robust.Shared.Collections;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+
+namespace Content.Shared.Station.Systems;
+
+public abstract partial class StationSystem
+{
+    /// <summary>
+    ///     Utility function for finding a random event-eligible station entity
+    ///     TODO: Make calls of this use the below method with T = StationEventEligibleComponent and make this a lookup for NO T versions of stations!!!
+    /// </summary>
+    [PublicAPI]
+    [Obsolete($"Use TryGetRandomStation<T> instead using {nameof(StationEventEligibleComponent)}!")]
+    public bool TryGetRandomStation([NotNullWhen(true)] out Entity<StationDataComponent>? station, Func<EntityUid, bool>? filter = null)
+    {
+        var stations = new ValueList<Entity<StationDataComponent>>(Count<StationEventEligibleComponent>());
+
+        filter ??= _ => true;
+        var query = AllEntityQuery<StationEventEligibleComponent, StationDataComponent>();
+
+        while (query.MoveNext(out var uid, out _, out var data))
+        {
+            if (!filter(uid))
+                continue;
+
+            stations.Add((uid, data));
+        }
+
+        if (stations.Count == 0)
+        {
+            station = null;
+            return false;
+        }
+
+        // TODO: Engine PR.
+        station = stations[Random.Next(stations.Count)];
+        return true;
+    }
+
+    /// <summary>
+    /// Tries to get a random station with a given component.
+    /// </summary>
+    /// <param name="station">Station we are returning.</param>
+    /// <param name="filter">Optional filter.</param>
+    /// <typeparam name="T">Component we are querying for.</typeparam>
+    /// <returns>Station Entity if it exists</returns>
+    [PublicAPI]
+    public bool TryGetRandomStation<T>([NotNullWhen(true)] out Entity<StationDataComponent, T>? station, Func<EntityUid, bool>? filter = null) where T : IComponent
+    {
+        var stations = new ValueList<Entity<StationDataComponent, T>>(Count<T>());
+
+        filter ??= _ => true;
+        var query = AllEntityQuery<T, StationDataComponent>();
+
+        while (query.MoveNext(out var uid, out var comp, out var data))
+        {
+            if (!filter(uid))
+                continue;
+
+            stations.Add((uid, data, comp));
+        }
+
+        if (stations.Count == 0)
+        {
+            station = null;
+            return false;
+        }
+
+        // TODO: Engine PR.
+        station = stations[Random.Next(stations.Count)];
+        return true;
+    }
+
+    [PublicAPI]
+    public bool TryFindRandomTile(out Vector2i tile,
+        [NotNullWhen(true)] out Entity<StationDataComponent>? targetStation,
+        [NotNullWhen(true)] out Entity<MapGridComponent>? targetGrid,
+        out EntityCoordinates targetCoords)
+    {
+        tile = default;
+        targetStation = null;
+        targetGrid = null;
+        targetCoords = EntityCoordinates.Invalid;
+        if (TryGetRandomStation(out targetStation))
+        {
+            return TryFindRandomTileOnStation(targetStation.Value,
+                out tile,
+                out targetGrid,
+                out targetCoords);
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Returns a random tile on a random station with the given T component.
+    /// </summary>
+    /// <param name="tile">Tile returned.</param>
+    /// <param name="targetStation">Station returned</param>
+    /// <param name="targetGrid">Station grid with the tile.</param>
+    /// <param name="targetCoords">Coordinates of the tile.</param>
+    /// <typeparam name="T">Component we query for the station!</typeparam>
+    /// <returns>True if all of the above were found</returns>
+    [PublicAPI]
+    public bool TryFindRandomTile<T>(out Vector2i tile,
+        [NotNullWhen(true)] out Entity<StationDataComponent, T>? targetStation,
+        [NotNullWhen(true)] out Entity<MapGridComponent>? targetGrid,
+        out EntityCoordinates targetCoords) where T : IComponent
+    {
+        tile = default;
+        targetStation = null;
+        targetGrid = null;
+        targetCoords = EntityCoordinates.Invalid;
+        return TryGetRandomStation(out targetStation) && TryFindRandomTileOnStation(targetStation.Value,
+            out tile,
+            out targetGrid,
+            out targetCoords);
+    }
+
+    [PublicAPI]
+    public virtual bool TryFindRandomTileOnStation(Entity<StationDataComponent> station,
+        out Vector2i tile,
+        [NotNullWhen(true)] out Entity<MapGridComponent>? targetGrid,
+        out EntityCoordinates targetCoords,
+        int numAttempts = 10)
+    {
+        tile = default;
+        targetCoords = EntityCoordinates.Invalid;
+        targetGrid = null;
+        return false;
+    }
+}
diff --git a/Content.Shared/Station/SharedStationSystem.Tracker.cs b/Content.Shared/Station/Systems/StationSystem.Tracker.cs
similarity index 76%
rename from Content.Shared/Station/SharedStationSystem.Tracker.cs
rename to Content.Shared/Station/Systems/StationSystem.Tracker.cs
index 41129da13f..ce8a27013e 100644
--- a/Content.Shared/Station/SharedStationSystem.Tracker.cs
+++ b/Content.Shared/Station/Systems/StationSystem.Tracker.cs
@@ -2,34 +2,30 @@ using Content.Shared.Station.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
 
-namespace Content.Shared.Station;
+namespace Content.Shared.Station.Systems;
 
-public abstract partial class SharedStationSystem
+public abstract partial class StationSystem
 {
-    private void InitializeTracker()
-    {
-        SubscribeLocalEvent<StationTrackerComponent, MapInitEvent>(OnTrackerMapInit);
-        SubscribeLocalEvent<StationTrackerComponent, ComponentRemove>(OnTrackerRemove);
-        SubscribeLocalEvent<StationTrackerComponent, GridUidChangedEvent>(OnTrackerGridChanged);
-        SubscribeLocalEvent<StationTrackerComponent, MetaFlagRemoveAttemptEvent>(OnMetaFlagRemoveAttempt);
-    }
-
+    [SubscribeLocalEvent]
     private void OnTrackerMapInit(Entity<StationTrackerComponent> ent, ref MapInitEvent args)
     {
-        _meta.AddFlag(ent, MetaDataFlags.ExtraTransformEvents);
+        Meta.AddFlag(ent, MetaDataFlags.ExtraTransformEvents);
         UpdateStationTracker(ent.AsNullable());
     }
 
+    [SubscribeLocalEvent]
     private void OnTrackerRemove(Entity<StationTrackerComponent> ent, ref ComponentRemove args)
     {
-        _meta.RemoveFlag(ent, MetaDataFlags.ExtraTransformEvents);
+        Meta.RemoveFlag(ent, MetaDataFlags.ExtraTransformEvents);
     }
 
+    [SubscribeLocalEvent]
     private void OnTrackerGridChanged(Entity<StationTrackerComponent> ent, ref GridUidChangedEvent args)
     {
         UpdateStationTracker((ent, ent.Comp, args.Transform));
     }
 
+    [SubscribeLocalEvent]
     private void OnMetaFlagRemoveAttempt(Entity<StationTrackerComponent> ent, ref MetaFlagRemoveAttemptEvent args)
     {
         if ((args.ToRemove & MetaDataFlags.ExtraTransformEvents) != 0 &&
diff --git a/Content.Shared/Station/SharedStationSystem.cs b/Content.Shared/Station/Systems/StationSystem.cs
similarity index 83%
rename from Content.Shared/Station/SharedStationSystem.cs
rename to Content.Shared/Station/Systems/StationSystem.cs
index 8de80602ff..c73fa667ed 100644
--- a/Content.Shared/Station/SharedStationSystem.cs
+++ b/Content.Shared/Station/Systems/StationSystem.cs
@@ -5,30 +5,24 @@ using Robust.Shared.Collections;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
+using Robust.Shared.Random;
 
-namespace Content.Shared.Station;
+namespace Content.Shared.Station.Systems;
 
-public abstract partial class SharedStationSystem : EntitySystem
+public abstract partial class StationSystem : EntitySystem
 {
-    [Dependency] private SharedMapSystem _map = default!;
-    [Dependency] private MetaDataSystem _meta = default!;
-    [Dependency] private SharedTransformSystem _transform = default!;
+    [Dependency] protected IRobustRandom Random = default!;
     [Dependency] private ISharedPlayerManager _player = default!;
+    [Dependency] protected MetaDataSystem Meta = default!;
+    [Dependency] protected SharedMapSystem Map = default!;
+    [Dependency] private SharedTransformSystem _transform = default!;
 
     [Dependency] private EntityQuery<StationMemberComponent> _stationMemberQuery;
-    [Dependency] private EntityQuery<MapGridComponent> _gridQuery;
+    [Dependency] protected EntityQuery<MapGridComponent> GridQuery;
 
     private ValueList<MapId> _mapIds;
     private ValueList<(Box2Rotated Bounds, MapId MapId)> _gridBounds;
 
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        InitializeTracker();
-    }
-
     /// <summary>
     /// Gets the largest member grid from a station.
     /// </summary>
@@ -67,7 +61,7 @@ public abstract partial class SharedStationSystem : EntitySystem
             if (!TryComp<MapGridComponent>(gridUid, out var grid))
                 continue;
 
-            count += _map.GetAllTiles(gridUid, grid).Count();
+            count += Map.GetAllTiles(gridUid, grid).Count();
         }
 
         return count;
@@ -123,13 +117,13 @@ public abstract partial class SharedStationSystem : EntitySystem
         return CompOrNull<StationMemberComponent>(xform.GridUid)?.Station;
     }
 
-    public List<EntityUid> GetStations()
+    public List<Entity<StationDataComponent>> GetStations()
     {
-        var stations = new List<EntityUid>();
+        var stations = new List<Entity<StationDataComponent>>();
         var query = EntityQueryEnumerator<StationDataComponent>();
-        while (query.MoveNext(out var uid, out _))
+        while (query.MoveNext(out var uid, out var data))
         {
-            stations.Add(uid);
+            stations.Add((uid, data));
         }
 
         return stations;
@@ -202,6 +196,40 @@ public abstract partial class SharedStationSystem : EntitySystem
         return Filter.Empty();
     }
 
+    /// <summary>
+    /// Retrieves a filter for everything on the same map as a given station.
+    /// </summary>
+    public Filter GetOnMap(StationDataComponent dataComponent)
+    {
+        var filter = Filter.Empty();
+        _mapIds.Clear();
+
+        // First collect all valid map IDs where station grids exist
+        foreach (var gridUid in dataComponent.Grids)
+        {
+            if (!TryComp(gridUid, out TransformComponent? xform))
+                continue;
+
+            var mapId = xform.MapID;
+            if (!_mapIds.Contains(mapId))
+                _mapIds.Add(mapId);
+        }
+
+        foreach (var session in Filter.GetAllPlayers(_player))
+        {
+            var entity = session.AttachedEntity;
+            if (entity == null || !TryComp(entity, out TransformComponent? xform))
+                continue;
+
+            if (!_mapIds.Contains(xform.MapID))
+                continue;
+
+            filter.AddPlayer(session);
+        }
+
+        return filter;
+    }
+
     /// <summary>
     /// Retrieves a filter for everything in a particular station or near its member grids.
     /// </summary>
@@ -226,7 +254,7 @@ public abstract partial class SharedStationSystem : EntitySystem
 
         foreach (var gridUid in dataComponent.Grids)
         {
-            if (!_gridQuery.TryComp(gridUid, out var grid) ||
+            if (!GridQuery.TryComp(gridUid, out var grid) ||
                 !TryComp(gridUid, out TransformComponent? gridXform))
             {
                 continue;
@@ -283,7 +311,8 @@ public abstract partial class SharedStationSystem : EntitySystem
         return filter;
     }
 
-    /// Returns true if a entity's parent is the station, and false if the entity is not on the station
+    /// <summary>
+    /// Returns true if an entity's parent is the station, and false if the entity is not on the station
     /// </summary>
     /// <param name="entity">The entity to check if is on a grid</param>
     /// <param name="onlyCountLargestGrid">If true, only the largest grid of each station will count, so if the entity is on
diff --git a/Content.Shared/StationRecords/Events/GeneralRecordCreatedEvent.cs b/Content.Shared/StationRecords/Events/GeneralRecordCreatedEvent.cs
index 182ecf995e..af5d95f164 100644
--- a/Content.Shared/StationRecords/Events/GeneralRecordCreatedEvent.cs
+++ b/Content.Shared/StationRecords/Events/GeneralRecordCreatedEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Preferences;
+using Content.Shared.Preferences;
 
 namespace Content.Shared.StationRecords.Events;
 
diff --git a/Content.Shared/StationRecords/Events/IStationRecordEvent.cs b/Content.Shared/StationRecords/Events/IStationRecordEvent.cs
index 16c54a0bbe..3869345cd9 100644
--- a/Content.Shared/StationRecords/Events/IStationRecordEvent.cs
+++ b/Content.Shared/StationRecords/Events/IStationRecordEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.StationRecords.Events;
+namespace Content.Shared.StationRecords.Events;
 
 /// <summary>
 /// Base event for station record events.
diff --git a/Content.Shared/StationRecords/Events/RecordModifiedEvent.cs b/Content.Shared/StationRecords/Events/RecordModifiedEvent.cs
index 293dd23e73..5ee5c1da77 100644
--- a/Content.Shared/StationRecords/Events/RecordModifiedEvent.cs
+++ b/Content.Shared/StationRecords/Events/RecordModifiedEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.StationRecords.Events;
+namespace Content.Shared.StationRecords.Events;
 
 /// <summary>
 ///     Event raised after a record is modified. This is to
diff --git a/Content.Shared/StationRecords/Events/RecordRemovedEvent.cs b/Content.Shared/StationRecords/Events/RecordRemovedEvent.cs
index 61aa815571..ec6a15bc57 100644
--- a/Content.Shared/StationRecords/Events/RecordRemovedEvent.cs
+++ b/Content.Shared/StationRecords/Events/RecordRemovedEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.StationRecords.Events;
+namespace Content.Shared.StationRecords.Events;
 
 /// <summary>
 ///     Event raised after a record is removed. Only the key is given
diff --git a/Content.Shared/StationRecords/StationRecord.cs b/Content.Shared/StationRecords/StationRecord.cs
index e717ffc8b9..3649f653db 100644
--- a/Content.Shared/StationRecords/StationRecord.cs
+++ b/Content.Shared/StationRecords/StationRecord.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.StationRecords;
 
diff --git a/Content.Shared/StationRecords/Systems/SharedGeneralStationRecordConsoleSystem.cs b/Content.Shared/StationRecords/Systems/SharedGeneralStationRecordConsoleSystem.cs
index 8177045c3f..2ad0fd9665 100644
--- a/Content.Shared/StationRecords/Systems/SharedGeneralStationRecordConsoleSystem.cs
+++ b/Content.Shared/StationRecords/Systems/SharedGeneralStationRecordConsoleSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Station;
+using Content.Shared.Station.Systems;
 using Content.Shared.StationRecords.Components;
 using Content.Shared.StationRecords.Events;
 
@@ -6,7 +6,7 @@ namespace Content.Shared.StationRecords.Systems;
 
 public abstract partial class SharedGeneralStationRecordConsoleSystem : EntitySystem
 {
-    [Dependency] protected SharedStationSystem StationSys = default!;
+    [Dependency] protected StationSystem StationSys = default!;
     [Dependency] protected StationRecordsSystem StationRecordsSys = default!;
 
     [Dependency] protected EntityQuery<StationRecordsComponent> RecordsQuery = default!;
diff --git a/Content.Shared/StationRecords/Systems/StationRecordsSystem.API.cs b/Content.Shared/StationRecords/Systems/StationRecordsSystem.API.cs
index a7c90e64df..17bcbade1a 100644
--- a/Content.Shared/StationRecords/Systems/StationRecordsSystem.API.cs
+++ b/Content.Shared/StationRecords/Systems/StationRecordsSystem.API.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Random.Helpers;
 using Content.Shared.StationRecords.Components;
 using Content.Shared.StationRecords.Events;
diff --git a/Content.Shared/StationRecords/Systems/StationRecordsSystem.Helpers.cs b/Content.Shared/StationRecords/Systems/StationRecordsSystem.Helpers.cs
index dc5861cbd3..cb8997e1f7 100644
--- a/Content.Shared/StationRecords/Systems/StationRecordsSystem.Helpers.cs
+++ b/Content.Shared/StationRecords/Systems/StationRecordsSystem.Helpers.cs
@@ -1,4 +1,4 @@
-using Content.Shared.StationRecords.Components;
+using Content.Shared.StationRecords.Components;
 
 namespace Content.Shared.StationRecords.Systems;
 
diff --git a/Content.Shared/StationTeleporter/SharedStationTeleporterSystem.cs b/Content.Shared/StationTeleporter/SharedStationTeleporterSystem.cs
index eb61da3cb1..856e54010e 100644
--- a/Content.Shared/StationTeleporter/SharedStationTeleporterSystem.cs
+++ b/Content.Shared/StationTeleporter/SharedStationTeleporterSystem.cs
@@ -7,7 +7,8 @@ using Content.Shared.Power;
 using Content.Shared.Power.EntitySystems;
 using Content.Shared.StationTeleporter.Components;
 using Content.Shared.Teleportation.Systems;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 
@@ -103,7 +104,7 @@ public abstract partial class SharedStationTeleporterSystem : EntitySystem
         if (args.Handled)
             return;
 
-        if (TryComp<UseDelayComponent>(args.Used, out var useDelayComp) && _useDelay.IsDelayed((args.Used, useDelayComp)))
+        if (_useDelay.IsDelayed(args.Used))
             return;
 
         _useDelay.TryResetDelay(args.Used);
diff --git a/Content.Shared/StatusEffect/StatusEffectPrototype.cs b/Content.Shared/StatusEffect/StatusEffectPrototype.cs
index f325103d0a..59d7e5aff9 100644
--- a/Content.Shared/StatusEffect/StatusEffectPrototype.cs
+++ b/Content.Shared/StatusEffect/StatusEffectPrototype.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Alert;
+using Content.Shared.Alert;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.StatusEffect
diff --git a/Content.Shared/StatusEffectNew/Components/CloneableStatusEffectComponent.cs b/Content.Shared/StatusEffectNew/Components/CloneableStatusEffectComponent.cs
index 7855d73bb9..170e39827b 100644
--- a/Content.Shared/StatusEffectNew/Components/CloneableStatusEffectComponent.cs
+++ b/Content.Shared/StatusEffectNew/Components/CloneableStatusEffectComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.StatusEffectNew.Components;
 
diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
index 91fe2173e0..06f47fed55 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
@@ -3,6 +3,7 @@ using Content.Shared.Atmos;
 using Content.Shared.Chat;
 using Content.Shared.Chemistry.Events;
 using Content.Shared.Climbing.Events;
+using Content.Shared.Cuffs;
 using Content.Shared.Damage.Events;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Examine;
@@ -13,6 +14,8 @@ using Content.Shared.Mobs;
 using Content.Shared.Mobs.Events;
 using Content.Shared.Movement.Events;
 using Content.Shared.Movement.Systems;
+using Content.Shared.NightVision;
+using Content.Shared.Overlays;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Speech;
 using Content.Shared.Speech.EntitySystems;
@@ -64,9 +67,13 @@ public sealed partial class StatusEffectsSystem
         SubscribeLocalEvent<StatusEffectContainerComponent, RefreshPressureImmunityEvent>(RefRelayStatusEffectEvent);
         SubscribeLocalEvent<StatusEffectContainerComponent, SelfBeforeDefibrillatorZapsEvent>(RelayStatusEffectEvent);
         SubscribeLocalEvent<StatusEffectContainerComponent, SelfBeforeInjectEvent>(RelayStatusEffectEvent);
+        SubscribeLocalEvent<StatusEffectContainerComponent, RefreshNightVisionEvent>(RefRelayStatusEffectEvent);
 
         SubscribeLocalEvent<StatusEffectContainerComponent, CatchAttemptEvent>(RefRelayStatusEffectEvent);
         SubscribeLocalEvent<StatusEffectContainerComponent, SelfBeforeGunShotEvent>(RelayStatusEffectEvent);
+
+        SubscribeLocalEvent<StatusEffectContainerComponent, TargetHandcuffedEvent>(RefRelayStatusEffectEvent);
+        SubscribeLocalEvent<StatusEffectContainerComponent, BeforeTargetHandcuffedEvent>(RefRelayStatusEffectEvent);
     }
 
     private void RefRelayStatusEffectEvent<T>(EntityUid uid, StatusEffectContainerComponent component, ref T args) where T : struct
diff --git a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
index 16f76826e7..724ca294b6 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
@@ -74,6 +74,9 @@ public sealed partial class StatusEffectsSystem : EntitySystem
 
     private void OnEntityInserted(Entity<StatusEffectContainerComponent> ent, ref EntInsertedIntoContainerMessage args)
     {
+        if (_timing.ApplyingState)
+            return;
+
         if (args.Container.ID != StatusEffectContainerComponent.ContainerId)
             return;
 
diff --git a/Content.Shared/StatusIcon/Components/JobStatusComponent.cs b/Content.Shared/StatusIcon/Components/JobStatusComponent.cs
index 4ec20d7815..849cbb8be8 100644
--- a/Content.Shared/StatusIcon/Components/JobStatusComponent.cs
+++ b/Content.Shared/StatusIcon/Components/JobStatusComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Overlays;
+using Content.Shared.Overlays;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/StatusIcon/SharedStatusIconSystem.cs b/Content.Shared/StatusIcon/SharedStatusIconSystem.cs
index a4b22e595e..0caa969a44 100644
--- a/Content.Shared/StatusIcon/SharedStatusIconSystem.cs
+++ b/Content.Shared/StatusIcon/SharedStatusIconSystem.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.StatusIcon;
+namespace Content.Shared.StatusIcon;
 
 public abstract class SharedStatusIconSystem : EntitySystem
 {
diff --git a/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs b/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs
index a79f445dd0..8081431ec0 100644
--- a/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs
+++ b/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Examine;
+using Content.Shared.Examine;
 using Content.Shared.Inventory;
 using Content.Shared.StepTrigger.Components;
 
diff --git a/Content.Shared/Sticky/Components/StickyComponent.cs b/Content.Shared/Sticky/Components/StickyComponent.cs
index a4007b0780..b1070a575f 100644
--- a/Content.Shared/Sticky/Components/StickyComponent.cs
+++ b/Content.Shared/Sticky/Components/StickyComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Sticky.Systems;
+using Content.Shared.Sticky.Systems;
 using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
 using Robust.Shared.Utility;
diff --git a/Content.Shared/Sticky/Components/StickyVisualizerComponent.cs b/Content.Shared/Sticky/Components/StickyVisualizerComponent.cs
index fd37836dcf..95253b825e 100644
--- a/Content.Shared/Sticky/Components/StickyVisualizerComponent.cs
+++ b/Content.Shared/Sticky/Components/StickyVisualizerComponent.cs
@@ -2,7 +2,7 @@ using Robust.Shared.Serialization;
 
 namespace Content.Shared.Sticky.Components;
 
-using DrawDepth;
+using DrawDepth;
 
 /// <summary>
 /// Sets the sprite's draw depth depending on whether it's stuck.
diff --git a/Content.Shared/Sticky/EntityStuckEvent.cs b/Content.Shared/Sticky/EntityStuckEvent.cs
index ae7a65c0ad..b164ca722d 100644
--- a/Content.Shared/Sticky/EntityStuckEvent.cs
+++ b/Content.Shared/Sticky/EntityStuckEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Sticky;
+namespace Content.Shared.Sticky;
 
 /// <summary>
 ///     Risen on sticky entity to see if it can stick to another entity.
diff --git a/Content.Shared/Sticky/StickyDoAfterEvent.cs b/Content.Shared/Sticky/StickyDoAfterEvent.cs
index a2f003895e..75cc13c3c8 100644
--- a/Content.Shared/Sticky/StickyDoAfterEvent.cs
+++ b/Content.Shared/Sticky/StickyDoAfterEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Sticky;
diff --git a/Content.Shared/Storage/Components/BinComponent.cs b/Content.Shared/Storage/Components/BinComponent.cs
index 03967d7fc9..369743e614 100644
--- a/Content.Shared/Storage/Components/BinComponent.cs
+++ b/Content.Shared/Storage/Components/BinComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Storage.EntitySystems;
+using Content.Shared.Storage.EntitySystems;
 using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
diff --git a/Content.Shared/Storage/Components/InsideEntityStorageComponent.cs b/Content.Shared/Storage/Components/InsideEntityStorageComponent.cs
index 8d0b45a4a2..96b915a052 100644
--- a/Content.Shared/Storage/Components/InsideEntityStorageComponent.cs
+++ b/Content.Shared/Storage/Components/InsideEntityStorageComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Storage.Components;
 
diff --git a/Content.Shared/Storage/Components/ItemMapperComponent.cs b/Content.Shared/Storage/Components/ItemMapperComponent.cs
index fd83120af0..1394c7d95f 100644
--- a/Content.Shared/Storage/Components/ItemMapperComponent.cs
+++ b/Content.Shared/Storage/Components/ItemMapperComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Storage.EntitySystems;
+using Content.Shared.Storage.EntitySystems;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Storage.Components
diff --git a/Content.Shared/Storage/Components/SpawnAfterInteractComponent.cs b/Content.Shared/Storage/Components/SpawnAfterInteractComponent.cs
new file mode 100644
index 0000000000..5a0c655fca
--- /dev/null
+++ b/Content.Shared/Storage/Components/SpawnAfterInteractComponent.cs
@@ -0,0 +1,35 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Storage.Components;
+
+/// <summary>
+/// This component enables the spawn of a specific entity upon being interacted with.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SpawnAfterInteractComponent : Component
+{
+    /// <summary>
+    /// The prototype id of the entity to be spawned in.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Prototype;
+
+    /// <summary>
+    /// Stops the spawn if the target space is no longer in reach, unless true.
+    /// </summary>
+    [DataField]
+    public bool IgnoreDistance;
+
+    /// <summary>
+    /// The length of the interact action.
+    /// </summary>
+    [DataField("doAfter")]
+    public float DoAfterTime;
+
+    /// <summary>
+    /// If the entity with this component should be deleted upon a successful spawn.
+    /// </summary>
+    [DataField]
+    public bool RemoveOnInteract;
+}
diff --git a/Content.Shared/Storage/Components/StorageFillVisualizerComponent.cs b/Content.Shared/Storage/Components/StorageFillVisualizerComponent.cs
index 7c0d8c1ca9..4fe952dc84 100644
--- a/Content.Shared/Storage/Components/StorageFillVisualizerComponent.cs
+++ b/Content.Shared/Storage/Components/StorageFillVisualizerComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Storage.Components;
 
diff --git a/Content.Shared/Storage/Components/StoreAfterFailedInteractComponent.cs b/Content.Shared/Storage/Components/StoreAfterFailedInteractComponent.cs
index 578da52dfc..3bc0510866 100644
--- a/Content.Shared/Storage/Components/StoreAfterFailedInteractComponent.cs
+++ b/Content.Shared/Storage/Components/StoreAfterFailedInteractComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Storage.Components;
 
diff --git a/Content.Shared/Storage/Components/StoreOnCollideComponent.cs b/Content.Shared/Storage/Components/StoreOnCollideComponent.cs
index d8fff31938..33bb77d31f 100644
--- a/Content.Shared/Storage/Components/StoreOnCollideComponent.cs
+++ b/Content.Shared/Storage/Components/StoreOnCollideComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Storage.EntitySystems;
+using Content.Shared.Storage.EntitySystems;
 using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
 
diff --git a/Content.Shared/Storage/EntitySystems/BluespaceLockerDoAfterEvent.cs b/Content.Shared/Storage/EntitySystems/BluespaceLockerDoAfterEvent.cs
index 2e58de4811..54c9f36403 100644
--- a/Content.Shared/Storage/EntitySystems/BluespaceLockerDoAfterEvent.cs
+++ b/Content.Shared/Storage/EntitySystems/BluespaceLockerDoAfterEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Storage.EntitySystems;
diff --git a/Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs b/Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs
index 55d8d2c3b0..c8cdd79337 100644
--- a/Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Stacks;
+using Content.Shared.Stacks;
 using Content.Shared.Storage.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index e012b2e38c..bd1a614e08 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -22,7 +22,6 @@ using Content.Shared.Popups;
 using Content.Shared.Stacks;
 using Content.Shared.Storage.Components;
 using Content.Shared.Tag;
-using Content.Shared.Timing;
 using Content.Shared.Storage.Events;
 using Content.Shared.Verbs;
 using Content.Shared.Whitelist;
@@ -39,6 +38,8 @@ using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 using Content.Shared.Rounding;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using Robust.Shared.Collections;
 using Robust.Shared.Map.Enumerators;
 
diff --git a/Content.Shared/Storage/EntitySystems/SpawnAfterInteractSystem.cs b/Content.Shared/Storage/EntitySystems/SpawnAfterInteractSystem.cs
new file mode 100644
index 0000000000..4a4b7d0111
--- /dev/null
+++ b/Content.Shared/Storage/EntitySystems/SpawnAfterInteractSystem.cs
@@ -0,0 +1,101 @@
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.DoAfter;
+using Content.Shared.Interaction;
+using Content.Shared.Maps;
+using Content.Shared.Physics;
+using Content.Shared.Stacks;
+using Content.Shared.Storage.Components;
+using JetBrains.Annotations;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Storage.EntitySystems;
+
+[UsedImplicitly]
+public sealed partial class SpawnAfterInteractSystem : EntitySystem
+{
+    [Dependency] private SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private SharedMapSystem _maps = default!;
+    [Dependency] private SharedStackSystem _stack = default!;
+    [Dependency] private SharedTransformSystem _transform = default!;
+    [Dependency] private TurfSystem _turf = default!;
+
+    [SubscribeLocalEvent]
+    private void OnInteract(Entity<SpawnAfterInteractComponent> ent, ref AfterInteractEvent args)
+    {
+        if (!args.CanReach && !ent.Comp.IgnoreDistance)
+            return;
+
+        if (!CanSpawn(args.ClickLocation))
+            return;
+
+        var gridUid = _transform.GetGrid(args.ClickLocation);
+        if (gridUid == null)
+            return;
+
+        var doAfterArgs = new DoAfterArgs(EntityManager,
+            args.User,
+            ent.Comp.DoAfterTime,
+            new SpawnAfterInteractEvent(GetNetCoordinates(args.ClickLocation.SnapToGrid())),
+            ent,
+            used: ent)
+        {
+            BreakOnDamage = true,
+            BreakOnMove = true,
+        };
+        _doAfter.TryStartDoAfter(doAfterArgs);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnDoAfter(Entity<SpawnAfterInteractComponent> ent, ref SpawnAfterInteractEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        var coords = GetCoordinates(args.Coordinates);
+        if (!CanSpawn(coords))
+            return;
+
+        if (ent.Comp.RemoveOnInteract && !_stack.TryUse(ent.Owner, 1))
+            return;
+
+        PredictedSpawnAtPosition(ent.Comp.Prototype, coords);
+
+        if (ent.Comp.RemoveOnInteract && !HasComp<StackComponent>(ent))
+            PredictedQueueDel(ent);
+    }
+
+    private bool CanSpawn(EntityCoordinates coords)
+    {
+        var gridUid = _transform.GetGrid(coords);
+        if (!TryComp<MapGridComponent>(gridUid, out var grid))
+            return false;
+
+        if (!_maps.TryGetTileRef(gridUid.Value, grid, coords, out var tileRef))
+            return false;
+
+        return !tileRef.Tile.IsEmpty && !_turf.IsTileBlocked(tileRef, CollisionGroup.MobMask);
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed partial class SpawnAfterInteractEvent : DoAfterEvent
+{
+    [DataField(required: true)]
+    public NetCoordinates Coordinates;
+
+    private SpawnAfterInteractEvent()
+    {
+    }
+
+    public SpawnAfterInteractEvent(NetCoordinates coordinates)
+    {
+        Coordinates = coordinates;
+    }
+
+    public override DoAfterEvent Clone()
+    {
+        return this;
+    }
+}
diff --git a/Content.Shared/Storage/EntitySystems/StoreAfterFailedInteractSystem.cs b/Content.Shared/Storage/EntitySystems/StoreAfterFailedInteractSystem.cs
index 3a7b73c527..eb28f28d1e 100644
--- a/Content.Shared/Storage/EntitySystems/StoreAfterFailedInteractSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/StoreAfterFailedInteractSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Storage.Components;
+using Content.Shared.Storage.Components;
 using Content.Shared.Storage.Events;
 
 namespace Content.Shared.Storage.EntitySystems;
diff --git a/Content.Shared/Storage/EntitySystems/StoreOnCollideSystem.cs b/Content.Shared/Storage/EntitySystems/StoreOnCollideSystem.cs
index 44e502412c..9534a66fe6 100644
--- a/Content.Shared/Storage/EntitySystems/StoreOnCollideSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/StoreOnCollideSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Lock;
+using Content.Shared.Lock;
 using Content.Shared.Storage.Components;
 using Content.Shared.Whitelist;
 using Robust.Shared.Network;
diff --git a/Content.Shared/Storage/Events/EntityProviderInsertCheckEvent.cs b/Content.Shared/Storage/Events/EntityProviderInsertCheckEvent.cs
index 8f1e06cb01..4b0dc637a0 100644
--- a/Content.Shared/Storage/Events/EntityProviderInsertCheckEvent.cs
+++ b/Content.Shared/Storage/Events/EntityProviderInsertCheckEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Storage.Components;
+using Content.Shared.Storage.Components;
 
 namespace Content.Shared.Storage.Events;
 
diff --git a/Content.Shared/Storage/Events/StorageInsertFailedEvent.cs b/Content.Shared/Storage/Events/StorageInsertFailedEvent.cs
index 50f759e43f..b4d3180c6d 100644
--- a/Content.Shared/Storage/Events/StorageInsertFailedEvent.cs
+++ b/Content.Shared/Storage/Events/StorageInsertFailedEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Hands.Components;
+using Content.Shared.Hands.Components;
 
 namespace Content.Shared.Storage.Events;
 
diff --git a/Content.Shared/Store/Components/StoreComponent.cs b/Content.Shared/Store/Components/StoreComponent.cs
index 0d5b1952a5..7bf92c47ef 100644
--- a/Content.Shared/Store/Components/StoreComponent.cs
+++ b/Content.Shared/Store/Components/StoreComponent.cs
@@ -94,6 +94,13 @@ public sealed partial class StoreComponent : Component
     [DataField]
     public EntityUid? StartingMap;
 
+    /// <summary>
+    /// Whether the UI added to the store should require input validation.
+    /// Does nothing if the store UI is added seperately via <see cref="UserInterfaceComponent"/>
+    /// </summary>
+    [DataField]
+    public bool InputValidation = true;
+
     #region audio
     /// <summary>
     /// The sound played to the buyer when a purchase is succesfully made.
diff --git a/Content.Shared/Store/ListingLocalisationHelpers.cs b/Content.Shared/Store/ListingLocalisationHelpers.cs
index 882300109c..3bbc3214f1 100644
--- a/Content.Shared/Store/ListingLocalisationHelpers.cs
+++ b/Content.Shared/Store/ListingLocalisationHelpers.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Store;
 
diff --git a/Content.Shared/Store/SharedStoreSystem.Listings.cs b/Content.Shared/Store/SharedStoreSystem.Listings.cs
index 1ad0a84ad6..e5bc6fae7d 100644
--- a/Content.Shared/Store/SharedStoreSystem.Listings.cs
+++ b/Content.Shared/Store/SharedStoreSystem.Listings.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Mind;
 using Content.Shared.Store.Components;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Store/SharedStoreSystem.UI.cs b/Content.Shared/Store/SharedStoreSystem.UI.cs
index 2d4b166c27..6f4d0f9f01 100644
--- a/Content.Shared/Store/SharedStoreSystem.UI.cs
+++ b/Content.Shared/Store/SharedStoreSystem.UI.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.FixedPoint;
 using Content.Shared.PDA.Ringer;
 using Content.Shared.Store.Components;
diff --git a/Content.Shared/Stunnable/CrawlerComponent.cs b/Content.Shared/Stunnable/CrawlerComponent.cs
index d969117344..ee7eb465e5 100644
--- a/Content.Shared/Stunnable/CrawlerComponent.cs
+++ b/Content.Shared/Stunnable/CrawlerComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Stunnable;
 
diff --git a/Content.Shared/Stunnable/KnockdownStatusEffectComponent.cs b/Content.Shared/Stunnable/KnockdownStatusEffectComponent.cs
index b4805511b2..a8c015773c 100644
--- a/Content.Shared/Stunnable/KnockdownStatusEffectComponent.cs
+++ b/Content.Shared/Stunnable/KnockdownStatusEffectComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Stunnable;
 
diff --git a/Content.Shared/Stunnable/SharedStunSystem.Visualizer.cs b/Content.Shared/Stunnable/SharedStunSystem.Visualizer.cs
index f574e1924b..17c85def77 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.Visualizer.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.Visualizer.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Bed.Sleep;
+using Content.Shared.Bed.Sleep;
 using Content.Shared.Mobs;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Stunnable/StunVisualsComponent.cs b/Content.Shared/Stunnable/StunVisualsComponent.cs
index 6f1070a558..053cca31ed 100644
--- a/Content.Shared/Stunnable/StunVisualsComponent.cs
+++ b/Content.Shared/Stunnable/StunVisualsComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Utility;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.Stunnable;
 
diff --git a/Content.Shared/Stunnable/StunnableEvents.cs b/Content.Shared/Stunnable/StunnableEvents.cs
index f0c08f6136..b79bef784a 100644
--- a/Content.Shared/Stunnable/StunnableEvents.cs
+++ b/Content.Shared/Stunnable/StunnableEvents.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Alert;
+using Content.Shared.Alert;
 using Content.Shared.DoAfter;
 using Content.Shared.Popups;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/SubFloor/SharedTrayScannerSystem.cs b/Content.Shared/SubFloor/SharedTrayScannerSystem.cs
index e732450de4..ab626f7285 100644
--- a/Content.Shared/SubFloor/SharedTrayScannerSystem.cs
+++ b/Content.Shared/SubFloor/SharedTrayScannerSystem.cs
@@ -3,7 +3,7 @@ using Content.Shared.Eye;
 using Content.Shared.Hands;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory.Events;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Verbs;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -69,7 +69,7 @@ public abstract partial class SharedTrayScannerSystem : EntitySystem
             return;
 
         // Prevents ping spam
-        if (!_delay.TryResetDelay(scanner, checkDelayed: true))
+        if (!_delay.TryResetDelay(scanner.Owner, checkDelayed: true))
             return;
 
         scanner.Comp.Mode = Next(scanner.Comp.Mode);
diff --git a/Content.Shared/SurveillanceCamera/Components/SurveillanceCameraMapComponent.cs b/Content.Shared/SurveillanceCamera/Components/SurveillanceCameraMapComponent.cs
index 754240f604..3613456bcd 100644
--- a/Content.Shared/SurveillanceCamera/Components/SurveillanceCameraMapComponent.cs
+++ b/Content.Shared/SurveillanceCamera/Components/SurveillanceCameraMapComponent.cs
@@ -1,5 +1,7 @@
 using System.Numerics;
+using Content.Shared.DeviceNetwork;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.SurveillanceCamera.Components;
@@ -46,7 +48,7 @@ public partial struct CameraMarker
     /// Subnet the camera is connected to.
     /// </summary>
     [DataField]
-    public string Subnet;
+    public ProtoId<DeviceFrequencyPrototype> Subnet;
 
     /// <summary>
     /// Should the camera be displayed on the camera map.
diff --git a/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraSystem.cs b/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraSystem.cs
index 1be49f8fc8..dfe4365b1a 100644
--- a/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraSystem.cs
+++ b/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraSystem.cs
@@ -9,6 +9,7 @@ public abstract partial class SharedSurveillanceCameraSystem : EntitySystem
 {
     public override void Initialize()
     {
+        base.Initialize();
         SubscribeLocalEvent<SurveillanceCameraComponent, GetVerbsEvent<AlternativeVerb>>(AddVerbs);
         SubscribeLocalEvent<SurveillanceCameraComponent, EmpPulseEvent>(OnEmpPulse);
         SubscribeLocalEvent<SurveillanceCameraComponent, EmpDisabledRemovedEvent>(OnEmpDisabledRemoved);
diff --git a/Content.Shared/SurveillanceCamera/SurveillanceCameraPayloads.cs b/Content.Shared/SurveillanceCamera/SurveillanceCameraPayloads.cs
new file mode 100644
index 0000000000..5c09824be4
--- /dev/null
+++ b/Content.Shared/SurveillanceCamera/SurveillanceCameraPayloads.cs
@@ -0,0 +1,114 @@
+using Content.Shared.DeviceNetwork;
+using Content.Shared.DeviceNetwork.Payloads;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.SurveillanceCamera;
+
+/// <summary>
+/// Response to <see cref="SurveillanceCameraConnectRequestPayload"/>
+/// from the camera in order to establish the connection.
+/// </summary>
+public partial record struct SurveillanceCameraConnectPayload : IRoutableNetworkPayload
+{
+    [DataField]
+    public string? SenderAddress { get; set; }
+
+    [DataField]
+    public EntityUid Sender { get; set; }
+}
+
+/// <summary>
+/// Request to connect to a camera from the camera monitor.
+/// </summary>
+public partial record struct SurveillanceCameraConnectRequestPayload : IRoutableNetworkPayload
+{
+    [DataField]
+    public string? SenderAddress { get; set; }
+
+    [DataField]
+    public EntityUid Sender { get; set; }
+}
+
+/// <summary>
+/// Message sent periodically by an active camera monitor towards the active camera.
+/// </summary>
+public partial record struct SurveillanceCameraHeartbeatRequestPayload : IRoutableNetworkPayload
+{
+    [DataField]
+    public string? SenderAddress { get; set; }
+
+    [DataField]
+    public EntityUid Sender { get; set; }
+}
+
+/// <summary>
+/// Response from the camera to the <see cref="SurveillanceCameraHeartbeatRequestPayload"/>.
+/// </summary>
+public partial record struct SurveillanceCameraHeartbeatPayload : IRoutableNetworkPayload
+{
+    [DataField]
+    public string? SenderAddress { get; set; }
+
+    [DataField]
+    public EntityUid Sender { get; set; }
+}
+
+/// <summary>
+/// Request to get <see cref="SurveillanceCameraDataPayload"/> from all cameras on a certain subnet.
+/// </summary>
+public partial record struct SurveillanceCameraPingPayload : IRoutableNetworkPayload
+{
+    [DataField]
+    public string Subnet;
+
+    [DataField]
+    public string? SenderAddress { get; set; }
+
+    [DataField]
+    public EntityUid Sender { get; set; }
+}
+
+/// <summary>
+/// Response to the <see cref="SurveillanceCameraPingPayload"/> request, contains info about a camera on a subnet.
+/// </summary>
+public partial record struct SurveillanceCameraDataPayload : IRoutableNetworkPayload
+{
+    [DataField]
+    public string Name;
+
+    [DataField]
+    public string Subnet;
+
+    [DataField]
+    public string? SenderAddress { get; set; }
+
+    [DataField]
+    public EntityUid Sender { get; set; }
+}
+
+/// <summary>
+/// Request to connect to a camera subnet.
+/// </summary>
+public partial record struct SurveillanceCameraSubnetConnectPayload : INetworkPayload;
+
+/// <summary>
+/// Request to disconnect from a camera subnet.
+/// </summary>
+public partial record struct SurveillanceCameraSubnetDisconnectPayload : INetworkPayload;
+
+/// <summary>
+/// Request to get all available subnets.
+/// </summary>
+public partial record struct SurveillanceCameraPingSubnetPayload : INetworkPayload;
+
+/// <summary>
+/// Response to the <see cref="SurveillanceCameraPingSubnetPayload"/>, contains the name of the available subnet.
+/// </summary>
+public partial record struct SurveillanceCameraSubnetDataPayload : INetworkPayload
+{
+    [DataField]
+    public string Subnet;
+
+    [DataField]
+    public ProtoId<DeviceFrequencyPrototype> TransmitFrequency;
+}
diff --git a/Content.Shared/Survivor/Components/SurvivorComponent.cs b/Content.Shared/Survivor/Components/SurvivorComponent.cs
index 140f688077..98ac2741c0 100644
--- a/Content.Shared/Survivor/Components/SurvivorComponent.cs
+++ b/Content.Shared/Survivor/Components/SurvivorComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Survivor.Components;
 
diff --git a/Content.Shared/Swab/SwabEvents.cs b/Content.Shared/Swab/SwabEvents.cs
index 3c9fcbef41..018e80bd20 100644
--- a/Content.Shared/Swab/SwabEvents.cs
+++ b/Content.Shared/Swab/SwabEvents.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Swab;
diff --git a/Content.Shared/Tabletop/Events/TabletopMoveEvent.cs b/Content.Shared/Tabletop/Events/TabletopMoveEvent.cs
index 8abbd90aec..d31769fa4d 100644
--- a/Content.Shared/Tabletop/Events/TabletopMoveEvent.cs
+++ b/Content.Shared/Tabletop/Events/TabletopMoveEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Tabletop.Components;
+using Content.Shared.Tabletop.Components;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Tabletop/Events/TabletopPlayEvent.cs b/Content.Shared/Tabletop/Events/TabletopPlayEvent.cs
index 566434bce7..ecc5d5a72d 100644
--- a/Content.Shared/Tabletop/Events/TabletopPlayEvent.cs
+++ b/Content.Shared/Tabletop/Events/TabletopPlayEvent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Tabletop.Events
 {
diff --git a/Content.Shared/Tabletop/Events/TabletopStopPlayingEvent.cs b/Content.Shared/Tabletop/Events/TabletopStopPlayingEvent.cs
index 23301dec4a..b4d02e6cab 100644
--- a/Content.Shared/Tabletop/Events/TabletopStopPlayingEvent.cs
+++ b/Content.Shared/Tabletop/Events/TabletopStopPlayingEvent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Tabletop.Events
 {
diff --git a/Content.Shared/Tabletop/SharedTabletopSystem.cs b/Content.Shared/Tabletop/SharedTabletopSystem.cs
index 751d8c10ba..4a1ec4be6e 100644
--- a/Content.Shared/Tabletop/SharedTabletopSystem.cs
+++ b/Content.Shared/Tabletop/SharedTabletopSystem.cs
@@ -94,7 +94,7 @@ public abstract partial class SharedTabletopSystem : EntitySystem
         var meta = MetaData(handEnt.Value);
         var protoId = meta.EntityPrototype?.ID;
 
-        var hologram = EntityManager.PredictedSpawn(protoId, session.Position.Offset(-1, 0));
+        var hologram = PredictedSpawn(protoId, session.Position.Offset(-1, 0));
 
         // Make sure the entity can be dragged and can be removed, move it into the board game world and add it to the Entities hashmap.
         EnsureComp<TabletopDraggableComponent>(hologram);
diff --git a/Content.Shared/Tabletop/TabletopItemVisuals.cs b/Content.Shared/Tabletop/TabletopItemVisuals.cs
index 94887feac7..7a73a3b0b8 100644
--- a/Content.Shared/Tabletop/TabletopItemVisuals.cs
+++ b/Content.Shared/Tabletop/TabletopItemVisuals.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Tabletop
 {
diff --git a/Content.Shared/Tabletop/TabletopSession.cs b/Content.Shared/Tabletop/TabletopSession.cs
index 3d0e486148..7972bd554b 100644
--- a/Content.Shared/Tabletop/TabletopSession.cs
+++ b/Content.Shared/Tabletop/TabletopSession.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 
diff --git a/Content.Shared/Tag/TagComponent.cs b/Content.Shared/Tag/TagComponent.cs
index ad4240ba06..fe9e72dba4 100644
--- a/Content.Shared/Tag/TagComponent.cs
+++ b/Content.Shared/Tag/TagComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Tag;
diff --git a/Content.Shared/Tag/TagPrototype.cs b/Content.Shared/Tag/TagPrototype.cs
index b89569ca8e..2a2bfe4f72 100644
--- a/Content.Shared/Tag/TagPrototype.cs
+++ b/Content.Shared/Tag/TagPrototype.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Tag;
 
diff --git a/Content.Shared/Teleportation/Components/LinkedEntityComponent.cs b/Content.Shared/Teleportation/Components/LinkedEntityComponent.cs
index b1df6f4ee7..504f94c307 100644
--- a/Content.Shared/Teleportation/Components/LinkedEntityComponent.cs
+++ b/Content.Shared/Teleportation/Components/LinkedEntityComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Teleportation.Systems;
+using Content.Shared.Teleportation.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Teleportation/Components/PortalComponent.cs b/Content.Shared/Teleportation/Components/PortalComponent.cs
index 1e2c2e6428..667ca821b1 100644
--- a/Content.Shared/Teleportation/Components/PortalComponent.cs
+++ b/Content.Shared/Teleportation/Components/PortalComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Audio;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Teleportation.Components;
diff --git a/Content.Shared/Teleportation/Components/PortalTimeoutComponent.cs b/Content.Shared/Teleportation/Components/PortalTimeoutComponent.cs
index 341c68d7c8..0d940bceef 100644
--- a/Content.Shared/Teleportation/Components/PortalTimeoutComponent.cs
+++ b/Content.Shared/Teleportation/Components/PortalTimeoutComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Teleportation.Components;
 
diff --git a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
index e2aebbad82..3279a93f96 100644
--- a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
+++ b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Pulling.Systems;
 using Content.Shared.Popups;
diff --git a/Content.Shared/Teleportation/Systems/SharedTeleportLocationsSystem.cs b/Content.Shared/Teleportation/Systems/SharedTeleportLocationsSystem.cs
index b66e8d1ce8..000d25fc8c 100644
--- a/Content.Shared/Teleportation/Systems/SharedTeleportLocationsSystem.cs
+++ b/Content.Shared/Teleportation/Systems/SharedTeleportLocationsSystem.cs
@@ -1,10 +1,10 @@
-using Content.Shared.Maths;
+using Content.Shared.Maths;
 using Content.Shared.Teleportation.Components;
-using Content.Shared.Timing;
 using Content.Shared.UserInterface;
 using Content.Shared.Warps;
 using Robust.Shared.Map;
 using System.Numerics;
+using Content.Shared.Timing.Systems;
 
 namespace Content.Shared.Teleportation.Systems;
 
diff --git a/Content.Shared/Teleportation/TeleportLocationsUi.cs b/Content.Shared/Teleportation/TeleportLocationsUi.cs
index f4ca97584a..706b240ba6 100644
--- a/Content.Shared/Teleportation/TeleportLocationsUi.cs
+++ b/Content.Shared/Teleportation/TeleportLocationsUi.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Teleportation;
 
diff --git a/Content.Shared/Temperature/IsHotEvent.cs b/Content.Shared/Temperature/IsHotEvent.cs
index a473262649..cf1b326e36 100644
--- a/Content.Shared/Temperature/IsHotEvent.cs
+++ b/Content.Shared/Temperature/IsHotEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Temperature
+namespace Content.Shared.Temperature
 {
     /// <summary>
     ///     Directed event raised on entities to query whether they're "hot" or not.
diff --git a/Content.Shared/Temperature/TemperatureHelpers.cs b/Content.Shared/Temperature/TemperatureHelpers.cs
index c1683ee8dc..3243147662 100644
--- a/Content.Shared/Temperature/TemperatureHelpers.cs
+++ b/Content.Shared/Temperature/TemperatureHelpers.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos;
+using Content.Shared.Atmos;
 
 namespace Content.Shared.Temperature
 {
diff --git a/Content.Shared/Throwing/ThrowAttemptEvent.cs b/Content.Shared/Throwing/ThrowAttemptEvent.cs
index 994206afa5..a3b79f42ab 100644
--- a/Content.Shared/Throwing/ThrowAttemptEvent.cs
+++ b/Content.Shared/Throwing/ThrowAttemptEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Throwing
+namespace Content.Shared.Throwing
 {
     public sealed class ThrowAttemptEvent : CancellableEntityEventArgs
     {
diff --git a/Content.Shared/Timing/UseDelayComponent.cs b/Content.Shared/Timing/Components/UseDelayComponent.cs
similarity index 85%
rename from Content.Shared/Timing/UseDelayComponent.cs
rename to Content.Shared/Timing/Components/UseDelayComponent.cs
index aa6c66eb81..9b0b40b02e 100644
--- a/Content.Shared/Timing/UseDelayComponent.cs
+++ b/Content.Shared/Timing/Components/UseDelayComponent.cs
@@ -1,15 +1,14 @@
+using Content.Shared.Timing.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Timing;
+namespace Content.Shared.Timing.Components;
 
 /// <summary>
 /// Timer that creates a cooldown each time an object is activated/used.
 /// Can support additional, separate cooldown timers on the object by passing a unique ID with the system methods.
 /// </summary>
-[RegisterComponent]
-[NetworkedComponent]
-[Access(typeof(UseDelaySystem))]
+[RegisterComponent, NetworkedComponent, Access(typeof(UseDelaySystem))]
 public sealed partial class UseDelayComponent : Component
 {
     [DataField]
@@ -21,7 +20,7 @@ public sealed partial class UseDelayComponent : Component
     /// <remarks>
     /// This is only used at MapInit and should not be expected
     /// to reflect the length of the default delay after that.
-    /// Use <see cref="UseDelaySystem.TryGetDelayInfo"/> instead.
+    /// Use <see cref="Systems.UseDelaySystem.TryGetDelayInfo"/> instead.
     /// </remarks>
     [DataField]
     public TimeSpan Delay = TimeSpan.FromSeconds(1);
diff --git a/Content.Shared/Timing/StartEndTime.cs b/Content.Shared/Timing/StartEndTime.cs
index fde9f7341c..2a8341a76c 100644
--- a/Content.Shared/Timing/StartEndTime.cs
+++ b/Content.Shared/Timing/StartEndTime.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Timing;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.Timing;
 
diff --git a/Content.Shared/Timing/Systems/UseDelaySystem.API.cs b/Content.Shared/Timing/Systems/UseDelaySystem.API.cs
new file mode 100644
index 0000000000..98c96d8d86
--- /dev/null
+++ b/Content.Shared/Timing/Systems/UseDelaySystem.API.cs
@@ -0,0 +1,158 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Timing.Components;
+using JetBrains.Annotations;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Timing.Systems;
+
+public sealed partial class UseDelaySystem
+{
+    /// <summary>
+    /// Sets the Delay Duration of the specified delayID.
+    /// If the delayID doesn't exist, it'll be added.
+    /// </summary>
+    /// <param name="delayed">The entity whose useDelay is being modified.</param>
+    /// <param name="length">The new length of the delay.</param>
+    /// <param name="id">The specified id of the delay. If null, it'll use the standard delay.</param>
+    /// <remarks>This will add the <see cref="Components.UseDelayComponent"/> if it isn't already present on the entity.</remarks>
+    [PublicAPI]
+    public void SetLength(Entity<UseDelayComponent?> delayed, TimeSpan length, string id = DefaultId)
+    {
+        EnsureComp<UseDelayComponent>(delayed.Owner, out var comp);
+
+        if (comp.Delays.TryGetValue(id, out var entry))
+        {
+            if (entry.Length == length)
+                return;
+
+            entry.Length = length;
+        }
+        else
+        {
+            comp.Delays.Add(id, new UseDelayInfo(length));
+        }
+
+        Dirty(delayed);
+    }
+
+    /// <summary>
+    /// Checks whether the entity currently has an active delay with the specified ID.
+    /// </summary>
+    /// <param name="delayed">The entity with the possibly active useDelay.</param>
+    /// <param name="id">The specified id of the delay. If null, it'll use the standard delay.</param>
+    /// <returns>True, if the specified delay is active, otherwise false.</returns>
+    [PublicAPI]
+    public bool IsDelayed(Entity<UseDelayComponent?> delayed, string id = DefaultId)
+    {
+        if (!Resolve(delayed.Owner, ref delayed.Comp, false))
+            return false;
+
+        if (!delayed.Comp.Delays.TryGetValue(id, out var entry))
+            return false;
+
+        return entry.EndTime >= _gameTiming.CurTime;
+    }
+
+    /// <summary>
+    /// Cancels an active delay with the specified delayID.
+    /// </summary>
+    /// <param name="delayed">The entity whose active delay is to be canceled.</param>
+    /// <param name="id">The specified id of the delay. If null, it'll use the standard delay.</param>
+    /// <returns>Returns true if it was active and has been canceled, otherwise false.</returns>
+    [PublicAPI]
+    public bool CancelDelay(Entity<UseDelayComponent> delayed, string id = DefaultId)
+    {
+        if (!delayed.Comp.Delays.TryGetValue(id, out var entry) || entry.EndTime <= _gameTiming.CurTime)
+            return false;
+
+        entry.EndTime = _gameTiming.CurTime;
+        Dirty(delayed);
+        return true;
+    }
+
+    /// <summary>
+    /// Tries to get info about the delay with the specified ID. See <see cref="Components.UseDelayInfo"/>.
+    /// </summary>
+    /// <param name="delayed">The entity with the useDelay.</param>
+    /// <param name="info">The info about the specified useDelay.</param>
+    /// <param name="id">The specified id of the delay. If null, it'll use the standard delay.</param>
+    /// <returns>Returns true if the entity has the delay, otherwise false.</returns>
+    [PublicAPI]
+    public bool TryGetDelayInfo(Entity<UseDelayComponent?> delayed, [NotNullWhen(true)] out UseDelayInfo? info, string id = DefaultId)
+    {
+        if (!Resolve(delayed.Owner, ref delayed.Comp, false))
+        {
+            info = null;
+            return false;
+        }
+
+        return delayed.Comp.Delays.TryGetValue(id, out info);
+    }
+
+    /// <summary>
+    /// Returns the info about the last ending, active delay.
+    /// </summary>
+    /// <param name="delayed">The entity with the delays.</param>
+    /// <param name="info">The info of the active delay.</param>
+    /// <returns>Returns true if one is present and active, otherwise false.</returns>
+    [PublicAPI]
+    public bool GetLastActiveDelay(Entity<UseDelayComponent> delayed, out UseDelayInfo info)
+    {
+        var success = false;
+        info = new UseDelayInfo(TimeSpan.Zero);
+
+        foreach (var entry in delayed.Comp.Delays)
+        {
+            if (entry.Value.EndTime <= _gameTiming.CurTime || entry.Value.EndTime <= info.EndTime)
+                continue;
+
+            info = entry.Value;
+            success = true;
+        }
+        return success;
+    }
+
+    /// <summary>
+    /// Try to reset the specified delay of the entity.
+    /// </summary>
+    /// <param name="delayed">The entity whose specified delay is being reset.</param>
+    /// <param name="checkDelayed">Whether to check if the delay is already active. If so, it'll not reset it.</param>
+    /// <param name="id">The specified id of the delay. If null, it'll use the standard delay.</param>
+    /// <returns>Returns true if it was able to find & reset the delay, otherwise false.</returns>
+    [PublicAPI]
+    public bool TryResetDelay(Entity<UseDelayComponent?> delayed, bool checkDelayed = false, string id = DefaultId)
+    {
+        if (!Resolve(delayed, ref delayed.Comp, false))
+            return false;
+
+        if (checkDelayed && IsDelayed(delayed, id))
+            return false;
+
+        if (!delayed.Comp.Delays.TryGetValue(id, out var entry))
+        {
+            DebugTools.Assert($"Attempted to reset the {id} delay of {delayed}, but it's missing.");
+            return false;
+        }
+
+        var curTime = _gameTiming.CurTime;
+        entry.StartTime = curTime;
+        entry.EndTime = curTime - _metadata.GetPauseTime(delayed) + entry.Length;
+        Dirty(delayed);
+        return true;
+    }
+
+    /// <summary>
+    /// Resets all delays on the entity.
+    /// </summary>
+    [PublicAPI]
+    public void ResetAllDelays(Entity<UseDelayComponent> ent)
+    {
+        var curTime = _gameTiming.CurTime;
+        foreach (var entry in ent.Comp.Delays.Values)
+        {
+            entry.StartTime = curTime;
+            entry.EndTime = curTime - _metadata.GetPauseTime(ent) + entry.Length;
+        }
+        Dirty(ent);
+    }
+}
diff --git a/Content.Shared/Timing/Systems/UseDelaySystem.cs b/Content.Shared/Timing/Systems/UseDelaySystem.cs
new file mode 100644
index 0000000000..ef7e7bbd7e
--- /dev/null
+++ b/Content.Shared/Timing/Systems/UseDelaySystem.cs
@@ -0,0 +1,55 @@
+using Content.Shared.Timing.Components;
+using Robust.Shared.GameStates;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Timing.Systems;
+
+public sealed partial class UseDelaySystem : EntitySystem
+{
+    [Dependency] private IGameTiming _gameTiming = default!;
+    [Dependency] private MetaDataSystem _metadata = default!;
+
+    public const string DefaultId = "default";
+
+    [SubscribeLocalEvent]
+    private void OnDelayHandleState(Entity<UseDelayComponent> ent, ref ComponentHandleState args)
+    {
+        if (args.Current is not UseDelayComponentState state)
+            return;
+
+        ent.Comp.Delays.Clear();
+
+        // At time of writing sourcegen networking doesn't deep copy so this will mispredict if you try.
+        foreach (var (key, delay) in state.Delays)
+        {
+            ent.Comp.Delays[key] = new UseDelayInfo(delay.Length, delay.StartTime, delay.EndTime);
+        }
+    }
+
+    [SubscribeLocalEvent]
+    private void OnDelayGetState(Entity<UseDelayComponent> ent, ref ComponentGetState args)
+    {
+        args.State = new UseDelayComponentState()
+        {
+            Delays = ent.Comp.Delays
+        };
+    }
+
+    [SubscribeLocalEvent]
+    private void OnMapInit(Entity<UseDelayComponent> ent, ref MapInitEvent args)
+    {
+        // Set default delay length from the prototype
+        // This makes it easier for simple use cases that only need a single delay
+        SetLength((ent, ent.Comp), ent.Comp.Delay, DefaultId);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnUnpaused(Entity<UseDelayComponent> ent, ref EntityUnpausedEvent args)
+    {
+        // We have to do this manually, since it's not just a single field.
+        foreach (var entry in ent.Comp.Delays.Values)
+        {
+            entry.EndTime += args.PausedTime;
+        }
+    }
+}
diff --git a/Content.Shared/Timing/UseDelaySystem.cs b/Content.Shared/Timing/UseDelaySystem.cs
deleted file mode 100644
index 3f0e5d3568..0000000000
--- a/Content.Shared/Timing/UseDelaySystem.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Robust.Shared.GameStates;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.Timing;
-
-public sealed partial class UseDelaySystem : EntitySystem
-{
-    [Dependency] private IGameTiming _gameTiming = default!;
-    [Dependency] private MetaDataSystem _metadata = default!;
-
-    public const string DefaultId = "default";
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<UseDelayComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<UseDelayComponent, EntityUnpausedEvent>(OnUnpaused);
-        SubscribeLocalEvent<UseDelayComponent, ComponentGetState>(OnDelayGetState);
-        SubscribeLocalEvent<UseDelayComponent, ComponentHandleState>(OnDelayHandleState);
-    }
-
-    private void OnDelayHandleState(Entity<UseDelayComponent> ent, ref ComponentHandleState args)
-    {
-        if (args.Current is not UseDelayComponentState state)
-            return;
-
-        ent.Comp.Delays.Clear();
-
-        // At time of writing sourcegen networking doesn't deep copy so this will mispredict if you try.
-        foreach (var (key, delay) in state.Delays)
-        {
-            ent.Comp.Delays[key] = new UseDelayInfo(delay.Length, delay.StartTime, delay.EndTime);
-        }
-    }
-
-    private void OnDelayGetState(Entity<UseDelayComponent> ent, ref ComponentGetState args)
-    {
-        args.State = new UseDelayComponentState()
-        {
-            Delays = ent.Comp.Delays
-        };
-    }
-
-    private void OnMapInit(Entity<UseDelayComponent> ent, ref MapInitEvent args)
-    {
-        // Set default delay length from the prototype
-        // This makes it easier for simple use cases that only need a single delay
-        SetLength((ent, ent.Comp), ent.Comp.Delay, DefaultId);
-    }
-
-    private void OnUnpaused(Entity<UseDelayComponent> ent, ref EntityUnpausedEvent args)
-    {
-        // We have to do this manually, since it's not just a single field.
-        foreach (var entry in ent.Comp.Delays.Values)
-        {
-            entry.EndTime += args.PausedTime;
-        }
-    }
-
-    /// <summary>
-    /// Sets the length of the delay with the specified ID.
-    /// </summary>
-    /// <remarks>
-    /// This will add a UseDelay component to the entity if it doesn't have one.
-    /// </remarks>
-    public bool SetLength(Entity<UseDelayComponent?> ent, TimeSpan length, string id = DefaultId)
-    {
-        EnsureComp<UseDelayComponent>(ent.Owner, out var comp);
-
-        if (comp.Delays.TryGetValue(id, out var entry))
-        {
-            if (entry.Length == length)
-                return true;
-
-            entry.Length = length;
-        }
-        else
-        {
-            comp.Delays.Add(id, new UseDelayInfo(length));
-        }
-
-        Dirty(ent);
-        return true;
-    }
-
-    /// <summary>
-    /// Returns true if the entity has a currently active UseDelay with the specified ID.
-    /// </summary>
-    public bool IsDelayed(Entity<UseDelayComponent?> ent, string id = DefaultId)
-    {
-        if (!Resolve(ent.Owner, ref ent.Comp, false))
-            return false;
-
-        if (!ent.Comp.Delays.TryGetValue(id, out var entry))
-            return false;
-
-        return entry.EndTime >= _gameTiming.CurTime;
-    }
-
-    /// <summary>
-    /// Cancels the delay with the specified ID.
-    /// </summary>
-    public void CancelDelay(Entity<UseDelayComponent> ent, string id = DefaultId)
-    {
-        if (!ent.Comp.Delays.TryGetValue(id, out var entry))
-            return;
-
-        entry.EndTime = _gameTiming.CurTime;
-        Dirty(ent);
-    }
-
-    /// <summary>
-    /// Tries to get info about the delay with the specified ID. See <see cref="UseDelayInfo"/>.
-    /// </summary>
-    /// <param name="ent"></param>
-    /// <param name="info"></param>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public bool TryGetDelayInfo(Entity<UseDelayComponent?> ent, [NotNullWhen(true)] out UseDelayInfo? info, string id = DefaultId)
-    {
-        if (!Resolve(ent.Owner, ref ent.Comp, false))
-        {
-            info = null;
-            return false;
-        }
-
-        return ent.Comp.Delays.TryGetValue(id, out info);
-    }
-
-    /// <summary>
-    /// Returns info for the delay that will end farthest in the future.
-    /// </summary>
-    public UseDelayInfo GetLastEndingDelay(Entity<UseDelayComponent> ent)
-    {
-        if (!ent.Comp.Delays.TryGetValue(DefaultId, out var last))
-            return new UseDelayInfo(TimeSpan.Zero);
-
-        foreach (var entry in ent.Comp.Delays)
-        {
-            if (entry.Value.EndTime > last.EndTime)
-                last = entry.Value;
-        }
-        return last;
-    }
-
-    /// <summary>
-    /// Resets the delay with the specified ID for this entity if possible.
-    /// </summary>
-    /// <param name="checkDelayed">Check if the entity has an ongoing delay with the specified ID.
-    /// If it does, return false and don't reset it.
-    /// Otherwise reset it and return true.</param>
-    public bool TryResetDelay(Entity<UseDelayComponent> ent, bool checkDelayed = false, string id = DefaultId)
-    {
-        if (checkDelayed && IsDelayed((ent.Owner, ent.Comp), id))
-            return false;
-
-        if (!ent.Comp.Delays.TryGetValue(id, out var entry))
-            return false;
-
-        var curTime = _gameTiming.CurTime;
-        entry.StartTime = curTime;
-        entry.EndTime = curTime - _metadata.GetPauseTime(ent) + entry.Length;
-        Dirty(ent);
-        return true;
-    }
-
-    public bool TryResetDelay(EntityUid uid, bool checkDelayed = false, UseDelayComponent? component = null, string id = DefaultId)
-    {
-        if (!Resolve(uid, ref component, false))
-            return false;
-
-        return TryResetDelay((uid, component), checkDelayed, id);
-    }
-
-    /// <summary>
-    /// Resets all delays on the entity.
-    /// </summary>
-    public void ResetAllDelays(Entity<UseDelayComponent> ent)
-    {
-        var curTime = _gameTiming.CurTime;
-        foreach (var entry in ent.Comp.Delays.Values)
-        {
-            entry.StartTime = curTime;
-            entry.EndTime = curTime - _metadata.GetPauseTime(ent) + entry.Length;
-        }
-        Dirty(ent);
-    }
-}
diff --git a/Content.Shared/Tools/Components/LayerChangeOnWeldComponent.cs b/Content.Shared/Tools/Components/LayerChangeOnWeldComponent.cs
index 165cd41e69..5e999e2dd2 100644
--- a/Content.Shared/Tools/Components/LayerChangeOnWeldComponent.cs
+++ b/Content.Shared/Tools/Components/LayerChangeOnWeldComponent.cs
@@ -4,6 +4,9 @@ using Robust.Shared.GameStates;
 
 namespace Content.Shared.Tools.Components;
 
+/// <summary>
+/// This component changes the collision layer of airlocks when they are welded, so rats can't crawl under them
+/// </summary>
 [RegisterComponent, NetworkedComponent]
 [Access(typeof(WeldableSystem))]
 public sealed partial class LayerChangeOnWeldComponent : Component
diff --git a/Content.Shared/Tools/Components/ToolComponent.cs b/Content.Shared/Tools/Components/ToolComponent.cs
index be273c8c05..88733da017 100644
--- a/Content.Shared/Tools/Components/ToolComponent.cs
+++ b/Content.Shared/Tools/Components/ToolComponent.cs
@@ -5,20 +5,20 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Tools.Components;
 
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 [Access(typeof(SharedToolSystem))]
 public sealed partial class ToolComponent : Component
 {
-    [DataField]
-    public HashSet<ProtoId<ToolQualityPrototype>> Qualities  = [];
+    [DataField, AutoNetworkedField]
+    public HashSet<ProtoId<ToolQualityPrototype>> Qualities = [];
 
     /// <summary>
-    ///     For tool interactions that have a delay before action this will modify the rate, time to wait is divided by this value
+    /// For tool interactions that have a delay before action this will modify the rate, time to wait is divided by this value
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public float SpeedModifier = 1f;
 
-    [DataField]
+    [DataField, AutoNetworkedField]
     public SoundSpecifier? UseSound;
 }
 
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs b/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
index 73bb348588..a00c02bddd 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
@@ -68,11 +68,13 @@ public abstract partial class SharedToolSystem
         var current = multiple.Entries[multiple.CurrentEntry];
         tool.UseSound = current.UseSound;
         tool.Qualities = current.Behavior;
+        Dirty(uid, tool);
 
         // TODO: Replace this with a better solution later
         if (TryComp<PryingComponent>(uid, out var pryComp))
         {
             pryComp.Enabled = current.Behavior.Contains("Prying");
+            Dirty(uid, pryComp);
         }
 
         if (playSound && current.ChangeSound != null)
diff --git a/Content.Shared/Tools/Systems/WeldFinishedEvent.cs b/Content.Shared/Tools/Systems/WeldFinishedEvent.cs
index 4ece52835d..a87d36b2b9 100644
--- a/Content.Shared/Tools/Systems/WeldFinishedEvent.cs
+++ b/Content.Shared/Tools/Systems/WeldFinishedEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Tools.Systems;
diff --git a/Content.Shared/Tools/Systems/WeldableAttemptEvent.cs b/Content.Shared/Tools/Systems/WeldableAttemptEvent.cs
index a3b853422d..8fa35ccd8a 100644
--- a/Content.Shared/Tools/Systems/WeldableAttemptEvent.cs
+++ b/Content.Shared/Tools/Systems/WeldableAttemptEvent.cs
@@ -14,4 +14,4 @@ public sealed class WeldableAttemptEvent : CancellableEntityEventArgs
         User = user;
         Tool = tool;
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Toolshed/TypeParsers/FixedPoint2TypeParser.cs b/Content.Shared/Toolshed/TypeParsers/FixedPoint2TypeParser.cs
index 331c7eba7a..378f0d4a46 100644
--- a/Content.Shared/Toolshed/TypeParsers/FixedPoint2TypeParser.cs
+++ b/Content.Shared/Toolshed/TypeParsers/FixedPoint2TypeParser.cs
@@ -1,4 +1,4 @@
-using Content.Shared.FixedPoint;
+using Content.Shared.FixedPoint;
 using Robust.Shared.Console;
 using Robust.Shared.Toolshed;
 using Robust.Shared.Toolshed.Syntax;
diff --git a/Content.Shared/Toolshed/TypeParsers/XenoArtifact/XenoEffectParser.cs b/Content.Shared/Toolshed/TypeParsers/XenoArtifact/XenoArtifactEffectParser.cs
similarity index 88%
rename from Content.Shared/Toolshed/TypeParsers/XenoArtifact/XenoEffectParser.cs
rename to Content.Shared/Toolshed/TypeParsers/XenoArtifact/XenoArtifactEffectParser.cs
index b01747e979..77f67b3e84 100644
--- a/Content.Shared/Toolshed/TypeParsers/XenoArtifact/XenoEffectParser.cs
+++ b/Content.Shared/Toolshed/TypeParsers/XenoArtifact/XenoArtifactEffectParser.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Robust.Shared.Console;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Toolshed;
@@ -11,7 +10,7 @@ namespace Content.Shared.Toolshed.TypeParsers.XenoArtifact;
 /// Custom type parser for toolshed commands
 /// that lets choose entity prototype of XenoArtifact effect.
 /// </summary>
-public sealed partial class XenoEffectParser : CustomCompletionParser<ProtoId<EntityPrototype>>
+public sealed partial class XenoArtifactEffectParser : CustomCompletionParser<ProtoId<EntityPrototype>>
 {
     private static readonly ProtoId<EntityCategoryPrototype> EffectCategoryId = "XenoArtifactEffects";
 
diff --git a/Content.Shared/Toolshed/TypeParsers/XenoArtifact/XenoArtifactNodeParser.cs b/Content.Shared/Toolshed/TypeParsers/XenoArtifact/XenoArtifactNodeParser.cs
index 23266f7a5d..e8f15cb165 100644
--- a/Content.Shared/Toolshed/TypeParsers/XenoArtifact/XenoArtifactNodeParser.cs
+++ b/Content.Shared/Toolshed/TypeParsers/XenoArtifact/XenoArtifactNodeParser.cs
@@ -31,14 +31,18 @@ public sealed partial class XenoArtifactNodeParser : CustomCompletionParser<(Ent
                 node =>
                 {
                     var metadata = _entityManager.GetComponent<MetaDataComponent>(node);
-                    var entDescription = Loc.GetString(metadata.EntityDescription);
+                    var effect = Loc.GetString(metadata.EntityDescription);
+                    var trigger = node.Comp.TriggerTip.HasValue
+                        ? Loc.GetString(node.Comp.TriggerTip)
+                        : "Unknown";
                     return new CompletionOption(
                         node.Owner.ToString(),
                         Loc.GetString(
                             "command-xenoartifact-common-node-hint",
                             ("depth", node.Comp.Depth),
                             ("nodeId", artifact.GetNodeId(node.Owner)),
-                            ("nodeDetail", entDescription)
+                            ("trigger", trigger),
+                            ("effect", effect)
                         )
                     );
                 });
diff --git a/Content.Shared/Toolshed/TypeParsers/XenoArtifact/XenoArtifactTriggerParser.cs b/Content.Shared/Toolshed/TypeParsers/XenoArtifact/XenoArtifactTriggerParser.cs
new file mode 100644
index 0000000000..1ebae9118c
--- /dev/null
+++ b/Content.Shared/Toolshed/TypeParsers/XenoArtifact/XenoArtifactTriggerParser.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.Console;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Toolshed;
+using Robust.Shared.Toolshed.Syntax;
+using Robust.Shared.Toolshed.TypeParsers;
+
+namespace Content.Shared.Toolshed.TypeParsers.XenoArtifact;
+
+/// <summary>
+/// Custom type parser for toolshed commands
+/// that lets choose entity prototype of XenoArtifact trigger.
+/// </summary>
+public sealed partial class XenoArtifactTriggerParser : CustomCompletionParser<ProtoId<EntityPrototype>>
+{
+    private static readonly ProtoId<EntityCategoryPrototype> TriggerCategoryId = "XenoArtifactTriggers";
+
+    [Dependency] private IPrototypeManager _prototype = default!;
+
+    public override CompletionResult TryAutocomplete(ParserContext ctx, CommandArgument? arg)
+    {
+        var hint = ToolshedCommand.GetArgHint(arg, typeof(ProtoId<EntityPrototype>));
+        var completionOptions = CompletionHelper.EntityPrototypes(ctx.GetWord(), TriggerCategoryId, _prototype);
+        return CompletionResult.FromHintOptions(completionOptions, hint);
+
+    }
+}
diff --git a/Content.Shared/Traits/Assorted/HemophiliaStatusEffectComponent.cs b/Content.Shared/Traits/Assorted/HemophiliaStatusEffectComponent.cs
index 3216052257..a17dd58f38 100644
--- a/Content.Shared/Traits/Assorted/HemophiliaStatusEffectComponent.cs
+++ b/Content.Shared/Traits/Assorted/HemophiliaStatusEffectComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Traits.Assorted;
 
diff --git a/Content.Shared/Traits/Assorted/HemophiliaSystem.cs b/Content.Shared/Traits/Assorted/HemophiliaSystem.cs
index 3968c4014d..a3a2c09cd3 100644
--- a/Content.Shared/Traits/Assorted/HemophiliaSystem.cs
+++ b/Content.Shared/Traits/Assorted/HemophiliaSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Body.Events;
+using Content.Shared.Body.Events;
 using Content.Shared.StatusEffectNew;
 
 namespace Content.Shared.Traits.Assorted;
diff --git a/Content.Shared/Traits/Assorted/LegsParalyzedComponent.cs b/Content.Shared/Traits/Assorted/LegsParalyzedComponent.cs
index 59f9ca758b..d18c476731 100644
--- a/Content.Shared/Traits/Assorted/LegsParalyzedComponent.cs
+++ b/Content.Shared/Traits/Assorted/LegsParalyzedComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Traits.Assorted;
 
diff --git a/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs b/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs
index cd2f4e9de5..952041a14c 100644
--- a/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs
+++ b/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Buckle.Components;
+using Content.Shared.Buckle.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Standing;
diff --git a/Content.Shared/Traits/Assorted/NarcolepsyComponent.cs b/Content.Shared/Traits/Assorted/NarcolepsyComponent.cs
index ae94908925..6da8c2ce85 100644
--- a/Content.Shared/Traits/Assorted/NarcolepsyComponent.cs
+++ b/Content.Shared/Traits/Assorted/NarcolepsyComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Traits.Assorted;
diff --git a/Content.Shared/Traits/Assorted/PermanentBlindnessComponent.cs b/Content.Shared/Traits/Assorted/PermanentBlindnessComponent.cs
index 9abbd46f66..6b350d6e46 100644
--- a/Content.Shared/Traits/Assorted/PermanentBlindnessComponent.cs
+++ b/Content.Shared/Traits/Assorted/PermanentBlindnessComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Traits.Assorted;
 
diff --git a/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs b/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
index e5aba9c9a3..2c42f16023 100644
--- a/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
+++ b/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Examine;
+using Content.Shared.Examine;
 using Content.Shared.Eye.Blinding.Components;
 using Content.Shared.Eye.Blinding.Systems;
 using Content.Shared.IdentityManagement;
diff --git a/Content.Shared/Trigger/Components/Conditions/UseDelayTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/UseDelayTriggerConditionComponent.cs
index 70a331227e..e06b298b99 100644
--- a/Content.Shared/Trigger/Components/Conditions/UseDelayTriggerConditionComponent.cs
+++ b/Content.Shared/Trigger/Components/Conditions/UseDelayTriggerConditionComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Timing;
+using Content.Shared.Timing.Systems;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Conditions;
diff --git a/Content.Shared/Trigger/Components/Effects/GhostKickOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/GhostKickOnTriggerComponent.cs
index 16c1365c05..c9be11c2d7 100644
--- a/Content.Shared/Trigger/Components/Effects/GhostKickOnTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/Effects/GhostKickOnTriggerComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Effects;
 
diff --git a/Content.Shared/Trigger/Components/Effects/LightBehaviorOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/LightBehaviorOnTriggerComponent.cs
index b31bff7841..83f1078151 100644
--- a/Content.Shared/Trigger/Components/Effects/LightBehaviorOnTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/Effects/LightBehaviorOnTriggerComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Effects;
 
diff --git a/Content.Shared/Trigger/Components/Effects/ReleaseGasOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/ReleaseGasOnTriggerComponent.cs
index 4edd5f83f4..1ca5877fb6 100644
--- a/Content.Shared/Trigger/Components/Effects/ReleaseGasOnTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/Effects/ReleaseGasOnTriggerComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos;
+using Content.Shared.Atmos;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
diff --git a/Content.Shared/Trigger/Components/Effects/UseDelayOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/UseDelayOnTriggerComponent.cs
index 4d43c2860b..936abf35a7 100644
--- a/Content.Shared/Trigger/Components/Effects/UseDelayOnTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/Effects/UseDelayOnTriggerComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Timing;
+using Content.Shared.Timing.Systems;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Effects;
diff --git a/Content.Shared/Trigger/Components/Triggers/ActiveTriggerOnTimedCollideComponent.cs b/Content.Shared/Trigger/Components/Triggers/ActiveTriggerOnTimedCollideComponent.cs
index 88b68913f0..782fd1f183 100644
--- a/Content.Shared/Trigger/Components/Triggers/ActiveTriggerOnTimedCollideComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/ActiveTriggerOnTimedCollideComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Triggers;
 
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateComponent.cs
index 9dd145bb26..0ac21a2b95 100644
--- a/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Triggers;
 
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnDidEquipHandComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnDidEquipHandComponent.cs
index d598db6d93..8b5967e8cc 100644
--- a/Content.Shared/Trigger/Components/Triggers/TriggerOnDidEquipHandComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnDidEquipHandComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Triggers;
 
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnDidUnequipHandComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnDidUnequipHandComponent.cs
index 5c3d2da018..417e0da75c 100644
--- a/Content.Shared/Trigger/Components/Triggers/TriggerOnDidUnequipHandComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnDidUnequipHandComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Triggers;
 
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnDroppedComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnDroppedComponent.cs
index 6e06216a2c..ee86108b40 100644
--- a/Content.Shared/Trigger/Components/Triggers/TriggerOnDroppedComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnDroppedComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Triggers;
 
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnGotEquippedHandComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnGotEquippedHandComponent.cs
index 24c2d4231c..c21ef08a63 100644
--- a/Content.Shared/Trigger/Components/Triggers/TriggerOnGotEquippedHandComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnGotEquippedHandComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Triggers;
 
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnGotUnequippedHandComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnGotUnequippedHandComponent.cs
index 624c1a141b..c438927ddc 100644
--- a/Content.Shared/Trigger/Components/Triggers/TriggerOnGotUnequippedHandComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnGotUnequippedHandComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Triggers;
 
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanFiredComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanFiredComponent.cs
index f7a86c0ce3..b885ff431b 100644
--- a/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanFiredComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanFiredComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Triggers;
 
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanHitComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanHitComponent.cs
index 4520578a8f..fd93623dc3 100644
--- a/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanHitComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanHitComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Triggers;
 
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnIngestedComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnIngestedComponent.cs
index e8bd920e64..9d57cd658b 100644
--- a/Content.Shared/Trigger/Components/Triggers/TriggerOnIngestedComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnIngestedComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Triggers;
 
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnMobstateChangeComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnMobstateChangeComponent.cs
index a8dab4e6cd..88b8617507 100644
--- a/Content.Shared/Trigger/Components/Triggers/TriggerOnMobstateChangeComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnMobstateChangeComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Mobs;
+using Content.Shared.Mobs;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Triggers;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnStepTriggerComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnStepTriggerComponent.cs
index 70d33a1179..2159bd1249 100644
--- a/Content.Shared/Trigger/Components/Triggers/TriggerOnStepTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnStepTriggerComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Triggers;
 
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnThrowComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnThrowComponent.cs
index e9249a8f2a..ded4405d18 100644
--- a/Content.Shared/Trigger/Components/Triggers/TriggerOnThrowComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnThrowComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Triggers;
 
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnThrownComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnThrownComponent.cs
index e309261711..b3628100a7 100644
--- a/Content.Shared/Trigger/Components/Triggers/TriggerOnThrownComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnThrownComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Triggers;
 
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnTimedCollideComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnTimedCollideComponent.cs
index 185ea7dbe4..72e5bb66d0 100644
--- a/Content.Shared/Trigger/Components/Triggers/TriggerOnTimedCollideComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnTimedCollideComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Triggers;
 
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnUseComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnUseComponent.cs
index 71d289741e..2fb18d924d 100644
--- a/Content.Shared/Trigger/Components/Triggers/TriggerOnUseComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnUseComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Trigger.Components.Triggers;
 
diff --git a/Content.Shared/Trigger/SharedTriggerSystems.cs b/Content.Shared/Trigger/SharedTriggerSystems.cs
index 73fd9dbec8..cb2c6fe603 100644
--- a/Content.Shared/Trigger/SharedTriggerSystems.cs
+++ b/Content.Shared/Trigger/SharedTriggerSystems.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.Trigger.Components.Effects;
 using Content.Shared.Trigger.Systems;
 
 namespace Content.Shared.Trigger;
diff --git a/Content.Shared/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs
index 55125edde9..1499e679dd 100644
--- a/Content.Shared/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs
@@ -1,13 +1,13 @@
 using Content.Shared.AlertLevel;
+using Content.Shared.Station.Systems;
 using Content.Shared.Trigger.Components.Effects;
-using Content.Shared.Station;
 
 namespace Content.Shared.Trigger.Systems;
 
 public sealed partial class AlertLevelChangeOnTriggerSystem : EntitySystem
 {
     [Dependency] private AlertLevelSystem _alertLevel = default!;
-    [Dependency] private SharedStationSystem _station = default!;
+    [Dependency] private StationSystem _station = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Trigger/Systems/SharedReleaseGasOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/SharedReleaseGasOnTriggerSystem.cs
index db98017c3a..64c6d1b695 100644
--- a/Content.Shared/Trigger/Systems/SharedReleaseGasOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/SharedReleaseGasOnTriggerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.Trigger.Components.Effects;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Trigger.Systems;
diff --git a/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs
index 73d13f0c2e..2e11af8595 100644
--- a/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Implants;
+using Content.Shared.Implants;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Mobs;
 using Content.Shared.Popups;
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Collide.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Collide.cs
index dc71ca482f..ba2f509fd4 100644
--- a/Content.Shared/Trigger/Systems/TriggerSystem.Collide.cs
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Collide.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Trigger.Components.Triggers;
 using Content.Shared.StepTrigger.Systems;
 using Robust.Shared.Physics.Events;
 
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
index 7c132bb977..f76ef8efd5 100644
--- a/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Random.Helpers;
+using Content.Shared.Random.Helpers;
 using Content.Shared.Trigger.Components.Conditions;
 using Content.Shared.Verbs;
 using Robust.Shared.Random;
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs
index 8750110744..cc107f29c9 100644
--- a/Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs
@@ -1,4 +1,4 @@
-using Content.Shared.GameTicking;
+using Content.Shared.GameTicking;
 using Content.Shared.Trigger.Components.Effects;
 using Content.Shared.Trigger.Components.Triggers;
 using Robust.Shared.Prototypes;
@@ -72,7 +72,7 @@ public sealed partial class TriggerSystem
         {
             var mapCoords = _transform.GetMapCoordinates(target);
             if (predicted)
-                EntityManager.PredictedSpawn(proto, mapCoords);
+                PredictedSpawn(proto, mapCoords);
             else if (_net.IsServer)
                 Spawn(proto, mapCoords);
         }
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs
index b114b35cc8..e503beccb2 100644
--- a/Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Trigger.Components;
+using Content.Shared.Trigger.Components;
 using Content.Shared.Trigger.Components.Triggers;
 using Content.Shared.Examine;
 using Content.Shared.Verbs;
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.cs b/Content.Shared/Trigger/Systems/TriggerSystem.cs
index ae6caa99cb..7a720227cc 100644
--- a/Content.Shared/Trigger/Systems/TriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration.Logs;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.DeviceLinking;
 using Content.Shared.EntityTable;
@@ -6,7 +6,7 @@ using Content.Shared.Item.ItemToggle;
 using Content.Shared.Mind;
 using Content.Shared.Popups;
 using Content.Shared.Roles;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Trigger.Components;
 using Content.Shared.Whitelist;
 using Robust.Shared.Network;
diff --git a/Content.Shared/Trigger/TriggerVisuals.cs b/Content.Shared/Trigger/TriggerVisuals.cs
index f1d4a55fb1..ee54a2b6a5 100644
--- a/Content.Shared/Trigger/TriggerVisuals.cs
+++ b/Content.Shared/Trigger/TriggerVisuals.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Trigger;
 
diff --git a/Content.Shared/TurretController/TurretControllerPayloads.cs b/Content.Shared/TurretController/TurretControllerPayloads.cs
new file mode 100644
index 0000000000..29d00b2135
--- /dev/null
+++ b/Content.Shared/TurretController/TurretControllerPayloads.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Access;
+using Content.Shared.DeviceNetwork;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.TurretController;
+
+/// <summary>
+/// A network payload that sets fire mode for a turret.
+/// </summary>
+public partial record struct TurretControllerSetArmamentPayload : INetworkPayload
+{
+    [DataField]
+    public int ArmamentState;
+}
+
+/// <summary>
+/// A network payload that sets access exemptions for a turret.
+/// </summary>
+public partial record struct TurretControllerSetAccessPayload : INetworkPayload
+{
+    [DataField]
+    public HashSet<ProtoId<AccessLevelPrototype>> AccessExemptions = new();
+}
+
+/// <summary>
+/// A network payload request to get the state of all available turrets.
+/// </summary>
+public readonly partial record struct TurretControllerRequestPayload : INetworkPayload;
diff --git a/Content.Shared/Turrets/SharedDeployableTurretSystem.cs b/Content.Shared/Turrets/SharedDeployableTurretSystem.cs
index 3ed6790d1a..0b0fddd680 100644
--- a/Content.Shared/Turrets/SharedDeployableTurretSystem.cs
+++ b/Content.Shared/Turrets/SharedDeployableTurretSystem.cs
@@ -4,7 +4,8 @@ using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Wires;
@@ -61,7 +62,7 @@ public abstract partial class SharedDeployableTurretSystem : EntitySystem
 
     private void OnActivate(Entity<DeployableTurretComponent> ent, ref ActivateInWorldEvent args)
     {
-        if (TryComp(ent, out UseDelayComponent? useDelay) && !_useDelay.TryResetDelay((ent, useDelay), true))
+        if (!_useDelay.TryResetDelay(ent.Owner, true))
             return;
 
         if (!_accessReader.IsAllowed(args.User, ent))
diff --git a/Content.Shared/Turrets/TurretPayloads.cs b/Content.Shared/Turrets/TurretPayloads.cs
new file mode 100644
index 0000000000..6acb496ac5
--- /dev/null
+++ b/Content.Shared/Turrets/TurretPayloads.cs
@@ -0,0 +1,12 @@
+using Content.Shared.DeviceNetwork;
+
+namespace Content.Shared.Turrets;
+
+/// <summary>
+/// A wrapper for <see cref="DeployableTurretState"/>.
+/// </summary>
+public partial record struct TurretStatePayload : INetworkPayload
+{
+    [DataField]
+    public DeployableTurretState State;
+}
diff --git a/Content.Shared/UserInterface/ActivatableUIComponent.cs b/Content.Shared/UserInterface/ActivatableUIComponent.cs
index 56d6986a28..7731bda9be 100644
--- a/Content.Shared/UserInterface/ActivatableUIComponent.cs
+++ b/Content.Shared/UserInterface/ActivatableUIComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Whitelist;
+using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations;
 
diff --git a/Content.Shared/UserInterface/IntrinsicUIComponent.cs b/Content.Shared/UserInterface/IntrinsicUIComponent.cs
index ede0fd9c34..aa8011d635 100644
--- a/Content.Shared/UserInterface/IntrinsicUIComponent.cs
+++ b/Content.Shared/UserInterface/IntrinsicUIComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.UserInterface;
diff --git a/Content.Shared/UserInterface/IntrinsicUISystem.cs b/Content.Shared/UserInterface/IntrinsicUISystem.cs
index 659e15a1d2..8d34d2f77d 100644
--- a/Content.Shared/UserInterface/IntrinsicUISystem.cs
+++ b/Content.Shared/UserInterface/IntrinsicUISystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 
 namespace Content.Shared.UserInterface;
 
diff --git a/Content.Shared/UserInterface/OpenUiActionEvent.cs b/Content.Shared/UserInterface/OpenUiActionEvent.cs
index 1c5ca3d62c..d04d39b07c 100644
--- a/Content.Shared/UserInterface/OpenUiActionEvent.cs
+++ b/Content.Shared/UserInterface/OpenUiActionEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using Robust.Shared.Serialization.TypeSerializers.Implementations;
 
 namespace Content.Shared.UserInterface;
diff --git a/Content.Shared/UserInterface/ToggleIntrinsicUIEvent.cs b/Content.Shared/UserInterface/ToggleIntrinsicUIEvent.cs
index 5050aca9d4..0f6e2de03d 100644
--- a/Content.Shared/UserInterface/ToggleIntrinsicUIEvent.cs
+++ b/Content.Shared/UserInterface/ToggleIntrinsicUIEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using JetBrains.Annotations;
 using Robust.Shared.Serialization.TypeSerializers.Implementations;
 
diff --git a/Content.Shared/Vapor/SharedVaporComponent.cs b/Content.Shared/Vapor/SharedVaporComponent.cs
index 43c65f4959..70fc6307a5 100644
--- a/Content.Shared/Vapor/SharedVaporComponent.cs
+++ b/Content.Shared/Vapor/SharedVaporComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Vapor;
 
diff --git a/Content.Shared/Vehicle/Components/ContainerVehicleComponent.cs b/Content.Shared/Vehicle/Components/ContainerVehicleComponent.cs
index a3fe914173..768442d15a 100644
--- a/Content.Shared/Vehicle/Components/ContainerVehicleComponent.cs
+++ b/Content.Shared/Vehicle/Components/ContainerVehicleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Vehicle.Systems;
+using Content.Shared.Vehicle.Systems;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Vehicle.Components;
diff --git a/Content.Shared/Vehicle/Components/GenericKeyedVehicleComponent.cs b/Content.Shared/Vehicle/Components/GenericKeyedVehicleComponent.cs
index b16afb207c..08c4b61313 100644
--- a/Content.Shared/Vehicle/Components/GenericKeyedVehicleComponent.cs
+++ b/Content.Shared/Vehicle/Components/GenericKeyedVehicleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Vehicle.Systems;
+using Content.Shared.Vehicle.Systems;
 using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
 
diff --git a/Content.Shared/Vehicle/Components/StrapVehicleComponent.cs b/Content.Shared/Vehicle/Components/StrapVehicleComponent.cs
index a4182772fa..33d07948bd 100644
--- a/Content.Shared/Vehicle/Components/StrapVehicleComponent.cs
+++ b/Content.Shared/Vehicle/Components/StrapVehicleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Vehicle.Systems;
+using Content.Shared.Vehicle.Systems;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Vehicle.Components;
diff --git a/Content.Shared/Vehicle/Components/VehicleComponent.cs b/Content.Shared/Vehicle/Components/VehicleComponent.cs
index 5c0e7c5b28..c80b0a1f00 100644
--- a/Content.Shared/Vehicle/Components/VehicleComponent.cs
+++ b/Content.Shared/Vehicle/Components/VehicleComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage;
+using Content.Shared.Damage;
 using Content.Shared.Vehicle.Systems;
 using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
diff --git a/Content.Shared/Vehicle/Components/VehicleOperatorComponent.cs b/Content.Shared/Vehicle/Components/VehicleOperatorComponent.cs
index 7fc706f56f..47bb2e73c3 100644
--- a/Content.Shared/Vehicle/Components/VehicleOperatorComponent.cs
+++ b/Content.Shared/Vehicle/Components/VehicleOperatorComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Vehicle.Systems;
+using Content.Shared.Vehicle.Systems;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Vehicle.Components;
diff --git a/Content.Shared/Vehicle/Systems/VehicleSystem.cs b/Content.Shared/Vehicle/Systems/VehicleSystem.cs
index 7073277622..076a28fe0e 100644
--- a/Content.Shared/Vehicle/Systems/VehicleSystem.cs
+++ b/Content.Shared/Vehicle/Systems/VehicleSystem.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Access.Components;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Damage;
@@ -31,6 +31,7 @@ public sealed partial class VehicleSystem : EntitySystem
     [Dependency] private SharedContainerSystem _container = default!;
     [Dependency] private DamageableSystem _damageable = default!;
     [Dependency] private SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private SharedEyeSystem _eye = default!;
     [Dependency] private EntityWhitelistSystem _entityWhitelist = default!;
     [Dependency] private SharedHandsSystem _hands = default!;
     [Dependency] private SharedMoverController _mover = default!;
@@ -166,6 +167,7 @@ public sealed partial class VehicleSystem : EntitySystem
         Dirty(operatorUid, vehicleOperator);
 
         _mover.SetRelay(operatorUid, entity);
+        _eye.SetTarget(operatorUid, entity.Owner);
 
         var enterEvent = new OnVehicleEnteredEvent(entity, operatorUid);
         RaiseLocalEvent(operatorUid, ref enterEvent);
@@ -190,9 +192,9 @@ public sealed partial class VehicleSystem : EntitySystem
         if (entity.Comp.Operator is not { } currentOperator)
             return false;
 
-        _operatorQuery.TryComp(currentOperator, out var currentOperatorComponent);
+        _eye.SetTarget(currentOperator, null);
 
-        if (currentOperatorComponent != null)
+        if (_operatorQuery.TryComp(currentOperator, out var currentOperatorComponent))
         {
             var exitEvent = new OnVehicleExitedEvent(entity, currentOperator);
             RaiseLocalEvent(currentOperator, ref exitEvent);
@@ -211,7 +213,7 @@ public sealed partial class VehicleSystem : EntitySystem
         var setEvent = new VehicleOperatorSetEvent(null, currentOperator);
         RaiseLocalEvent(entity, ref setEvent);
 
-        Dirty(entity);
+        DirtyFields(entity.Owner, entity.Comp, null, nameof(VehicleComponent.Operator));
         return true;
     }
 
@@ -254,6 +256,7 @@ public sealed partial class VehicleSystem : EntitySystem
         if (_vehicleQuery.TryComp(vehicleUid, out var vehicle))
             return TryRemoveOperator((vehicleUid.Value, vehicle));
 
+        _eye.SetTarget(operatorEntity.Owner, null);
         UnblockHands(vehicleUid.Value, operatorEntity.Owner);
         ClearOperatorRelays(operatorEntity.Owner, vehicleUid.Value);
         operatorEntity.Comp.Vehicle = null;
diff --git a/Content.Shared/VoiceMask/VoiceMaskSetNameEvent.cs b/Content.Shared/VoiceMask/VoiceMaskSetNameEvent.cs
index 3d03a429d7..9cb4f54169 100644
--- a/Content.Shared/VoiceMask/VoiceMaskSetNameEvent.cs
+++ b/Content.Shared/VoiceMask/VoiceMaskSetNameEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using Content.Shared.Inventory;
 
 namespace Content.Shared.VoiceMask;
diff --git a/Content.Shared/Voting/MsgVoteCanCall.cs b/Content.Shared/Voting/MsgVoteCanCall.cs
index b23abdee6e..59717feccb 100644
--- a/Content.Shared/Voting/MsgVoteCanCall.cs
+++ b/Content.Shared/Voting/MsgVoteCanCall.cs
@@ -1,4 +1,4 @@
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Voting/MsgVoteMenu.cs b/Content.Shared/Voting/MsgVoteMenu.cs
index d94b326156..c7ee1b60f9 100644
--- a/Content.Shared/Voting/MsgVoteMenu.cs
+++ b/Content.Shared/Voting/MsgVoteMenu.cs
@@ -1,4 +1,4 @@
-using Lidgren.Network;
+using Lidgren.Network;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Wagging/WaggingComponent.cs b/Content.Shared/Wagging/WaggingComponent.cs
index c96884a265..4ffb54bc96 100644
--- a/Content.Shared/Wagging/WaggingComponent.cs
+++ b/Content.Shared/Wagging/WaggingComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Body;
+using Content.Shared.Body;
 using Content.Shared.Humanoid;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Wall/ReinforcedWallVisuals.cs b/Content.Shared/Wall/ReinforcedWallVisuals.cs
index 00a66b6787..9322f94779 100644
--- a/Content.Shared/Wall/ReinforcedWallVisuals.cs
+++ b/Content.Shared/Wall/ReinforcedWallVisuals.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Wall
 {
diff --git a/Content.Shared/Weapons/Melee/Components/BonusMeleeAttackRateComponent.cs b/Content.Shared/Weapons/Melee/Components/BonusMeleeAttackRateComponent.cs
index f2f9607757..5345ab31f1 100644
--- a/Content.Shared/Weapons/Melee/Components/BonusMeleeAttackRateComponent.cs
+++ b/Content.Shared/Weapons/Melee/Components/BonusMeleeAttackRateComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Weapons.Melee.Components;
 
diff --git a/Content.Shared/Weapons/Melee/Components/BonusMeleeDamageComponent.cs b/Content.Shared/Weapons/Melee/Components/BonusMeleeDamageComponent.cs
index 08af9e42a3..af7203ca13 100644
--- a/Content.Shared/Weapons/Melee/Components/BonusMeleeDamageComponent.cs
+++ b/Content.Shared/Weapons/Melee/Components/BonusMeleeDamageComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage;
+using Content.Shared.Damage;
 using Content.Shared.FixedPoint;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.GameStates;
diff --git a/Content.Shared/Weapons/Melee/Components/UseDelayOnMeleeHitComponent.cs b/Content.Shared/Weapons/Melee/Components/UseDelayOnMeleeHitComponent.cs
index 644971bc01..c9dbca91b2 100644
--- a/Content.Shared/Weapons/Melee/Components/UseDelayOnMeleeHitComponent.cs
+++ b/Content.Shared/Weapons/Melee/Components/UseDelayOnMeleeHitComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Weapons.Melee.Components;
 
diff --git a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
index 7cb9d259f1..4d06952324 100644
--- a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
+++ b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
@@ -1,10 +1,10 @@
 using Content.Shared.Stunnable;
 using Content.Shared.Throwing;
-using Content.Shared.Timing;
 using Content.Shared.Weapons.Melee.Components;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Physics.Components;
 using System.Numerics;
+using Content.Shared.Timing.Systems;
 
 namespace Content.Shared.Weapons.Melee;
 
diff --git a/Content.Shared/Weapons/Melee/UseDelayOnMeleeHitSystem.cs b/Content.Shared/Weapons/Melee/UseDelayOnMeleeHitSystem.cs
index 841fd219aa..c6c3c54845 100644
--- a/Content.Shared/Weapons/Melee/UseDelayOnMeleeHitSystem.cs
+++ b/Content.Shared/Weapons/Melee/UseDelayOnMeleeHitSystem.cs
@@ -1,5 +1,6 @@
-using Content.Shared.Throwing;
-using Content.Shared.Timing;
+using Content.Shared.Throwing;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Weapons.Melee.Components;
 using Content.Shared.Weapons.Melee.Events;
 
@@ -31,9 +32,6 @@ public sealed partial class UseDelayOnMeleeHitSystem : EntitySystem
     {
         var uid = ent.Owner;
 
-        if (!TryComp<UseDelayComponent>(uid, out var useDelay))
-            return;
-
-        _delay.TryResetDelay((uid, useDelay), checkDelayed: true);
+        _delay.TryResetDelay(uid, checkDelayed: true);
     }
 }
diff --git a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
index 3656fab2fb..0b3c68dc6d 100644
--- a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
+++ b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
@@ -333,7 +333,7 @@ public abstract partial class SharedGrapplingGunSystem : VirtualController
                 if (grapplerBodyB.Mass < BaseWeightMass)
                     massFactorB *= grapplerBodyB.Mass / BaseWeightMass;
 
-                if (sameGrid && physicalHook != _transform.GetGrid(joint.BodyAUid))
+                if (!sameGrid || sameGrid && physicalHook != _transform.GetGrid(joint.BodyAUid))
                     _physics.ApplyLinearImpulse(grapplerUidA, -targetDirection * massFactorA * grappling.ReelForce * frameTime, grapplerOffsetA, body: grapplerBodyA);
 
                 _physics.ApplyLinearImpulse(grapplerUidB, targetDirection * massFactorB * grappling.ReelForce * frameTime, grapplerOffsetB, body: grapplerBodyB);
diff --git a/Content.Shared/Weapons/Ranged/Components/BallisticAmmoInteractLoaderComponent.cs b/Content.Shared/Weapons/Ranged/Components/BallisticAmmoInteractLoaderComponent.cs
index 04d4a80774..f06d9ddbcb 100644
--- a/Content.Shared/Weapons/Ranged/Components/BallisticAmmoInteractLoaderComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/BallisticAmmoInteractLoaderComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Weapons.Ranged.Components;
 
diff --git a/Content.Shared/Weapons/Ranged/Components/BallisticAmmoSelfRefillerComponent.cs b/Content.Shared/Weapons/Ranged/Components/BallisticAmmoSelfRefillerComponent.cs
index acaeca89dc..af7cca6cfd 100644
--- a/Content.Shared/Weapons/Ranged/Components/BallisticAmmoSelfRefillerComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/BallisticAmmoSelfRefillerComponent.cs
@@ -1,5 +1,6 @@
-using Content.Shared.Power.Components;
+using Content.Shared.Power.Components;
 using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
@@ -53,9 +54,21 @@ public sealed partial class BallisticAmmoSelfRefillerComponent : Component
     [DataField, AutoNetworkedField]
     public bool AffectedByEmp = false;
 
+    /// <summary>
+    /// How much power in watts should this device consume each time it recharges ammo?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float PowerConsumption;
+
     /// <summary>
     /// When the next auto refill should occur. This is just implementation state.
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField, AutoPausedField]
     public TimeSpan NextAutoRefill = TimeSpan.Zero;
+
+    /// <summary>
+    /// Optional sound that plays when this item successfully recharges a piece of ammo.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? RechargeSound;
 }
diff --git a/Content.Shared/Weapons/Ranged/Components/ContainerAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/ContainerAmmoProviderComponent.cs
index f49cc812c2..7b6cf58c34 100644
--- a/Content.Shared/Weapons/Ranged/Components/ContainerAmmoProviderComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/ContainerAmmoProviderComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Weapons.Ranged.Systems;
+using Content.Shared.Weapons.Ranged.Systems;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Weapons.Ranged.Components;
diff --git a/Content.Shared/Weapons/Ranged/Components/CustomSpriteAmmoCounterComponent.cs b/Content.Shared/Weapons/Ranged/Components/CustomSpriteAmmoCounterComponent.cs
index e887e7dcca..a0a9b3d1fe 100644
--- a/Content.Shared/Weapons/Ranged/Components/CustomSpriteAmmoCounterComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/CustomSpriteAmmoCounterComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Weapons.Ranged.Components;
diff --git a/Content.Shared/Weapons/Ranged/Events/BeforeAmmoLoadedEvent.cs b/Content.Shared/Weapons/Ranged/Events/BeforeAmmoLoadedEvent.cs
index 896bfbcb6d..3539af6569 100644
--- a/Content.Shared/Weapons/Ranged/Events/BeforeAmmoLoadedEvent.cs
+++ b/Content.Shared/Weapons/Ranged/Events/BeforeAmmoLoadedEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Weapons.Ranged.Components;
 
 namespace Content.Shared.Weapons.Ranged.Events;
 
diff --git a/Content.Shared/Weapons/Ranged/Events/GetAmmoCountEvent.cs b/Content.Shared/Weapons/Ranged/Events/GetAmmoCountEvent.cs
index e080ff5848..f2a31642f5 100644
--- a/Content.Shared/Weapons/Ranged/Events/GetAmmoCountEvent.cs
+++ b/Content.Shared/Weapons/Ranged/Events/GetAmmoCountEvent.cs
@@ -8,4 +8,4 @@ public struct GetAmmoCountEvent
 {
     public int Count;
     public int Capacity;
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Weapons/Ranged/Events/GunGetAmmoSpreadEvent.cs b/Content.Shared/Weapons/Ranged/Events/GunGetAmmoSpreadEvent.cs
index 63419ab0f5..9515b2fe2c 100644
--- a/Content.Shared/Weapons/Ranged/Events/GunGetAmmoSpreadEvent.cs
+++ b/Content.Shared/Weapons/Ranged/Events/GunGetAmmoSpreadEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Weapons.Ranged.Events;
+namespace Content.Shared.Weapons.Ranged.Events;
 
 /// <summary>
 ///     Raised directed on the gun entity when ammo is shot to calculate its spread.
diff --git a/Content.Shared/Weapons/Ranged/Events/GunMuzzleFlashAttemptEvent.cs b/Content.Shared/Weapons/Ranged/Events/GunMuzzleFlashAttemptEvent.cs
index d6a2475308..ef2ed0d057 100644
--- a/Content.Shared/Weapons/Ranged/Events/GunMuzzleFlashAttemptEvent.cs
+++ b/Content.Shared/Weapons/Ranged/Events/GunMuzzleFlashAttemptEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Weapons.Ranged.Events;
+namespace Content.Shared.Weapons.Ranged.Events;
 
 /// <summary>
 ///     Raised directed on the gun entity when a muzzle flash is about to happen.
diff --git a/Content.Shared/Weapons/Ranged/Events/GunRefreshModifiersEvent.cs b/Content.Shared/Weapons/Ranged/Events/GunRefreshModifiersEvent.cs
index 0ad79bd74a..488124ece5 100644
--- a/Content.Shared/Weapons/Ranged/Events/GunRefreshModifiersEvent.cs
+++ b/Content.Shared/Weapons/Ranged/Events/GunRefreshModifiersEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Systems;
 using Robust.Shared.Audio;
 
diff --git a/Content.Shared/Weapons/Ranged/IShootable.cs b/Content.Shared/Weapons/Ranged/IShootable.cs
index b136b6a122..43b2a03ee7 100644
--- a/Content.Shared/Weapons/Ranged/IShootable.cs
+++ b/Content.Shared/Weapons/Ranged/IShootable.cs
@@ -3,4 +3,4 @@ namespace Content.Shared.Weapons.Ranged;
 /// <summary>
 /// Interface that says this can be shot from a gun. Exists to facilitate hitscan OR prototype shooting.
 /// </summary>
-public interface IShootable {}
\ No newline at end of file
+public interface IShootable {}
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
index b31b967ca8..724d40d94a 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
@@ -3,6 +3,7 @@ using Content.Shared.Emp;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Power;
 using Content.Shared.Stacks;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Ranged.Components;
@@ -416,6 +417,9 @@ public abstract partial class SharedGunSystem
         if (!refiller.AutoRefill || IsFull(entity))
             return;
 
+        if (refiller.PowerConsumption > 0 && _battery.GetCharge(entity).Charge < refiller.PowerConsumption)
+            return;
+
         if (refiller.AmmoProto is not { } refillerAmmoProto)
         {
             // No ammo proto on the refiller, so just increment the unspawned count on the provider
@@ -438,14 +442,19 @@ public abstract partial class SharedGunSystem
         {
             // Can't use unspawned ammo, so spawn an entity and try to insert it.
             var ammoEntity = PredictedSpawnAttachedTo(refiller.AmmoProto, Transform(entity).Coordinates);
-            var insertSucceeded = TryBallisticInsert(entity, ammoEntity, null, suppressInsertionSound: true);
-            if (!insertSucceeded)
+            if (!TryBallisticInsert(entity, ammoEntity, null, suppressInsertionSound: true))
             {
                 PredictedQueueDel(ammoEntity);
                 Log.Error(
                     $"Failed to insert ammo {ammoEntity} into non-full {entity}. This is a configuration error. Is the {nameof(BallisticAmmoSelfRefillerComponent)}'s {nameof(BallisticAmmoSelfRefillerComponent.AmmoProto)} incorrect for the {nameof(BallisticAmmoProviderComponent)}'s {nameof(BallisticAmmoProviderComponent.Whitelist)}?");
+                return;
             }
         }
+
+        Audio.PlayPredicted(entity.Comp2.RechargeSound, entity, entity);
+
+        if (refiller.PowerConsumption > 0)
+            TakeCharge(entity, refiller.PowerConsumption);
     }
 }
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.BasicEntity.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.BasicEntity.cs
index 546d488fa7..186a06936c 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.BasicEntity.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.BasicEntity.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 
 namespace Content.Shared.Weapons.Ranged.Systems;
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
index 63b77cb284..789f8fb788 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
@@ -3,6 +3,7 @@ using Content.Shared.Damage.Events;
 using Content.Shared.Examine;
 using Content.Shared.Projectiles;
 using Content.Shared.Power;
+using Content.Shared.Power.EntitySystems;
 using Content.Shared.PowerCell;
 using Content.Shared.Weapons.Hitscan.Components;
 using Content.Shared.Weapons.Ranged.Components;
@@ -14,6 +15,8 @@ namespace Content.Shared.Weapons.Ranged.Systems;
 
 public abstract partial class SharedGunSystem
 {
+    [Dependency] private SharedBatterySystem _battery = default!;
+
     protected virtual void InitializeBattery()
     {
         SubscribeLocalEvent<BatteryAmmoProviderComponent, ComponentStartup>(OnBatteryStartup);
@@ -80,14 +83,18 @@ public abstract partial class SharedGunSystem
         args.Capacity = ent.Comp.Capacity;
     }
 
+    /// <inhereitdoc cref="TakeCharge(EntityUid,float,int)"/>
+    public void TakeCharge(Entity<BatteryAmmoProviderComponent> ent, int shots = 1)
+    {
+        TakeCharge(ent, ent.Comp.FireCost, shots);
+    }
+
     /// <summary>
     /// Use up the required amount of battery charge for firing.
     /// </summary>
-    public void TakeCharge(Entity<BatteryAmmoProviderComponent> ent, int shots = 1)
+    public void TakeCharge(EntityUid gun, float fireCost, int shots = 1)
     {
-        // Take charge from either the BatteryComponent or PowerCellSlotComponent.
-        var ev = new ChangeChargeEvent(-ent.Comp.FireCost * shots);
-        RaiseLocalEvent(ent, ref ev);
+        _battery.ChangeCharge(gun, -fireCost * shots);
         // UpdateShots is already called by the resulting ChargeChangedEvent
     }
 
@@ -181,10 +188,9 @@ public abstract partial class SharedGunSystem
     /// </summary>
     public (int, int) GetShots(Entity<BatteryAmmoProviderComponent> ent)
     {
-        var ev = new GetChargeEvent();
-        RaiseLocalEvent(ent, ref ev);
-        var currentShots = (int)(ev.CurrentCharge / ent.Comp.FireCost);
-        var maxShots = (int)(ev.MaxCharge / ent.Comp.FireCost);
+        var charge = _battery.GetCharge(ent);
+        var currentShots = (int)(charge.Charge / ent.Comp.FireCost);
+        var maxShots = (int)(charge.MaxCharge / ent.Comp.FireCost);
 
         return (currentShots, maxShots);
     }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Container.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Container.cs
index 4947909e70..a2b2fd24cb 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Container.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Container.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Robust.Shared.Containers;
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.CustomAmmoCounter.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.CustomAmmoCounter.cs
index 1ff678a926..5591992875 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.CustomAmmoCounter.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.CustomAmmoCounter.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Weapons.Ranged.Systems;
+namespace Content.Shared.Weapons.Ranged.Systems;
 
 public abstract partial class SharedGunSystem
 {
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
index a6715c9cd8..5c30cf8177 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
@@ -36,7 +36,7 @@ public partial class SharedGunSystem
         if (args.Handled)
             return;
 
-        if (!_useDelay.TryResetDelay(ent))
+        if (!_useDelay.TryResetDelay(ent.Owner))
             return;
 
         args.Handled = true;
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Solution.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Solution.cs
index 7e7035657e..06b820782c 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Solution.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Solution.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Robust.Shared.Map;
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 9967076aff..6df2379a0a 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Actions;
@@ -15,7 +14,7 @@ using Content.Shared.Popups;
 using Content.Shared.Projectiles;
 using Content.Shared.Tag;
 using Content.Shared.Throwing;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Hitscan.Components;
 using Content.Shared.Weapons.Melee;
diff --git a/Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs b/Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs
index c195b02558..114494d0de 100644
--- a/Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Timing;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Weapons.Ranged.Components;
 
 namespace Content.Shared.Weapons.Ranged.Systems;
@@ -15,7 +15,6 @@ public sealed partial class UseDelayOnShootSystem : EntitySystem
 
     private void OnUseShoot(Entity<UseDelayOnShootComponent> ent, ref GunShotEvent args)
     {
-        if (TryComp(ent, out UseDelayComponent? useDelay))
-            _delay.TryResetDelay((ent, useDelay));
+        _delay.TryResetDelay(ent.Owner);
     }
 }
diff --git a/Content.Shared/Wieldable/SharedWieldableSystem.cs b/Content.Shared/Wieldable/SharedWieldableSystem.cs
index 0b96934e40..e37866ead4 100644
--- a/Content.Shared/Wieldable/SharedWieldableSystem.cs
+++ b/Content.Shared/Wieldable/SharedWieldableSystem.cs
@@ -11,7 +11,8 @@ using Content.Shared.Item;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Popups;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Components;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Melee.Components;
diff --git a/Content.Shared/Wires/ActivatableUIRequiresPanelComponent.cs b/Content.Shared/Wires/ActivatableUIRequiresPanelComponent.cs
index 6e8fff6e49..8134a31cf8 100644
--- a/Content.Shared/Wires/ActivatableUIRequiresPanelComponent.cs
+++ b/Content.Shared/Wires/ActivatableUIRequiresPanelComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Wires;
 
diff --git a/Content.Shared/Wires/SharedWireVisComponent.cs b/Content.Shared/Wires/SharedWireVisComponent.cs
index 532d197341..c29884985b 100644
--- a/Content.Shared/Wires/SharedWireVisComponent.cs
+++ b/Content.Shared/Wires/SharedWireVisComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Wires
 {
diff --git a/Content.Shared/Xenoarchaeology/Artifact/Components/XenoArtifactComponent.cs b/Content.Shared/Xenoarchaeology/Artifact/Components/XenoArtifactComponent.cs
index 144dccc546..9c87b80a2a 100644
--- a/Content.Shared/Xenoarchaeology/Artifact/Components/XenoArtifactComponent.cs
+++ b/Content.Shared/Xenoarchaeology/Artifact/Components/XenoArtifactComponent.cs
@@ -2,7 +2,6 @@ using Content.Shared.Actions;
 using Content.Shared.Actions.Components;
 using Content.Shared.Destructible.Thresholds;
 using Content.Shared.EntityTable.EntitySelectors;
-using Content.Shared.Xenoarchaeology.Artifact.Prototypes;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
@@ -146,7 +145,10 @@ public sealed partial class XenoArtifactComponent : Component
     /// Triggers that can be used during this artefact generation.
     /// </summary>
     [DataField]
-    public ProtoId<WeightedRandomXenoArchTriggerPrototype> TriggerWeights = "DefaultTriggers";
+    public EntityTableSelector TriggersTable = new NestedSelector
+    {
+        TableId = "XenoArtifactTriggerDefaultTable"
+    };
     #endregion
 
     /// <summary>
diff --git a/Content.Shared/Xenoarchaeology/Artifact/Prototypes/XenoArchTriggerPrototype.cs b/Content.Shared/Xenoarchaeology/Artifact/Prototypes/XenoArchTriggerPrototype.cs
deleted file mode 100644
index 05a33ea037..0000000000
--- a/Content.Shared/Xenoarchaeology/Artifact/Prototypes/XenoArchTriggerPrototype.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Content.Shared.Random;
-using Content.Shared.Whitelist;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Xenoarchaeology.Artifact.Prototypes;
-
-/// <summary> Proto for xeno artifact triggers - markers, which event could trigger node to unlock it. </summary>
-[Prototype]
-public sealed partial class XenoArchTriggerPrototype : IPrototype
-{
-    /// <inheritdoc/>
-    [IdDataField]
-    public string ID { get; private set; } = default!;
-
-    /// <summary>
-    /// Tip for user on how to activate this trigger.
-    /// </summary>
-    [DataField]
-    public LocId Tip;
-
-    /// <summary>
-    /// Whitelist, describing for which subtype of artifacts this trigger could be used.
-    /// </summary>
-    [DataField]
-    public EntityWhitelist? Whitelist;
-
-    /// <summary>
-    /// List of components that represent ways to trigger node.
-    /// </summary>
-    [DataField]
-    public ComponentRegistry Components = new();
-}
-
-/// <summary>
-/// Container for list of xeno artifact triggers and their respective weights to be used in case randomly rolling trigger is required.
-/// </summary>
-[Prototype]
-public sealed partial class WeightedRandomXenoArchTriggerPrototype : IWeightedRandomPrototype<XenoArchTriggerPrototype>
-{
-    [IdDataField]
-    public string ID { get; private set; } = default!;
-
-    [DataField]
-    public Dictionary<ProtoId<XenoArchTriggerPrototype>, float> Weights { get; private set; } = new();
-}
diff --git a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Node.cs b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Node.cs
index cf63b0ec84..95864435d4 100644
--- a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Node.cs
+++ b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Node.cs
@@ -1,10 +1,10 @@
-using System.Linq;
 using Content.Shared.EntityTable;
 using Content.Shared.NameIdentifier;
 using Content.Shared.Xenoarchaeology.Artifact.Components;
-using Content.Shared.Xenoarchaeology.Artifact.Prototypes;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
+using System.Linq;
+using Content.Shared.EntityTable.EntitySelectors;
 
 namespace Content.Shared.Xenoarchaeology.Artifact;
 
@@ -81,33 +81,33 @@ public abstract partial class SharedXenoArtifactSystem
     /// <summary>
     /// Creates artifact node entity, attaching trigger and marking depth level for future use.
     /// </summary>
-    public Entity<XenoArtifactNodeComponent> CreateNode(Entity<XenoArtifactComponent> ent, ProtoId<XenoArchTriggerPrototype> trigger, int depth = 0)
+    public Entity<XenoArtifactNodeComponent>? CreateNode(
+        Entity<XenoArtifactComponent> ent,
+        EntProtoId triggerProtoId,
+        EntityTableSelector effects,
+        int depth = 0
+    )
     {
-        var triggerProto = ProtoMan.Index(trigger);
-        return CreateNode(ent, triggerProto, depth);
+        var effect = _entityTable.GetFirstOrNull(effects);
+        if (effect == null)
+            return null;
+
+        var trigger = ProtoMan.Index(triggerProtoId);
+        return CreateNode(ent, effect.Value, trigger, depth);
     }
 
     /// <summary>
     /// Creates artifact node entity, attaching trigger and marking depth level for future use.
     /// </summary>
-    public Entity<XenoArtifactNodeComponent> CreateNode(Entity<XenoArtifactComponent> ent, XenoArchTriggerPrototype trigger, int depth = 0)
-    {
-        var entProtoId = _entityTable.GetSpawns(ent.Comp.EffectsTable)
-                                     .First();
-        return CreateNode(ent, entProtoId, trigger, depth);
-    }
-
-    /// <summary>
-    /// Creates artifact node entity, attaching trigger and marking depth level for future use.
-    /// </summary>
-    public Entity<XenoArtifactNodeComponent> CreateNode(Entity<XenoArtifactComponent> ent, EntProtoId effect, XenoArchTriggerPrototype trigger, int depth = 0)
+    public Entity<XenoArtifactNodeComponent> CreateNode(Entity<XenoArtifactComponent> ent, EntProtoId effect, EntityPrototype trigger, int depth = 0)
     {
         AddNode((ent, ent), effect, out var nodeEnt, dirty: false);
         DebugTools.Assert(nodeEnt.HasValue, "Failed to create node on artifact.");
 
         var nodeComponent = nodeEnt.Value.Comp;
         nodeComponent.Depth = depth;
-        nodeComponent.TriggerTip = trigger.Tip;
+        nodeComponent.TriggerTip = trigger.Name;
+
         EntityManager.AddComponents(nodeEnt.Value, trigger.Components);
 
         Dirty(nodeEnt.Value);
@@ -324,7 +324,7 @@ public abstract partial class SharedXenoArtifactSystem
     /// <summary>
     /// Gets two-dimensional array (as lists inside enumeration) that contains artifact nodes, grouped by segment.
     /// </summary>
-    public IEnumerable<List<Entity<XenoArtifactNodeComponent>>> GetSegmentsFromNodes(Entity<XenoArtifactComponent> ent, List<Entity<XenoArtifactNodeComponent>> nodes)
+    public List<List<Entity<XenoArtifactNodeComponent>>> GetSegmentsFromNodes(Entity<XenoArtifactComponent> ent, IReadOnlyCollection<Entity<XenoArtifactNodeComponent>> nodes)
     {
         var outSegments = new List<List<Entity<XenoArtifactNodeComponent>>>();
         foreach (var node in nodes)
@@ -332,10 +332,8 @@ public abstract partial class SharedXenoArtifactSystem
             var segment = new List<Entity<XenoArtifactNodeComponent>>();
             GetSegmentNodesRecursive(ent, node, segment, outSegments);
 
-            if (segment.Count == 0)
-                continue;
-
-            outSegments.Add(segment);
+            if (segment.Count != 0)
+                outSegments.Add(segment);
         }
 
         return outSegments;
diff --git a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.XAE.cs b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.XAE.cs
index a44c889a8b..93ccfb3fea 100644
--- a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.XAE.cs
+++ b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.XAE.cs
@@ -2,7 +2,7 @@ using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Xenoarchaeology.Artifact.Components;
 using Robust.Shared.Map;
 
@@ -65,7 +65,7 @@ public abstract partial class SharedXenoArtifactSystem
         if (xenoArtifactComponent.Suppressed)
             return false;
 
-        if (TryComp<UseDelayComponent>(artifact, out var delay) && !_useDelay.TryResetDelay((artifact, delay), true))
+        if (!_useDelay.TryResetDelay(artifact.Owner, true))
             return false;
 
         var success = false;
diff --git a/Content.Shared/Xenoarchaeology/Equipment/Components/SuppressArtifactContainerComponent.cs b/Content.Shared/Xenoarchaeology/Equipment/Components/SuppressArtifactContainerComponent.cs
index 831813b1c9..c3193e446f 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/Components/SuppressArtifactContainerComponent.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/Components/SuppressArtifactContainerComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Xenoarchaeology.Equipment.Components;
 
diff --git a/Content.Shared/Xenoarchaeology/Equipment/NodeScannerSystem.cs b/Content.Shared/Xenoarchaeology/Equipment/NodeScannerSystem.cs
index 135a12ae64..60c027736c 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/NodeScannerSystem.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/NodeScannerSystem.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Interaction;
-using Content.Shared.Timing;
+using Content.Shared.Timing.Systems;
 using Content.Shared.Verbs;
 using Content.Shared.Xenoarchaeology.Artifact.Components;
 using Content.Shared.Xenoarchaeology.Equipment.Components;
@@ -80,8 +80,7 @@ public sealed partial class NodeScannerSystem : EntitySystem
         EntityUid actor
     )
     {
-        if (TryComp(device, out UseDelayComponent? useDelay)
-            && !_useDelay.TryResetDelay((device, useDelay), true))
+        if (!_useDelay.TryResetDelay(device.Owner, true))
             return;
 
         var connected = EnsureComp<NodeScannerConnectedComponent>(device);
diff --git a/Content.Shared/Xenoarchaeology/Equipment/SuppressArtifactContainerSystem.cs b/Content.Shared/Xenoarchaeology/Equipment/SuppressArtifactContainerSystem.cs
index 8dcec312eb..1844e360c7 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/SuppressArtifactContainerSystem.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/SuppressArtifactContainerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Xenoarchaeology.Artifact;
+using Content.Shared.Xenoarchaeology.Artifact;
 using Content.Shared.Xenoarchaeology.Artifact.Components;
 using Content.Shared.Xenoarchaeology.Equipment.Components;
 using Robust.Shared.Containers;
diff --git a/Content.Shared/Zombies/IncurableZombieComponent.cs b/Content.Shared/Zombies/IncurableZombieComponent.cs
index 2d54950291..ebc838cef4 100644
--- a/Content.Shared/Zombies/IncurableZombieComponent.cs
+++ b/Content.Shared/Zombies/IncurableZombieComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Zombies;
 
diff --git a/Content.Shared/Zombies/SharedZombieSystem.cs b/Content.Shared/Zombies/SharedZombieSystem.cs
index 076917c4ac..20cedfa4d9 100644
--- a/Content.Shared/Zombies/SharedZombieSystem.cs
+++ b/Content.Shared/Zombies/SharedZombieSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Armor;
+using Content.Shared.Armor;
 using Content.Shared.Inventory;
 using Content.Shared.Movement.Systems;
 using Content.Shared.NameModifier.EntitySystems;
diff --git a/Content.Shared/Zombies/ZombieComponent.cs b/Content.Shared/Zombies/ZombieComponent.cs
index 2c04cd1c19..4b8c9e5bd0 100644
--- a/Content.Shared/Zombies/ZombieComponent.cs
+++ b/Content.Shared/Zombies/ZombieComponent.cs
@@ -2,6 +2,7 @@ using Content.Shared.Body;
 using Content.Shared.Chat.Prototypes;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Roles;
@@ -146,6 +147,12 @@ public sealed partial class ZombieComponent : Component
     [DataField]
     public SoundSpecifier BiteSound = new SoundPathSpecifier("/Audio/Effects/bite.ogg");
 
+    /// <summary>
+    /// The blood refresh of the humanoid to restore in case of cloning.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 BeforeZombifiedBloodRefresh = new();
+
     /// <summary>
     /// The blood reagents of the humanoid to restore in case of cloning
     /// </summary>
diff --git a/Content.Tests/AssemblyInfo.cs b/Content.Tests/AssemblyInfo.cs
index 8e01f41b18..9ae285d9ea 100644
--- a/Content.Tests/AssemblyInfo.cs
+++ b/Content.Tests/AssemblyInfo.cs
@@ -1,3 +1,3 @@
-using NUnit.Framework;
+using NUnit.Framework;
 
 [assembly: Parallelizable(ParallelScope.Fixtures)]
diff --git a/Content.Tests/Client/UserInterface/RadialMenuOptionComparerTest.cs b/Content.Tests/Client/UserInterface/RadialMenuOptionComparerTest.cs
new file mode 100644
index 0000000000..f7a8eafc85
--- /dev/null
+++ b/Content.Tests/Client/UserInterface/RadialMenuOptionComparerTest.cs
@@ -0,0 +1,69 @@
+using System;
+using Content.Client.UserInterface.Controls;
+using NUnit.Framework;
+using Robust.UnitTesting;
+
+namespace Content.Tests.Client.UserInterface;
+
+[TestFixture]
+[TestOf(typeof(RadialMenu))]
+public sealed class RadialMenuOptionComparerTest : RobustUnitTest
+{
+    public override UnitTestProject Project => UnitTestProject.Client;
+
+    private sealed class TestRadialMenuOption : RadialMenuOptionBase;
+    private sealed class OtherTestRadialMenuOption : RadialMenuOptionBase;
+
+    [Test]
+    [Description("Tests that radial menu options are sorted correctly.")]
+    public void TestSortingArray()
+    {
+        var comparer = new RadialMenuOptionComparer();
+
+        // Named based on their expected position in the returned array, for sanity.
+        var option1 = new TestRadialMenuOption
+        {
+            Order = 1,
+            ToolTip = "First.",
+        };
+        var option2 = new OtherTestRadialMenuOption
+        {
+            Order = 2,
+            ToolTip = "Before Option3, despite the equal order!"
+        };
+        var option3 = new TestRadialMenuOption
+        {
+            Order = 2
+        };
+        var option4 = new OtherTestRadialMenuOption
+        {
+            Order = null,
+            ToolTip = "Not last!"
+        };
+        var option5 = new TestRadialMenuOption
+        {
+            Order = null
+        };
+
+        // Out of order.
+        var radialOptions = new RadialMenuOptionBase[] {
+            option3,
+            option4,
+            option1,
+            option5,
+            option2
+        };
+
+        Array.Sort(radialOptions, comparer);
+
+        Assert.That(radialOptions.Length, Is.EqualTo(5));
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(radialOptions[0], Is.SameAs(option1));
+            Assert.That(radialOptions[1], Is.SameAs(option2));
+            Assert.That(radialOptions[2], Is.SameAs(option3));
+            Assert.That(radialOptions[3], Is.SameAs(option4));
+            Assert.That(radialOptions[4], Is.SameAs(option5));
+        }
+    }
+}
diff --git a/Content.Tests/Server/Connection/IPIntelTest.cs b/Content.Tests/Server/Connection/IPIntelTest.cs
index f571b82fa6..0649ab549a 100644
--- a/Content.Tests/Server/Connection/IPIntelTest.cs
+++ b/Content.Tests/Server/Connection/IPIntelTest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
diff --git a/Content.Tests/Server/Utility/IPAddressExtTest.cs b/Content.Tests/Server/Utility/IPAddressExtTest.cs
index dba8a0e6aa..aa96309839 100644
--- a/Content.Tests/Server/Utility/IPAddressExtTest.cs
+++ b/Content.Tests/Server/Utility/IPAddressExtTest.cs
@@ -1,4 +1,4 @@
-using System.Net;
+using System.Net;
 using Content.Server.IP;
 using NUnit.Framework;
 
diff --git a/Content.Tests/Shared/Administration/AdminFlagsExtTest.cs b/Content.Tests/Shared/Administration/AdminFlagsExtTest.cs
index c36aad7718..7f2fd1b124 100644
--- a/Content.Tests/Shared/Administration/AdminFlagsExtTest.cs
+++ b/Content.Tests/Shared/Administration/AdminFlagsExtTest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Content.Shared.Administration;
 using NUnit.Framework;
 
diff --git a/Content.Tests/Shared/Administration/Logs/LogTypeTests.cs b/Content.Tests/Shared/Administration/Logs/LogTypeTests.cs
index da52469bd6..d79ecad951 100644
--- a/Content.Tests/Shared/Administration/Logs/LogTypeTests.cs
+++ b/Content.Tests/Shared/Administration/Logs/LogTypeTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using Content.Shared.Database;
 using NUnit.Framework;
diff --git a/Content.Tests/Shared/Atmos/GasMixtureTest.cs b/Content.Tests/Shared/Atmos/GasMixtureTest.cs
index 5068d48581..a7dbde4864 100644
--- a/Content.Tests/Shared/Atmos/GasMixtureTest.cs
+++ b/Content.Tests/Shared/Atmos/GasMixtureTest.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Atmos;
+using Content.Shared.Atmos;
 using NUnit.Framework;
 
 namespace Content.Tests.Shared.Atmos;
diff --git a/Content.Tests/Shared/Chat/V2/Moderation/SimpleCensor.cs b/Content.Tests/Shared/Chat/V2/Moderation/SimpleCensor.cs
index 09870af317..08340af7ff 100644
--- a/Content.Tests/Shared/Chat/V2/Moderation/SimpleCensor.cs
+++ b/Content.Tests/Shared/Chat/V2/Moderation/SimpleCensor.cs
@@ -1,4 +1,4 @@
-using System.Text.Unicode;
+using System.Text.Unicode;
 using Content.Shared.Chat.V2.Moderation;
 using NUnit.Framework;
 
diff --git a/Content.Tests/Shared/Chemistry/ReagentPrototype_Tests.cs b/Content.Tests/Shared/Chemistry/ReagentPrototype_Tests.cs
index 19dee14cfe..27c49d77c9 100644
--- a/Content.Tests/Shared/Chemistry/ReagentPrototype_Tests.cs
+++ b/Content.Tests/Shared/Chemistry/ReagentPrototype_Tests.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using Content.Shared.Chemistry.Reagent;
 using NUnit.Framework;
 using Robust.Shared.IoC;
diff --git a/Content.Tests/Shared/DirectionRandomizerTest.cs b/Content.Tests/Shared/DirectionRandomizerTest.cs
index 0afaa9ba4a..9091fdf9de 100644
--- a/Content.Tests/Shared/DirectionRandomizerTest.cs
+++ b/Content.Tests/Shared/DirectionRandomizerTest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Shared;
 using NUnit.Framework;
diff --git a/Content.Tests/Shared/Gamestates/ComponentStateNullTest.cs b/Content.Tests/Shared/Gamestates/ComponentStateNullTest.cs
index 9306bd54cb..fcaf6477a5 100644
--- a/Content.Tests/Shared/Gamestates/ComponentStateNullTest.cs
+++ b/Content.Tests/Shared/Gamestates/ComponentStateNullTest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using NUnit.Framework;
diff --git a/Content.Tests/Shared/Preferences/Job/JobPriorityTest.cs b/Content.Tests/Shared/Preferences/Job/JobPriorityTest.cs
index fc095d1c96..f8ad717272 100644
--- a/Content.Tests/Shared/Preferences/Job/JobPriorityTest.cs
+++ b/Content.Tests/Shared/Preferences/Job/JobPriorityTest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Content.Server.Database;
 using Content.Shared.Preferences;
 using NUnit.Framework;
diff --git a/Content.Tests/Shared/Utility/ContentHelpers_Test.cs b/Content.Tests/Shared/Utility/ContentHelpers_Test.cs
index 6a54623892..45a3ba0918 100644
--- a/Content.Tests/Shared/Utility/ContentHelpers_Test.cs
+++ b/Content.Tests/Shared/Utility/ContentHelpers_Test.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Shared.Rounding;
 using NUnit.Framework;
 
diff --git a/Content.Tests/Shared/Utility/RandomExtensionsTests.cs b/Content.Tests/Shared/Utility/RandomExtensionsTests.cs
index f278bfbbd1..ff63826936 100644
--- a/Content.Tests/Shared/Utility/RandomExtensionsTests.cs
+++ b/Content.Tests/Shared/Utility/RandomExtensionsTests.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using Content.Shared.Dataset;
 using Content.Shared.Random.Helpers;
 using NUnit.Framework;
diff --git a/Content.Tools/MappingMergeDriver.cs b/Content.Tools/MappingMergeDriver.cs
index 1f3b56cd05..be40822830 100644
--- a/Content.Tools/MappingMergeDriver.cs
+++ b/Content.Tools/MappingMergeDriver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Content.Tools
 {
diff --git a/Content.Tools/Merger.cs b/Content.Tools/Merger.cs
index 9ca490504f..2824e8f0b6 100644
--- a/Content.Tools/Merger.cs
+++ b/Content.Tools/Merger.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Collections.Generic;
 using System.Globalization;
diff --git a/Content.Tools/TypeTagPreserver.cs b/Content.Tools/TypeTagPreserver.cs
index 6dda5b92c2..56ff333a6f 100644
--- a/Content.Tools/TypeTagPreserver.cs
+++ b/Content.Tools/TypeTagPreserver.cs
@@ -1,4 +1,4 @@
-using YamlDotNet.Core;
+using YamlDotNet.Core;
 using YamlDotNet.Core.Events;
 
 namespace Content.Tools
diff --git a/Content.Tools/YamlTools.cs b/Content.Tools/YamlTools.cs
index e59d61efa4..43153b6bd8 100644
--- a/Content.Tools/YamlTools.cs
+++ b/Content.Tools/YamlTools.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using YamlDotNet.RepresentationModel;
 
diff --git a/Pow3r/LinqHelper.cs b/Pow3r/LinqHelper.cs
index 25ae91b090..a0a01c4509 100644
--- a/Pow3r/LinqHelper.cs
+++ b/Pow3r/LinqHelper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace Pow3r
diff --git a/Pow3r/Program.OpenGL.cs b/Pow3r/Program.OpenGL.cs
index 1e4298e4bc..e94bc2cbc4 100644
--- a/Pow3r/Program.OpenGL.cs
+++ b/Pow3r/Program.OpenGL.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Numerics;
 using System.Text;
 using System.Linq;
diff --git a/Pow3r/Program.SaveLoad.cs b/Pow3r/Program.SaveLoad.cs
index 5fff64f662..e7cf1e6940 100644
--- a/Pow3r/Program.SaveLoad.cs
+++ b/Pow3r/Program.SaveLoad.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
diff --git a/Pow3r/Program.Veldrid.cs b/Pow3r/Program.Veldrid.cs
index ddbad8829e..851aa5f173 100644
--- a/Pow3r/Program.Veldrid.cs
+++ b/Pow3r/Program.Veldrid.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Numerics;
 using System.Runtime.InteropServices;
 using System.Text;
diff --git a/Pow3r/Program.cs b/Pow3r/Program.cs
index be5bf62f39..32490fc7ee 100644
--- a/Pow3r/Program.cs
+++ b/Pow3r/Program.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using ImGuiNET;
diff --git a/Resources/Audio/Ambience/Temporary/attributions.yml b/Resources/Audio/Ambience/Temporary/attributions.yml
index 7560df72a8..bb9be72ad6 100644
--- a/Resources/Audio/Ambience/Temporary/attributions.yml
+++ b/Resources/Audio/Ambience/Temporary/attributions.yml
@@ -1,4 +1,4 @@
 - files: ["flies.ogg"]
   license: "CC0-1.0"
   copyright: "Taken from source"
-  source: "https://freesound.org/people/telezon/sounds/321870/"
\ No newline at end of file
+  source: "https://freesound.org/people/telezon/sounds/321870/"
diff --git a/Resources/Audio/Effects/Changeling/attributions.yml b/Resources/Audio/Effects/Changeling/attributions.yml
index d7d7931cd6..285b8e9189 100644
--- a/Resources/Audio/Effects/Changeling/attributions.yml
+++ b/Resources/Audio/Effects/Changeling/attributions.yml
@@ -1,4 +1,4 @@
-- files: ["devour_suck.ogg"]
+- files: ["devour_suck.ogg"]
   license: "CC0-1.0"
   copyright: "4Cairnz on Freesound: June 5th 2023"
   source: "https://freesound.org/people/4Cairnz/sounds/689640/"
diff --git a/Resources/Audio/Effects/Shuttle/attributions.yml b/Resources/Audio/Effects/Shuttle/attributions.yml
index b251482b46..35b23522f8 100644
--- a/Resources/Audio/Effects/Shuttle/attributions.yml
+++ b/Resources/Audio/Effects/Shuttle/attributions.yml
@@ -14,4 +14,4 @@
   - radar_ping.ogg
   copyright: User unfa from freesound.org Remixed to mono and .ogg by metalgearsloth.
   license: CC0-1.0
-  source: https://freesound.org/people/unfa/sounds/215415/
\ No newline at end of file
+  source: https://freesound.org/people/unfa/sounds/215415/
diff --git a/Resources/Audio/Items/Anomaly/attributions.yml b/Resources/Audio/Items/Anomaly/attributions.yml
index 27bf35d875..e2c9c5761d 100644
--- a/Resources/Audio/Items/Anomaly/attributions.yml
+++ b/Resources/Audio/Items/Anomaly/attributions.yml
@@ -1,4 +1,4 @@
-- files: ["flesh_crit.ogg"]
+- files: ["flesh_crit.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Mashup by GonTar Quantumcross of malescream_1.ogg, malescream_2.ogg, femalescream_4.ogg, femalescream_5.ogg, alien_claw_flesh_2.ogg, alien_claw_flesh_3.ogg"
   source: "https://github.com/tgstation/tgstation/commit/3d049e69fe71a0be2133005e65ea469135d648c8"
diff --git a/Resources/Audio/Items/Dice/attributions.yml b/Resources/Audio/Items/Dice/attributions.yml
index 12d94403cd..c82558b132 100644
--- a/Resources/Audio/Items/Dice/attributions.yml
+++ b/Resources/Audio/Items/Dice/attributions.yml
@@ -1,4 +1,4 @@
 - files: ["coin1.ogg","coin2.ogg", "coin3.ogg"]
   license: "CC0-1.0"
   copyright: "Sampled from sfx created by Sorce, from freesound"
-  source: "https://freesound.org/people/sorce/sounds/425130"
\ No newline at end of file
+  source: "https://freesound.org/people/sorce/sounds/425130"
diff --git a/Resources/Audio/Items/Handcuffs/attributions.yml b/Resources/Audio/Items/Handcuffs/attributions.yml
index 9c189aec2b..4094ba84e5 100644
--- a/Resources/Audio/Items/Handcuffs/attributions.yml
+++ b/Resources/Audio/Items/Handcuffs/attributions.yml
@@ -1,4 +1,4 @@
 - files: ["ziptie_end.ogg"]
   license: "CC-BY-3.0"
   copyright: "Taken from cable tie.wav by THE_bizniss on Freesound.org"
-  source: "https://freesound.org/people/THE_bizniss/sounds/39318/"
\ No newline at end of file
+  source: "https://freesound.org/people/THE_bizniss/sounds/39318/"
diff --git a/Resources/Audio/Jukebox/attributions.yml b/Resources/Audio/Jukebox/attributions.yml
index 48e1458c4c..6d83ef5251 100644
--- a/Resources/Audio/Jukebox/attributions.yml
+++ b/Resources/Audio/Jukebox/attributions.yml
@@ -24,4 +24,4 @@
 - files: ["sunset.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Sunset by PigeonBeans. Exported in Mono OGG."
-  source: "https://soundcloud.com/pigeonbeans/sunset"
\ No newline at end of file
+  source: "https://soundcloud.com/pigeonbeans/sunset"
diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml
index 9d07a61acb..8564467687 100644
--- a/Resources/Audio/Lobby/attributions.yml
+++ b/Resources/Audio/Lobby/attributions.yml
@@ -1,4 +1,4 @@
-- files: ["thunderdome.ogg"]
+- files: ["thunderdome.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "-Sector11 by MashedByMachines. Converted from MP3 to OGG."
   source: "https://www.newgrounds.com/audio/listen/312622"
diff --git a/Resources/Audio/Machines/light_tube_on.ogg b/Resources/Audio/Machines/light_tube_on.ogg
index deeffa7339..6f00a777c5 100644
Binary files a/Resources/Audio/Machines/light_tube_on.ogg and b/Resources/Audio/Machines/light_tube_on.ogg differ
diff --git a/Resources/Audio/Magic/Cults/ClockCult/attributions.yml b/Resources/Audio/Magic/Cults/ClockCult/attributions.yml
index dae32f0ae2..736cb9d375 100644
--- a/Resources/Audio/Magic/Cults/ClockCult/attributions.yml
+++ b/Resources/Audio/Magic/Cults/ClockCult/attributions.yml
@@ -1,4 +1,4 @@
 - files: ["steam_woosh.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from Citadel Station"
-  source: "https://github.com/Citadel-Station-13/Citadel-Station-13/commit/e575bd66854786eb9455eae6954d976cf13c66ea"
\ No newline at end of file
+  source: "https://github.com/Citadel-Station-13/Citadel-Station-13/commit/e575bd66854786eb9455eae6954d976cf13c66ea"
diff --git a/Resources/Audio/Mecha/attributions.yml b/Resources/Audio/Mecha/attributions.yml
index 2330e20ad9..bb19933359 100644
--- a/Resources/Audio/Mecha/attributions.yml
+++ b/Resources/Audio/Mecha/attributions.yml
@@ -9,4 +9,4 @@
 - files: ["sound_mecha_powerloader_step.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "Taken from TG station."
-  source: "https://github.com/tgstation/tgstation/commit/45123dd06cb6dc7c56e8004c528230682ea559b2"
\ No newline at end of file
+  source: "https://github.com/tgstation/tgstation/commit/45123dd06cb6dc7c56e8004c528230682ea559b2"
diff --git a/Resources/Audio/UserInterface/attributions.yml b/Resources/Audio/UserInterface/attributions.yml
index f0d3612f74..6622aee2b7 100644
--- a/Resources/Audio/UserInterface/attributions.yml
+++ b/Resources/Audio/UserInterface/attributions.yml
@@ -8,4 +8,4 @@
   - hover.ogg
   license: "CC0-1.0"
   copyright: "Made by MATRIXXX_, edited by metalgearsloth"
-  source: "https://freesound.org/people/MATRIXXX_/sounds/703884/"
\ No newline at end of file
+  source: "https://freesound.org/people/MATRIXXX_/sounds/703884/"
diff --git a/Resources/Audio/Voice/Arachnid/attributions.yml b/Resources/Audio/Voice/Arachnid/attributions.yml
index dc7e5ce1d5..fe1e8c0d61 100644
--- a/Resources/Audio/Voice/Arachnid/attributions.yml
+++ b/Resources/Audio/Voice/Arachnid/attributions.yml
@@ -5,4 +5,4 @@
 - files: ["arachnid_chitter.ogg", "arachnid_click.ogg"]
   license: "CC-BY-4.0"
   copyright: "Recorded by https://github.com/PixelTheKermit, modified by Dutch-VanDerLinde"
-  source: "https://github.com/space-wizards/space-station-14/pull/23548"
\ No newline at end of file
+  source: "https://github.com/space-wizards/space-station-14/pull/23548"
diff --git a/Resources/Audio/Voice/Diona/attributions.yml b/Resources/Audio/Voice/Diona/attributions.yml
index 685e4e0f9a..4879bee379 100644
--- a/Resources/Audio/Voice/Diona/attributions.yml
+++ b/Resources/Audio/Voice/Diona/attributions.yml
@@ -1,4 +1,4 @@
-- files: ["diona_scream.ogg"]
+- files: ["diona_scream.ogg"]
   license: "CC-BY-4.0"
   copyright: "Made by InspectorJ (http://www.jshaw.co.uk/) of freesound.org. Modified by Morb0 for SS14 with the following modifications: Noise reduced, cropped, converted to mono"
   source: "https://freesound.org/people/InspectorJ/sounds/352201/"
diff --git a/Resources/Audio/Voice/Reptilian/attritbutions.yml b/Resources/Audio/Voice/Reptilian/attritbutions.yml
index 7fa86b2ebf..7c97eaa2d8 100644
--- a/Resources/Audio/Voice/Reptilian/attritbutions.yml
+++ b/Resources/Audio/Voice/Reptilian/attritbutions.yml
@@ -6,4 +6,4 @@
 - files: [reptilian_tailthump.ogg]
   copyright: "Taken from https://freesound.org/"
   license: "CC0-1.0"
-  source: https://freesound.org/people/TylerAM/sounds/389665/
\ No newline at end of file
+  source: https://freesound.org/people/TylerAM/sounds/389665/
diff --git a/Resources/Audio/Voice/Zombie/attributions.yml b/Resources/Audio/Voice/Zombie/attributions.yml
index 9fa56bc389..3bbbd81315 100644
--- a/Resources/Audio/Voice/Zombie/attributions.yml
+++ b/Resources/Audio/Voice/Zombie/attributions.yml
@@ -9,4 +9,4 @@
 - files: ["zombie-3.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "Zombie Snarl by gneube. Converted from MP3 to OGG."
-  source: "https://freesound.org/people/gneube/sounds/315844/"
\ No newline at end of file
+  source: "https://freesound.org/people/gneube/sounds/315844/"
diff --git a/Resources/Audio/Weapons/Guns/Gunshots/Magic/attributions.yml b/Resources/Audio/Weapons/Guns/Gunshots/Magic/attributions.yml
index c25a5ed484..c057db626b 100644
--- a/Resources/Audio/Weapons/Guns/Gunshots/Magic/attributions.yml
+++ b/Resources/Audio/Weapons/Guns/Gunshots/Magic/attributions.yml
@@ -4,4 +4,4 @@
 - files: [ "staff_animation.ogg", "staff_change.ogg", "staff_chaos.ogg", "staff_door.ogg", "staff_healing.ogg" ]
   license: "CC-BY-SA-3.0"
   copyright: "https://github.com/tgstation/tgstation/commit/906fb0682bab6a0975b45036001c54f021f58ae7"
-  source: "https://github.com/tgstation/tgstation/commit/906fb0682bab6a0975b45036001c54f021f58ae7"
\ No newline at end of file
+  source: "https://github.com/tgstation/tgstation/commit/906fb0682bab6a0975b45036001c54f021f58ae7"
diff --git a/Resources/Audio/Weapons/Guns/Misc/attributions.yml b/Resources/Audio/Weapons/Guns/Misc/attributions.yml
index dab5384b8d..3a1337fc65 100644
--- a/Resources/Audio/Weapons/Guns/Misc/attributions.yml
+++ b/Resources/Audio/Weapons/Guns/Misc/attributions.yml
@@ -6,4 +6,4 @@
 - files: ["selector.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "Taken from tgstation"
-  source: "https://github.com/tgstation/TerraGov-Marine-Corps/blob/0d97ec86c49e2a89409bd3ddf0b7451b3f1c9a0e/sound/weapons/guns/interact/selector.ogg"
\ No newline at end of file
+  source: "https://github.com/tgstation/TerraGov-Marine-Corps/blob/0d97ec86c49e2a89409bd3ddf0b7451b3f1c9a0e/sound/weapons/guns/interact/selector.ogg"
diff --git a/Resources/Audio/Weapons/Guns/Miss/attributions.yml b/Resources/Audio/Weapons/Guns/Miss/attributions.yml
index 7fd804b9d0..90e4348fe3 100644
--- a/Resources/Audio/Weapons/Guns/Miss/attributions.yml
+++ b/Resources/Audio/Weapons/Guns/Miss/attributions.yml
@@ -6,4 +6,4 @@
 - files: ["energy_miss1.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from CM-SS13"
-  source: "https://github.com/cmss13-devs/cmss13/tree/0535055a7abcd3016123f2be2cd3db428c122dac/sound/bullets"
\ No newline at end of file
+  source: "https://github.com/cmss13-devs/cmss13/tree/0535055a7abcd3016123f2be2cd3db428c122dac/sound/bullets"
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
index 680b5d0455..6c936532d6 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
@@ -20,7 +20,7 @@ ipintel_bad_rating = 0.99
 ipintel_alert_admin_warn_rating = 0.95
 
 [infolinks]
-bug_report = "https://github.com/space-wizards/space-station-14/issues/new/choose"
+bug_report = "https://forum.spacestation14.com/c/development/bug-reports/53"
 discord    = "https://discord.spacestation14.io"
 forum      = "https://forum.spacestation14.io"
 github     = "https://github.com/space-wizards/space-station-14"
diff --git a/Resources/Locale/en-US/accent/accents.ftl b/Resources/Locale/en-US/accent/accents.ftl
index 75644c8b2e..0cd645e5cd 100644
--- a/Resources/Locale/en-US/accent/accents.ftl
+++ b/Resources/Locale/en-US/accent/accents.ftl
@@ -1,155 +1,134 @@
 # Cat accent
-accent-words-cat-1 = Meow!
-accent-words-cat-2 = Mow.
-accent-words-cat-3 = Mrrrow!
-accent-words-cat-4 = Hhsss!
-accent-words-cat-5 = Brrow.
-accent-words-cat-6 = Meow?
-accent-words-cat-7 = Miau.
+accent-words-cat-1 = Meow
+accent-words-cat-2 = Mow
+accent-words-cat-3 = Mrrrow
+accent-words-cat-4 = Hhsss
+accent-words-cat-5 = Brrow
+accent-words-cat-6 = Miau
 
 # Dog accent
-accent-words-dog-1 = Bark!
-accent-words-dog-2 = Bork!
-accent-words-dog-3 = Woof!
-accent-words-dog-4 = Arf.
-accent-words-dog-5 = Grrr.
+accent-words-dog-1 = Bark
+accent-words-dog-2 = Bork
+accent-words-dog-3 = Woof
+accent-words-dog-4 = Arf
+accent-words-dog-5 = Grrr
 
 # Mouse
-accent-words-mouse-1 = Squeak!
-accent-words-mouse-2 = Piep!
-accent-words-mouse-3 = Chuu!
-accent-words-mouse-4 = Eeee!
-accent-words-mouse-5 = Pip!
-accent-words-mouse-6 = Fwiep!
-accent-words-mouse-7 = Heep!
+accent-words-mouse-1 = Squeak
+accent-words-mouse-2 = Piep
+accent-words-mouse-3 = Chuu
+accent-words-mouse-4 = Eeee
+accent-words-mouse-5 = Pip
+accent-words-mouse-6 = Fwiep
+accent-words-mouse-7 = Heep
 
 # Mumble
-accent-words-mumble-1 = Mmfph!
-accent-words-mumble-2 = Mmmf mrrfff!
-accent-words-mumble-3 = Mmmf mnnf!
+accent-words-mumble-1 = Mmfph
+accent-words-mumble-2 = Mmmf mrrfff
+accent-words-mumble-3 = Mmmf mnnf
 
 # Silicon
-accent-words-silicon-1 = Beep.
-accent-words-silicon-2 = Boop.
-accent-words-silicon-3 = Whirr.
-accent-words-silicon-4 = Beep-boop.
+accent-words-silicon-1 = Beep
+accent-words-silicon-2 = Boop
+accent-words-silicon-3 = Whirr
+accent-words-silicon-4 = Beep-boop
 
 # Xeno
-accent-words-xeno-1 = Hiss.
-accent-words-xeno-2 = Hisssss!
-accent-words-xeno-3 = Hisssuuu...
-accent-words-xeno-4 = Hiss...!
+accent-words-xeno-1 = Hiss
+accent-words-xeno-2 = Hisssss
+accent-words-xeno-3 = Hisssuuu
+accent-words-xeno-4 = Hiss
 
 # Zombie
-accent-words-zombie-1 = Gruaahhhh...
-accent-words-zombie-2 = Mmuaaaa..
-accent-words-zombie-3 = Braainnssss...
-accent-words-zombie-4 = Grrrrr...
-accent-words-zombie-5 = Ouuaahhhhh...
-accent-words-zombie-6 = Graaaaaooohhlll...
-accent-words-zombie-7 = Brainsss... Braaaiiinnsss..
-accent-words-zombie-8 = Braughhh...
-accent-words-zombie-9 = Breshhhh...
-accent-words-zombie-10 = Graaaaaa...
+accent-words-zombie-1 = Gruaahhhh
+accent-words-zombie-2 = Mmuaaaa
+accent-words-zombie-3 = Braainnssss
+accent-words-zombie-4 = Grrrrr
+accent-words-zombie-5 = Ouuaahhhhh
+accent-words-zombie-6 = Graaaaaooohhlll
+accent-words-zombie-7 = Brainsss... Braaaiiinnsss
+accent-words-zombie-8 = Braughhh
+accent-words-zombie-9 = Breshhhh
+accent-words-zombie-10 = Graaaaaa
 
 # Moth Zombie
-accent-words-zombie-moth-1 = Clothessss...
-accent-words-zombie-moth-2 = Shooooesss...
-accent-words-zombie-moth-3 = Liiiiight...
-accent-words-zombie-moth-4 = Laaamps...
-accent-words-zombie-moth-5 = Haaaatsss... Hatttssss...
-accent-words-zombie-moth-6 = Scarffsss...
+accent-words-zombie-moth-1 = Clothessss
+accent-words-zombie-moth-2 = Shooooesss
+accent-words-zombie-moth-3 = Liiiiight
+accent-words-zombie-moth-4 = Laaamps
+accent-words-zombie-moth-5 = Haaaatsss... Hatttssss
+accent-words-zombie-moth-6 = Scarffsss
 
 # Generic Aggressive
-accent-words-generic-aggressive-1 = Grr!
-accent-words-generic-aggressive-2 = Rrrr!
-accent-words-generic-aggressive-3 = Grr...
-accent-words-generic-aggressive-4 = Grrow!!
+accent-words-generic-aggressive-1 = Grr
+accent-words-generic-aggressive-2 = Rrrr
+accent-words-generic-aggressive-3 = Grrow
 
 # Duck
-accent-words-duck-1 = Quack!
-accent-words-duck-2 = Quack.
-accent-words-duck-3 = Quack?
-accent-words-duck-4 = Quack quack!
+accent-words-duck-1 = Quack
+accent-words-duck-2 = Quack quack
+accent-words-duck-3 = Quack quack quack
 
 # Chicken
-accent-words-chicken-1 = Cluck!
-accent-words-chicken-2 = Cluck.
-accent-words-chicken-3 = Cluck?
-accent-words-chicken-4 = Cluck cluck!
+accent-words-chicken-1 = Cluck
+accent-words-chicken-2 = Cluck cluck
+accent-words-chicken-3 = Cluck cluck cluck
 
 # Pig
-accent-words-pig-1 = Oink.
-accent-words-pig-2 = Oink?
-accent-words-pig-3 = Oink!
-accent-words-pig-4 = Oink oink!
+accent-words-pig-1 = Oink
+accent-words-pig-2 = Oink oink
+accent-words-pig-3 = Oink oink oink
 
 # Kangaroo
-accent-words-kangaroo-1 = Grr!
-accent-words-kangaroo-2 = Hisss!
-accent-words-kangaroo-3 = Shreak!
-accent-words-kangaroo-4 = Chuu!
+accent-words-kangaroo-1 = Grr
+accent-words-kangaroo-2 = Hisss
+accent-words-kangaroo-3 = Shreak
+accent-words-kangaroo-4 = Chuu
 
 # Slimes
-accent-words-slimes-1 = Blyump.
-accent-words-slimes-2 = Blimpuf?
-accent-words-slimes-3 = Blump!
-accent-words-slimes-4 = Bluuump...
-accent-words-slimes-5 = Blabl blump!
+accent-words-slimes-1 = Blyump
+accent-words-slimes-2 = Blimpuf
+accent-words-slimes-3 = Blump
+accent-words-slimes-4 = Bluuump
+accent-words-slimes-5 = Blabl blump
 
 # Mothroach
-accent-words-mothroach-1 = Chirp!
+accent-words-mothroach-1 = Chirp
 
 # Crab
-accent-words-crab-1 = Click.
-accent-words-crab-2 = Click-clack!
-accent-words-crab-3 = Clack?
-accent-words-crab-4 = Tipi-tap!
-accent-words-crab-5 = Clik-tap.
-accent-words-crab-6 = Cliliick.
+accent-words-crab-1 = Click
+accent-words-crab-2 = Click-clack
+accent-words-crab-3 = Clack
+accent-words-crab-4 = Tipi-tap
+accent-words-crab-5 = Clik-tap
+accent-words-crab-6 = Cliliick
 
 # Kobold
-accent-words-kobold-1 = Yip!
-accent-words-kobold-2 = Grrar.
-accent-words-kobold-3 = Yap!
-accent-words-kobold-4 = Bip.
-accent-words-kobold-5 = Screet?
-accent-words-kobold-6 = Gronk!
-accent-words-kobold-7 = Hiss!
-accent-words-kobold-8 = Eeee!
-accent-words-kobold-9 = Yip.
+accent-words-kobold-1 = Yip
+accent-words-kobold-2 = Grrar
+accent-words-kobold-3 = Yap
+accent-words-kobold-4 = Bip
+accent-words-kobold-5 = Screet
+accent-words-kobold-6 = Gronk
+accent-words-kobold-7 = Hiss
+accent-words-kobold-8 = Eeee
 
 # Nymph
-accent-words-nymph-1 = Chirp!
-accent-words-nymph-2 = Churr...
-accent-words-nymph-3 = Cheep?
-accent-words-nymph-4 = Chrrup!
+accent-words-nymph-1 = Chirp
+accent-words-nymph-2 = Churr
+accent-words-nymph-3 = Cheep
+accent-words-nymph-4 = Chrrup
 
 # TomatoKiller
-accent-words-tomato-1 = Totato!
+accent-words-tomato-1 = Totato
 accent-words-tomato-2 = Trotect
-accent-words-tomato-3 = Mastet?
-accent-words-tomato-4 = Reaty!
-accent-words-tomato-5 = Water...
+accent-words-tomato-3 = Mastet
+accent-words-tomato-4 = Reaty
+accent-words-tomato-5 = Water
 
 # Scurret
-accent-words-scurret-1 = Wa!
-accent-words-scurret-2 = Wa?
-accent-words-scurret-3 = Wa.
-accent-words-scurret-4 = Wa...
-accent-words-scurret-5 = Wawa!
-accent-words-scurret-6 = Wawa?
-accent-words-scurret-7 = Wawa.
-accent-words-scurret-8 = Wawa...
-accent-words-scurret-9 = Wa wawa!
-accent-words-scurret-10 = Wa wawa?
-accent-words-scurret-11 = Wa wawa.
-accent-words-scurret-12 = Wa wawa...
-accent-words-scurret-13 = Wawa wa!
-accent-words-scurret-14 = Wawa wa?
-accent-words-scurret-15 = Wawa wa.
-accent-words-scurret-16 = Wawa wa...
-accent-words-scurret-17 = Waaaaaa.
-accent-words-scurret-18 = Waaaaaa!
-accent-words-scurret-19 = Waaaaaa?
-accent-words-scurret-20 = Waaaaaa...
+accent-words-scurret-1 = Wa
+accent-words-scurret-2 = Wawa
+accent-words-scurret-3 = Wa wawa
+accent-words-scurret-4 = Wawa wa
+accent-words-scurret-5 = Waaaaaa
diff --git a/Resources/Locale/en-US/accent/mobster.ftl b/Resources/Locale/en-US/accent/mobster.ftl
index d0f510453d..7cf3bf55e7 100644
--- a/Resources/Locale/en-US/accent/mobster.ftl
+++ b/Resources/Locale/en-US/accent/mobster.ftl
@@ -1,4 +1,4 @@
-accent-mobster-prefix-1 = Nyehh,
+accent-mobster-prefix-1 = Nyehh,
 
 accent-mobster-suffix-boss-1 = , see?
 accent-mobster-suffix-boss-2 = , fugeddaboutit.
diff --git a/Resources/Locale/en-US/accent/russian.ftl b/Resources/Locale/en-US/accent/russian.ftl
index 596342dc9f..9ce6b78b28 100644
--- a/Resources/Locale/en-US/accent/russian.ftl
+++ b/Resources/Locale/en-US/accent/russian.ftl
@@ -16,4 +16,4 @@ accent-russian-words-5 = friends
 accent-russian-words-replace-5 = comrades
 
 accent-russian-words-6 = cheers
-accent-russian-words-replace-6 = na zdorovje
\ No newline at end of file
+accent-russian-words-replace-6 = na zdorovje
diff --git a/Resources/Locale/en-US/accent/scottish.ftl b/Resources/Locale/en-US/accent/scottish.ftl
index 9fed77d2f3..e5a649c278 100644
--- a/Resources/Locale/en-US/accent/scottish.ftl
+++ b/Resources/Locale/en-US/accent/scottish.ftl
@@ -1,4 +1,4 @@
-accent-scottish-words-1 = do
+accent-scottish-words-1 = do
 accent-scottish-words-replace-1 = dae
 
 accent-scottish-words-2 = don't
diff --git a/Resources/Locale/en-US/accent/scrambled.ftl b/Resources/Locale/en-US/accent/scrambled.ftl
index e651980734..0baf5d9b03 100644
--- a/Resources/Locale/en-US/accent/scrambled.ftl
+++ b/Resources/Locale/en-US/accent/scrambled.ftl
@@ -1,4 +1,4 @@
-accent-scrambled-words-1 = Who?
+accent-scrambled-words-1 = Who?
 accent-scrambled-words-2 = What?
 accent-scrambled-words-3 = When?
 accent-scrambled-words-4 = Where?
diff --git a/Resources/Locale/en-US/access/systems/access-reader-system.ftl b/Resources/Locale/en-US/access/systems/access-reader-system.ftl
index bf3bfe4d96..7f2ca5a72f 100644
--- a/Resources/Locale/en-US/access/systems/access-reader-system.ftl
+++ b/Resources/Locale/en-US/access/systems/access-reader-system.ftl
@@ -3,4 +3,4 @@ access-reader-access-label = [color=yellow]{$access}[/color]
 access-reader-examination = Access is generally restricted to personnel with {$access} access.
 access-reader-examination-functionality-restricted = {$access} access may be required to use certain functions.
 access-reader-access-settings-modified-message = [italic]The access reader has been modified to accept personnel with {$access} access.[/italic]
-access-reader-access-settings-removed-message = [italic]The settings on the access reader have been deleted.[/italic]
\ No newline at end of file
+access-reader-access-settings-removed-message = [italic]The settings on the access reader have been deleted.[/italic]
diff --git a/Resources/Locale/en-US/actions/actions/actions-commands.ftl b/Resources/Locale/en-US/actions/actions/actions-commands.ftl
index ac5374f008..c8b0839fef 100644
--- a/Resources/Locale/en-US/actions/actions/actions-commands.ftl
+++ b/Resources/Locale/en-US/actions/actions/actions-commands.ftl
@@ -1,4 +1,4 @@
-## Actions Commands loc
+## Actions Commands loc
 
 ## Upgradeaction command loc
 upgradeaction-command-help = Usage: upgradeaction <entityUid> [level]
diff --git a/Resources/Locale/en-US/actions/actions/blocking.ftl b/Resources/Locale/en-US/actions/actions/blocking.ftl
index ff0df1c99b..0a44813c67 100644
--- a/Resources/Locale/en-US/actions/actions/blocking.ftl
+++ b/Resources/Locale/en-US/actions/actions/blocking.ftl
@@ -1,4 +1,4 @@
-action-popup-blocking-user = You raise your {$shield}!
+action-popup-blocking-user = You raise your {$shield}!
 action-popup-blocking-disabling-user = You lower your {$shield}!
 
 action-popup-blocking-other = {CAPITALIZE(THE($blockerName))} raises {POSS-ADJ($blockerName)} {$shield}!
diff --git a/Resources/Locale/en-US/actions/actions/crit.ftl b/Resources/Locale/en-US/actions/actions/crit.ftl
index a065b42894..6a68520fb4 100644
--- a/Resources/Locale/en-US/actions/actions/crit.ftl
+++ b/Resources/Locale/en-US/actions/actions/crit.ftl
@@ -1 +1 @@
-action-name-crit-last-words = Say Last Words
+action-name-crit-last-words = Say Last Words
diff --git a/Resources/Locale/en-US/actions/actions/diona.ftl b/Resources/Locale/en-US/actions/actions/diona.ftl
index 3745e6fe49..5e1a7a0c9b 100644
--- a/Resources/Locale/en-US/actions/actions/diona.ftl
+++ b/Resources/Locale/en-US/actions/actions/diona.ftl
@@ -1,3 +1,3 @@
 diona-gib-action-use = {$name} splits apart in an instant!
 
-diona-reform-attempt = {$name} attempts to reform!
\ No newline at end of file
+diona-reform-attempt = {$name} attempts to reform!
diff --git a/Resources/Locale/en-US/actions/actions/egg-lay.ftl b/Resources/Locale/en-US/actions/actions/egg-lay.ftl
index 0aefdc6863..74bbc84037 100644
--- a/Resources/Locale/en-US/actions/actions/egg-lay.ftl
+++ b/Resources/Locale/en-US/actions/actions/egg-lay.ftl
@@ -1,3 +1,3 @@
-action-popup-lay-egg-user = You lay an egg.
+action-popup-lay-egg-user = You lay an egg.
 action-popup-lay-egg-others = {CAPITALIZE(THE($entity))} lays an egg.
 action-popup-lay-egg-too-hungry = You need more food before you can lay another egg!
diff --git a/Resources/Locale/en-US/actions/actions/entity-producer.ftl b/Resources/Locale/en-US/actions/actions/entity-producer.ftl
index 43f8435dbb..28ff45fe0c 100644
--- a/Resources/Locale/en-US/actions/actions/entity-producer.ftl
+++ b/Resources/Locale/en-US/actions/actions/entity-producer.ftl
@@ -1,3 +1,3 @@
-entity-producer-action-popup-user = You produce something.
+entity-producer-action-popup-user = You produce something.
 entity-producer-action-popup-others = {CAPITALIZE(THE($entity))} produces something.
 entity-producer-action-popup-too-hungry = You need more food before you can produce anything!
diff --git a/Resources/Locale/en-US/administration/admin-alerts.ftl b/Resources/Locale/en-US/administration/admin-alerts.ftl
index 512c654650..048697a093 100644
--- a/Resources/Locale/en-US/administration/admin-alerts.ftl
+++ b/Resources/Locale/en-US/administration/admin-alerts.ftl
@@ -1,4 +1,4 @@
-admin-alert-shared-connection = {$player} is sharing a connection with {$otherCount} connected player(s): {$otherList}
+admin-alert-shared-connection = {$player} is sharing a connection with {$otherCount} connected player(s): {$otherList}
 admin-alert-ipintel-blocked = {$player} was rejected from joining due to their IP having a {TOSTRING($percent, "P2")} confidence of being a VPN/Datacenter.
 admin-alert-ipintel-warning = {$player} IP has a {TOSTRING($percent, "P2")} confidence of being a VPN/Datacenter. Please watch them.
 admin-alert-antag-label = {$message} [ANTAG: {$name}, {$subtype}]
diff --git a/Resources/Locale/en-US/administration/commands/admin-overlay-command.ftl b/Resources/Locale/en-US/administration/commands/admin-overlay-command.ftl
index 6072a76f1e..8e48619b12 100644
--- a/Resources/Locale/en-US/administration/commands/admin-overlay-command.ftl
+++ b/Resources/Locale/en-US/administration/commands/admin-overlay-command.ftl
@@ -1,4 +1,4 @@
-cmd-admin_overlay-desc = Переключает отображение информации об игроке в административной панели.
+cmd-admin_overlay-desc = Переключает отображение информации об игроке в административной панели.
 cmd-admin_overlay-usage = admin_overlay <true|false>
 
 cmd-admin_overlay-arg-state = state
diff --git a/Resources/Locale/en-US/administration/commands/adminnotes.ftl b/Resources/Locale/en-US/administration/commands/adminnotes.ftl
index abeede4651..c4e2757450 100644
--- a/Resources/Locale/en-US/administration/commands/adminnotes.ftl
+++ b/Resources/Locale/en-US/administration/commands/adminnotes.ftl
@@ -1,4 +1,4 @@
-cmd-adminnotes-desc = Opens the admin notes panel of target player.
+cmd-adminnotes-desc = Opens the admin notes panel of target player.
 cmd-adminnotes-help = Usage: adminnotes <UserId OR Username>
 
 cmd-adminnotes-wrong-target = Unable to find user '{$user}'.
diff --git a/Resources/Locale/en-US/administration/commands/aghost.ftl b/Resources/Locale/en-US/administration/commands/aghost.ftl
index 30cd893dc8..86d823431c 100644
--- a/Resources/Locale/en-US/administration/commands/aghost.ftl
+++ b/Resources/Locale/en-US/administration/commands/aghost.ftl
@@ -1,3 +1,3 @@
-cmd-aghost-desc = Makes you or others an admin ghost.
+cmd-aghost-desc = Makes you or others an admin ghost.
 aghost-no-mind-self = You can't ghost here!
 aghost-no-mind-other = They can't ghost here!
diff --git a/Resources/Locale/en-US/administration/commands/camera.ftl b/Resources/Locale/en-US/administration/commands/camera.ftl
index 98839683e0..cfb2fed1a6 100644
--- a/Resources/Locale/en-US/administration/commands/camera.ftl
+++ b/Resources/Locale/en-US/administration/commands/camera.ftl
@@ -1,4 +1,4 @@
-cmd-camera-desc = Opens a remote camera window for an entity.
+cmd-camera-desc = Opens a remote camera window for an entity.
 cmd-camera-help = Usage: camera <entityUid or player>
 
 cmd-camera-hint = <entityUid or player>
diff --git a/Resources/Locale/en-US/administration/commands/change-cvar-command.ftl b/Resources/Locale/en-US/administration/commands/change-cvar-command.ftl
index b58339e57e..63efbdef1f 100644
--- a/Resources/Locale/en-US/administration/commands/change-cvar-command.ftl
+++ b/Resources/Locale/en-US/administration/commands/change-cvar-command.ftl
@@ -1,4 +1,4 @@
-cmd-changecvar-no-arguments = You must specify a cvar.
+cmd-changecvar-no-arguments = You must specify a cvar.
 cmd-changecvar-cvar-not-registered = The cvar {$cvar} is not registered.
 cmd-changecvar-cvar-not-allowed = You cannot change this cvar.
 cmd-changecvar-value-out-of-range = The value is out of range. The range is {$min} to {$max}.
diff --git a/Resources/Locale/en-US/administration/commands/connection-commands.ftl b/Resources/Locale/en-US/administration/commands/connection-commands.ftl
index 66991042d2..641f661a6a 100644
--- a/Resources/Locale/en-US/administration/commands/connection-commands.ftl
+++ b/Resources/Locale/en-US/administration/commands/connection-commands.ftl
@@ -1,4 +1,4 @@
-## Strings for the "grant_connect_bypass" command.
+## Strings for the "grant_connect_bypass" command.
 
 cmd-grant_connect_bypass-desc = Temporarily allow a user to bypass regular connection checks.
 cmd-grant_connect_bypass-help = Usage: grant_connect_bypass <user> [duration minutes]
diff --git a/Resources/Locale/en-US/administration/commands/control-mob-command.ftl b/Resources/Locale/en-US/administration/commands/control-mob-command.ftl
index 9260898a0b..13811e62d5 100644
--- a/Resources/Locale/en-US/administration/commands/control-mob-command.ftl
+++ b/Resources/Locale/en-US/administration/commands/control-mob-command.ftl
@@ -1,2 +1,2 @@
 control-mob-command-description = Transfers user mind to the specified entity.
-control-mob-command-help-text = Usage: controlmob <mobUid>.
\ No newline at end of file
+control-mob-command-help-text = Usage: controlmob <mobUid>.
diff --git a/Resources/Locale/en-US/administration/commands/delete-entities-with-component-command.ftl b/Resources/Locale/en-US/administration/commands/delete-entities-with-component-command.ftl
index 50f7945eaf..d5c3fc952c 100644
--- a/Resources/Locale/en-US/administration/commands/delete-entities-with-component-command.ftl
+++ b/Resources/Locale/en-US/administration/commands/delete-entities-with-component-command.ftl
@@ -1,4 +1,4 @@
 delete-entities-with-component-command-description = Deletes entities with the specified components.
 delete-entities-with-component-command-help-text = Usage: deleteewc <componentName_1> <componentName_2> ... <componentName_n>
                                                    Deletes any entities with the components specified.
-delete-entities-with-component-command-deleted-components = Deleted {$count} entities
\ No newline at end of file
+delete-entities-with-component-command-deleted-components = Deleted {$count} entities
diff --git a/Resources/Locale/en-US/administration/commands/forceghost.ftl b/Resources/Locale/en-US/administration/commands/forceghost.ftl
index 9d74409125..a145eb714f 100644
--- a/Resources/Locale/en-US/administration/commands/forceghost.ftl
+++ b/Resources/Locale/en-US/administration/commands/forceghost.ftl
@@ -1,4 +1,4 @@
-cmd-forceghost-desc = Makes a player an observer.
+cmd-forceghost-desc = Makes a player an observer.
 cmd-forceghost-help = Usage: forceghost <player>
 
 cmd-forceghost-error-lobby = Target player can't ghost right now. They are not in the game!
diff --git a/Resources/Locale/en-US/administration/commands/rejuvenate-command.ftl b/Resources/Locale/en-US/administration/commands/rejuvenate-command.ftl
index 18f0958074..cbf121af5f 100644
--- a/Resources/Locale/en-US/administration/commands/rejuvenate-command.ftl
+++ b/Resources/Locale/en-US/administration/commands/rejuvenate-command.ftl
@@ -2,4 +2,4 @@ rejuvenate-command-description = Fully heals a mob.
 rejuvenate-command-help-text = Usage: rejuvenate <mobUid_1> <mobUid_2> ... <mobUid_n>
                                Attempts to heal the user's mob if no arguments are provided.
 rejuvenate-command-self-heal-message = Healing the user's mob since no arguments were provided.
-rejuvenate-command-no-entity-attached-message = There's no entity attached to the user.
\ No newline at end of file
+rejuvenate-command-no-entity-attached-message = There's no entity attached to the user.
diff --git a/Resources/Locale/en-US/administration/commands/tag-commands.ftl b/Resources/Locale/en-US/administration/commands/tag-commands.ftl
index 898b6f0f2d..4d486af2fc 100644
--- a/Resources/Locale/en-US/administration/commands/tag-commands.ftl
+++ b/Resources/Locale/en-US/administration/commands/tag-commands.ftl
@@ -1,4 +1,4 @@
-addtag-command-description = Adds a tag to a given entity
+addtag-command-description = Adds a tag to a given entity
 addtag-command-help = Usage: addtag <entity uid> <tag>
 
 addtag-command-success = Added {$tag} to {$target}.
diff --git a/Resources/Locale/en-US/administration/commands/toggle-chat-command.ftl b/Resources/Locale/en-US/administration/commands/toggle-chat-command.ftl
index 9153654126..ff243d7072 100644
--- a/Resources/Locale/en-US/administration/commands/toggle-chat-command.ftl
+++ b/Resources/Locale/en-US/administration/commands/toggle-chat-command.ftl
@@ -1,4 +1,4 @@
-cmd-togglechat-desc = Toggles the specified chat on/off for the server.
+cmd-togglechat-desc = Toggles the specified chat on/off for the server.
 cmd-togglechat-help = Usage: togglechat [chat name] OR togglechat [chat name] [value]
 
 cmd-setdeadchat-looc-enabled = Dead chat has been enabled.
diff --git a/Resources/Locale/en-US/administration/commands/variantize-command.ftl b/Resources/Locale/en-US/administration/commands/variantize-command.ftl
index 2fe58325a7..51578738bd 100644
--- a/Resources/Locale/en-US/administration/commands/variantize-command.ftl
+++ b/Resources/Locale/en-US/administration/commands/variantize-command.ftl
@@ -1,3 +1,3 @@
-cmd-variantize-desc = Randomizes all tile variants on a given grid.
+cmd-variantize-desc = Randomizes all tile variants on a given grid.
 cmd-variantize-help = variantize <grid id>
 cmd-variantize-hint-grid = Grid
diff --git a/Resources/Locale/en-US/administration/managers/admin-notes-manager.ftl b/Resources/Locale/en-US/administration/managers/admin-notes-manager.ftl
index 9e272f2322..3ad7d0ab4f 100644
--- a/Resources/Locale/en-US/administration/managers/admin-notes-manager.ftl
+++ b/Resources/Locale/en-US/administration/managers/admin-notes-manager.ftl
@@ -1 +1 @@
-admin-notes-manager-note-notification = Your account has received an administrative note. For further information, open the admin remarks panel via the escape menu.
\ No newline at end of file
+admin-notes-manager-note-notification = Your account has received an administrative note. For further information, open the admin remarks panel via the escape menu.
diff --git a/Resources/Locale/en-US/administration/multi-server-kick.ftl b/Resources/Locale/en-US/administration/multi-server-kick.ftl
index 2aa3c4ed35..b8c65b95a0 100644
--- a/Resources/Locale/en-US/administration/multi-server-kick.ftl
+++ b/Resources/Locale/en-US/administration/multi-server-kick.ftl
@@ -1 +1 @@
-multi-server-kick-reason = Connected to different server in this community.
+multi-server-kick-reason = Connected to different server in this community.
diff --git a/Resources/Locale/en-US/administration/smites.ftl b/Resources/Locale/en-US/administration/smites.ftl
index 58c8b94385..6b84565f16 100644
--- a/Resources/Locale/en-US/administration/smites.ftl
+++ b/Resources/Locale/en-US/administration/smites.ftl
@@ -1,14 +1,14 @@
 admin-smite-chess-self = You feel exceptionally small.
-admin-smite-chess-others = {CAPITALIZE($name)} shrinks into the chessboard!
+admin-smite-chess-others = {CAPITALIZE($entity)} shrinks into the chessboard!
 admin-smite-set-alight-self = You burst into flames!
-admin-smite-set-alight-others = {CAPITALIZE($name)} bursts into flames!
+admin-smite-set-alight-others = {CAPITALIZE($entity)} bursts into flames!
 admin-smite-remove-blood-self = You feel lighter, and chilly.
-admin-smite-remove-blood-others = {CAPITALIZE($name)} leaks blood all over the floor!
+admin-smite-remove-blood-others = {CAPITALIZE($entity)} leaks blood all over the floor!
 admin-smite-vomit-organs-self = You puke, and feel rather hollow!
-admin-smite-vomit-organs-others = {CAPITALIZE($name)} vomits up their organs!
+admin-smite-vomit-organs-others = {CAPITALIZE($entity)} vomits up their organs!
 admin-smite-remove-hands-self = Your hands fall off!
-admin-smite-remove-hands-other = {CAPITALIZE($name)}'s hands fall off!
-admin-smite-turned-ash-other = {CAPITALIZE($name)} turns into a pile of ash!
+admin-smite-remove-hands-other = {CAPITALIZE($entity)}'s hands fall off!
+admin-smite-turned-ash-other = {CAPITALIZE($entity)} turns into a pile of ash!
 admin-smite-stomach-removal-self = Your stomach feels hollow...
 admin-smite-run-walk-swap-prompt = You have to press shift to run!
 admin-smite-super-speed-prompt = You move at mach 0.8!
@@ -23,6 +23,7 @@ admin-smite-set-alight-name = Set Alight
 admin-smite-monkeyify-name = Monkeyify
 admin-smite-garbage-can-name = Garbage Can
 admin-smite-electrocute-name = Electrocute
+admin-smite-heartattack-name = Heart Attack
 admin-smite-remove-blood-name = Remove blood
 admin-smite-remove-hands-name = Remove hands
 admin-smite-remove-hand-name = Remove hand
@@ -72,7 +73,8 @@ admin-smite-explode-description = Explode them.
 admin-smite-chess-dimension-description = Banishment to the Chess Dimension.
 admin-smite-set-alight-description = Makes them burn.
 admin-smite-monkeyify-description = Turns the target into a monkey.
-admin-smite-electrocute-description = Electrocutes them, rendering anything they were wearing useless.
+admin-smite-electrocute-description = Electrocutes them through any insulation.
+admin-smite-heartattack-description = Immediately kills them with asphyxiation damage.
 admin-smite-creampie-description = A creampie, condensed into a button.
 admin-smite-remove-blood-description = Removes all of their blood, messily.
 admin-smite-vomit-organs-description = Causes them to vomit, organs included.
@@ -149,3 +151,5 @@ admin-trick-pause-map-description = Pause the selected map. Note this doesn't en
 admin-trick-snap-joints-description = Remove all physics joints from an object. Unfortunately does not snap every bone in their body.
 admin-trick-minigun-fire-description = Makes the targetted gun fire like a minigun (very fast).
 admin-trick-set-bullet-amount-description = Quickly set the amount of unspawned bullets in a gun.
+
+admin-smite-ghostkick-reason = Smitten.
diff --git a/Resources/Locale/en-US/administration/ui/admin-camera-window.ftl b/Resources/Locale/en-US/administration/ui/admin-camera-window.ftl
index bf9f45a745..3dbd5bfef5 100644
--- a/Resources/Locale/en-US/administration/ui/admin-camera-window.ftl
+++ b/Resources/Locale/en-US/administration/ui/admin-camera-window.ftl
@@ -1,4 +1,4 @@
-admin-camera-window-title = Observing { $name }
+admin-camera-window-title = Observing { $name }
 admin-camera-window-title-placeholder = Observing
 admin-camera-window-follow = Follow
 admin-camera-window-pop-out = Pop out
diff --git a/Resources/Locale/en-US/administration/ui/admin-erase.ftl b/Resources/Locale/en-US/administration/ui/admin-erase.ftl
index 86b75196ac..bd5845a312 100644
--- a/Resources/Locale/en-US/administration/ui/admin-erase.ftl
+++ b/Resources/Locale/en-US/administration/ui/admin-erase.ftl
@@ -1 +1 @@
-admin-erase-popup = {$user} disappears without a trace. You should keep playing as if they never existed.
+admin-erase-popup = {$user} disappears without a trace. You should keep playing as if they never existed.
diff --git a/Resources/Locale/en-US/administration/ui/admin-logs.ftl b/Resources/Locale/en-US/administration/ui/admin-logs.ftl
index 25e0943310..99b74abff0 100644
--- a/Resources/Locale/en-US/administration/ui/admin-logs.ftl
+++ b/Resources/Locale/en-US/administration/ui/admin-logs.ftl
@@ -1,4 +1,4 @@
-admin-logs-title = Admin Logs Panel
+admin-logs-title = Admin Logs Panel
 admin-logs-count = Showing {$showing}/{$total} of {$round}
 admin-logs-export = Export
 admin-logs-pop-out = Pop Out
diff --git a/Resources/Locale/en-US/administration/ui/admin-notes.ftl b/Resources/Locale/en-US/administration/ui/admin-notes.ftl
index c8da267e05..6875617a45 100644
--- a/Resources/Locale/en-US/administration/ui/admin-notes.ftl
+++ b/Resources/Locale/en-US/administration/ui/admin-notes.ftl
@@ -1,4 +1,4 @@
-# UI
+# UI
 admin-notes-title = Notes for {$player}
 admin-notes-new-note = New note
 admin-notes-show-more = Show more
diff --git a/Resources/Locale/en-US/administration/ui/ban-list.ftl b/Resources/Locale/en-US/administration/ui/ban-list.ftl
index 3aa1d081b5..c2aaa8383c 100644
--- a/Resources/Locale/en-US/administration/ui/ban-list.ftl
+++ b/Resources/Locale/en-US/administration/ui/ban-list.ftl
@@ -1,4 +1,4 @@
-# UI
+# UI
 ban-list-bans = Bans
 ban-list-role-bans = Role Bans
 
diff --git a/Resources/Locale/en-US/administration/ui/manage-solutions/add-reagent.ftl b/Resources/Locale/en-US/administration/ui/manage-solutions/add-reagent.ftl
index 16b0f704a1..fd33b1db08 100644
--- a/Resources/Locale/en-US/administration/ui/manage-solutions/add-reagent.ftl
+++ b/Resources/Locale/en-US/administration/ui/manage-solutions/add-reagent.ftl
@@ -2,4 +2,4 @@ admin-add-reagent-window-title = Add to {$solution}
 admin-add-reagent-window-amount-label = Quantity:
 admin-add-reagent-window-search-placeholder = Filter...
 admin-add-reagent-window-add = Add {$quantity}u {$reagent}
-admin-add-reagent-window-add-invalid-reagent = Select a Reagent
\ No newline at end of file
+admin-add-reagent-window-add-invalid-reagent = Select a Reagent
diff --git a/Resources/Locale/en-US/administration/ui/quick-info.ftl b/Resources/Locale/en-US/administration/ui/quick-info.ftl
index f7e0ac020b..72919aedec 100644
--- a/Resources/Locale/en-US/administration/ui/quick-info.ftl
+++ b/Resources/Locale/en-US/administration/ui/quick-info.ftl
@@ -1,4 +1,4 @@
-admin-quick-info-loading = Loading info for entity {ESCAPE($entity)}...
+admin-quick-info-loading = Loading info for entity {ESCAPE($entity)}...
 admin-quick-info-entity = Entity: [color=white]{ESCAPE($name)}[/color] ([color=cyan]{ESCAPE($prototype)}[/color], [color=lime]{ESCAPE($entity)}[/color])
 admin-quick-info-entity-missing = Entity {ESCAPE($entity)} no longer exists
 admin-quick-info-no-prototype = (No prototype)
diff --git a/Resources/Locale/en-US/administration/ui/quick-links.ftl b/Resources/Locale/en-US/administration/ui/quick-links.ftl
index 7c0aafb960..d5da97b96a 100644
--- a/Resources/Locale/en-US/administration/ui/quick-links.ftl
+++ b/Resources/Locale/en-US/administration/ui/quick-links.ftl
@@ -1,4 +1,4 @@
-admin-quick-link-playerpanel = (PP)
+admin-quick-link-playerpanel = (PP)
 admin-quick-link-playerpanel-tooltip = Player Panel...
 
 admin-quick-link-message = (MSG)
diff --git a/Resources/Locale/en-US/administration/ui/set-outfit/set-outfit-menu.ftl b/Resources/Locale/en-US/administration/ui/set-outfit/set-outfit-menu.ftl
index ccdf9467f2..0a0fa5634c 100644
--- a/Resources/Locale/en-US/administration/ui/set-outfit/set-outfit-menu.ftl
+++ b/Resources/Locale/en-US/administration/ui/set-outfit/set-outfit-menu.ftl
@@ -1,4 +1,4 @@
 ### SetOutfitMEnu.xaml.cs
 
 set-outfit-menu-title = Set Outfit
-set-outfit-menu-confirm-button = Confirm
\ No newline at end of file
+set-outfit-menu-confirm-button = Confirm
diff --git a/Resources/Locale/en-US/administration/ui/silicon-law-ui.ftl b/Resources/Locale/en-US/administration/ui/silicon-law-ui.ftl
index ce98b91592..acac9c3a4f 100644
--- a/Resources/Locale/en-US/administration/ui/silicon-law-ui.ftl
+++ b/Resources/Locale/en-US/administration/ui/silicon-law-ui.ftl
@@ -1,4 +1,4 @@
-silicon-law-ui-verb = Manage Laws
+silicon-law-ui-verb = Manage Laws
 silicon-law-ui-title = Admin Edit: Silicon Laws
 silicon-law-ui-new-law = New Law
 silicon-law-ui-save = Save Changes
diff --git a/Resources/Locale/en-US/administration/ui/tabs/babyjail-tab.ftl b/Resources/Locale/en-US/administration/ui/tabs/babyjail-tab.ftl
index 46dce54c1f..930d66ea38 100644
--- a/Resources/Locale/en-US/administration/ui/tabs/babyjail-tab.ftl
+++ b/Resources/Locale/en-US/administration/ui/tabs/babyjail-tab.ftl
@@ -1,4 +1,4 @@
-admin-ui-baby-jail-window-title = Baby Jail
+admin-ui-baby-jail-window-title = Baby Jail
 
 admin-ui-baby-jail-enabled = Baby Jail Enabled
 admin-ui-baby-jail-disabled = Baby Jail Disabled
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 3f49a4ad9c..8c6cfa5778 100644
--- a/Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl
+++ b/Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl
@@ -1,4 +1,4 @@
-object-tab-entity-id = Entity ID
+object-tab-entity-id = Entity ID
 object-tab-object-name = Object name
 
 object-tab-object-type = Object type:
diff --git a/Resources/Locale/en-US/administration/ui/tabs/panicbunker-tab.ftl b/Resources/Locale/en-US/administration/ui/tabs/panicbunker-tab.ftl
index 26349263ac..889a1bfd91 100644
--- a/Resources/Locale/en-US/administration/ui/tabs/panicbunker-tab.ftl
+++ b/Resources/Locale/en-US/administration/ui/tabs/panicbunker-tab.ftl
@@ -1,4 +1,4 @@
-admin-ui-panic-bunker-window-title = Panic Bunker
+admin-ui-panic-bunker-window-title = Panic Bunker
 
 admin-ui-panic-bunker-enabled = Panic Bunker Enabled
 admin-ui-panic-bunker-disabled = Panic Bunker Disabled
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 f6437c41f7..474188ec75 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,4 @@
-player-tab-player-count = Players: { $count }
+player-tab-player-count = Players: { $count }
 player-tab-username = Username
 player-tab-character = Character
 player-tab-job = Job
diff --git a/Resources/Locale/en-US/advertisements/other/firebot.ftl b/Resources/Locale/en-US/advertisements/other/firebot.ftl
index c614d5ecd0..ad35cf2d24 100644
--- a/Resources/Locale/en-US/advertisements/other/firebot.ftl
+++ b/Resources/Locale/en-US/advertisements/other/firebot.ftl
@@ -1,4 +1,4 @@
 advertisement-firebot-1 = No fires detected.
 advertisement-firebot-2 = Only you can prevent station fires.
 advertisement-firebot-3 = Temperature nominal.
-advertisement-firebot-4 = Keep it cool.
\ No newline at end of file
+advertisement-firebot-4 = Keep it cool.
diff --git a/Resources/Locale/en-US/advertisements/vending/ammo.ftl b/Resources/Locale/en-US/advertisements/vending/ammo.ftl
index 74f7a8a8b8..75d34ff3e5 100644
--- a/Resources/Locale/en-US/advertisements/vending/ammo.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/ammo.ftl
@@ -1,4 +1,4 @@
-advertisement-ammo-1 = Liberation Station: Your one-stop shop for all things second amendment!
+advertisement-ammo-1 = Liberation Station: Your one-stop shop for all things second amendment!
 advertisement-ammo-2 = Be a patriot today, pick up a gun!
 advertisement-ammo-3 = Quality weapons for cheap prices!
 advertisement-ammo-4 = Better dead than red!
diff --git a/Resources/Locale/en-US/advertisements/vending/bardrobe.ftl b/Resources/Locale/en-US/advertisements/vending/bardrobe.ftl
index cc1174b1ed..6536a3d84d 100644
--- a/Resources/Locale/en-US/advertisements/vending/bardrobe.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/bardrobe.ftl
@@ -1,2 +1,2 @@
-advertisement-bardrobe-1 = Guaranteed to prevent stains from spilled drinks!
+advertisement-bardrobe-1 = Guaranteed to prevent stains from spilled drinks!
 advertisement-bardrobe-2 = Classy and stylish!
diff --git a/Resources/Locale/en-US/advertisements/vending/boozeomat.ftl b/Resources/Locale/en-US/advertisements/vending/boozeomat.ftl
index f5ecc76ec2..148863086c 100644
--- a/Resources/Locale/en-US/advertisements/vending/boozeomat.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/boozeomat.ftl
@@ -1,4 +1,4 @@
-advertisement-boozeomat-1 = I hope nobody asks me for a bloody cup o' tea...
+advertisement-boozeomat-1 = I hope nobody asks me for a bloody cup o' tea...
 advertisement-boozeomat-2 = Alcohol is humanity's friend. Would you abandon a friend?
 advertisement-boozeomat-3 = Quite delighted to serve you!
 advertisement-boozeomat-4 = Is nobody thirsty on this station?
diff --git a/Resources/Locale/en-US/advertisements/vending/bruiseomat.ftl b/Resources/Locale/en-US/advertisements/vending/bruiseomat.ftl
index a8cb903efe..da10bcfeb0 100644
--- a/Resources/Locale/en-US/advertisements/vending/bruiseomat.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/bruiseomat.ftl
@@ -1,4 +1,4 @@
-advertisement-bruiseomat-1 = I VOTE WAROPS!!!
+advertisement-bruiseomat-1 = I VOTE WAROPS!!!
 advertisement-bruiseomat-2 = Who has TC?
 advertisement-bruiseomat-3 = Did anyone buy an EMAG?
 advertisement-bruiseomat-4 = I wanna go back to my home station...
diff --git a/Resources/Locale/en-US/advertisements/vending/chang.ftl b/Resources/Locale/en-US/advertisements/vending/chang.ftl
index 089023a5b8..b553de1be6 100644
--- a/Resources/Locale/en-US/advertisements/vending/chang.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/chang.ftl
@@ -1,4 +1,4 @@
-advertisement-chang-1 = Taste 5000 years of culture!
+advertisement-chang-1 = Taste 5000 years of culture!
 advertisement-chang-2 = Mr. Chang, approved for safe consumption in over 10 sectors!
 advertisement-chang-3 = Chinese food is great for a date night, or a lonely night!
 advertisement-chang-4 = You can't go wrong with Mr. Chang's authentic Chinese food!
diff --git a/Resources/Locale/en-US/advertisements/vending/chefdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/chefdrobe.ftl
index 025c731ff3..83e05b41bc 100644
--- a/Resources/Locale/en-US/advertisements/vending/chefdrobe.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/chefdrobe.ftl
@@ -1,4 +1,4 @@
-advertisement-chefdrobe-1 = Our clothes are guaranteed to protect you from food splatters!
+advertisement-chefdrobe-1 = Our clothes are guaranteed to protect you from food splatters!
 advertisement-chefdrobe-2 = Perfectly white, so everyone knows about the murder in the kitchen!
 advertisement-chefdrobe-3 = Easy to clean, easy to see!
 advertisement-chefdrobe-4 = Cook like a pro, look like a maestro!
diff --git a/Resources/Locale/en-US/advertisements/vending/chefvend.ftl b/Resources/Locale/en-US/advertisements/vending/chefvend.ftl
index bf7dab5f4e..269e38d4ff 100644
--- a/Resources/Locale/en-US/advertisements/vending/chefvend.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/chefvend.ftl
@@ -1,4 +1,4 @@
-advertisement-chefvend-1 = At least sixty percent of our eggs un-broken, guranteed!
+advertisement-chefvend-1 = At least sixty percent of our eggs un-broken, guranteed!
 advertisement-chefvend-2 = Rice, rice, baby.
 advertisement-chefvend-3 = Slap some butter on it!
 advertisement-chefvend-4 = Are you worth your salt? We are.
diff --git a/Resources/Locale/en-US/advertisements/vending/cigs.ftl b/Resources/Locale/en-US/advertisements/vending/cigs.ftl
index 4964622edd..1f8229254e 100644
--- a/Resources/Locale/en-US/advertisements/vending/cigs.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/cigs.ftl
@@ -1,4 +1,4 @@
-advertisement-cigs-1 = Space cigs taste good like a cigarette should.
+advertisement-cigs-1 = Space cigs taste good like a cigarette should.
 advertisement-cigs-2 = I'd rather toolbox than switch.
 advertisement-cigs-3 = Smoke!
 advertisement-cigs-4 = Don't believe the reports - smoke today!
diff --git a/Resources/Locale/en-US/advertisements/vending/clothesmate.ftl b/Resources/Locale/en-US/advertisements/vending/clothesmate.ftl
index 6b1d471840..74bf15a7c5 100644
--- a/Resources/Locale/en-US/advertisements/vending/clothesmate.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/clothesmate.ftl
@@ -1,7 +1,7 @@
-advertisement-clothes-1 = Dress for success!
+advertisement-clothes-1 = Dress for success!
 advertisement-clothes-2 = Prepare to look swagalicious!
 advertisement-clothes-3 = Look at all this swag!
 advertisement-clothes-4 = Why leave style up to fate? Use the ClothesMate!
 advertisement-clothes-5 = Now with added neck warmers!
 advertisement-clothes-6 = You are looking stylish!
-advertisement-clothes-7 = Lovely outfit you have going there!
\ No newline at end of file
+advertisement-clothes-7 = Lovely outfit you have going there!
diff --git a/Resources/Locale/en-US/advertisements/vending/coffee.ftl b/Resources/Locale/en-US/advertisements/vending/coffee.ftl
index 675db91d81..a78ee09624 100644
--- a/Resources/Locale/en-US/advertisements/vending/coffee.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/coffee.ftl
@@ -1,4 +1,4 @@
-advertisement-coffee-1 = Have a drink!
+advertisement-coffee-1 = Have a drink!
 advertisement-coffee-2 = Drink up!
 advertisement-coffee-3 = It's good for you!
 advertisement-coffee-4 = Would you like a hot joe?
diff --git a/Resources/Locale/en-US/advertisements/vending/cola.ftl b/Resources/Locale/en-US/advertisements/vending/cola.ftl
index a0c03c2614..8c50c1ba10 100644
--- a/Resources/Locale/en-US/advertisements/vending/cola.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/cola.ftl
@@ -1,4 +1,4 @@
-advertisement-cola-1 = Refreshing!
+advertisement-cola-1 = Refreshing!
 advertisement-cola-2 = Hope you're thirsty!
 advertisement-cola-3 = Over 1 million drinks sold!
 advertisement-cola-4 = Thirsty? Why not cola?
diff --git a/Resources/Locale/en-US/advertisements/vending/condiments.ftl b/Resources/Locale/en-US/advertisements/vending/condiments.ftl
index ee649288d4..2230a1390d 100644
--- a/Resources/Locale/en-US/advertisements/vending/condiments.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/condiments.ftl
@@ -1,4 +1,4 @@
-advertisement-condiment-1 = Tired of dry meat? Squirt some flavor-packed condiments on it!
+advertisement-condiment-1 = Tired of dry meat? Squirt some flavor-packed condiments on it!
 advertisement-condiment-2 = Child-safe utensils. Forks, spoons, and knives that won't cut a thing.
 advertisement-condiment-3 = Corn oil!
 advertisement-condiment-4 = Sweeten up your day with Astrotame! Eight out of ten doctors agree, it probably won't cause cancer.
diff --git a/Resources/Locale/en-US/advertisements/vending/dinnerware.ftl b/Resources/Locale/en-US/advertisements/vending/dinnerware.ftl
index a7e1244061..b088daf43c 100644
--- a/Resources/Locale/en-US/advertisements/vending/dinnerware.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/dinnerware.ftl
@@ -1,4 +1,4 @@
-advertisement-dinnerware-1 = Mm, food stuffs!
+advertisement-dinnerware-1 = Mm, food stuffs!
 advertisement-dinnerware-2 = Food and food accessories.
 advertisement-dinnerware-3 = Get your plates!
 advertisement-dinnerware-4 = You like forks?
diff --git a/Resources/Locale/en-US/advertisements/vending/discount.ftl b/Resources/Locale/en-US/advertisements/vending/discount.ftl
index 3cbe924129..ca6c940d1c 100644
--- a/Resources/Locale/en-US/advertisements/vending/discount.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/discount.ftl
@@ -1,4 +1,4 @@
-advertisement-discount-1 = Discount Dan, he's the man!
+advertisement-discount-1 = Discount Dan, he's the man!
 advertisement-discount-2 = There ain't nothing better in this world than a bite of mystery.
 advertisement-discount-3 = Don't listen to those other machines, buy my product!
 advertisement-discount-4 = Quantity over Quality!
diff --git a/Resources/Locale/en-US/advertisements/vending/donut.ftl b/Resources/Locale/en-US/advertisements/vending/donut.ftl
index 53d8ee6ccb..b2b52d87ae 100644
--- a/Resources/Locale/en-US/advertisements/vending/donut.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/donut.ftl
@@ -1,4 +1,4 @@
-advertisement-donut-1 = Each of us is a little cop!
+advertisement-donut-1 = Each of us is a little cop!
 advertisement-donut-2 = Hope you're hungry!
 advertisement-donut-3 = Over 1 million donuts sold!
 advertisement-donut-4 = We pride ourselves in the consistency of our products!
diff --git a/Resources/Locale/en-US/advertisements/vending/gibb.ftl b/Resources/Locale/en-US/advertisements/vending/gibb.ftl
index b4360d8e4a..c9627ac0f2 100644
--- a/Resources/Locale/en-US/advertisements/vending/gibb.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/gibb.ftl
@@ -1,4 +1,4 @@
-advertisement-gibb-1 = Delicious!
+advertisement-gibb-1 = Delicious!
 advertisement-gibb-2 = Recommended by at least one doctor!
 advertisement-gibb-3 = Over 1 million drinks sold!
 advertisement-gibb-4 = Dr. Gibb, what's the worst that could happen?
diff --git a/Resources/Locale/en-US/advertisements/vending/happyhonk.ftl b/Resources/Locale/en-US/advertisements/vending/happyhonk.ftl
index 1c245045b0..a8468d8350 100644
--- a/Resources/Locale/en-US/advertisements/vending/happyhonk.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/happyhonk.ftl
@@ -1,4 +1,4 @@
-advertisement-happyhonk-1 = Honk! Honk! Why not order a Happy Honk Meal today?
+advertisement-happyhonk-1 = Honk! Honk! Why not order a Happy Honk Meal today?
 advertisement-happyhonk-2 = Clowns deserve a hug, if you see one be sure to show your appreciation.
 advertisement-happyhonk-3 = If you find the Golden Honker then pray to the gods, you are one lucky person.
 advertisement-happyhonk-4 = Happy Honk: it's a meal, it's a deal, it's got a plastic toy that will make you squeal.
diff --git a/Resources/Locale/en-US/advertisements/vending/megaseed.ftl b/Resources/Locale/en-US/advertisements/vending/megaseed.ftl
index 16b8106869..9a6304f6ab 100644
--- a/Resources/Locale/en-US/advertisements/vending/megaseed.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/megaseed.ftl
@@ -1,4 +1,4 @@
-advertisement-megaseed-1 = We like plants!
+advertisement-megaseed-1 = We like plants!
 advertisement-megaseed-2 = Grow some crops
 advertisement-megaseed-3 = Grow, baby, growww!
 advertisement-megaseed-4 = Aw h'yeah son!
diff --git a/Resources/Locale/en-US/advertisements/vending/nanomed.ftl b/Resources/Locale/en-US/advertisements/vending/nanomed.ftl
index 2f6b27c3eb..b15b76753e 100644
--- a/Resources/Locale/en-US/advertisements/vending/nanomed.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/nanomed.ftl
@@ -1,4 +1,4 @@
-advertisement-nanomed-1 = Go save some lives!
+advertisement-nanomed-1 = Go save some lives!
 advertisement-nanomed-2 = The best stuff for your medbay.
 advertisement-nanomed-3 = Only the finest tools.
 advertisement-nanomed-4 = Natural chemicals!
@@ -6,4 +6,4 @@ advertisement-nanomed-5 = This stuff saves lives.
 advertisement-nanomed-6 = Don't you want some?
 advertisement-nanomed-7 = Ping!
 advertisement-nanomed-8 = Make sure not to overdose people!
-advertisement-nanomed-9 = Go overdose people!
\ No newline at end of file
+advertisement-nanomed-9 = Go overdose people!
diff --git a/Resources/Locale/en-US/advertisements/vending/nutrimax.ftl b/Resources/Locale/en-US/advertisements/vending/nutrimax.ftl
index 0ba8c7bb08..8bbde78582 100644
--- a/Resources/Locale/en-US/advertisements/vending/nutrimax.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/nutrimax.ftl
@@ -1,4 +1,4 @@
-advertisement-nutrimax-1 = We like plants!
+advertisement-nutrimax-1 = We like plants!
 advertisement-nutrimax-2 = Don't you want some?
 advertisement-nutrimax-3 = The greenest thumbs ever.
 advertisement-nutrimax-4 = We like big plants.
diff --git a/Resources/Locale/en-US/advertisements/vending/pride.ftl b/Resources/Locale/en-US/advertisements/vending/pride.ftl
index 042291ba8e..5e09ebe28f 100644
--- a/Resources/Locale/en-US/advertisements/vending/pride.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/pride.ftl
@@ -1,4 +1,4 @@
-advertisement-pride-1 = Be gay do crime!
+advertisement-pride-1 = Be gay do crime!
 advertisement-pride-2 = Full of colors!
 advertisement-pride-3 = You are valid!
 advertisement-pride-4 = The first pride was a riot!
diff --git a/Resources/Locale/en-US/advertisements/vending/robodrobe.ftl b/Resources/Locale/en-US/advertisements/vending/robodrobe.ftl
index 7cb36ba27c..a3bbcc1a67 100644
--- a/Resources/Locale/en-US/advertisements/vending/robodrobe.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/robodrobe.ftl
@@ -1,4 +1,4 @@
 advertisement-robodrobe-1 = You turn me TRUE, use defines!
 advertisement-robodrobe-2 = 0110001101101100011011110111010001101000011001010111001101101000011001010111001001100101
 advertisement-robodrobe-3 = Steal someone from maintenance and turn them into a robot!
-advertisement-robodrobe-4 = Robotics is fun!
\ No newline at end of file
+advertisement-robodrobe-4 = Robotics is fun!
diff --git a/Resources/Locale/en-US/advertisements/vending/sectech.ftl b/Resources/Locale/en-US/advertisements/vending/sectech.ftl
index 8f02897142..9c1b83d767 100644
--- a/Resources/Locale/en-US/advertisements/vending/sectech.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/sectech.ftl
@@ -1,4 +1,4 @@
-advertisement-sectech-1 = Crack syndicate skulls!
+advertisement-sectech-1 = Crack syndicate skulls!
 advertisement-sectech-2 = Beat some heads in!
 advertisement-sectech-3 = Don't forget - harm is good!
 advertisement-sectech-4 = Your weapons are right here.
diff --git a/Resources/Locale/en-US/advertisements/vending/smartfridge.ftl b/Resources/Locale/en-US/advertisements/vending/smartfridge.ftl
index 1a3c344c77..02d9be4af5 100644
--- a/Resources/Locale/en-US/advertisements/vending/smartfridge.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/smartfridge.ftl
@@ -1,4 +1,4 @@
-advertisement-smartfridge-1 = Hello world!
+advertisement-smartfridge-1 = Hello world!
 advertisement-smartfridge-2 = PLEASE LET ME OUT
 advertisement-smartfridge-3 = I can make a quintillion calculations a second. Now, I am a fridge.
 advertisement-smartfridge-4 = New firmware update available.
diff --git a/Resources/Locale/en-US/advertisements/vending/smite.ftl b/Resources/Locale/en-US/advertisements/vending/smite.ftl
index e6214f4627..9231b36ecd 100644
--- a/Resources/Locale/en-US/advertisements/vending/smite.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/smite.ftl
@@ -1,4 +1,4 @@
-advertisement-smite-1 = SMITE! Ban your thirst!
+advertisement-smite-1 = SMITE! Ban your thirst!
 advertisement-smite-2 = An eldritch blast of lemon and lime!
 advertisement-smite-3 = Over 1 million drinks sold!
 advertisement-smite-4 = SMITE! Roll 2d8 for FLAVOR.
diff --git a/Resources/Locale/en-US/advertisements/vending/snack.ftl b/Resources/Locale/en-US/advertisements/vending/snack.ftl
index a445509bcb..1b9cbb56d7 100644
--- a/Resources/Locale/en-US/advertisements/vending/snack.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/snack.ftl
@@ -1,4 +1,4 @@
-advertisement-snack-1 = Try our new nougat bar!
+advertisement-snack-1 = Try our new nougat bar!
 advertisement-snack-2 = Twice the calories for half the price!
 advertisement-snack-3 = The healthiest!
 advertisement-snack-4 = Award-winning chocolate bars!
diff --git a/Resources/Locale/en-US/advertisements/vending/sovietsoda.ftl b/Resources/Locale/en-US/advertisements/vending/sovietsoda.ftl
index f548f32ea2..beaf2075b9 100644
--- a/Resources/Locale/en-US/advertisements/vending/sovietsoda.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/sovietsoda.ftl
@@ -1,4 +1,4 @@
-advertisement-sovietsoda-1 = For comrade and country.
+advertisement-sovietsoda-1 = For comrade and country.
 advertisement-sovietsoda-2 = Have you fulfilled your nutrition quota today?
 advertisement-sovietsoda-3 = Very nice!
 advertisement-sovietsoda-4 = We are simple people, for this is all we eat.
@@ -6,4 +6,4 @@ advertisement-sovietsoda-5 = If there is a person, there is a problem. If there
 advertisement-sovietsoda-6 = If its good enough for daily life, it's good enough for us!
 thankyou-sovietsoda-1 = Enjoy, comrade!
 thankyou-sovietsoda-2 = Now get back to work.
-thankyou-sovietsoda-3 = This is all you're getting.
\ No newline at end of file
+thankyou-sovietsoda-3 = This is all you're getting.
diff --git a/Resources/Locale/en-US/advertisements/vending/theater.ftl b/Resources/Locale/en-US/advertisements/vending/theater.ftl
index 6784301f56..39a21d2372 100644
--- a/Resources/Locale/en-US/advertisements/vending/theater.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/theater.ftl
@@ -1,4 +1,4 @@
-advertisement-theater-1 = Dress for success!
+advertisement-theater-1 = Dress for success!
 advertisement-theater-2 = Suited and booted!
 advertisement-theater-3 = It's show time!
 advertisement-theater-4 = Why leave style up to fate? Use AutoDrobe!
diff --git a/Resources/Locale/en-US/advertisements/vending/vendomat.ftl b/Resources/Locale/en-US/advertisements/vending/vendomat.ftl
index b3a16ecd80..ccba5b4130 100644
--- a/Resources/Locale/en-US/advertisements/vending/vendomat.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/vendomat.ftl
@@ -1,4 +1,4 @@
-advertisement-vendomat-1 = Only the finest!
+advertisement-vendomat-1 = Only the finest!
 advertisement-vendomat-2 = Have some tools.
 advertisement-vendomat-3 = The most robust equipment.
 advertisement-vendomat-4 = The finest gear in space!
diff --git a/Resources/Locale/en-US/alerts/alerts.ftl b/Resources/Locale/en-US/alerts/alerts.ftl
index 47292815bd..d8c294d5fa 100644
--- a/Resources/Locale/en-US/alerts/alerts.ftl
+++ b/Resources/Locale/en-US/alerts/alerts.ftl
@@ -37,7 +37,7 @@ alerts-handcuffed-name = [color=yellow]Handcuffed[/color]
 alerts-handcuffed-desc = You're [color=yellow]handcuffed[/color] and can't use your hands. If anyone drags you, you won't be able to resist.
 
 alerts-ensnared-name = [color=yellow]Ensnared[/color]
-alerts-ensnared-desc = You're [color=yellow]ensnared[/color] and is impairing your ability to move.
+alerts-ensnared-desc = You're [color=yellow]ensnared[/color] and is impairing your ability to move. Click with a free hand to remove.
 
 alerts-buckled-name = [color=yellow]Buckled[/color]
 alerts-buckled-desc = You've been [color=yellow]buckled[/color] to something. Click the alert to unbuckle unless you're [color=yellow]handcuffed.[/color]
diff --git a/Resources/Locale/en-US/ame/components/ame-part-component.ftl b/Resources/Locale/en-US/ame/components/ame-part-component.ftl
index c601120be3..c125c811df 100644
--- a/Resources/Locale/en-US/ame/components/ame-part-component.ftl
+++ b/Resources/Locale/en-US/ame/components/ame-part-component.ftl
@@ -1,2 +1,2 @@
 ame-part-component-interact-using-no-hands = You have no hands.
-ame-part-component-shielding-already-present = Shielding is already there!
\ No newline at end of file
+ame-part-component-shielding-already-present = Shielding is already there!
diff --git a/Resources/Locale/en-US/anomaly/inner_anomaly.ftl b/Resources/Locale/en-US/anomaly/inner_anomaly.ftl
index f5e8140c5e..c2a7e6a970 100644
--- a/Resources/Locale/en-US/anomaly/inner_anomaly.ftl
+++ b/Resources/Locale/en-US/anomaly/inner_anomaly.ftl
@@ -15,4 +15,4 @@ inner-anomaly-end-message = The abnormal activity within you disappears without
 inner-anomaly-severity-info-50 = You feel that the anomaly is taking over half your body.
 inner-anomaly-severity-info-75 = You feel that the anomaly is taking over a large part of your body.
 inner-anomaly-severity-info-90 = You feel that the anomaly has almost completely taken over your body.
-inner-anomaly-severity-info-100 = The anomaly inside you is growing uncontrollably, causing immense pain, and tearing you apart!
\ No newline at end of file
+inner-anomaly-severity-info-100 = The anomaly inside you is growing uncontrollably, causing immense pain, and tearing you apart!
diff --git a/Resources/Locale/en-US/arcade/spacevillain.ftl b/Resources/Locale/en-US/arcade/spacevillain.ftl
index 164535dcaf..1568470e4f 100644
--- a/Resources/Locale/en-US/arcade/spacevillain.ftl
+++ b/Resources/Locale/en-US/arcade/spacevillain.ftl
@@ -1,4 +1,4 @@
-spacevillain-menu-title = Space Villain
+spacevillain-menu-title = Space Villain
 spacevillain-menu-label-player = Player
 spacevillain-menu-label-enemy = Villain
 spacevillain-menu-label-health = {$amount} {-spacevillain-health}
diff --git a/Resources/Locale/en-US/armable/armable.ftl b/Resources/Locale/en-US/armable/armable.ftl
index ebdae76096..e6e7540a0e 100644
--- a/Resources/Locale/en-US/armable/armable.ftl
+++ b/Resources/Locale/en-US/armable/armable.ftl
@@ -1,2 +1,2 @@
-armable-examine-armed = {CAPITALIZE(THE($name))} is [color=red]armed[/color].
+armable-examine-armed = {CAPITALIZE(THE($name))} is [color=red]armed[/color].
 armable-examine-not-armed = {CAPITALIZE(THE($name))} needs to be armed.
diff --git a/Resources/Locale/en-US/atmos/atmos-alerts-console.ftl b/Resources/Locale/en-US/atmos/atmos-alerts-console.ftl
index dd9b6a0128..54df868428 100644
--- a/Resources/Locale/en-US/atmos/atmos-alerts-console.ftl
+++ b/Resources/Locale/en-US/atmos/atmos-alerts-console.ftl
@@ -35,4 +35,4 @@ atmos-alerts-window-alerts-being-silenced = Silencing alerts...
 atmos-alerts-window-toggle-overlays = Toggle alarm display
 
 atmos-alerts-window-flavor-left = Contact an atmospheric technician for assistance
-atmos-alerts-window-flavor-right = v1.8
\ No newline at end of file
+atmos-alerts-window-flavor-right = v1.8
diff --git a/Resources/Locale/en-US/atmos/atmos-pipe-layers.ftl b/Resources/Locale/en-US/atmos/atmos-pipe-layers.ftl
index 27491efb5e..6bc32858dc 100644
--- a/Resources/Locale/en-US/atmos/atmos-pipe-layers.ftl
+++ b/Resources/Locale/en-US/atmos/atmos-pipe-layers.ftl
@@ -7,4 +7,4 @@ atmos-pipe-layers-component-current-layer = It is in its {$layerName} configurat
 atmos-pipe-layers-component-select-layer = {CAPITALIZE($layerName)} configuration
 atmos-pipe-layers-component-tool-missing = Requires {INDEFINITE($toolName)} {$toolName}
 atmos-pipe-layers-component-pipes-are-covered = The pipes are covered
-atmos-pipe-layers-component-cannot-adjust-pipes = You need to uncover the pipes before they can be adjusted.
\ No newline at end of file
+atmos-pipe-layers-component-cannot-adjust-pipes = You need to uncover the pipes before they can be adjusted.
diff --git a/Resources/Locale/en-US/atmos/flammable-component.ftl b/Resources/Locale/en-US/atmos/flammable-component.ftl
index b5d108be57..c6823b43c4 100644
--- a/Resources/Locale/en-US/atmos/flammable-component.ftl
+++ b/Resources/Locale/en-US/atmos/flammable-component.ftl
@@ -1 +1 @@
-flammable-component-resist-message = You stop, drop, and roll!
\ No newline at end of file
+flammable-component-resist-message = You stop, drop, and roll!
diff --git a/Resources/Locale/en-US/atmos/gas-miner-component.ftl b/Resources/Locale/en-US/atmos/gas-miner-component.ftl
index 87016e4522..3689ee59a3 100644
--- a/Resources/Locale/en-US/atmos/gas-miner-component.ftl
+++ b/Resources/Locale/en-US/atmos/gas-miner-component.ftl
@@ -8,4 +8,4 @@ gas-miner-pressure-cutoff-text = Surrounding pressure cutoff: {$pressure} kPA.
 
 gas-miner-state-working-text = The miner is [color=green]active[/color] and mining gas.
 gas-miner-state-idle-text = The miner is [color=yellow]idle[/color] and not mining gas.
-gas-miner-state-disabled-text = The miner is [color=red]disabled[/color] and not mining gas.
\ No newline at end of file
+gas-miner-state-disabled-text = The miner is [color=red]disabled[/color] and not mining gas.
diff --git a/Resources/Locale/en-US/atmos/gas-pressure-regulator-system.ftl b/Resources/Locale/en-US/atmos/gas-pressure-regulator-system.ftl
index 0f30f3d75d..84335638e1 100644
--- a/Resources/Locale/en-US/atmos/gas-pressure-regulator-system.ftl
+++ b/Resources/Locale/en-US/atmos/gas-pressure-regulator-system.ftl
@@ -1,4 +1,4 @@
-# Examine Text
+# Examine Text
 gas-pressure-regulator-system-examined = The valve is [color={$statusColor}]{$open ->
 [true] open
 *[false] closed
diff --git a/Resources/Locale/en-US/atmos/gas-tank-component.ftl b/Resources/Locale/en-US/atmos/gas-tank-component.ftl
index 1f2d8f1e9f..495fa60092 100644
--- a/Resources/Locale/en-US/atmos/gas-tank-component.ftl
+++ b/Resources/Locale/en-US/atmos/gas-tank-component.ftl
@@ -1,4 +1,4 @@
-### GasTankComponent stuff.
+### GasTankComponent stuff.
 
 # Examine text showing pressure in tank.
 comp-gas-tank-examine = Pressure: [color=orange]{PRESSURE($pressure)}[/color].
diff --git a/Resources/Locale/en-US/bed/cryostorage/cryogenic-storage.ftl b/Resources/Locale/en-US/bed/cryostorage/cryogenic-storage.ftl
index 7d2e50e772..4370fc02fe 100644
--- a/Resources/Locale/en-US/bed/cryostorage/cryogenic-storage.ftl
+++ b/Resources/Locale/en-US/bed/cryostorage/cryogenic-storage.ftl
@@ -1,4 +1,4 @@
-
+
 ### Announcement
 
 earlyleave-cryo-job-unknown = Unknown
diff --git a/Resources/Locale/en-US/body/body-scanner/body-scanner-component.ftl b/Resources/Locale/en-US/body/body-scanner/body-scanner-component.ftl
index 7f5ac28ee4..339a2dca27 100644
--- a/Resources/Locale/en-US/body/body-scanner/body-scanner-component.ftl
+++ b/Resources/Locale/en-US/body/body-scanner/body-scanner-component.ftl
@@ -2,4 +2,4 @@
 
 body-scanner-display-title = Body Scanner
 body-scanner-display-health-label = Health:
-body-scanner-display-body-part-damage-text = {$damage} damage
\ No newline at end of file
+body-scanner-display-body-part-damage-text = {$damage} damage
diff --git a/Resources/Locale/en-US/botany/mutations.ftl b/Resources/Locale/en-US/botany/mutations.ftl
index 7d09cf8d73..a4575fbfbe 100644
--- a/Resources/Locale/en-US/botany/mutations.ftl
+++ b/Resources/Locale/en-US/botany/mutations.ftl
@@ -1,8 +1,16 @@
-mutation-plant-kudzu = It is growing unusually fast and thin.
-mutation-plant-ligneous = It is woody and will need a sharp tool to harvest.
-mutation-plant-scream = This plant seems nervous somehow.
 mutation-plant-sentient = It seems to be examining its surroundings.
 mutation-plant-slippery = It is slick to the touch.
-mutation-plant-unviable = It is wilting and sickly.
-mutation-plant-seedless = Its harvested produce is seedless.
-mutation-plant-sampled = It has already been sampled.
+
+mutation-plant-description-kudzu = It is growing unusually fast and thin.
+mutation-plant-description-ligneous = It is woody and will need a sharp tool to harvest.
+mutation-plant-description-scream = This plant seems nervous somehow.
+mutation-plant-description-unviable = It is wilting and sickly.
+mutation-plant-description-seedless = Its harvested produce is seedless.
+mutation-plant-description-sampled = It has already been sampled.
+
+mutation-plant-noun-kudzu = kudzu growth
+mutation-plant-noun-ligneous = ligneous growth
+mutation-plant-noun-scream = mandragora
+mutation-plant-noun-unviable = unviability
+mutation-plant-noun-seedless = seedlessness
+mutation-plant-noun-sampled = clip scarring
diff --git a/Resources/Locale/en-US/bql/bql-select.ftl b/Resources/Locale/en-US/bql/bql-select.ftl
index 8d508ff14d..e15a83ca14 100644
--- a/Resources/Locale/en-US/bql/bql-select.ftl
+++ b/Resources/Locale/en-US/bql/bql-select.ftl
@@ -1,4 +1,4 @@
-cmd-bql_select-desc = Show results of a BQL query in a client-side window
+cmd-bql_select-desc = Show results of a BQL query in a client-side window
 cmd-bql_select-help = Usage: bql_select <bql query>
     The opened window allows you to teleport to or view variables the resulting entities.
 
diff --git a/Resources/Locale/en-US/burial/burial.ftl b/Resources/Locale/en-US/burial/burial.ftl
index 7c20e9de7e..38ed800fdd 100644
--- a/Resources/Locale/en-US/burial/burial.ftl
+++ b/Resources/Locale/en-US/burial/burial.ftl
@@ -2,4 +2,4 @@ grave-start-digging-others = {CAPITALIZE($user)} starts digging {THE($grave)} wi
 grave-start-digging-user = You start digging {THE($grave)} with {THE($tool)}.
 grave-start-digging-user-trapped = You start clawing your way out of {THE($grave)}!
 
-grave-digging-requires-tool = You need a tool to dig this {$grave}!
\ No newline at end of file
+grave-digging-requires-tool = You need a tool to dig this {$grave}!
diff --git a/Resources/Locale/en-US/burning/bodyburn.ftl b/Resources/Locale/en-US/burning/bodyburn.ftl
index 7387c2826a..fef960c629 100644
--- a/Resources/Locale/en-US/burning/bodyburn.ftl
+++ b/Resources/Locale/en-US/burning/bodyburn.ftl
@@ -1,2 +1,2 @@
-bodyburn-text-others = {CAPITALIZE(THE($name))} burns to ash!
+bodyburn-text-others = {CAPITALIZE(THE($name))} burns to ash!
 bodyburn-vox-text-others = {CAPITALIZE(THE($name))} turned into fried vox!
diff --git a/Resources/Locale/en-US/candle/extinguish-on-interact-component.ftl b/Resources/Locale/en-US/candle/extinguish-on-interact-component.ftl
index 7db519c870..ac9f971aad 100644
--- a/Resources/Locale/en-US/candle/extinguish-on-interact-component.ftl
+++ b/Resources/Locale/en-US/candle/extinguish-on-interact-component.ftl
@@ -1 +1 @@
-candle-extinguish-failed = The flame flickers, but it doesn't go out
\ No newline at end of file
+candle-extinguish-failed = The flame flickers, but it doesn't go out
diff --git a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
index d7a7025927..c12f43d224 100644
--- a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
@@ -1,4 +1,4 @@
-bounty-console-menu-title = Cargo bounty console
+bounty-console-menu-title = Cargo bounty console
 bounty-console-label-button-text = Print label
 bounty-console-skip-button-text = Skip
 bounty-console-time-label = Time: [color=orange]{$time}[/color]
diff --git a/Resources/Locale/en-US/cargo/cargo-order-database-component.ftl b/Resources/Locale/en-US/cargo/cargo-order-database-component.ftl
index 1987902383..77bd8be6b4 100644
--- a/Resources/Locale/en-US/cargo/cargo-order-database-component.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-order-database-component.ftl
@@ -1,3 +1,3 @@
 ## Cargo order database
 
-cargo-order-database-order-overflow-message = {$placeholder} (Overflow)
\ No newline at end of file
+cargo-order-database-order-overflow-message = {$placeholder} (Overflow)
diff --git a/Resources/Locale/en-US/cargo/price-gun-component.ftl b/Resources/Locale/en-US/cargo/price-gun-component.ftl
index fe20e3296b..22c724e3e6 100644
--- a/Resources/Locale/en-US/cargo/price-gun-component.ftl
+++ b/Resources/Locale/en-US/cargo/price-gun-component.ftl
@@ -1,4 +1,4 @@
-price-gun-pricing-result = The device deems {THE($object)} to be worth {$price} spesos.
+price-gun-pricing-result = The device deems {THE($object)} to be worth {$price} spesos.
 price-gun-verb-text = Appraisal
 price-gun-verb-message = Appraise {THE($object)}.
 price-gun-bounty-complete = The device confirms that the bounty contained within is completed.
diff --git a/Resources/Locale/en-US/cartridge-loader/cartridge-loader-component.ftl b/Resources/Locale/en-US/cartridge-loader/cartridge-loader-component.ftl
index 763ccdf7f4..73206dcf51 100644
--- a/Resources/Locale/en-US/cartridge-loader/cartridge-loader-component.ftl
+++ b/Resources/Locale/en-US/cartridge-loader/cartridge-loader-component.ftl
@@ -1,2 +1,2 @@
-cartridge-bound-user-interface-install-button = Install
+cartridge-bound-user-interface-install-button = Install
 cartridge-bound-user-interface-uninstall-button = Remove
diff --git a/Resources/Locale/en-US/changeling/changeling.ftl b/Resources/Locale/en-US/changeling/changeling.ftl
index 849f509a57..2d8e0943f5 100644
--- a/Resources/Locale/en-US/changeling/changeling.ftl
+++ b/Resources/Locale/en-US/changeling/changeling.ftl
@@ -18,10 +18,15 @@ changeling-devour-begin-consume-others = { CAPITALIZE(POSS-ADJ($user)) } uncanny
 changeling-devour-consume-complete-self = Our uncanny mouth retreats, biomass consumed.
 changeling-devour-consume-complete-others = { CAPITALIZE(POSS-ADJ($user)) } uncanny mouth retreats.
 
+changeling-devour-doafter-windup = [color=red]{ CAPITALIZE(POSS-ADJ($user)) } face is splitting open, preparing to feast![/color]
+changeling-devour-doafter = [color=red]{ CAPITALIZE(SUBJECT($user)) } { CONJUGATE-BE($user) } tearing into the flesh of {$target}![/color]
+
 # transformation
 changeling-transform-attempt-self = Our bones snap, muscles tear, one flesh becomes another.
 changeling-transform-attempt-others = { CAPITALIZE(POSS-ADJ($user)) } bones snap, muscles tear, body shifts into another.
 
+changeling-transform-doafter = [color=red]The surface of { POSS-ADJ($user) } skin is melting, taking another shape.[/color]
+
 # transformation BUI
 changeling-transform-bui-select-entity = {$entity}
 changeling-transform-bui-drop-identity-menu = Drop a devoured identity from your memory.
diff --git a/Resources/Locale/en-US/changeling/stasis.ftl b/Resources/Locale/en-US/changeling/stasis.ftl
index d1790afaee..9ee9741d19 100644
--- a/Resources/Locale/en-US/changeling/stasis.ftl
+++ b/Resources/Locale/en-US/changeling/stasis.ftl
@@ -1,4 +1,4 @@
-changeling-stasis-active-name = [color=red]Exit Stasis[/color]
+changeling-stasis-active-name = [color=red]Exit Stasis[/color]
 changeling-stasis-active-desc = Exit the stasis, healing all damage to your body.
 
 changeling-stasis-enter = We enter stasis, gathering energy to rise once more.
diff --git a/Resources/Locale/en-US/chat/chat-channel.ftl b/Resources/Locale/en-US/chat/chat-channel.ftl
index 10ab1fc756..2c019325ef 100644
--- a/Resources/Locale/en-US/chat/chat-channel.ftl
+++ b/Resources/Locale/en-US/chat/chat-channel.ftl
@@ -1,2 +1,2 @@
-chat-channel-humanized-ooc = OOC
+chat-channel-humanized-ooc = OOC
 chat-channel-humanized-admin = ADMIN
diff --git a/Resources/Locale/en-US/chat/commands/ghost-command.ftl b/Resources/Locale/en-US/chat/commands/ghost-command.ftl
index 53dfa478d6..989ae5eaaf 100644
--- a/Resources/Locale/en-US/chat/commands/ghost-command.ftl
+++ b/Resources/Locale/en-US/chat/commands/ghost-command.ftl
@@ -1,4 +1,4 @@
-ghost-command-description = Give up on life and become a ghost.
+ghost-command-description = Give up on life and become a ghost.
 ghost-command-help-text = The ghost command turns you into a ghost and makes the character you played permanently catatonic.
                           Please note that you cannot return to your character's body after ghosting.
 ghost-command-no-session = You have no session, you can't ghost.
diff --git a/Resources/Locale/en-US/chat/highlights.ftl b/Resources/Locale/en-US/chat/highlights.ftl
index be34dbfff4..60de705c7f 100644
--- a/Resources/Locale/en-US/chat/highlights.ftl
+++ b/Resources/Locale/en-US/chat/highlights.ftl
@@ -32,7 +32,7 @@ highlights-paramedic = Paramedic, "Para", "Medic", Medbay, Medical, "Med"
 highlights-scientist = Scientist, Science, "Sci", "RND", "R&D"
 highlights-researchassistant = Research Assistant, Science, "Sci", "RND", "R&D"
 
-# Civilian
+# Service
 highlights-bartender = Bartender, Barkeeper, Barkeep, "Bar", Service, "Serv"
 highlights-botanist = Botanist, Botany, Hydroponics, Service, "Serv"
 highlights-chaplain = Chaplain, "Chap", Chapel, Service, "Serv"
@@ -43,7 +43,6 @@ highlights-lawyer = Lawyer, Attorney, "Law", Service, "Serv"
 highlights-librarian = Librarian, Library, Service, "Serv"
 highlights-mime = Mime, Theatre, Theater, Service, "Serv"
 highlights-musician = Musician, "Music", Theatre, Theater, Service, "Serv"
-highlights-passenger = Passenger, Greytider, Graytider, "Tider", "Tide"
 highlights-serviceworker = Service Worker, Service, "Serv"
 
 # Station-specific
@@ -53,3 +52,6 @@ highlights-psychologist = Psychologist, Psychology, "Psych", Medbay, Medical, "M
 # Silicon
 highlights-borg = Cyborg, Silicon, Borg, Robotics, "Robot"
 highlights-stationai = Station AI, Silicon, "AI", "sAI"
+
+# Civilian
+highlights-passenger = Passenger, Greytider, Graytider, "Tider", "Tide"
diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
index 3fffe0db55..45d63bea85 100644
--- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl
+++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
@@ -58,8 +58,6 @@ chat-manager-admin-channel-name = ADMIN
 chat-manager-rate-limited = You are sending messages too quickly!
 chat-manager-rate-limit-admin-announcement = Rate limit warning: { $player }
 
-chat-manager-follow-button = (F)
-
 ## Speech verbs for chat
 
 chat-speech-verb-suffix-exclamation = !
diff --git a/Resources/Locale/en-US/chemistry/components/rehydratable-component.ftl b/Resources/Locale/en-US/chemistry/components/rehydratable-component.ftl
index c2e61e6cd4..3e8165a3ea 100644
--- a/Resources/Locale/en-US/chemistry/components/rehydratable-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/rehydratable-component.ftl
@@ -1 +1 @@
-rehydratable-component-expands-message = {$owner} expands!
\ No newline at end of file
+rehydratable-component-expands-message = {$owner} expands!
diff --git a/Resources/Locale/en-US/chemistry/components/solution-scanner-component.ftl b/Resources/Locale/en-US/chemistry/components/solution-scanner-component.ftl
index 51a049aab1..ef1f22981f 100644
--- a/Resources/Locale/en-US/chemistry/components/solution-scanner-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/solution-scanner-component.ftl
@@ -3,4 +3,4 @@ scannable-solution-verb-message = Examine the chemical composition.
 scannable-solution-main-text = It contains the following chemicals:
 scannable-solution-empty-container = It contains no chemicals.
 scannable-solution-chemical = - {$amount}u [color={$color}]{$type}[/color]
-scannable-solution-temperature = Solution temperature: {$temperature}K
\ No newline at end of file
+scannable-solution-temperature = Solution temperature: {$temperature}K
diff --git a/Resources/Locale/en-US/chemistry/components/solution-status.ftl b/Resources/Locale/en-US/chemistry/components/solution-status.ftl
index 0ec5f932e0..8bc92bbc32 100644
--- a/Resources/Locale/en-US/chemistry/components/solution-status.ftl
+++ b/Resources/Locale/en-US/chemistry/components/solution-status.ftl
@@ -1,2 +1,2 @@
-solution-status-volume = Volume: [color=white]{$currentVolume}/{$maxVolume}u[/color]
+solution-status-volume = Volume: [color=white]{$currentVolume}/{$maxVolume}u[/color]
 solution-status-transfer = Transfer: [color=white]{$volume}u[/color]
diff --git a/Resources/Locale/en-US/climbing/glass-table-component.ftl b/Resources/Locale/en-US/climbing/glass-table-component.ftl
index 1e7a159aed..9fb0233d20 100644
--- a/Resources/Locale/en-US/climbing/glass-table-component.ftl
+++ b/Resources/Locale/en-US/climbing/glass-table-component.ftl
@@ -1,4 +1,4 @@
-### Tables which take damage when a user is dragged onto them
+### Tables which take damage when a user is dragged onto them
 
 ## Showed to users other than the climber
 glass-table-shattered-others = { CAPITALIZE(THE($table)) } cracks under the weight of { THE($climber) }!
diff --git a/Resources/Locale/en-US/cloning/accept-cloning-window.ftl b/Resources/Locale/en-US/cloning/accept-cloning-window.ftl
index 26ddcec1ed..5d855dac81 100644
--- a/Resources/Locale/en-US/cloning/accept-cloning-window.ftl
+++ b/Resources/Locale/en-US/cloning/accept-cloning-window.ftl
@@ -2,4 +2,4 @@ accept-cloning-window-title = Cloning Machine
 accept-cloning-window-prompt-text-part = You are being cloned!
                                          Transfer your soul to the clone body?
 accept-cloning-window-accept-button = Yes
-accept-cloning-window-deny-button = No
\ No newline at end of file
+accept-cloning-window-deny-button = No
diff --git a/Resources/Locale/en-US/clothing/belts.ftl b/Resources/Locale/en-US/clothing/belts.ftl
index c0281b9fec..4276884929 100644
--- a/Resources/Locale/en-US/clothing/belts.ftl
+++ b/Resources/Locale/en-US/clothing/belts.ftl
@@ -1,2 +1,2 @@
 sheath-insert-verb = Sheathe
-sheath-eject-verb = Unsheathe
\ No newline at end of file
+sheath-eject-verb = Unsheathe
diff --git a/Resources/Locale/en-US/clothing/components/chameleon-component.ftl b/Resources/Locale/en-US/clothing/components/chameleon-component.ftl
index 19ab3834d9..180495e2b6 100644
--- a/Resources/Locale/en-US/clothing/components/chameleon-component.ftl
+++ b/Resources/Locale/en-US/clothing/components/chameleon-component.ftl
@@ -1,4 +1,4 @@
-
+
 ## UI
 chameleon-component-ui-window-name = Chameleon Settings
 chameleon-component-ui-search-placeholder = Search...
diff --git a/Resources/Locale/en-US/commands/actions-command.ftl b/Resources/Locale/en-US/commands/actions-command.ftl
index b369da03d2..255f8c06e7 100644
--- a/Resources/Locale/en-US/commands/actions-command.ftl
+++ b/Resources/Locale/en-US/commands/actions-command.ftl
@@ -4,4 +4,4 @@ cmd-loadacts-error = Failed to load action assignments
 
 cmd-loadmapacts-desc = Loads the mapping preset action toolbar assignments.
 cmd-loadmapacts-help = Usage: {$command} <user resource path>
-cmd-loadmapacts-error = Failed to load action assignments
\ No newline at end of file
+cmd-loadmapacts-error = Failed to load action assignments
diff --git a/Resources/Locale/en-US/commands/add-body-part-command.ftl b/Resources/Locale/en-US/commands/add-body-part-command.ftl
index 6a7a54f730..1db4dad662 100644
--- a/Resources/Locale/en-US/commands/add-body-part-command.ftl
+++ b/Resources/Locale/en-US/commands/add-body-part-command.ftl
@@ -1,2 +1,2 @@
-cmd-addbodypart-desc = Adds a given entity to a containing body.
+cmd-addbodypart-desc = Adds a given entity to a containing body.
 cmd-addbodypart-help = Usage: addbodypart <entity uid> <body uid> <part slot> <part type>
diff --git a/Resources/Locale/en-US/commands/addpolymorphaction-command.ftl b/Resources/Locale/en-US/commands/addpolymorphaction-command.ftl
index 72f2158273..16ed3091b8 100644
--- a/Resources/Locale/en-US/commands/addpolymorphaction-command.ftl
+++ b/Resources/Locale/en-US/commands/addpolymorphaction-command.ftl
@@ -1,2 +1,2 @@
-cmd-addpolymorphaction-desc = Takes an entity and gives them a voluntary polymorph.
+cmd-addpolymorphaction-desc = Takes an entity and gives them a voluntary polymorph.
 cmd-addpolymorphaction-help = Usage: addpolymorphaction <id> <polymorph prototype>
diff --git a/Resources/Locale/en-US/commands/admin-logs-command.ftl b/Resources/Locale/en-US/commands/admin-logs-command.ftl
index 539c917ddb..056dd945a3 100644
--- a/Resources/Locale/en-US/commands/admin-logs-command.ftl
+++ b/Resources/Locale/en-US/commands/admin-logs-command.ftl
@@ -1,2 +1,2 @@
-cmd-adminlogs-desc = Opens the admin logs panel.
+cmd-adminlogs-desc = Opens the admin logs panel.
 cmd-adminlogs-help = Usage: adminlogs
diff --git a/Resources/Locale/en-US/commands/admin-who-command.ftl b/Resources/Locale/en-US/commands/admin-who-command.ftl
index b6491ada03..62824b828d 100644
--- a/Resources/Locale/en-US/commands/admin-who-command.ftl
+++ b/Resources/Locale/en-US/commands/admin-who-command.ftl
@@ -1,2 +1,2 @@
-cmd-adminwho-desc = Returns a list of all admins currently online on the server.
+cmd-adminwho-desc = Returns a list of all admins currently online on the server.
 cmd-adminwho-help = Usage: adminwho
diff --git a/Resources/Locale/en-US/commands/asay-command.ftl b/Resources/Locale/en-US/commands/asay-command.ftl
index 3882947a7e..cf55f7c691 100644
--- a/Resources/Locale/en-US/commands/asay-command.ftl
+++ b/Resources/Locale/en-US/commands/asay-command.ftl
@@ -1,2 +1,2 @@
-cmd-asay-desc = Send chat messages to the private admin chat channel.
+cmd-asay-desc = Send chat messages to the private admin chat channel.
 cmd-asay-help = Usage: asay <text>
diff --git a/Resources/Locale/en-US/commands/colornetwork-command.ftl b/Resources/Locale/en-US/commands/colornetwork-command.ftl
index c77657000e..47d205ad3b 100644
--- a/Resources/Locale/en-US/commands/colornetwork-command.ftl
+++ b/Resources/Locale/en-US/commands/colornetwork-command.ftl
@@ -2,4 +2,4 @@ cmd-colornetwork-desc = Paints the atmos devices in the specified color
 cmd-colornetwork-help = colornetwork <uid> Pipe <HexColor>
 cmd-colornetwork-no-access = You are not currently able to use mapping commands.
 shell-entity-is-not-node-container = Target entity is not a node container.
-shell-node-group-is-invalid = Invalid node group specified. Valid groups: { $groups }.
\ No newline at end of file
+shell-node-group-is-invalid = Invalid node group specified. Valid groups: { $groups }.
diff --git a/Resources/Locale/en-US/commands/credits-command.ftl b/Resources/Locale/en-US/commands/credits-command.ftl
index 9e506fc2a9..aea5265151 100644
--- a/Resources/Locale/en-US/commands/credits-command.ftl
+++ b/Resources/Locale/en-US/commands/credits-command.ftl
@@ -1,2 +1,2 @@
 cmd-credits-desc = Opens the credits window
-cmd-credits-help = Usage: {$command}
\ No newline at end of file
+cmd-credits-help = Usage: {$command}
diff --git a/Resources/Locale/en-US/commands/crew-manifest-command.ftl b/Resources/Locale/en-US/commands/crew-manifest-command.ftl
index 8b46e3ec6d..272a62c91e 100644
--- a/Resources/Locale/en-US/commands/crew-manifest-command.ftl
+++ b/Resources/Locale/en-US/commands/crew-manifest-command.ftl
@@ -1,2 +1,2 @@
-cmd-crewmanifest-desc = Opens the crew manifest for the given station.
+cmd-crewmanifest-desc = Opens the crew manifest for the given station.
 cmd-crewmanifest-help = Usage: crewmanifest <entityUid>
diff --git a/Resources/Locale/en-US/commands/deadmin-command.ftl b/Resources/Locale/en-US/commands/deadmin-command.ftl
index e031595eba..4da6a4d9fe 100644
--- a/Resources/Locale/en-US/commands/deadmin-command.ftl
+++ b/Resources/Locale/en-US/commands/deadmin-command.ftl
@@ -1,3 +1,3 @@
-cmd-deadmin-desc = Temporarily de-admins you so you can experience the round as a normal player.
+cmd-deadmin-desc = Temporarily de-admins you so you can experience the round as a normal player.
 cmd-deadmin-help = Usage: deadmin
                    Use readmin to re-admin after using this.
diff --git a/Resources/Locale/en-US/commands/debug-pathfinding-command.ftl b/Resources/Locale/en-US/commands/debug-pathfinding-command.ftl
index c1f0df9e8f..ae48dc88b2 100644
--- a/Resources/Locale/en-US/commands/debug-pathfinding-command.ftl
+++ b/Resources/Locale/en-US/commands/debug-pathfinding-command.ftl
@@ -1,4 +1,4 @@
 cmd-pathfinder-desc = Toggles visibility of pathfinding debuggers.
 cmd-pathfinder-help = Usage: {$command} [options]
 cmd-pathfinder-error = Unrecognised pathfinder args {$arg}
-cmd-pathfinder-notify = Toggled {$arg} to {$newMode}
\ No newline at end of file
+cmd-pathfinder-notify = Toggled {$arg} to {$newMode}
diff --git a/Resources/Locale/en-US/commands/delaystart-command.ftl b/Resources/Locale/en-US/commands/delaystart-command.ftl
index 77560508b3..9e26425253 100644
--- a/Resources/Locale/en-US/commands/delaystart-command.ftl
+++ b/Resources/Locale/en-US/commands/delaystart-command.ftl
@@ -1,4 +1,4 @@
-cmd-delaystart-desc = Adjusts the roundstart timer (accepts positive and negative integers). Pauses/Resumes the countdown if no argument is provided.
+cmd-delaystart-desc = Adjusts the roundstart timer (accepts positive and negative integers). Pauses/Resumes the countdown if no argument is provided.
 cmd-delaystart-help = Usage: delaystart [seconds]
 
 delaystart-preround-only = This can only be executed while the game is in the pre-round lobby.
diff --git a/Resources/Locale/en-US/commands/delete-component-command.ftl b/Resources/Locale/en-US/commands/delete-component-command.ftl
index f8435e4c64..d1d90045f0 100644
--- a/Resources/Locale/en-US/commands/delete-component-command.ftl
+++ b/Resources/Locale/en-US/commands/delete-component-command.ftl
@@ -1,4 +1,4 @@
-cmd-deletecomponent-desc = Deletes all instances of the specified component.
+cmd-deletecomponent-desc = Deletes all instances of the specified component.
 cmd-deletecomponent-help = Usage: deletecomponent <name>"
 cmd-deletecomponent-no-component-exists = No component exists with name {$name}.
 cmd-deletecomponent-success = Removed {$count} components with name {$name}.
diff --git a/Resources/Locale/en-US/commands/destroy-mechanism-command.ftl b/Resources/Locale/en-US/commands/destroy-mechanism-command.ftl
index e199b6230c..37b966633f 100644
--- a/Resources/Locale/en-US/commands/destroy-mechanism-command.ftl
+++ b/Resources/Locale/en-US/commands/destroy-mechanism-command.ftl
@@ -1,4 +1,4 @@
-cmd-destroymechanism-desc = Destroys a mechanism from your entity.
+cmd-destroymechanism-desc = Destroys a mechanism from your entity.
 cmd-destroymechanism-help = Usage: destroymechanism <mechanism>
 cmd-destroymechanism-success = Mechanism with name {$name} has been destroyed.
 cmd-destroymechanism-no-mechanism-found = No mechanism was found with name {$name}.
diff --git a/Resources/Locale/en-US/commands/dirty-command.ftl b/Resources/Locale/en-US/commands/dirty-command.ftl
index c3e7bc1c39..35d7151629 100644
--- a/Resources/Locale/en-US/commands/dirty-command.ftl
+++ b/Resources/Locale/en-US/commands/dirty-command.ftl
@@ -1,2 +1,2 @@
-cmd-dirty-desc = Marks all components on an entity as dirty. If not specified, dirties everything.
+cmd-dirty-desc = Marks all components on an entity as dirty. If not specified, dirties everything.
 cmd-dirty-help = Usage: dirty [entityUid]
diff --git a/Resources/Locale/en-US/commands/dump-reagent-guide-text-command.ftl b/Resources/Locale/en-US/commands/dump-reagent-guide-text-command.ftl
index 694854c1cd..47ddb999e1 100644
--- a/Resources/Locale/en-US/commands/dump-reagent-guide-text-command.ftl
+++ b/Resources/Locale/en-US/commands/dump-reagent-guide-text-command.ftl
@@ -1,4 +1,4 @@
-cmd-dumpreagentguidetext-desc = Dumps the guidebook text for a reagent to the console.
+cmd-dumpreagentguidetext-desc = Dumps the guidebook text for a reagent to the console.
 cmd-dumpreagentguidetext-help = Usage: dumpreagentguidetext <reagentPrototype>
 cmd-dumpreagentguidetext-nothing-to-dump = Nothing to dump.
 cmd-dumpreagentguidetext-skipped = [skipped effect of type {$effect}]
diff --git a/Resources/Locale/en-US/commands/endround-command.ftl b/Resources/Locale/en-US/commands/endround-command.ftl
index 3b322b59df..c3569bbbd8 100644
--- a/Resources/Locale/en-US/commands/endround-command.ftl
+++ b/Resources/Locale/en-US/commands/endround-command.ftl
@@ -1,2 +1,2 @@
-cmd-endround-desc = Ends the round and moves the server to PostRound.
+cmd-endround-desc = Ends the round and moves the server to PostRound.
 cmd-endround-help = Usage: endround
diff --git a/Resources/Locale/en-US/commands/eye-commands.ftl b/Resources/Locale/en-US/commands/eye-commands.ftl
index 512c56cb60..6561dbc881 100644
--- a/Resources/Locale/en-US/commands/eye-commands.ftl
+++ b/Resources/Locale/en-US/commands/eye-commands.ftl
@@ -1,4 +1,4 @@
-parse-bool-fail = Unable to parse {$arg} as a bool
+parse-bool-fail = Unable to parse {$arg} as a bool
 parse-float-fail = Unable to parse {$arg} as a float
 
 cmd-lockeyes-desc = Prevents eyes from being rotated any further.
diff --git a/Resources/Locale/en-US/commands/force-map-command.ftl b/Resources/Locale/en-US/commands/force-map-command.ftl
index fabd5f04c8..02ff66b689 100644
--- a/Resources/Locale/en-US/commands/force-map-command.ftl
+++ b/Resources/Locale/en-US/commands/force-map-command.ftl
@@ -1,4 +1,4 @@
-cmd-forcemap-desc = Forces the game to start with a given map next round.
+cmd-forcemap-desc = Forces the game to start with a given map next round.
 cmd-forcemap-help = Usage: forcemap <map ID>
 cmd-forcemap-success = Forced the game to start with map { $map } next round.
 cmd-forcemap-cleared = Cleared the forced map setting.
diff --git a/Resources/Locale/en-US/commands/force-preset-command.ftl b/Resources/Locale/en-US/commands/force-preset-command.ftl
index 9f534a01c4..dc9f2e801e 100644
--- a/Resources/Locale/en-US/commands/force-preset-command.ftl
+++ b/Resources/Locale/en-US/commands/force-preset-command.ftl
@@ -1,4 +1,4 @@
-cmd-forcepreset-desc = Forces a specific game preset to start for the current lobby.
+cmd-forcepreset-desc = Forces a specific game preset to start for the current lobby.
 cmd-forcepreset-help = Usage: forcepreset <preset>
 cmd-forcepreset-preround-lobby-only = This can only be executed while the game is in the pre-round lobby.
 cmd-forcepreset-no-preset-found = No preset exists with name {$preset}.
diff --git a/Resources/Locale/en-US/commands/ghost-kick-command.ftl b/Resources/Locale/en-US/commands/ghost-kick-command.ftl
index fffae96ebe..64e1564e45 100644
--- a/Resources/Locale/en-US/commands/ghost-kick-command.ftl
+++ b/Resources/Locale/en-US/commands/ghost-kick-command.ftl
@@ -1,3 +1,3 @@
-cmd-ghostkick-desc = Kick a client from the server as if their network just dropped.
+cmd-ghostkick-desc = Kick a client from the server as if their network just dropped.
 cmd-ghostkick-help = Usage: ghostkick <Player> [Reason]
 cmd-ghostkick-default-reason = Ghost kicked by console.
diff --git a/Resources/Locale/en-US/commands/ghost-visibility-commands.ftl b/Resources/Locale/en-US/commands/ghost-visibility-commands.ftl
index a4eaed21f6..2fc84a0492 100644
--- a/Resources/Locale/en-US/commands/ghost-visibility-commands.ftl
+++ b/Resources/Locale/en-US/commands/ghost-visibility-commands.ftl
@@ -1,4 +1,4 @@
-cmd-toggleghostvisibility-desc = Toggles ghost visibility on the client.
+cmd-toggleghostvisibility-desc = Toggles ghost visibility on the client.
 cmd-toggleghostvisibility-help = Usage: toggleghostvisibility [bool]
 
 cmd-toggleselfghost-desc = Toggles seeing your own ghost.
diff --git a/Resources/Locale/en-US/commands/go-lobby-command.ftl b/Resources/Locale/en-US/commands/go-lobby-command.ftl
index 7ba54aa730..9953a3f82d 100644
--- a/Resources/Locale/en-US/commands/go-lobby-command.ftl
+++ b/Resources/Locale/en-US/commands/go-lobby-command.ftl
@@ -1,4 +1,4 @@
-cmd-golobby-desc = Enables the lobby and restarts the round.
+cmd-golobby-desc = Enables the lobby and restarts the round.
 cmd-golobby-help = Usage: golobby / golobby <preset>
 cmd-golobby-success = Enabling the lobby and restarting the round.
 cmd-golobby-success-with-preset = Enabling the lobby and restarting the round with preset {$preset}.
diff --git a/Resources/Locale/en-US/commands/grid-drag-command.ftl b/Resources/Locale/en-US/commands/grid-drag-command.ftl
index 34efa64491..d38e11e5b3 100644
--- a/Resources/Locale/en-US/commands/grid-drag-command.ftl
+++ b/Resources/Locale/en-US/commands/grid-drag-command.ftl
@@ -1,3 +1,3 @@
-cmd-griddrag-desc = Allows someone with permissions to drag grids around.
+cmd-griddrag-desc = Allows someone with permissions to drag grids around.
 cmd-griddrag-help = Usage: griddrag
 cmd-griddrag-status = Grid dragging set to {$status}.
diff --git a/Resources/Locale/en-US/commands/grouping-entity-menu-command.ftl b/Resources/Locale/en-US/commands/grouping-entity-menu-command.ftl
index eb519ae72d..be8fbff64b 100644
--- a/Resources/Locale/en-US/commands/grouping-entity-menu-command.ftl
+++ b/Resources/Locale/en-US/commands/grouping-entity-menu-command.ftl
@@ -1,4 +1,4 @@
 cmd-entitymenug-desc = Sets the entity menu grouping type.
 cmd-entitymenug-help = Usage: {$command} <0:{$groupingTypesCount}>
 cmd-entitymenug-error = {$arg} is not a valid integer.
-cmd-entitymenug-notify = Context Menu Grouping set to type: {$cvar}
\ No newline at end of file
+cmd-entitymenug-notify = Context Menu Grouping set to type: {$cvar}
diff --git a/Resources/Locale/en-US/commands/is-afk-command.ftl b/Resources/Locale/en-US/commands/is-afk-command.ftl
index ad3a6f3ab4..f51815089c 100644
--- a/Resources/Locale/en-US/commands/is-afk-command.ftl
+++ b/Resources/Locale/en-US/commands/is-afk-command.ftl
@@ -1,4 +1,4 @@
-cmd-isafk-desc = Checks if a specified player is AFK.
+cmd-isafk-desc = Checks if a specified player is AFK.
 cmd-isafk-help = Usage: isafk <playerName>
 cmd-isafk-true = They are indeed AFK.
 cmd-isafk-false = They are not AFK.
diff --git a/Resources/Locale/en-US/commands/job-whitelist-command.ftl b/Resources/Locale/en-US/commands/job-whitelist-command.ftl
index a188f9ba5c..9fd99ccdbb 100644
--- a/Resources/Locale/en-US/commands/job-whitelist-command.ftl
+++ b/Resources/Locale/en-US/commands/job-whitelist-command.ftl
@@ -1,4 +1,4 @@
-cmd-jobwhitelist-job-does-not-exist = Job {$job} does not exist.
+cmd-jobwhitelist-job-does-not-exist = Job {$job} does not exist.
 cmd-jobwhitelist-player-not-found = Player {$player} not found.
 cmd-jobwhitelist-hint-player = [player]
 cmd-jobwhitelist-hint-job = [job]
diff --git a/Resources/Locale/en-US/commands/makesentient-command.ftl b/Resources/Locale/en-US/commands/makesentient-command.ftl
index 2d972b8e60..c74ba7ff66 100644
--- a/Resources/Locale/en-US/commands/makesentient-command.ftl
+++ b/Resources/Locale/en-US/commands/makesentient-command.ftl
@@ -1,2 +1,2 @@
-cmd-makesentient-desc = Makes an entity sentient (able to be controlled by a player).
+cmd-makesentient-desc = Makes an entity sentient (able to be controlled by a player).
 cmd-makesentient-help = Usage: makesentient <entityUid>
diff --git a/Resources/Locale/en-US/commands/map-commands.ftl b/Resources/Locale/en-US/commands/map-commands.ftl
index f5663f6824..d7689d4d46 100644
--- a/Resources/Locale/en-US/commands/map-commands.ftl
+++ b/Resources/Locale/en-US/commands/map-commands.ftl
@@ -1,4 +1,4 @@
-cmd-loadgamemap-desc = Loads the given game map at the given coordinates.
+cmd-loadgamemap-desc = Loads the given game map at the given coordinates.
 cmd-loadgamemap-help = loadgamemap <mapid> <gamemap> [<x> <y> [<name>]]
 
 cmd-listgamemaps-desc = Lists the game maps that can be used by loadgamemap.
diff --git a/Resources/Locale/en-US/commands/me-command.ftl b/Resources/Locale/en-US/commands/me-command.ftl
index cd482b0be3..ba0e6fc344 100644
--- a/Resources/Locale/en-US/commands/me-command.ftl
+++ b/Resources/Locale/en-US/commands/me-command.ftl
@@ -1,2 +1,2 @@
-cmd-me-desc = Perform an action.
+cmd-me-desc = Perform an action.
 cmd-me-help = Usage: me <text>
diff --git a/Resources/Locale/en-US/commands/melee-spread-command.ftl b/Resources/Locale/en-US/commands/melee-spread-command.ftl
index 7e62fb53b9..7ece0d69ac 100644
--- a/Resources/Locale/en-US/commands/melee-spread-command.ftl
+++ b/Resources/Locale/en-US/commands/melee-spread-command.ftl
@@ -1 +1 @@
-cmd-showmeleespread-desc = Shows the current weapon's range and arc for debugging.
+cmd-showmeleespread-desc = Shows the current weapon's range and arc for debugging.
diff --git a/Resources/Locale/en-US/commands/mind-info-command.ftl b/Resources/Locale/en-US/commands/mind-info-command.ftl
index 57a1731928..8268bc96dc 100644
--- a/Resources/Locale/en-US/commands/mind-info-command.ftl
+++ b/Resources/Locale/en-US/commands/mind-info-command.ftl
@@ -1,3 +1,3 @@
-cmd-mindinfo-desc = Lists info for the mind of a specific player.
+cmd-mindinfo-desc = Lists info for the mind of a specific player.
 cmd-mindinfo-help = Usage: mindinfo <session ID>
 cmd-mindinfo-mind-not-found = Can't find that mind.
diff --git a/Resources/Locale/en-US/commands/node-vis-commands.ftl b/Resources/Locale/en-US/commands/node-vis-commands.ftl
index e921c478f8..0f0639576c 100644
--- a/Resources/Locale/en-US/commands/node-vis-commands.ftl
+++ b/Resources/Locale/en-US/commands/node-vis-commands.ftl
@@ -1,4 +1,4 @@
-cmd-nodevis-desc = Toggles node group visualization.
+cmd-nodevis-desc = Toggles node group visualization.
 cmd-nodevis-help = Usage: nodevis
 
 cmd-nodevisfilter-desc = Toggles showing a specific group on nodevis.
diff --git a/Resources/Locale/en-US/commands/npc-command.ftl b/Resources/Locale/en-US/commands/npc-command.ftl
index 37117437dd..e1f58705e9 100644
--- a/Resources/Locale/en-US/commands/npc-command.ftl
+++ b/Resources/Locale/en-US/commands/npc-command.ftl
@@ -1,2 +1,2 @@
-cmd-npc-desc = Opens the debug window for NPCs.
+cmd-npc-desc = Opens the debug window for NPCs.
 cmd-npc-help = Usage: npc
diff --git a/Resources/Locale/en-US/commands/nukecodes-command.ftl b/Resources/Locale/en-US/commands/nukecodes-command.ftl
index 50e324c524..4ae90dfaa9 100644
--- a/Resources/Locale/en-US/commands/nukecodes-command.ftl
+++ b/Resources/Locale/en-US/commands/nukecodes-command.ftl
@@ -1,2 +1,2 @@
-cmd-nukecodes-desc = Send nuke codes to a station's communication consoles.
+cmd-nukecodes-desc = Send nuke codes to a station's communication consoles.
 cmd-nukecodes-help = Usage: nukecodes <entityUid>
diff --git a/Resources/Locale/en-US/commands/ooc-command.ftl b/Resources/Locale/en-US/commands/ooc-command.ftl
index a2fa48e2ae..6bcf7a1128 100644
--- a/Resources/Locale/en-US/commands/ooc-command.ftl
+++ b/Resources/Locale/en-US/commands/ooc-command.ftl
@@ -1,2 +1,2 @@
-cmd-ooc-desc = Send Out Of Character chat messages.
+cmd-ooc-desc = Send Out Of Character chat messages.
 cmd-ooc-help = Usage: ooc <text>
diff --git a/Resources/Locale/en-US/commands/open-a-help-command.ftl b/Resources/Locale/en-US/commands/open-a-help-command.ftl
index a7e0e76c1d..24618c11d7 100644
--- a/Resources/Locale/en-US/commands/open-a-help-command.ftl
+++ b/Resources/Locale/en-US/commands/open-a-help-command.ftl
@@ -1,3 +1,3 @@
 cmd-openahelp-desc = Opens AHelp channel for a given NetUserID, or your personal channel if none given.
 cmd-openahelp-help = Usage: {$command} [<netuserid>]
-cmd-openahelp-error = Bad GUID!
\ No newline at end of file
+cmd-openahelp-error = Bad GUID!
diff --git a/Resources/Locale/en-US/commands/pardon-command.ftl b/Resources/Locale/en-US/commands/pardon-command.ftl
index c934865629..8699564be3 100644
--- a/Resources/Locale/en-US/commands/pardon-command.ftl
+++ b/Resources/Locale/en-US/commands/pardon-command.ftl
@@ -1,4 +1,4 @@
-cmd-pardon-desc = Pardon somebody's ban.
+cmd-pardon-desc = Pardon somebody's ban.
 cmd-pardon-help = Usage: pardon <ban id>
 cmd-pardon-unable-to-parse = Unable to parse {$id} as a ban id integer.
                              {$help}
diff --git a/Resources/Locale/en-US/commands/powerstat-command.ftl b/Resources/Locale/en-US/commands/powerstat-command.ftl
index c22cd5e22a..c998ae78d3 100644
--- a/Resources/Locale/en-US/commands/powerstat-command.ftl
+++ b/Resources/Locale/en-US/commands/powerstat-command.ftl
@@ -1,4 +1,4 @@
-cmd-powerstat-desc = Shows statistics for pow3r.
+cmd-powerstat-desc = Shows statistics for pow3r.
 cmd-powerstat-help = Usage: powerstat
 cmd-powerstat-output = Networks:   {$networks}
                        Loads:      {$loads}
diff --git a/Resources/Locale/en-US/commands/promote-host-command.ftl b/Resources/Locale/en-US/commands/promote-host-command.ftl
index f31deb6ee1..7155fecc26 100644
--- a/Resources/Locale/en-US/commands/promote-host-command.ftl
+++ b/Resources/Locale/en-US/commands/promote-host-command.ftl
@@ -1,2 +1,2 @@
-cmd-promotehost-desc = Grants client temporary full host admin privileges. Use this to bootstrap admins.
+cmd-promotehost-desc = Grants client temporary full host admin privileges. Use this to bootstrap admins.
 cmd-promotehost-help = Usage promotehost <player>
diff --git a/Resources/Locale/en-US/commands/readmin-command.ftl b/Resources/Locale/en-US/commands/readmin-command.ftl
index 4f6084903d..0a59cdc5fe 100644
--- a/Resources/Locale/en-US/commands/readmin-command.ftl
+++ b/Resources/Locale/en-US/commands/readmin-command.ftl
@@ -1,3 +1,3 @@
-cmd-readmin-desc = Re-admins you if you previously de-adminned.
+cmd-readmin-desc = Re-admins you if you previously de-adminned.
 cmd-readmin-help = Usage: readmin
 cmd-readmin-not-an-admin = You're not an admin.
diff --git a/Resources/Locale/en-US/commands/readyall-command.ftl b/Resources/Locale/en-US/commands/readyall-command.ftl
index e5642f5536..2f357ddc6f 100644
--- a/Resources/Locale/en-US/commands/readyall-command.ftl
+++ b/Resources/Locale/en-US/commands/readyall-command.ftl
@@ -1,2 +1,2 @@
-cmd-readyall-desc = Readies up all players in the lobby, except for observers.
+cmd-readyall-desc = Readies up all players in the lobby, except for observers.
 cmd-readyall-help = Usage: readyall [bool]
diff --git a/Resources/Locale/en-US/commands/remove-extra-components-command.ftl b/Resources/Locale/en-US/commands/remove-extra-components-command.ftl
index 8cd0fc5797..a39e1638aa 100644
--- a/Resources/Locale/en-US/commands/remove-extra-components-command.ftl
+++ b/Resources/Locale/en-US/commands/remove-extra-components-command.ftl
@@ -1,4 +1,4 @@
-cmd-removeextracomponents-desc = Removes all components from all entities of the specified id if that component is not in its prototype.\nIf no id is specified, it matches all entities.
+cmd-removeextracomponents-desc = Removes all components from all entities of the specified id if that component is not in its prototype.\nIf no id is specified, it matches all entities.
 cmd-removeextracomponents-help = removeextracomponents / removeextracomponents <entityId>
 cmd-removeextracomponents-invalid-prototype-id = Can't find entity prototype with id {$id}.
 cmd-removeextracomponents-success = Removed {$count} components from {$entities},
diff --git a/Resources/Locale/en-US/commands/restartround-command.ftl b/Resources/Locale/en-US/commands/restartround-command.ftl
index 22bf074452..ecbdcb063f 100644
--- a/Resources/Locale/en-US/commands/restartround-command.ftl
+++ b/Resources/Locale/en-US/commands/restartround-command.ftl
@@ -1,4 +1,4 @@
-cmd-restartround-desc = Ends the current round and starts the countdown for the next lobby.
+cmd-restartround-desc = Ends the current round and starts the countdown for the next lobby.
 cmd-restartround-help = Usage: restartround
 
 cmd-restartroundnow-desc = Moves the server from PostRound to a new PreRoundLobby.
diff --git a/Resources/Locale/en-US/commands/role-commands.ftl b/Resources/Locale/en-US/commands/role-commands.ftl
index ff8a2533e3..c2adca85e6 100644
--- a/Resources/Locale/en-US/commands/role-commands.ftl
+++ b/Resources/Locale/en-US/commands/role-commands.ftl
@@ -1,4 +1,4 @@
-cmd-addrole-desc = Adds a role to a player's mind.
+cmd-addrole-desc = Adds a role to a player's mind.
 cmd-addrole-help = Usage: addrole <session ID> <role>
 cmd-addrole-mind-not-found = Can't find that mind.
 cmd-addrole-role-not-found = Can't find that role.
diff --git a/Resources/Locale/en-US/commands/say-command.ftl b/Resources/Locale/en-US/commands/say-command.ftl
index 8deb7bdc45..d74ea43868 100644
--- a/Resources/Locale/en-US/commands/say-command.ftl
+++ b/Resources/Locale/en-US/commands/say-command.ftl
@@ -1,2 +1,2 @@
-cmd-say-desc = Send chat messages to the local channel or a specified radio channel.
+cmd-say-desc = Send chat messages to the local channel or a specified radio channel.
 cmd-say-help = Usage: say <text>
diff --git a/Resources/Locale/en-US/commands/set-battery-percent-command.ftl b/Resources/Locale/en-US/commands/set-battery-percent-command.ftl
index d7323e4831..d70283cadd 100644
--- a/Resources/Locale/en-US/commands/set-battery-percent-command.ftl
+++ b/Resources/Locale/en-US/commands/set-battery-percent-command.ftl
@@ -1,4 +1,4 @@
-cmd-setbatterypercent-desc = Drains or recharges a battery by entity uid and percentage, i.e.: forall with Battery do setbatterypercent $ID 0
+cmd-setbatterypercent-desc = Drains or recharges a battery by entity uid and percentage, i.e.: forall with Battery do setbatterypercent $ID 0
 cmd-setbatterypercent-help = Usage: setbatterypercent <id> <percent>
 cmd-setbatterypercent-battery-not-found = No battery found with id {$id}.
 cmd-setbatterypercent-not-valid-percent = {$arg} is not a valid float (percentage).
diff --git a/Resources/Locale/en-US/commands/set-menu-visibility-command.ftl b/Resources/Locale/en-US/commands/set-menu-visibility-command.ftl
index e3bcd51216..3d81abb5f7 100644
--- a/Resources/Locale/en-US/commands/set-menu-visibility-command.ftl
+++ b/Resources/Locale/en-US/commands/set-menu-visibility-command.ftl
@@ -1,3 +1,3 @@
 cmd-menuvis-desc = Set restrictions about what entities to show on the entity context menu.
 cmd-menuvis-help = Usage: {Command} [NoFoV] [InContainer] [Invisible] [All]
-cmd-menuvis-error = Unknown visibility argument '{$arg}'. Only 'NoFov', 'InContainer', 'Invisible' or 'All' are valid. Provide no arguments to set to default.
\ No newline at end of file
+cmd-menuvis-error = Unknown visibility argument '{$arg}'. Only 'NoFov', 'InContainer', 'Invisible' or 'All' are valid. Provide no arguments to set to default.
diff --git a/Resources/Locale/en-US/commands/show-access-readers-command.ftl b/Resources/Locale/en-US/commands/show-access-readers-command.ftl
index f74553a066..351c21fa3b 100644
--- a/Resources/Locale/en-US/commands/show-access-readers-command.ftl
+++ b/Resources/Locale/en-US/commands/show-access-readers-command.ftl
@@ -1,4 +1,4 @@
-cmd-showaccessreaders-desc = Toggles showing access reader permissions on the map
+cmd-showaccessreaders-desc = Toggles showing access reader permissions on the map
 cmd-showaccessreaders-help =
     Overlay Info:
     -Disabled | The access reader is disabled
diff --git a/Resources/Locale/en-US/commands/show-ambient-command.ftl b/Resources/Locale/en-US/commands/show-ambient-command.ftl
index 262bbca47b..98444797e0 100644
--- a/Resources/Locale/en-US/commands/show-ambient-command.ftl
+++ b/Resources/Locale/en-US/commands/show-ambient-command.ftl
@@ -1,3 +1,3 @@
-cmd-showambient-desc = Shows all AmbientSoundComponents in the viewport.
+cmd-showambient-desc = Shows all AmbientSoundComponents in the viewport.
 cmd-showambient-help = Usage: showambient
 cmd-showambient-status = Ambient sound overlay set to {$status}.
diff --git a/Resources/Locale/en-US/commands/show-emergency-shuttle-command.ftl b/Resources/Locale/en-US/commands/show-emergency-shuttle-command.ftl
index e51494685c..9572652c99 100644
--- a/Resources/Locale/en-US/commands/show-emergency-shuttle-command.ftl
+++ b/Resources/Locale/en-US/commands/show-emergency-shuttle-command.ftl
@@ -1,2 +1,2 @@
-cmd-showemergencyshuttle-desc = Shows the expected position of the emergency shuttle.
+cmd-showemergencyshuttle-desc = Shows the expected position of the emergency shuttle.
 cmd-showemergencyshuttle-status = Set emergency shuttle debug to {$status}.
diff --git a/Resources/Locale/en-US/commands/show-gun-spread-command.ftl b/Resources/Locale/en-US/commands/show-gun-spread-command.ftl
index a4a043e92e..5ba7a09f58 100644
--- a/Resources/Locale/en-US/commands/show-gun-spread-command.ftl
+++ b/Resources/Locale/en-US/commands/show-gun-spread-command.ftl
@@ -1,3 +1,3 @@
-cmd-showgunspread-desc = Shows gun spread overlay for debugging.
+cmd-showgunspread-desc = Shows gun spread overlay for debugging.
 cmd-showgunspreade-help = Usage: showgunspread
 cmd-showgunspread-status = Set spread overlay to {$status}.
diff --git a/Resources/Locale/en-US/commands/show-htn-command.ftl b/Resources/Locale/en-US/commands/show-htn-command.ftl
index 6580a41b98..05d1a753a7 100644
--- a/Resources/Locale/en-US/commands/show-htn-command.ftl
+++ b/Resources/Locale/en-US/commands/show-htn-command.ftl
@@ -1,2 +1,2 @@
-cmd-showhtn-desc = Shows the current status for HTN NPCs.
+cmd-showhtn-desc = Shows the current status for HTN NPCs.
 cmd-showhtn-help = Usage: showhtn
diff --git a/Resources/Locale/en-US/commands/showrules-command.ftl b/Resources/Locale/en-US/commands/showrules-command.ftl
index d997427de4..ebdfd5099a 100644
--- a/Resources/Locale/en-US/commands/showrules-command.ftl
+++ b/Resources/Locale/en-US/commands/showrules-command.ftl
@@ -1,3 +1,3 @@
-cmd-showrules-desc = Opens the rules popup for the specified player.
+cmd-showrules-desc = Opens the rules popup for the specified player.
 cmd-showrules-help = Usage: showrules <username> [seconds]
 cmd-showrules-invalid-seconds = {$seconds} is not a valid number of seconds!
diff --git a/Resources/Locale/en-US/commands/start-singularity-command.ftl b/Resources/Locale/en-US/commands/start-singularity-command.ftl
index 26c9c6a4fd..43aa81ba31 100644
--- a/Resources/Locale/en-US/commands/start-singularity-command.ftl
+++ b/Resources/Locale/en-US/commands/start-singularity-command.ftl
@@ -1,2 +1,2 @@
-cmd-startsingularityengine-desc = Automatically turns on the particle accelerator and containment field emitters.
+cmd-startsingularityengine-desc = Automatically turns on the particle accelerator and containment field emitters.
 cmd-startsingularityengine-help = Usage: startsingularityengine
diff --git a/Resources/Locale/en-US/commands/startround-command.ftl b/Resources/Locale/en-US/commands/startround-command.ftl
index 51e85e81b7..1056978701 100644
--- a/Resources/Locale/en-US/commands/startround-command.ftl
+++ b/Resources/Locale/en-US/commands/startround-command.ftl
@@ -1,2 +1,2 @@
-cmd-startround-desc = Ends PreRoundLobby state and starts the round.
+cmd-startround-desc = Ends PreRoundLobby state and starts the round.
 cmd-startround-help = Usage: startround
diff --git a/Resources/Locale/en-US/commands/tile-pry-command.ftl b/Resources/Locale/en-US/commands/tile-pry-command.ftl
index 5c7d313127..2941573d84 100644
--- a/Resources/Locale/en-US/commands/tile-pry-command.ftl
+++ b/Resources/Locale/en-US/commands/tile-pry-command.ftl
@@ -1,4 +1,4 @@
-cmd-tilepry-desc = Pries up all tiles in a radius around the user.
+cmd-tilepry-desc = Pries up all tiles in a radius around the user.
 cmd-tilepry-help = Usage: tilepry <radius>
 cmd-tilepry-radius-must-be-positive = Radius must be positive.
 cmd-tilepry-arg-must-be-number = {$arg} isn't a valid integer.
diff --git a/Resources/Locale/en-US/commands/toggle-decals-command.ftl b/Resources/Locale/en-US/commands/toggle-decals-command.ftl
index 0455704b3b..3b38d6ce6c 100644
--- a/Resources/Locale/en-US/commands/toggle-decals-command.ftl
+++ b/Resources/Locale/en-US/commands/toggle-decals-command.ftl
@@ -1,2 +1,2 @@
-cmd-toggledecals-desc = Toggles decal overlay.
+cmd-toggledecals-desc = Toggles decal overlay.
 cmd-toggledecals-help = Usage: toggledecals
diff --git a/Resources/Locale/en-US/commands/toggle-disallow-late-join-command.ftl b/Resources/Locale/en-US/commands/toggle-disallow-late-join-command.ftl
index 1f797b4141..bb0de5d4ef 100644
--- a/Resources/Locale/en-US/commands/toggle-disallow-late-join-command.ftl
+++ b/Resources/Locale/en-US/commands/toggle-disallow-late-join-command.ftl
@@ -1,4 +1,4 @@
-cmd-toggledisallowlatejoin-desc = Allows or disallows latejoining during mid-game.
+cmd-toggledisallowlatejoin-desc = Allows or disallows latejoining during mid-game.
 cmd-toggledisallowlatejoin-help = Usage: toggledisallowlatejoin <disallow>
 cmd-toggledisallowlatejoin-disabled = Late joining has been disabled.
 cmd-toggledisallowlatejoin-enabled = Late joining has been enabled.
diff --git a/Resources/Locale/en-US/commands/toggle-outline-command.ftl b/Resources/Locale/en-US/commands/toggle-outline-command.ftl
index ac323f4dc8..0874c21803 100644
--- a/Resources/Locale/en-US/commands/toggle-outline-command.ftl
+++ b/Resources/Locale/en-US/commands/toggle-outline-command.ftl
@@ -1,3 +1,3 @@
 cmd-toggleoutline-desc = Toggles outline drawing on entities.
 cmd-toggleoutline-help = Usage: {$command}
-cmd-toggleoutline-notify = Draw outlines set to: {$cvar}
\ No newline at end of file
+cmd-toggleoutline-notify = Draw outlines set to: {$cvar}
diff --git a/Resources/Locale/en-US/commands/toggleready-command.ftl b/Resources/Locale/en-US/commands/toggleready-command.ftl
index 0dfd3a9b9d..701e30323b 100644
--- a/Resources/Locale/en-US/commands/toggleready-command.ftl
+++ b/Resources/Locale/en-US/commands/toggleready-command.ftl
@@ -1,2 +1,2 @@
-cmd-toggleready-desc = Toggle the players ready status.
+cmd-toggleready-desc = Toggle the players ready status.
 cmd-toggleready-help = Usage: toggleready <ready>
diff --git a/Resources/Locale/en-US/commands/toolshed/xenoartifact-command.ftl b/Resources/Locale/en-US/commands/toolshed/xenoartifact-command.ftl
index e65443defd..2aa21f8efd 100644
--- a/Resources/Locale/en-US/commands/toolshed/xenoartifact-command.ftl
+++ b/Resources/Locale/en-US/commands/toolshed/xenoartifact-command.ftl
@@ -26,4 +26,4 @@ command-spawnartifactwithnode-spawn-artifact-item-hint = use hand-held artifact
 command-spawnartifactwithnode-spawn-artifact-structure-hint = use structure-like stationary artifact
 command-spawnartifactwithnode-spawn-artifact-type-hint = <artifact entity proto id>
 
-command-xenoartifact-common-node-hint = depth {$depth} node {$nodeId} trigger {$nodeDetail}
+command-xenoartifact-common-node-hint = depth {$depth} node {$nodeId} trigger: '{$trigger}', effect: '{$effect}'
diff --git a/Resources/Locale/en-US/commands/whisper-command.ftl b/Resources/Locale/en-US/commands/whisper-command.ftl
index 7dfe909f24..76331a0cd4 100644
--- a/Resources/Locale/en-US/commands/whisper-command.ftl
+++ b/Resources/Locale/en-US/commands/whisper-command.ftl
@@ -1,2 +1,2 @@
-cmd-whisper-desc = Send chat messages to the local channel as a whisper.
+cmd-whisper-desc = Send chat messages to the local channel as a whisper.
 cmd-whisper-help = Usage: whisper <text>
diff --git a/Resources/Locale/en-US/components/atmos-monitoring-component.ftl b/Resources/Locale/en-US/components/atmos-monitoring-component.ftl
index eab6f50c60..7bbd077fb3 100644
--- a/Resources/Locale/en-US/components/atmos-monitoring-component.ftl
+++ b/Resources/Locale/en-US/components/atmos-monitoring-component.ftl
@@ -11,4 +11,4 @@ atmos-monitoring-window-show-pipe-network = Pipe network
 atmos-monitoring-window-show-gas-pipe-sensors = Gas pipe sensors
 atmos-monitoring-window-label-gases = Present gases
 atmos-monitoring-window-flavor-left = Contact an atmospheric technician for assistance
-atmos-monitoring-window-flavor-right = v1.1
\ No newline at end of file
+atmos-monitoring-window-flavor-right = v1.1
diff --git a/Resources/Locale/en-US/components/gas-pressure-regulator-component.ftl b/Resources/Locale/en-US/components/gas-pressure-regulator-component.ftl
index 2434e2df63..7541a977a5 100644
--- a/Resources/Locale/en-US/components/gas-pressure-regulator-component.ftl
+++ b/Resources/Locale/en-US/components/gas-pressure-regulator-component.ftl
@@ -1,4 +1,4 @@
-# UI Labels
+# UI Labels
 gas-pressure-regulator-ui-set-threshold = Set
 gas-pressure-regulator-ui-zero-threshold = Zero
 gas-pressure-regulator-ui-set-to-current-pressure = Set to Inlet Pressure
diff --git a/Resources/Locale/en-US/components/gas-thermomachine-component.ftl b/Resources/Locale/en-US/components/gas-thermomachine-component.ftl
index f5cdb7949e..8158d5489b 100644
--- a/Resources/Locale/en-US/components/gas-thermomachine-component.ftl
+++ b/Resources/Locale/en-US/components/gas-thermomachine-component.ftl
@@ -1,4 +1,4 @@
-comp-gas-thermomachine-ui-title-freezer = Freezer
+comp-gas-thermomachine-ui-title-freezer = Freezer
 comp-gas-thermomachine-ui-title-heater = Heater
 
 comp-gas-thermomachine-ui-temperature = Temperature (K):
diff --git a/Resources/Locale/en-US/components/ghost-component.ftl b/Resources/Locale/en-US/components/ghost-component.ftl
index e691da8886..b9cc4e537a 100644
--- a/Resources/Locale/en-US/components/ghost-component.ftl
+++ b/Resources/Locale/en-US/components/ghost-component.ftl
@@ -1,3 +1,3 @@
-# Examine text
+# Examine text
 comp-ghost-examine-time-minutes = Died [color=yellow]{$minutes} minutes ago.[/color]
 comp-ghost-examine-time-seconds = Died [color=yellow]{$seconds} seconds ago.[/color]
diff --git a/Resources/Locale/en-US/components/screen-component.ftl b/Resources/Locale/en-US/components/screen-component.ftl
index baa3229533..6d3ae2ac5f 100644
--- a/Resources/Locale/en-US/components/screen-component.ftl
+++ b/Resources/Locale/en-US/components/screen-component.ftl
@@ -1,2 +1,2 @@
 screen-text = screenText
-screen-color = screenColor
\ No newline at end of file
+screen-color = screenColor
diff --git a/Resources/Locale/en-US/components/space-heater-component.ftl b/Resources/Locale/en-US/components/space-heater-component.ftl
index d373a6dc6f..2b8051dddb 100644
--- a/Resources/Locale/en-US/components/space-heater-component.ftl
+++ b/Resources/Locale/en-US/components/space-heater-component.ftl
@@ -1,4 +1,4 @@
-comp-space-heater-ui-title = Temperature Control Unit
+comp-space-heater-ui-title = Temperature Control Unit
 comp-space-heater-ui-thermostat = Thermostat:
 comp-space-heater-ui-mode = Mode
 comp-space-heater-ui-increase-temperature-range = +
diff --git a/Resources/Locale/en-US/components/station-anchor-component.ftl b/Resources/Locale/en-US/components/station-anchor-component.ftl
index 18221e945a..0210bcedf3 100644
--- a/Resources/Locale/en-US/components/station-anchor-component.ftl
+++ b/Resources/Locale/en-US/components/station-anchor-component.ftl
@@ -1,2 +1,2 @@
-station-anchor-unanchoring-failed = Can't unanchor an active station anchor.
+station-anchor-unanchoring-failed = Can't unanchor an active station anchor.
 station-anchor-window-title = Station Anchor
diff --git a/Resources/Locale/en-US/components/storage-voice-control-component.ftl b/Resources/Locale/en-US/components/storage-voice-control-component.ftl
index 019b5ecfa1..3187e16b5f 100644
--- a/Resources/Locale/en-US/components/storage-voice-control-component.ftl
+++ b/Resources/Locale/en-US/components/storage-voice-control-component.ftl
@@ -1 +1 @@
-comp-storagevoicecontrol-self-insert = You can't insert { THE($entity) } into itself!
+comp-storagevoicecontrol-self-insert = You can't insert { THE($entity) } into itself!
diff --git a/Resources/Locale/en-US/configurable/configuration-component.ftl b/Resources/Locale/en-US/configurable/configuration-component.ftl
index 5632003c2c..20c7b93097 100644
--- a/Resources/Locale/en-US/configurable/configuration-component.ftl
+++ b/Resources/Locale/en-US/configurable/configuration-component.ftl
@@ -1,6 +1,6 @@
-
+
 configuration-menu-confirm = Confirm
 configuration-menu-device-title = Device Configuration
 
 ## ConfigureVerb
-configure-verb-get-data-text = Open Configuration
\ No newline at end of file
+configure-verb-get-data-text = Open Configuration
diff --git a/Resources/Locale/en-US/connection-messages.ftl b/Resources/Locale/en-US/connection-messages.ftl
index 3a9bd5f097..dd304fd86d 100644
--- a/Resources/Locale/en-US/connection-messages.ftl
+++ b/Resources/Locale/en-US/connection-messages.ftl
@@ -1,4 +1,4 @@
-cmd-whitelistadd-desc = Adds the player with the given username to the server whitelist.
+cmd-whitelistadd-desc = Adds the player with the given username to the server whitelist.
 cmd-whitelistadd-help = Usage: whitelistadd <username or User ID>
 cmd-whitelistadd-existing = {$username} is already on the whitelist!
 cmd-whitelistadd-added = {$username} added to the whitelist
diff --git a/Resources/Locale/en-US/construction/components/construction-component-verbs.ftl b/Resources/Locale/en-US/construction/components/construction-component-verbs.ftl
index d884ddc376..e14eedbacc 100644
--- a/Resources/Locale/en-US/construction/components/construction-component-verbs.ftl
+++ b/Resources/Locale/en-US/construction/components/construction-component-verbs.ftl
@@ -1,3 +1,3 @@
 deconstructible-verb-begin-deconstruct = Begin deconstructing 
 deconstructible-verb-activate-no-target-text = There is no way to deconstruct this.
-deconstructible-verb-activate-text = Examine to see instructions.
\ No newline at end of file
+deconstructible-verb-activate-text = Examine to see instructions.
diff --git a/Resources/Locale/en-US/construction/components/machine-board-component.ftl b/Resources/Locale/en-US/construction/components/machine-board-component.ftl
index 6c926c7552..b4b5e1bd7d 100644
--- a/Resources/Locale/en-US/construction/components/machine-board-component.ftl
+++ b/Resources/Locale/en-US/construction/components/machine-board-component.ftl
@@ -1,2 +1,2 @@
 machine-board-component-on-examine-label = Requires:
-machine-board-component-required-element-entry-text = [color=yellow]{$amount}x[/color] [color=green]{$requiredElement}[/color]
\ No newline at end of file
+machine-board-component-required-element-entry-text = [color=yellow]{$amount}x[/color] [color=green]{$requiredElement}[/color]
diff --git a/Resources/Locale/en-US/construction/conditions/locked.ftl b/Resources/Locale/en-US/construction/conditions/locked.ftl
index 8093ee27a1..f7baad5242 100644
--- a/Resources/Locale/en-US/construction/conditions/locked.ftl
+++ b/Resources/Locale/en-US/construction/conditions/locked.ftl
@@ -2,4 +2,4 @@
 construction-examine-condition-unlock = First, [color=limegreen]unlock[/color] it.
 construction-examine-condition-lock = First, [color=red]lock[/color] it.
 construction-step-condition-unlock = It must be unlocked.
-construction-step-condition-lock = It must be locked.
\ No newline at end of file
+construction-step-condition-lock = It must be locked.
diff --git a/Resources/Locale/en-US/construction/construction-categories.ftl b/Resources/Locale/en-US/construction/construction-categories.ftl
index 85d14cf2eb..64dbb8df7b 100644
--- a/Resources/Locale/en-US/construction/construction-categories.ftl
+++ b/Resources/Locale/en-US/construction/construction-categories.ftl
@@ -1,4 +1,4 @@
-construction-category-all = All
+construction-category-all = All
 construction-category-atmospherics = Atmospherics
 construction-category-furniture = Furniture
 construction-category-storage = Storage
diff --git a/Resources/Locale/en-US/construction/construction-ghost-component.ftl b/Resources/Locale/en-US/construction/construction-ghost-component.ftl
index 893e173d55..9c6c37719b 100644
--- a/Resources/Locale/en-US/construction/construction-ghost-component.ftl
+++ b/Resources/Locale/en-US/construction/construction-ghost-component.ftl
@@ -1 +1 @@
-construction-ghost-examine-message = Building: [color=cyan]{$name}[/color]
\ No newline at end of file
+construction-ghost-examine-message = Building: [color=cyan]{$name}[/color]
diff --git a/Resources/Locale/en-US/construction/recipes/structures.ftl b/Resources/Locale/en-US/construction/recipes/structures.ftl
index 6534277937..bb299532d5 100644
--- a/Resources/Locale/en-US/construction/recipes/structures.ftl
+++ b/Resources/Locale/en-US/construction/recipes/structures.ftl
@@ -22,6 +22,6 @@ construction-recipe-fence-wood-t-junction-small = small wooden fence T-junction
 construction-recipe-fence-wood-gate-small = small wooden fence gate
 construction-recipe-pinion-airlock = clockwork airlock
 construction-recipe-pinion-airlock-glass = glass clockwork airlock
-construction-recipe-airlock-glass-shuttle = glass shuttle airlock
+construction-recipe-airlock-glass-shuttle = glass docking airlock
 construction-recipe-plastic-flaps-clear = plastic flaps (clear)
 construction-recipe-plastic-flaps-opaque = plastic flaps (opaque)
diff --git a/Resources/Locale/en-US/construction/steps/component-construction-graph-step.ftl b/Resources/Locale/en-US/construction/steps/component-construction-graph-step.ftl
index 4e4cb8a462..e295dc14a7 100644
--- a/Resources/Locale/en-US/construction/steps/component-construction-graph-step.ftl
+++ b/Resources/Locale/en-US/construction/steps/component-construction-graph-step.ftl
@@ -2,4 +2,4 @@
 construction-insert-entity-with-component = Next, insert an entity with a {$componentName} component.
 
 # Shown when examining an in-construction object
-construction-insert-exact-entity = Next, insert {$entityName}.
\ No newline at end of file
+construction-insert-exact-entity = Next, insert {$entityName}.
diff --git a/Resources/Locale/en-US/construction/steps/material-construction-graph-step.ftl b/Resources/Locale/en-US/construction/steps/material-construction-graph-step.ftl
index 54e72d22fb..bf1b77e6d6 100644
--- a/Resources/Locale/en-US/construction/steps/material-construction-graph-step.ftl
+++ b/Resources/Locale/en-US/construction/steps/material-construction-graph-step.ftl
@@ -1 +1 @@
-construction-insert-material-entity = Next, add [color=yellow]{$amount}x[/color] [color=cyan]{$materialName}[/color].
\ No newline at end of file
+construction-insert-material-entity = Next, add [color=yellow]{$amount}x[/color] [color=cyan]{$materialName}[/color].
diff --git a/Resources/Locale/en-US/construction/steps/prototype-construction-graph-step.ftl b/Resources/Locale/en-US/construction/steps/prototype-construction-graph-step.ftl
index 9cd828f31f..9dcd8dec23 100644
--- a/Resources/Locale/en-US/construction/steps/prototype-construction-graph-step.ftl
+++ b/Resources/Locale/en-US/construction/steps/prototype-construction-graph-step.ftl
@@ -2,4 +2,4 @@
 construction-insert-prototype-no-name = Next, insert {$prototypeName}.
 
 # Shown when examining an in-construction object
-construction-insert-prototype = Next, insert {$entityName}.
\ No newline at end of file
+construction-insert-prototype = Next, insert {$entityName}.
diff --git a/Resources/Locale/en-US/construction/steps/tool-construction-graph-step.ftl b/Resources/Locale/en-US/construction/steps/tool-construction-graph-step.ftl
index ac32fee293..1510c82cc9 100644
--- a/Resources/Locale/en-US/construction/steps/tool-construction-graph-step.ftl
+++ b/Resources/Locale/en-US/construction/steps/tool-construction-graph-step.ftl
@@ -1 +1 @@
-construction-use-tool-entity = Next, use a [color=cyan]{$toolName}[/color].
\ No newline at end of file
+construction-use-tool-entity = Next, use a [color=cyan]{$toolName}[/color].
diff --git a/Resources/Locale/en-US/construction/ui/construction-menu-presenter.ftl b/Resources/Locale/en-US/construction/ui/construction-menu-presenter.ftl
index c51752f54a..7961461dd9 100644
--- a/Resources/Locale/en-US/construction/ui/construction-menu-presenter.ftl
+++ b/Resources/Locale/en-US/construction/ui/construction-menu-presenter.ftl
@@ -1,4 +1,4 @@
-construction-presenter-to-craft = To craft this item, you need to:
+construction-presenter-to-craft = To craft this item, you need to:
 construction-presenter-to-build = To build this, first you need to:
 
 construction-presenter-step-wrapper = {$step-number}. {$text}
diff --git a/Resources/Locale/en-US/containers/containers.ftl b/Resources/Locale/en-US/containers/containers.ftl
index d96383305a..ec76e0be80 100644
--- a/Resources/Locale/en-US/containers/containers.ftl
+++ b/Resources/Locale/en-US/containers/containers.ftl
@@ -2,4 +2,4 @@ container-verb-text-enter = Enter
 container-verb-text-empty = Empty
 
 ## missed
-container-thrown-missed = Missed!
\ No newline at end of file
+container-thrown-missed = Missed!
diff --git a/Resources/Locale/en-US/cvar/cvar-help.ftl b/Resources/Locale/en-US/cvar/cvar-help.ftl
index 03f5ab7107..33791410a1 100644
--- a/Resources/Locale/en-US/cvar/cvar-help.ftl
+++ b/Resources/Locale/en-US/cvar/cvar-help.ftl
@@ -1,4 +1,4 @@
-changecvar-simple-debug_test_cvar = Does nothing.
+changecvar-simple-debug_test_cvar = Does nothing.
 changecvar-full-debug_test_cvar = Just a simple testing cvar. Does nothing.
 
 changecvar-simple-events_enabled = Controls if the game should run station events.
diff --git a/Resources/Locale/en-US/damage/damage-command.ftl b/Resources/Locale/en-US/damage/damage-command.ftl
index 2d6816225c..cbaf889412 100644
--- a/Resources/Locale/en-US/damage/damage-command.ftl
+++ b/Resources/Locale/en-US/damage/damage-command.ftl
@@ -1,4 +1,4 @@
-## Damage command loc.
+## Damage command loc.
 
 damage-command-description = Add or remove damage to an entity. 
 damage-command-help = Usage: {$command} <type/group> <amount> [ignoreResistances] [uid]
@@ -12,4 +12,4 @@ damage-command-error-euid = {$arg} is not a valid entity uid.
 damage-command-error-quantity = {$arg} is not a valid quantity.
 damage-command-error-bool = {$arg} is not a valid bool.
 damage-command-error-player = No entity attached to session. You must specify a target uid
-damage-command-error-args = Invalid number of arguments 
\ No newline at end of file
+damage-command-error-args = Invalid number of arguments 
diff --git a/Resources/Locale/en-US/damage/damage-force-say.ftl b/Resources/Locale/en-US/damage/damage-force-say.ftl
index 83934a181e..283b684d50 100644
--- a/Resources/Locale/en-US/damage/damage-force-say.ftl
+++ b/Resources/Locale/en-US/damage/damage-force-say.ftl
@@ -1,4 +1,4 @@
-damage-force-say-message-wrap = {$message}-{$suffix}
+damage-force-say-message-wrap = {$message}-{$suffix}
 damage-force-say-message-wrap-no-suffix = {$message}-
 
 damage-force-say-1 = GACK!
diff --git a/Resources/Locale/en-US/damage/damage-popup-component.ftl b/Resources/Locale/en-US/damage/damage-popup-component.ftl
index 3ab9c37c02..d2bea0d7e0 100644
--- a/Resources/Locale/en-US/damage/damage-popup-component.ftl
+++ b/Resources/Locale/en-US/damage/damage-popup-component.ftl
@@ -7,4 +7,4 @@
        *[other] Unknown
     }
 
-damage-popup-component-switched = Target set to type: { -damage-popup-component-type(setting: $setting) }
\ No newline at end of file
+damage-popup-component-switched = Target set to type: { -damage-popup-component-type(setting: $setting) }
diff --git a/Resources/Locale/en-US/damage/rejuvenate-verb.ftl b/Resources/Locale/en-US/damage/rejuvenate-verb.ftl
index 88b499b357..6c6daf372d 100644
--- a/Resources/Locale/en-US/damage/rejuvenate-verb.ftl
+++ b/Resources/Locale/en-US/damage/rejuvenate-verb.ftl
@@ -1 +1 @@
-rejuvenate-verb-get-data-text = Rejuvenate
\ No newline at end of file
+rejuvenate-verb-get-data-text = Rejuvenate
diff --git a/Resources/Locale/en-US/darts/darts-popup.ftl b/Resources/Locale/en-US/darts/darts-popup.ftl
index 82bf7fde53..6d54b022b5 100644
--- a/Resources/Locale/en-US/darts/darts-popup.ftl
+++ b/Resources/Locale/en-US/darts/darts-popup.ftl
@@ -3,4 +3,4 @@ darts-popup-25 = 25 points
 darts-popup-10 = 10 points
 darts-popup-5 = 5 points
 darts-popup-1 = 1 point
-darts-popup-miss = Miss
\ No newline at end of file
+darts-popup-miss = Miss
diff --git a/Resources/Locale/en-US/datasets/names/arachnid_last.ftl b/Resources/Locale/en-US/datasets/names/arachnid_last.ftl
index 826b3bc837..21de270fee 100644
--- a/Resources/Locale/en-US/datasets/names/arachnid_last.ftl
+++ b/Resources/Locale/en-US/datasets/names/arachnid_last.ftl
@@ -65,4 +65,4 @@ names-arachnid-last-dataset-64 = Viridans
 names-arachnid-last-dataset-65 = Walckenaeri
 names-arachnid-last-dataset-66 = Walckenaerius
 names-arachnid-last-dataset-67 = Wisharti
-names-arachnid-last-dataset-68 = X-Notata
\ No newline at end of file
+names-arachnid-last-dataset-68 = X-Notata
diff --git a/Resources/Locale/en-US/datasets/names/wizard_first.ftl b/Resources/Locale/en-US/datasets/names/wizard_first.ftl
index ad11ea529c..8a30788fd3 100644
--- a/Resources/Locale/en-US/datasets/names/wizard_first.ftl
+++ b/Resources/Locale/en-US/datasets/names/wizard_first.ftl
@@ -41,4 +41,4 @@ names-wizard-first-dataset-40 = Xom
 names-wizard-first-dataset-41 = Yredelemnul
 names-wizard-first-dataset-42 = Yodalf
 names-wizard-first-dataset-43 = Zartemis
-names-wizard-first-dataset-44 = Zin
\ No newline at end of file
+names-wizard-first-dataset-44 = Zin
diff --git a/Resources/Locale/en-US/decals/decal-window.ftl b/Resources/Locale/en-US/decals/decal-window.ftl
index ce1be838ba..57f82fe9e5 100644
--- a/Resources/Locale/en-US/decals/decal-window.ftl
+++ b/Resources/Locale/en-US/decals/decal-window.ftl
@@ -1,4 +1,4 @@
-decal-placer-window-title = Decal Placer
+decal-placer-window-title = Decal Placer
 decal-placer-window-use-color = Custom Color
 decal-placer-window-rotation = Rotation
 decal-placer-window-zindex = Draw Depth
diff --git a/Resources/Locale/en-US/detail-examinable/detail-examinable.ftl b/Resources/Locale/en-US/detail-examinable/detail-examinable.ftl
index 12754c6cbb..486fac6ff6 100644
--- a/Resources/Locale/en-US/detail-examinable/detail-examinable.ftl
+++ b/Resources/Locale/en-US/detail-examinable/detail-examinable.ftl
@@ -1,2 +1,2 @@
-detail-examinable-verb-text = Detail
+detail-examinable-verb-text = Detail
 detail-examinable-verb-disabled = View the object in greater detail.
diff --git a/Resources/Locale/en-US/devices/device-network.ftl b/Resources/Locale/en-US/devices/device-network.ftl
index 7151e218f3..c198215867 100644
--- a/Resources/Locale/en-US/devices/device-network.ftl
+++ b/Resources/Locale/en-US/devices/device-network.ftl
@@ -1,4 +1,4 @@
-# named frequencies
+# Named frequencies
 device-frequency-prototype-name-atmos = Atmospheric Devices
 device-frequency-prototype-name-suit-sensors = Suit Sensors
 device-frequency-prototype-name-crew-monitor = Crew Monitor
@@ -13,8 +13,11 @@ device-frequency-prototype-name-turret = Sentry Turret
 device-frequency-prototype-name-turret-control = Sentry Turret Control
 device-frequency-prototype-name-xenoborg = Xenoborg
 device-frequency-prototype-name-mothership = Mothership
+device-frequency-prototype-name-arrivals-shuttle-timer = Arrivals Timer
+device-frequency-prototype-name-shuttle-timer = Evac Shuttle Timer
 
-## camera frequencies
+## Camera frequencies
+device-frequency-prototype-name-surveillance-camera = Cameras
 device-frequency-prototype-name-surveillance-camera-test = Subnet Test
 device-frequency-prototype-name-surveillance-camera-engineering = Engineering Cameras
 device-frequency-prototype-name-surveillance-camera-security = Security Cameras
@@ -26,7 +29,7 @@ device-frequency-prototype-name-surveillance-camera-medical = Medical Cameras
 device-frequency-prototype-name-surveillance-camera-general = General Cameras
 device-frequency-prototype-name-surveillance-camera-entertainment = Entertainment Cameras
 
-# prefixes for randomly generated device addresses
+# Prefixes for randomly generated device addresses
 device-address-prefix-vent = VNT-
 device-address-prefix-scrubber = SCR-
 device-address-prefix-sensor = SNS-
@@ -43,7 +46,16 @@ device-address-prefix-console = CLS-
 device-address-prefix-fire-alarm = FIR-
 device-address-prefix-air-alarm = AIR-
 
-device-address-prefix-sensor-monitor = MON-
+# Consoles
+device-address-prefix-sensor-monitor = SEM-
+device-address-prefix-camera-monitor = SCM-
+device-address-prefix-crew-monitor = MCM-
+
+# Servers and routers
+device-address-prefix-camera-router = CMR-
+device-address-prefix-camera-router-wireless = CMW-
+device-address-prefix-camera = CAM-
+device-address-prefix-crew-monitoring-server = CMS-
 
 device-address-examine-message = The device's address is {$address}.
 
diff --git a/Resources/Locale/en-US/devices/network-configurator.ftl b/Resources/Locale/en-US/devices/network-configurator.ftl
index 092a3fb0fa..78f02ca2c9 100644
--- a/Resources/Locale/en-US/devices/network-configurator.ftl
+++ b/Resources/Locale/en-US/devices/network-configurator.ftl
@@ -1,4 +1,4 @@
-# Popups
+# Popups
 
 network-configurator-device-saved = Successfully saved network device {$device} with address {$address}!
 network-configurator-device-failed = Failed to save network device {$device}! No address assigned!
diff --git a/Resources/Locale/en-US/discord/round-notifications.ftl b/Resources/Locale/en-US/discord/round-notifications.ftl
index ce5045452b..7402eeee0c 100644
--- a/Resources/Locale/en-US/discord/round-notifications.ftl
+++ b/Resources/Locale/en-US/discord/round-notifications.ftl
@@ -1,4 +1,4 @@
-discord-round-notifications-new = A new round is starting!
+discord-round-notifications-new = A new round is starting!
 discord-round-notifications-started = Round #{$id} on map "{$map}" started.
 discord-round-notifications-end = Round #{$id} has ended. It lasted for {$hours} hours, {$minutes} minutes, and {$seconds} seconds.
 discord-round-notifications-end-ping = <@&{$roleId}>, a new round will start soon!
diff --git a/Resources/Locale/en-US/disease/disease.ftl b/Resources/Locale/en-US/disease/disease.ftl
index 296fb4d925..28ece3a988 100644
--- a/Resources/Locale/en-US/disease/disease.ftl
+++ b/Resources/Locale/en-US/disease/disease.ftl
@@ -1 +1 @@
-disease-vomit = {CAPITALIZE(THE($person))} vomits.
\ No newline at end of file
+disease-vomit = {CAPITALIZE(THE($person))} vomits.
diff --git a/Resources/Locale/en-US/disposal/tube-connections-command.ftl b/Resources/Locale/en-US/disposal/tube-connections-command.ftl
index 44b8682ce5..9deb2d15f2 100644
--- a/Resources/Locale/en-US/disposal/tube-connections-command.ftl
+++ b/Resources/Locale/en-US/disposal/tube-connections-command.ftl
@@ -1,2 +1,2 @@
 tube-connections-command-description = Shows all the directions that a tube can connect in.
-tube-connections-command-help-text = Usage: {$command} <entityUid>
\ No newline at end of file
+tube-connections-command-help-text = Usage: {$command} <entityUid>
diff --git a/Resources/Locale/en-US/disposal/tube/components/disposal-tube-component.ftl b/Resources/Locale/en-US/disposal/tube/components/disposal-tube-component.ftl
index 251731f913..2ca556adde 100644
--- a/Resources/Locale/en-US/disposal/tube/components/disposal-tube-component.ftl
+++ b/Resources/Locale/en-US/disposal/tube/components/disposal-tube-component.ftl
@@ -2,4 +2,4 @@ disposal-tube-component-popup-directions-text = {$directions}
 
 ## TubeDirectionVerb
 
-tube-direction-verb-get-data-text = Tube Directions
\ No newline at end of file
+tube-direction-verb-get-data-text = Tube Directions
diff --git a/Resources/Locale/en-US/doors/components/airlock-component.ftl b/Resources/Locale/en-US/doors/components/airlock-component.ftl
index 27861ec4e2..424ac24cf1 100644
--- a/Resources/Locale/en-US/doors/components/airlock-component.ftl
+++ b/Resources/Locale/en-US/doors/components/airlock-component.ftl
@@ -1,4 +1,4 @@
 ## AirlockComponent
 
 airlock-component-cannot-pry-is-bolted-message = The airlock's bolts prevent it from being forced!
-airlock-component-cannot-pry-is-powered-message = The powered motors block your efforts!
\ No newline at end of file
+airlock-component-cannot-pry-is-powered-message = The powered motors block your efforts!
diff --git a/Resources/Locale/en-US/doors/door.ftl b/Resources/Locale/en-US/doors/door.ftl
index 04bbd8c07a..1103141d64 100644
--- a/Resources/Locale/en-US/doors/door.ftl
+++ b/Resources/Locale/en-US/doors/door.ftl
@@ -1 +1 @@
-door-pry = Pry door
\ No newline at end of file
+door-pry = Pry door
diff --git a/Resources/Locale/en-US/drag-drop/drag-drop-system.ftl b/Resources/Locale/en-US/drag-drop/drag-drop-system.ftl
index 421f598959..b89226192f 100644
--- a/Resources/Locale/en-US/drag-drop/drag-drop-system.ftl
+++ b/Resources/Locale/en-US/drag-drop/drag-drop-system.ftl
@@ -1 +1 @@
-drag-drop-system-out-of-range-text = You can't reach there!
\ No newline at end of file
+drag-drop-system-out-of-range-text = You can't reach there!
diff --git a/Resources/Locale/en-US/engineering/inflatables.ftl b/Resources/Locale/en-US/engineering/inflatables.ftl
index 0c4a2d44c0..188244eecf 100644
--- a/Resources/Locale/en-US/engineering/inflatables.ftl
+++ b/Resources/Locale/en-US/engineering/inflatables.ftl
@@ -1 +1 @@
-inflatable-safe-disassembly = You expertly use { THE($item) } to open the valve on { THE($target) }, and start deflating { OBJECT($target) } without causing damage.
+inflatable-safe-disassembly = You expertly use { THE($item) } to open the valve on { THE($target) }, and start deflating { OBJECT($target) } without causing damage.
diff --git a/Resources/Locale/en-US/ensnare/ensnare-component.ftl b/Resources/Locale/en-US/ensnare/ensnare-component.ftl
index 1566b7cffa..9ecb402025 100644
--- a/Resources/Locale/en-US/ensnare/ensnare-component.ftl
+++ b/Resources/Locale/en-US/ensnare/ensnare-component.ftl
@@ -1,4 +1,4 @@
-ensnare-component-try-free = You struggle to remove {$ensnare} that's ensnaring you!
+ensnare-component-try-free = You struggle to remove {$ensnare} that's ensnaring you!
 ensnare-component-try-free-complete = You successfully free yourself from the {$ensnare}!
 ensnare-component-try-free-fail = You fail to free yourself from the {$ensnare}!
 
diff --git a/Resources/Locale/en-US/entity-categories.ftl b/Resources/Locale/en-US/entity-categories.ftl
index 3ed481333e..157115ac6d 100644
--- a/Resources/Locale/en-US/entity-categories.ftl
+++ b/Resources/Locale/en-US/entity-categories.ftl
@@ -6,5 +6,6 @@ entity-category-name-mapping = Mapping
 entity-category-name-donotmap = Do not map
 entity-category-name-status-effects = Status Effects
 entity-category-name-xeno-artifact-effects = Xeno Artifact Effects
+entity-category-name-xeno-artifact-triggers = Xeno Artifact triggers
 
 entity-category-suffix-donotmap = DO NOT MAP
diff --git a/Resources/Locale/en-US/entity-systems/bin-system/bin-system.ftl b/Resources/Locale/en-US/entity-systems/bin-system/bin-system.ftl
index eb0f6a35b0..fddeb5e5cb 100644
--- a/Resources/Locale/en-US/entity-systems/bin-system/bin-system.ftl
+++ b/Resources/Locale/en-US/entity-systems/bin-system/bin-system.ftl
@@ -1 +1 @@
-bin-component-on-examine-text = Looks like there's {$count} items left.
+bin-component-on-examine-text = Looks like there's {$count} items left.
diff --git a/Resources/Locale/en-US/escape-menu/ui/escape-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/escape-menu.ftl
index 09cfd9a1b3..e621708fef 100644
--- a/Resources/Locale/en-US/escape-menu/ui/escape-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/escape-menu.ftl
@@ -8,6 +8,7 @@ ui-escape-wiki = Wiki
 ui-escape-disconnect = Disconnect
 ui-escape-quit = Quit
 ui-escape-feedback = Feedback
+ui-escape-bug-report = Report Bugs
 ui-escape-remarks = Admin Remarks
 
 ui-escape-remarks-button-disabled = This functionality has been disabled by the server.
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 7b6caf1829..5996e122b8 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -63,7 +63,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-chat-follow-button = As ghost, show a follow button next to chat messages
 ui-options-vsync = VSync
 ui-options-max-fps = Maximum FPS:
 ui-options-max-fps-display-rate = Display Rate
diff --git a/Resources/Locale/en-US/fluids/components/drain-component.ftl b/Resources/Locale/en-US/fluids/components/drain-component.ftl
index 897971a788..5a428997b9 100644
--- a/Resources/Locale/en-US/fluids/components/drain-component.ftl
+++ b/Resources/Locale/en-US/fluids/components/drain-component.ftl
@@ -1,4 +1,4 @@
-drain-component-empty-verb-using-is-empty-message = { CAPITALIZE(THE($object)) } is empty!
+drain-component-empty-verb-using-is-empty-message = { CAPITALIZE(THE($object)) } is empty!
 drain-component-empty-verb-target-is-full-message = { CAPITALIZE(THE($object)) } is full!
 drain-component-empty-verb-inhand = Empty {$object}
 drain-component-examine-hint-full = [color="blue"]It is filled to the brim. Maybe a plunger can help?[/color]
diff --git a/Resources/Locale/en-US/follower/follow-verb.ftl b/Resources/Locale/en-US/follower/follow-verb.ftl
index b5538b806f..b3bf780402 100644
--- a/Resources/Locale/en-US/follower/follow-verb.ftl
+++ b/Resources/Locale/en-US/follower/follow-verb.ftl
@@ -1,2 +1,2 @@
-verb-follow-text = Follow
+verb-follow-text = Follow
 verb-follow-me-text = Make follow
diff --git a/Resources/Locale/en-US/forensics/residues.ftl b/Resources/Locale/en-US/forensics/residues.ftl
index 3c5fe3c96d..44b458fd02 100644
--- a/Resources/Locale/en-US/forensics/residues.ftl
+++ b/Resources/Locale/en-US/forensics/residues.ftl
@@ -8,4 +8,4 @@ residue-green = green
 residue-blue = blue
 residue-red = red
 residue-grey = grey
-residue-brown = brown
\ No newline at end of file
+residue-brown = brown
diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-allatonce.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-allatonce.ftl
index ba4f62c4ca..74d4cb953f 100644
--- a/Resources/Locale/en-US/game-ticking/game-presets/preset-allatonce.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-allatonce.ftl
@@ -2,4 +2,4 @@ all-at-once-title = All at once
 all-at-once-description = It's just not your day...
 
 aller-at-once-title = Aller at once
-aller-at-once-description = You have fucked up now. You *have* fucked up now.
\ No newline at end of file
+aller-at-once-description = You have fucked up now. You *have* fucked up now.
diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-changeling.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-changeling.ftl
index 46a0a30d5d..911523fd50 100644
--- a/Resources/Locale/en-US/game-ticking/game-presets/preset-changeling.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-changeling.ftl
@@ -11,3 +11,9 @@ changeling-briefing =
 objective-issuer-changeling = [color=#FA2A55]The Hivemind[/color]
 
 changeling-round-end-agent-name = changeling
+
+space-changeling-role-greeting =
+    You are a changeling, a highly intelligent predator.
+    After drifting frozen in space for decades, you find yourself near a space station filled to the brim with juicy crew members.
+    You are hungry and will not make it long without sustenance...
+    Kill. Consume. Hide. Survive.
diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-survival.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-survival.ftl
index 492bb9e341..cbfe616e70 100644
--- a/Resources/Locale/en-US/game-ticking/game-presets/preset-survival.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-survival.ftl
@@ -2,4 +2,4 @@ survival-title = Survival
 survival-description = No internal threats, but how long can the station survive increasingly chaotic and frequent events?
 
 kessler-syndrome-title = Kessler Syndrome
-kessler-syndrome-description = No internal threats, but the station is quickly falling into a belt of meteors!
\ No newline at end of file
+kessler-syndrome-description = No internal threats, but the station is quickly falling into a belt of meteors!
diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-zombies.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-zombies.ftl
index 4d127d9fa5..855609e6b1 100644
--- a/Resources/Locale/en-US/game-ticking/game-presets/preset-zombies.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-zombies.ftl
@@ -1,4 +1,4 @@
-zombie-title = Zombies
+zombie-title = Zombies
 zombie-description = The undead have been unleashed on the station! Work with the crew to survive the outbreak and secure the station.
 
 zombieteors-title = Zombieteors
diff --git a/Resources/Locale/en-US/game-ticking/game-rules/rule-death-match.ftl b/Resources/Locale/en-US/game-ticking/game-rules/rule-death-match.ftl
index b9754ed9aa..a02a3133b3 100644
--- a/Resources/Locale/en-US/game-ticking/game-rules/rule-death-match.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-rules/rule-death-match.ftl
@@ -1,3 +1,3 @@
 rule-death-match-added-announcement = The game is now a death match. Kill everybody else to win!
 rule-death-match-check-winner-stalemate = Everybody is dead, it's a stalemate!
-rule-death-match-check-winner = {$winner} wins the death match!
\ No newline at end of file
+rule-death-match-check-winner = {$winner} wins the death match!
diff --git a/Resources/Locale/en-US/game-ticking/game-rules/rule-traitor.ftl b/Resources/Locale/en-US/game-ticking/game-rules/rule-traitor.ftl
index 22b37313aa..6de010f932 100644
--- a/Resources/Locale/en-US/game-ticking/game-rules/rule-traitor.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-rules/rule-traitor.ftl
@@ -1 +1 @@
-rule-traitor-added-announcement = Hello crew! Have a good shift!
\ No newline at end of file
+rule-traitor-added-announcement = Hello crew! Have a good shift!
diff --git a/Resources/Locale/en-US/gases/gas-tank.ftl b/Resources/Locale/en-US/gases/gas-tank.ftl
index 03af8cb7a3..47b7143465 100644
--- a/Resources/Locale/en-US/gases/gas-tank.ftl
+++ b/Resources/Locale/en-US/gases/gas-tank.ftl
@@ -1 +1 @@
-gas-max-pressure-alert = The pressure relief valve bursts open!
+gas-max-pressure-alert = The pressure relief valve bursts open!
diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
index 30d97a2889..35cf7b782e 100644
--- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
@@ -350,3 +350,6 @@ ghost-role-information-wizard-desc = YER A WIZARD! Show the station what your ma
 
 ghost-role-information-emotional-support-scurret-name = Emotional Support Scurret
 ghost-role-information-emotional-support-scurret-description = Support the crew, be adorable, say "wa" a lot.
+
+ghost-role-information-space-changeling-name = Elder Headslug
+ghost-role-information-space-changeling-description = An adult changeling headslug, eager to assimilate crew members and ready to hide within the station. This headslug is especially frail and needs to find a dead body to assume a humanoid appearance.
diff --git a/Resources/Locale/en-US/ghost/roles/ghostrole-spawner-verb-selectable.ftl b/Resources/Locale/en-US/ghost/roles/ghostrole-spawner-verb-selectable.ftl
index 9d649a5e07..0b483b74d1 100644
--- a/Resources/Locale/en-US/ghost/roles/ghostrole-spawner-verb-selectable.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghostrole-spawner-verb-selectable.ftl
@@ -1 +1 @@
-ghostrole-spawner-select = Selected: {$mode}
\ No newline at end of file
+ghostrole-spawner-select = Selected: {$mode}
diff --git a/Resources/Locale/en-US/ghost/roles/make-ghost-role-verb.ftl b/Resources/Locale/en-US/ghost/roles/make-ghost-role-verb.ftl
index 6ff4d7e89c..265580e8f5 100644
--- a/Resources/Locale/en-US/ghost/roles/make-ghost-role-verb.ftl
+++ b/Resources/Locale/en-US/ghost/roles/make-ghost-role-verb.ftl
@@ -1 +1 @@
-make-ghost-role-verb-get-data-text = Make Ghost Role
\ No newline at end of file
+make-ghost-role-verb-get-data-text = Make Ghost Role
diff --git a/Resources/Locale/en-US/guidebook/chemistry/core.ftl b/Resources/Locale/en-US/guidebook/chemistry/core.ftl
index 502675bd9e..b430bd5913 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/core.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/core.ftl
@@ -1,4 +1,4 @@
-guidebook-reagent-effect-description =
+guidebook-reagent-effect-description =
     {$quantity ->
         [0] {""}
         *[other] If there is at least {$quantity}u {$reagent},{" "}
diff --git a/Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl b/Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl
index 7796d9b99a..44ecefea72 100644
--- a/Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl
+++ b/Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl
@@ -92,3 +92,6 @@ entity-condition-guidebook-internals =
                 [true] using internals
                 *[false] breathing atmospheric air
                }
+
+entity-condition-guidebook-mouth-uncovered-condition =
+    the mob has an uncovered mouth
diff --git a/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl b/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
index 6602db9b38..be6ee682d3 100644
--- a/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
+++ b/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
@@ -510,6 +510,22 @@ entity-effect-guidebook-plant-seeds-remove =
         *[other] remove the
     } seeds of the plant
 
+entity-effect-guidebook-plant-change-trait =
+    { $chance ->
+        [1] { $change ->
+            [Add] adds {$trait} to
+            [Remove] removes {$trait} from
+            [Toggle] toggles {$trait} on
+            *[other] changes {$trait} on
+        }
+        *[other] { $change ->
+            [Add] add {$trait} to
+            [Remove] remove {$trait} from
+            [Toggle] toggle {$trait} on
+            *[other] change {$trait} on
+        }
+    } the plant
+
 entity-effect-guidebook-plant-mutate-exude-gasses =
     { $chance ->
         [1] Mutates
diff --git a/Resources/Locale/en-US/guidebook/entity-effects/healthchange.ftl b/Resources/Locale/en-US/guidebook/entity-effects/healthchange.ftl
index d5eba5b02c..435722c5fe 100644
--- a/Resources/Locale/en-US/guidebook/entity-effects/healthchange.ftl
+++ b/Resources/Locale/en-US/guidebook/entity-effects/healthchange.ftl
@@ -1,4 +1,4 @@
-health-change-display =
+health-change-display =
     { $deltasign ->
         [-1] [color=green]{NATURALFIXED($amount, 2)}[/color] {$kind}
         *[1] [color=red]{NATURALFIXED($amount, 2)}[/color] {$kind}
diff --git a/Resources/Locale/en-US/guidebook/entity-effects/statuseffects.ftl b/Resources/Locale/en-US/guidebook/entity-effects/statuseffects.ftl
index fe92b2ff06..3cfc843ada 100644
--- a/Resources/Locale/en-US/guidebook/entity-effects/statuseffects.ftl
+++ b/Resources/Locale/en-US/guidebook/entity-effects/statuseffects.ftl
@@ -1,4 +1,4 @@
-entity-effect-status-effect-Stun = stunning
+entity-effect-status-effect-Stun = stunning
 entity-effect-status-effect-KnockedDown = knockdown
 entity-effect-status-effect-Jitter = jittering
 entity-effect-status-effect-SeeingRainbows = hallucinations
diff --git a/Resources/Locale/en-US/guidebook/verb.ftl b/Resources/Locale/en-US/guidebook/verb.ftl
index ca921f1213..0d7cd78e0a 100644
--- a/Resources/Locale/en-US/guidebook/verb.ftl
+++ b/Resources/Locale/en-US/guidebook/verb.ftl
@@ -1 +1 @@
-guide-help-verb = Help
\ No newline at end of file
+guide-help-verb = Help
diff --git a/Resources/Locale/en-US/health-examinable/health-examinable-comp.ftl b/Resources/Locale/en-US/health-examinable/health-examinable-comp.ftl
index af31837ab8..bfc3dcc821 100644
--- a/Resources/Locale/en-US/health-examinable/health-examinable-comp.ftl
+++ b/Resources/Locale/en-US/health-examinable/health-examinable-comp.ftl
@@ -1,2 +1,2 @@
-health-examinable-verb-text = Health
+health-examinable-verb-text = Health
 health-examinable-verb-disabled = Perform a basic health examination in close range.
diff --git a/Resources/Locale/en-US/holiday/gifts.ftl b/Resources/Locale/en-US/holiday/gifts.ftl
index 3374dc61d7..62d43d2258 100644
--- a/Resources/Locale/en-US/holiday/gifts.ftl
+++ b/Resources/Locale/en-US/holiday/gifts.ftl
@@ -1,3 +1,3 @@
-gift-packin-contains = This present appears to contain {INDEFINITE($name)} {$name}.
+gift-packin-contains = This present appears to contain {INDEFINITE($name)} {$name}.
 christmas-tree-got-gift = After a bit of digging, you find a present with your name on it!
 christmas-tree-no-gift = There isn't a gift under the tree for you...
diff --git a/Resources/Locale/en-US/holopad/holopad.ftl b/Resources/Locale/en-US/holopad/holopad.ftl
index a843b6a0e4..283fb1a719 100644
--- a/Resources/Locale/en-US/holopad/holopad.ftl
+++ b/Resources/Locale/en-US/holopad/holopad.ftl
@@ -1,4 +1,4 @@
-# Window headers
+# Window headers
 holopad-window-title = {CAPITALIZE($title)}
 holopad-window-subtitle = [color=white][bold]Holographic communication system[/bold][/color]
 holopad-window-options = [color=darkgray][font size=10][italic]Please select an option from the list below[/italic][/font][/color]
diff --git a/Resources/Locale/en-US/identity/identity-system.ftl b/Resources/Locale/en-US/identity/identity-system.ftl
index efaadb8188..f53e5d5160 100644
--- a/Resources/Locale/en-US/identity/identity-system.ftl
+++ b/Resources/Locale/en-US/identity/identity-system.ftl
@@ -1,4 +1,4 @@
-identity-unknown-name = ???
+identity-unknown-name = ???
 
 identity-age-young = young
 identity-age-middle-aged = middle-aged
diff --git a/Resources/Locale/en-US/immovable-rod/immovable-rod.ftl b/Resources/Locale/en-US/immovable-rod/immovable-rod.ftl
index 6843e350b0..7aa6667ae3 100644
--- a/Resources/Locale/en-US/immovable-rod/immovable-rod.ftl
+++ b/Resources/Locale/en-US/immovable-rod/immovable-rod.ftl
@@ -1,4 +1,4 @@
-immovable-rod-collided-rod-not-good = Oh fuck, that can't be good.
+immovable-rod-collided-rod-not-good = Oh fuck, that can't be good.
 immovable-rod-penetrated-mob = {CAPITALIZE(THE($rod))} cleanly eviscerates {THE($mob)}!
 
 immovable-rod-consumed-none = {CAPITALIZE(THE($rod))} has consumed zero souls.
diff --git a/Resources/Locale/en-US/implant/chameleon-controller.ftl b/Resources/Locale/en-US/implant/chameleon-controller.ftl
index d7e3d1484a..7b9049a1b5 100644
--- a/Resources/Locale/en-US/implant/chameleon-controller.ftl
+++ b/Resources/Locale/en-US/implant/chameleon-controller.ftl
@@ -1 +1 @@
-chameleon-controller-ui-window-name = Chameleon controls
+chameleon-controller-ui-window-name = Chameleon controls
diff --git a/Resources/Locale/en-US/info/rules.ftl b/Resources/Locale/en-US/info/rules.ftl
index db5c9d656b..cf9169bf3c 100644
--- a/Resources/Locale/en-US/info/rules.ftl
+++ b/Resources/Locale/en-US/info/rules.ftl
@@ -1,4 +1,4 @@
-# Rules
+# Rules
 
 ui-rules-header = Wizard's Den Official Server Rules
 ui-rules-header-rp = Wizard's Den Roleplay Official Server Rules
diff --git a/Resources/Locale/en-US/intellicard/intellicard.ftl b/Resources/Locale/en-US/intellicard/intellicard.ftl
index aed155a120..d18e0af3e9 100644
--- a/Resources/Locale/en-US/intellicard/intellicard.ftl
+++ b/Resources/Locale/en-US/intellicard/intellicard.ftl
@@ -1,3 +1,3 @@
 # General
 intellicard-core-occupied = The AI core is already occupied by another digital consciousness.
-intellicard-core-empty = The AI core has no digital consciousness to download.
\ No newline at end of file
+intellicard-core-empty = The AI core has no digital consciousness to download.
diff --git a/Resources/Locale/en-US/interaction/in-range-unoccluded-verb.ftl b/Resources/Locale/en-US/interaction/in-range-unoccluded-verb.ftl
index 66d136fbfc..091b053697 100644
--- a/Resources/Locale/en-US/interaction/in-range-unoccluded-verb.ftl
+++ b/Resources/Locale/en-US/interaction/in-range-unoccluded-verb.ftl
@@ -1,3 +1,3 @@
 in-range-unoccluded-verb-get-data-text = In Range Unoccluded
 in-range-unoccluded-verb-on-activate-not-occluded = Not occluded
-in-range-unoccluded-verb-on-activate-occluded = Occluded
\ No newline at end of file
+in-range-unoccluded-verb-on-activate-occluded = Occluded
diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
index 41114e5833..2f951ffb13 100644
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -34,6 +34,8 @@ petting-success-snake = You pet {THE($target)} on {POSS-ADJ($target)} scaly larg
 petting-success-monkey = You pet {THE($target)} on {POSS-ADJ($target)} mischevious little head.
 petting-success-nymph = You pet {THE($target)} on {POSS-ADJ($target)} wooden little head.
 petting-success-scurret = You pet {THE($target)} on {POSS-ADJ($target)} legally distinct head.
+petting-success-headslug = You pet {THE($target)} on {POSS-ADJ($target)} oozy surface.
+petting-success-elder-headslug = You pet {THE($target)} {POSS-ADJ($target)} pulsating skin.
 
 petting-failure-generic = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} aloof towards you.
 
@@ -57,6 +59,8 @@ petting-failure-monkey = You reach out to pet {THE($target)}, but {SUBJECT($targ
 petting-failure-nymph = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BASIC($target, "move", "moves")} {POSS-ADJ($target)} branches away.
 petting-failure-shadow = You try to pet {THE($target)}, but your hand passes through the cold darkness of {POSS-ADJ($target)} body.
 petting-failure-scurret = You reach out to pet {THE($target)}, but {SUBJECT($target)} does a backflip!
+petting-failure-headslug = You try to pet {THE($target)}, but your hand sinks in {POSS-ADJ($target)} flesh.
+petting-failure-elder-headslug = You try to pet {THE($target)}, but {SUBJECT($target)} almost bites you!
 
 ## Petting silicons
 
diff --git a/Resources/Locale/en-US/interaction/smart-equip-system.ftl b/Resources/Locale/en-US/interaction/smart-equip-system.ftl
index 8c61116caa..b87f6264b4 100644
--- a/Resources/Locale/en-US/interaction/smart-equip-system.ftl
+++ b/Resources/Locale/en-US/interaction/smart-equip-system.ftl
@@ -1,4 +1,4 @@
-smart-equip-missing-equipment-slot = You have no {$slotName} slot to interact with!
+smart-equip-missing-equipment-slot = You have no {$slotName} slot to interact with!
 smart-equip-empty-equipment-slot = There's nothing in your {$slotName} slot to take out!
 smart-equip-no-valid-item-slot-insert = There's no valid item slot for {THE($item)} to go into!
 smart-equip-cant-drop = You can't drop that!
diff --git a/Resources/Locale/en-US/inventory/human-inventory-interface-controller.ftl b/Resources/Locale/en-US/inventory/human-inventory-interface-controller.ftl
index 9a098d960a..b82e6866ce 100644
--- a/Resources/Locale/en-US/inventory/human-inventory-interface-controller.ftl
+++ b/Resources/Locale/en-US/inventory/human-inventory-interface-controller.ftl
@@ -1 +1 @@
-human-inventory-window-title = Your Inventory
\ No newline at end of file
+human-inventory-window-title = Your Inventory
diff --git a/Resources/Locale/en-US/inventory/item-status.ftl b/Resources/Locale/en-US/inventory/item-status.ftl
index a53ba8be7d..f3d80ca9bf 100644
--- a/Resources/Locale/en-US/inventory/item-status.ftl
+++ b/Resources/Locale/en-US/inventory/item-status.ftl
@@ -1 +1 @@
-item-status-not-held = No held item
+item-status-not-held = No held item
diff --git a/Resources/Locale/en-US/items/item-status.ftl b/Resources/Locale/en-US/items/item-status.ftl
index 34a6a73214..ed4ed59a9e 100644
--- a/Resources/Locale/en-US/items/item-status.ftl
+++ b/Resources/Locale/en-US/items/item-status.ftl
@@ -33,3 +33,4 @@ anomaly-status-charges = [color=orange]{$charges} charges[/color]
 
 # Timer Trigger Status
 timer-trigger-status-delay = Set Delay: [color=white]{$delay}s[/color]
+timer-trigger-status-delay-unknown = Set Delay: [color=gray]???[/color]
diff --git a/Resources/Locale/en-US/job/department-desc.ftl b/Resources/Locale/en-US/job/department-desc.ftl
index 798992037c..4d4be3c637 100644
--- a/Resources/Locale/en-US/job/department-desc.ftl
+++ b/Resources/Locale/en-US/job/department-desc.ftl
@@ -1,10 +1,11 @@
-department-Cargo-description = Acquire and deliver useful supplies for the rest of the station.
-department-Civilian-description = Attend to the crew's basic physical and psychological needs.
+department-Cargo-description = Acquire and deliver useful supplies for the rest of the station.
+department-Civilian-description = Crew members without formal jobs.
 department-Command-description = Manage the crew and keep them working efficiently.
 department-CentralCommand-description = Manage the crew and keep them working efficiently.
 department-Engineering-description = Maintain and repair the station.
 department-Medical-description = Keep the crew healthy.
-department-Security-description = Protect the station and keep the peace.
 department-Science-description = Research and develop new technologies for the station.
+department-Security-description = Protect the station and keep the peace.
+department-Service-description = Attend to the crew's basic physical and psychological needs.
 department-Silicon-description = Fulfill the terms of your installed lawset.
 department-Specific-description = Jobs that not all stations have.
diff --git a/Resources/Locale/en-US/job/department.ftl b/Resources/Locale/en-US/job/department.ftl
index 8711b3f118..1bdfb08517 100644
--- a/Resources/Locale/en-US/job/department.ftl
+++ b/Resources/Locale/en-US/job/department.ftl
@@ -4,8 +4,9 @@ department-Command = Command
 department-CentralCommand = Central Command
 department-Engineering = Engineering
 department-Medical = Medical
-department-Security = Security
 department-Science = Science
+department-Security = Security
+department-Service = Service
 department-Silicon = Silicon
 department-Specific = Station specific
 
diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl
index 13c3c9659a..112fd9ba71 100644
--- a/Resources/Locale/en-US/job/job-description.ftl
+++ b/Resources/Locale/en-US/job/job-description.ftl
@@ -44,11 +44,13 @@ job-description-lawyer = Ensure that criminals receive legal representation and
 job-description-librarian = Keep the library organized. Provide the crew with educational materials, entertaining stories, and tabletop games.
 job-description-mime = Entertain the crew with silent acts of performance art, and engage in light rivalry with the clown.
 job-description-musician = Entertain the crew with your unique musical talents.
-job-description-passenger = Enjoy your stay aboard the station with no obligations!
 job-description-reporter = Inform and entertain the station's crew with wireless cameras and news bulletins.
 job-description-serviceworker = Assist the bar and kitchen with providing sustenance to the crew.
 job-description-tram-driver = Drive around a tram from stop to stop.
 
+# Civilian
+job-description-passenger = Enjoy your stay aboard the station with no obligations!
+
 # Silicon
 job-description-borg = Use your robotic chassis to perform a wide variety of specialized tasks.
 job-description-station-ai = Remotely interface with the station's cameras, airlocks, radio, and other electronic devices from the safety of your core.
diff --git a/Resources/Locale/en-US/job/job.ftl b/Resources/Locale/en-US/job/job.ftl
index d999c0d92d..b4213c0804 100644
--- a/Resources/Locale/en-US/job/job.ftl
+++ b/Resources/Locale/en-US/job/job.ftl
@@ -3,4 +3,4 @@ job-greet-introduce-job-name = Your role is: {$jobName}.
 job-greet-important-disconnect-admin-notify = You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via ahelp.
 job-greet-supervisors-warning = As the {$jobName} you answer directly to {$supervisors}. Special circumstances may change this.
 job-greet-crew-shortages = As this station was initially staffed with a skeleton crew, additional access has been added to your ID card.
-job-not-available-wait-in-lobby = The round has started, but you did not receive any of your preferred job roles (or have no preferred job roles selected) and chose to remain in the lobby. You can change this behavior on the customization screen.
\ No newline at end of file
+job-not-available-wait-in-lobby = The round has started, but you did not receive any of your preferred job roles (or have no preferred job roles selected) and chose to remain in the lobby. You can change this behavior on the customization screen.
diff --git a/Resources/Locale/en-US/job/role-ban-command.ftl b/Resources/Locale/en-US/job/role-ban-command.ftl
index 148fb9a7b0..1e7a692860 100644
--- a/Resources/Locale/en-US/job/role-ban-command.ftl
+++ b/Resources/Locale/en-US/job/role-ban-command.ftl
@@ -1,4 +1,4 @@
-### Localization for role ban command
+### Localization for role ban command
 
 cmd-roleban-desc = Bans a player from a role
 cmd-roleban-help = Usage: roleban <name or user ID> <job> <reason> [duration in minutes, leave out or 0 for permanent ban]
diff --git a/Resources/Locale/en-US/job/role-requirements.ftl b/Resources/Locale/en-US/job/role-requirements.ftl
index 37265b875c..4c95468646 100644
--- a/Resources/Locale/en-US/job/role-requirements.ftl
+++ b/Resources/Locale/en-US/job/role-requirements.ftl
@@ -1,4 +1,4 @@
-role-timer-department-insufficient = You require [color=yellow]{$time}[/color] more playtime in the [color={$departmentColor}]{$department}[/color] department to unlock this.
+role-timer-department-insufficient = You require [color=yellow]{$time}[/color] more playtime in the [color={$departmentColor}]{$department}[/color] department to unlock this.
 role-timer-department-too-high = You require [color=yellow]{$time}[/color] less playtime in the [color={$departmentColor}]{$department}[/color] department to select this. (Are you trying to play a trainee role?)
 role-timer-overall-insufficient = You require [color=yellow]{$time}[/color] more overall playtime to unlock this.
 role-timer-overall-too-high = You require [color=yellow]{$time}[/color] less overall playtime to select this. (Are you trying to play a trainee role?)
diff --git a/Resources/Locale/en-US/job/role-whitelist.ftl b/Resources/Locale/en-US/job/role-whitelist.ftl
index 3149f182b6..70031a650d 100644
--- a/Resources/Locale/en-US/job/role-whitelist.ftl
+++ b/Resources/Locale/en-US/job/role-whitelist.ftl
@@ -1 +1 @@
-role-not-whitelisted = You are not whitelisted to play this role.
+role-not-whitelisted = You are not whitelisted to play this role.
diff --git a/Resources/Locale/en-US/kitchen/components/kitchen-spike-component.ftl b/Resources/Locale/en-US/kitchen/components/kitchen-spike-component.ftl
index e2c4fd73ab..818923441a 100644
--- a/Resources/Locale/en-US/kitchen/components/kitchen-spike-component.ftl
+++ b/Resources/Locale/en-US/kitchen/components/kitchen-spike-component.ftl
@@ -1,4 +1,4 @@
-comp-kitchen-spike-begin-hook-self = You begin dragging yourself onto { THE($hook) }!
+comp-kitchen-spike-begin-hook-self = You begin dragging yourself onto { THE($hook) }!
 comp-kitchen-spike-begin-hook-self-other = { CAPITALIZE(THE($victim)) } begins dragging { REFLEXIVE($victim) } onto { THE($hook) }!
 
 comp-kitchen-spike-begin-hook-other-self = You begin dragging { CAPITALIZE(THE($victim)) } onto { THE($hook) }!
diff --git a/Resources/Locale/en-US/land-mines/land-mines.ftl b/Resources/Locale/en-US/land-mines/land-mines.ftl
index f6ce2aa1f7..c0ee8a6a00 100644
--- a/Resources/Locale/en-US/land-mines/land-mines.ftl
+++ b/Resources/Locale/en-US/land-mines/land-mines.ftl
@@ -1,2 +1,2 @@
-land-mine-triggered = You step on the { $mine }!
+land-mine-triggered = You step on the { $mine }!
 land-mine-verb-begin = Arm
diff --git a/Resources/Locale/en-US/light/components/powered-ligth-component.ftl b/Resources/Locale/en-US/light/components/powered-ligth-component.ftl
index 3a4c7ab4f9..3b68afc196 100644
--- a/Resources/Locale/en-US/light/components/powered-ligth-component.ftl
+++ b/Resources/Locale/en-US/light/components/powered-ligth-component.ftl
@@ -1 +1 @@
-powered-light-component-burn-hand = You burn your hand!
\ No newline at end of file
+powered-light-component-burn-hand = You burn your hand!
diff --git a/Resources/Locale/en-US/light/components/unpowered-flashlight-component.ftl b/Resources/Locale/en-US/light/components/unpowered-flashlight-component.ftl
index 782eed8364..fe40dadd81 100644
--- a/Resources/Locale/en-US/light/components/unpowered-flashlight-component.ftl
+++ b/Resources/Locale/en-US/light/components/unpowered-flashlight-component.ftl
@@ -1,2 +1,2 @@
 # ToggleFlashlightVerb
-toggle-flashlight-verb-get-data-text = Toggle flashlight
\ No newline at end of file
+toggle-flashlight-verb-get-data-text = Toggle flashlight
diff --git a/Resources/Locale/en-US/lock/bypass-lock-component.ftl b/Resources/Locale/en-US/lock/bypass-lock-component.ftl
index d37996041d..8c3d7785f9 100644
--- a/Resources/Locale/en-US/lock/bypass-lock-component.ftl
+++ b/Resources/Locale/en-US/lock/bypass-lock-component.ftl
@@ -1,4 +1,4 @@
-bypass-lock-verb = Force open the access lock
+bypass-lock-verb = Force open the access lock
 bypass-lock-disabled-healthy = The lock needs to be damaged further before it can be forced open.
 bypass-lock-disabled-wrong-tool = This lock requires {$quality} to be forced open.
 bypass-lock-disabled-already-open = The lock is already open.
diff --git a/Resources/Locale/en-US/lock/locking-whitelist-component.ftl b/Resources/Locale/en-US/lock/locking-whitelist-component.ftl
index 182814c2c5..afd1f6b5b9 100644
--- a/Resources/Locale/en-US/lock/locking-whitelist-component.ftl
+++ b/Resources/Locale/en-US/lock/locking-whitelist-component.ftl
@@ -1 +1 @@
-locking-whitelist-component-lock-toggle-deny = You can't toggle the lock.
+locking-whitelist-component-lock-toggle-deny = You can't toggle the lock.
diff --git a/Resources/Locale/en-US/machine-linking/components/signal-linker-component.ftl b/Resources/Locale/en-US/machine-linking/components/signal-linker-component.ftl
index bc4d0acf9a..9b821578ee 100644
--- a/Resources/Locale/en-US/machine-linking/components/signal-linker-component.ftl
+++ b/Resources/Locale/en-US/machine-linking/components/signal-linker-component.ftl
@@ -14,4 +14,4 @@ signal-linking-verb-text-link-default = Link default ports
 signal-linking-verb-success = Connected all default {$machine} links.
 signal-linking-verb-fail = Failed to connect all default {$machine} links.
 signal-linking-verb-disabled-no-transmitter = First interact with a transmitter, then link default ports.
-signal-linking-verb-disabled-no-receiver = First interact with a receiver, then link default ports.
\ No newline at end of file
+signal-linking-verb-disabled-no-receiver = First interact with a receiver, then link default ports.
diff --git a/Resources/Locale/en-US/magic/magic.ftl b/Resources/Locale/en-US/magic/magic.ftl
index 4c8a5fc51d..71d500e631 100644
--- a/Resources/Locale/en-US/magic/magic.ftl
+++ b/Resources/Locale/en-US/magic/magic.ftl
@@ -1 +1 @@
-spell-requirements-failed = Missing requirements to cast this spell!
+spell-requirements-failed = Missing requirements to cast this spell!
diff --git a/Resources/Locale/en-US/magic/spells-actions.ftl b/Resources/Locale/en-US/magic/spells-actions.ftl
index 11dceef536..48019f27d9 100644
--- a/Resources/Locale/en-US/magic/spells-actions.ftl
+++ b/Resources/Locale/en-US/magic/spells-actions.ftl
@@ -8,4 +8,4 @@ action-speech-spell-summon-magic = RYGOIN FEMA-VERECO
 action-speech-spell-mind-swap = GIN'YU CAPAN!
 action-speech-spell-cluwne = !KNOH
 action-speech-spell-slip = SLEE PARRI!
-action-speech-spell-charge = DI'RI CEL!
\ No newline at end of file
+action-speech-spell-charge = DI'RI CEL!
diff --git a/Resources/Locale/en-US/mapping/editor.ftl b/Resources/Locale/en-US/mapping/editor.ftl
index 153df531e2..919824f2e5 100644
--- a/Resources/Locale/en-US/mapping/editor.ftl
+++ b/Resources/Locale/en-US/mapping/editor.ftl
@@ -4,4 +4,4 @@ mapping-decals = Decals
 
 mapping-replace = Replace
 mapping-erase-entity = Erase Entity
-mapping-erase-decal = Erase Decal
\ No newline at end of file
+mapping-erase-decal = Erase Decal
diff --git a/Resources/Locale/en-US/markings/scars.ftl b/Resources/Locale/en-US/markings/scars.ftl
index 75eedf0cd2..352465ff23 100644
--- a/Resources/Locale/en-US/markings/scars.ftl
+++ b/Resources/Locale/en-US/markings/scars.ftl
@@ -32,4 +32,4 @@ marking-ScarEyeRightSmall-scar_eye_right_small = Right Eye Scar (Small)
 marking-ScarEyeRightSmall = Small Eye Scar (Right)
 
 marking-ScarEyeLeftSmall-scar_eye_left_small = Left Eye Scar (Small)
-marking-ScarEyeLeftSmall = Small Eye Scar (Left)
\ No newline at end of file
+marking-ScarEyeLeftSmall = Small Eye Scar (Left)
diff --git a/Resources/Locale/en-US/markings/undergarment.ftl b/Resources/Locale/en-US/markings/undergarment.ftl
index 4eebee641a..86d40c6545 100644
--- a/Resources/Locale/en-US/markings/undergarment.ftl
+++ b/Resources/Locale/en-US/markings/undergarment.ftl
@@ -51,4 +51,4 @@ marking-UndergarmentBottomBoxersVulpkanin-boxers_vulpkanin = Boxers
 marking-UndergarmentBottomBriefsVulpkanin = Briefs
 marking-UndergarmentBottomBriefsVulpkanin-briefs_vulpkanin = Briefs
 marking-UndergarmentBottomSatinVulpkanin = Satin
-marking-UndergarmentBottomSatinVulpkanin-satin_vulpkanin = Satin
\ No newline at end of file
+marking-UndergarmentBottomSatinVulpkanin-satin_vulpkanin = Satin
diff --git a/Resources/Locale/en-US/medical/components/biomass-reclaimer-component.ftl b/Resources/Locale/en-US/medical/components/biomass-reclaimer-component.ftl
index 443429c1ef..1ab89c1fb3 100644
--- a/Resources/Locale/en-US/medical/components/biomass-reclaimer-component.ftl
+++ b/Resources/Locale/en-US/medical/components/biomass-reclaimer-component.ftl
@@ -1 +1 @@
-biomass-reclaimer-suicide-others = {CAPITALIZE(THE($victim))} threw themselves into the biomass reclaimer!
+biomass-reclaimer-suicide-others = {CAPITALIZE(THE($victim))} threw themselves into the biomass reclaimer!
diff --git a/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl b/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl
index 5629515845..db9fb4ea6b 100644
--- a/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl
+++ b/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl
@@ -1,4 +1,4 @@
-## UI
+## UI
 
 crew-monitoring-ui-title = Crew Monitoring Console
 
diff --git a/Resources/Locale/en-US/medical/components/cryo-pod-component.ftl b/Resources/Locale/en-US/medical/components/cryo-pod-component.ftl
index 077bc26663..657cb0e60a 100644
--- a/Resources/Locale/en-US/medical/components/cryo-pod-component.ftl
+++ b/Resources/Locale/en-US/medical/components/cryo-pod-component.ftl
@@ -1,4 +1,4 @@
-# Ejection verb label.
+# Ejection verb label.
 cryo-pod-verb-noun-occupant = Patient
 # Examine text showing whether there's a beaker in the pod and if it is empty.
 cryo-pod-examine = There's {INDEFINITE($beaker)} {$beaker} in here.
diff --git a/Resources/Locale/en-US/medical/components/defibrillator.ftl b/Resources/Locale/en-US/medical/components/defibrillator.ftl
index 618c6775e8..6ec2d87ada 100644
--- a/Resources/Locale/en-US/medical/components/defibrillator.ftl
+++ b/Resources/Locale/en-US/medical/components/defibrillator.ftl
@@ -1,4 +1,4 @@
-defibrillator-begin = {$name} places the defibrillator pads against {THE($target)}
+defibrillator-begin = {$name} places the defibrillator pads against {THE($target)}
 defibrillator-not-on = The defibrillator isn't turned on.
 defibrillator-no-mind = No intelligence pattern can be detected in patient's brain. Further attempts futile.
 defibrillator-not-living = Warning: Defibrillation target was an inanimate object. Consider retargeting.
diff --git a/Resources/Locale/en-US/medical/components/healing-component.ftl b/Resources/Locale/en-US/medical/components/healing-component.ftl
index d206150a0e..8bc6d72dcc 100644
--- a/Resources/Locale/en-US/medical/components/healing-component.ftl
+++ b/Resources/Locale/en-US/medical/components/healing-component.ftl
@@ -1,4 +1,4 @@
-medical-item-finished-using = You have finished healing with the {$item}.
+medical-item-finished-using = You have finished healing with the {$item}.
 medical-item-cant-use = There is no damage you can heal with the {$item}.
 medical-item-stop-bleeding = {CAPITALIZE($target)} has stopped bleeding.
 medical-item-stop-bleeding-self = You have stopped bleeding.
diff --git a/Resources/Locale/en-US/medical/components/suit-sensor-component.ftl b/Resources/Locale/en-US/medical/components/suit-sensor-component.ftl
index 1ffb83cdbc..07e179def3 100644
--- a/Resources/Locale/en-US/medical/components/suit-sensor-component.ftl
+++ b/Resources/Locale/en-US/medical/components/suit-sensor-component.ftl
@@ -1,4 +1,4 @@
-## Modes
+## Modes
 
 suit-sensor-mode-off = Off
 suit-sensor-mode-binary = Binary
diff --git a/Resources/Locale/en-US/metabolism/metabolism-component.ftl b/Resources/Locale/en-US/metabolism/metabolism-component.ftl
index 5baa4cc254..c98d77688f 100644
--- a/Resources/Locale/en-US/metabolism/metabolism-component.ftl
+++ b/Resources/Locale/en-US/metabolism/metabolism-component.ftl
@@ -1,3 +1,3 @@
 metabolism-component-is-comfortable = You feel comfortable
 metabolism-component-is-sweating = You are sweating
-metabolism-component-is-shivering = You are shivering
\ No newline at end of file
+metabolism-component-is-shivering = You are shivering
diff --git a/Resources/Locale/en-US/mind/verbs/control-mob-verb.ftl b/Resources/Locale/en-US/mind/verbs/control-mob-verb.ftl
index 3841479bac..41c4568029 100644
--- a/Resources/Locale/en-US/mind/verbs/control-mob-verb.ftl
+++ b/Resources/Locale/en-US/mind/verbs/control-mob-verb.ftl
@@ -1 +1 @@
-control-mob-verb-get-data-text = Control Mob
\ No newline at end of file
+control-mob-verb-get-data-text = Control Mob
diff --git a/Resources/Locale/en-US/mind/verbs/make-sentient-verb.ftl b/Resources/Locale/en-US/mind/verbs/make-sentient-verb.ftl
index 76e05ff6ee..9a926e616b 100644
--- a/Resources/Locale/en-US/mind/verbs/make-sentient-verb.ftl
+++ b/Resources/Locale/en-US/mind/verbs/make-sentient-verb.ftl
@@ -1 +1 @@
-make-sentient-verb-get-data-text = Make Sentient
\ No newline at end of file
+make-sentient-verb-get-data-text = Make Sentient
diff --git a/Resources/Locale/en-US/mob-state.ftl b/Resources/Locale/en-US/mob-state.ftl
deleted file mode 100644
index 3c4b83a256..0000000000
--- a/Resources/Locale/en-US/mob-state.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-mob-state-action-requires-state = You need to be {$states} to do that!
-mob-state-Alive = Alive
-mob-state-Critical = Critical
-mob-state-Dead = Dead
diff --git a/Resources/Locale/en-US/morgue/components/crematorium-entity-storage-component.ftl b/Resources/Locale/en-US/morgue/components/crematorium-entity-storage-component.ftl
index 96915b468b..c0864273b0 100644
--- a/Resources/Locale/en-US/morgue/components/crematorium-entity-storage-component.ftl
+++ b/Resources/Locale/en-US/morgue/components/crematorium-entity-storage-component.ftl
@@ -6,4 +6,4 @@ crematorium-entity-storage-component-suicide-message = You cremate yourself!
 crematorium-entity-storage-component-suicide-message-others = {$victim} is cremating {$victim}!
 
 # CremateVerb
-cremate-verb-get-data-text = Cremate
\ No newline at end of file
+cremate-verb-get-data-text = Cremate
diff --git a/Resources/Locale/en-US/morgue/components/morgue-entity-storage-component.ftl b/Resources/Locale/en-US/morgue/components/morgue-entity-storage-component.ftl
index b067c3a377..bf01197fd3 100644
--- a/Resources/Locale/en-US/morgue/components/morgue-entity-storage-component.ftl
+++ b/Resources/Locale/en-US/morgue/components/morgue-entity-storage-component.ftl
@@ -1,4 +1,4 @@
 morgue-entity-storage-component-on-examine-details-body-has-soul = The content light is [color=green]green[/color], this body might still be saved!
 morgue-entity-storage-component-on-examine-details-body-has-no-soul = The content light is [color=red]red[/color], there's a dead body in here! Oh wait...
 morgue-entity-storage-component-on-examine-details-has-contents = The content light is [color=yellow]yellow[/color], there's something in here.
-morgue-entity-storage-component-on-examine-details-empty = The content light is off, there's nothing in here.
\ No newline at end of file
+morgue-entity-storage-component-on-examine-details-empty = The content light is off, there's nothing in here.
diff --git a/Resources/Locale/en-US/name-identifier.ftl b/Resources/Locale/en-US/name-identifier.ftl
index 847fe84a70..ab2966a587 100644
--- a/Resources/Locale/en-US/name-identifier.ftl
+++ b/Resources/Locale/en-US/name-identifier.ftl
@@ -1,10 +1,10 @@
-name-identifier-format-monkey = MK-{$number}
-name-identifier-format-kobold = KB-{$number}
-name-identifier-format-holoparasite = HOLO-{$number}
-name-identifier-format-mmi = MMI-{$number}
-name-identifier-format-positronic-brain = PB-{$number}
-name-identifier-format-silicon = Si-{$number}
-name-identifier-format-xenoborg = Xi-{$number}
-name-identifier-format-station-ai = AI-{$number}
-name-identifier-format-telepad = TELE-{$number}
+name-identifier-format-monkey = (MK-{$number})
+name-identifier-format-kobold = (KB-{$number})
+name-identifier-format-holoparasite = (HOLO-{$number})
+name-identifier-format-mmi = (MMI-{$number})
+name-identifier-format-positronic-brain = (PB-{$number})
+name-identifier-format-silicon = (Si-{$number})
+name-identifier-format-xenoborg = (Xi-{$number})
+name-identifier-format-station-ai = (AI-{$number})
+name-identifier-format-telepad = (TELE-{$number})
 name-identifier-format-parens = ({$number})
diff --git a/Resources/Locale/en-US/npc/hugbot.ftl b/Resources/Locale/en-US/npc/hugbot.ftl
index 6b38eda30e..d0cb6c334d 100644
--- a/Resources/Locale/en-US/npc/hugbot.ftl
+++ b/Resources/Locale/en-US/npc/hugbot.ftl
@@ -1,4 +1,4 @@
-hugbot-start-hug-1 = LEVEL 5 HUG DEFICIENCY DETECTED!
+hugbot-start-hug-1 = LEVEL 5 HUG DEFICIENCY DETECTED!
 hugbot-start-hug-2 = You look like you need a hug!
 hugbot-start-hug-3 = Aww, somebody needs a hug!
 hugbot-start-hug-4 = Target acquired; Initiating hug routine.
diff --git a/Resources/Locale/en-US/nutrition/components/ingestion-system.ftl b/Resources/Locale/en-US/nutrition/components/ingestion-system.ftl
index 5f714925e4..4a8ea42f2f 100644
--- a/Resources/Locale/en-US/nutrition/components/ingestion-system.ftl
+++ b/Resources/Locale/en-US/nutrition/components/ingestion-system.ftl
@@ -1,4 +1,4 @@
-### Interaction Messages
+### Interaction Messages
 
 # System
 
diff --git a/Resources/Locale/en-US/nutrition/components/sealable-component.ftl b/Resources/Locale/en-US/nutrition/components/sealable-component.ftl
index be37b91ce2..aaf72b6bbb 100644
--- a/Resources/Locale/en-US/nutrition/components/sealable-component.ftl
+++ b/Resources/Locale/en-US/nutrition/components/sealable-component.ftl
@@ -1,4 +1,4 @@
-sealable-component-on-examine-is-sealed = The seal is intact.
+sealable-component-on-examine-is-sealed = The seal is intact.
 sealable-component-on-examine-is-unsealed = The seal is broken.
 sealable-component-on-examine-is-unsealed-no-cork = The seal is broken, and the cork is gone.
 sealable-component-on-examine-is-unsealed-crown-cap = The seal is broken, and the crown cap is bent.
diff --git a/Resources/Locale/en-US/nutrition/components/vape-component.ftl b/Resources/Locale/en-US/nutrition/components/vape-component.ftl
index d43bd5ebcc..ea87d4bf5f 100644
--- a/Resources/Locale/en-US/nutrition/components/vape-component.ftl
+++ b/Resources/Locale/en-US/nutrition/components/vape-component.ftl
@@ -4,4 +4,4 @@ vape-component-vape-success-user-forced = You successfully forced to puff {THE($
 vape-component-try-use-vape-forced = {CAPITALIZE(THE($user))} is trying to make you puff on the vape.
 vape-component-try-use-vape-forced-user = You are forcing {THE($target)} to puff on the vape.
 vape-component-try-use-vape = You are trying to puff on the vape.
-vape-component-vape-empty = The vape is empty!
\ No newline at end of file
+vape-component-vape-empty = The vape is empty!
diff --git a/Resources/Locale/en-US/paper/envelope.ftl b/Resources/Locale/en-US/paper/envelope.ftl
index bb7993d284..91997ff3f1 100644
--- a/Resources/Locale/en-US/paper/envelope.ftl
+++ b/Resources/Locale/en-US/paper/envelope.ftl
@@ -8,4 +8,4 @@ envelope-torn-examine = [color=yellow]{CAPITALIZE(THE($envelope))} is torn and u
 
 envelope-default-message = TO: 
   
-  FROM: 
\ No newline at end of file
+  FROM: 
diff --git a/Resources/Locale/en-US/particle-accelerator/components/particle-accelerator-control-box-component.ftl b/Resources/Locale/en-US/particle-accelerator/components/particle-accelerator-control-box-component.ftl
index 9b600e7951..53ed57b19e 100644
--- a/Resources/Locale/en-US/particle-accelerator/components/particle-accelerator-control-box-component.ftl
+++ b/Resources/Locale/en-US/particle-accelerator/components/particle-accelerator-control-box-component.ftl
@@ -1 +1 @@
-particle-accelerator-control-box-component-wires-update-limiter-on-pulse = The control box makes a whirring noise.
\ No newline at end of file
+particle-accelerator-control-box-component-wires-update-limiter-on-pulse = The control box makes a whirring noise.
diff --git a/Resources/Locale/en-US/payload/payload-case.ftl b/Resources/Locale/en-US/payload/payload-case.ftl
index d7c567e9cc..0b83002d13 100644
--- a/Resources/Locale/en-US/payload/payload-case.ftl
+++ b/Resources/Locale/en-US/payload/payload-case.ftl
@@ -1,3 +1,3 @@
-payload-case-not-close-enough = You need to get closer to determine if {THE($ent)} has a payload installed.
+payload-case-not-close-enough = You need to get closer to determine if {THE($ent)} has a payload installed.
 payload-case-has-payload = {CAPITALIZE(THE($ent))} has a payload installed!
 payload-case-does-not-have-payload = {CAPITALIZE(THE($ent))} does not have a payload installed.
diff --git a/Resources/Locale/en-US/pinpointer/pinpointer.ftl b/Resources/Locale/en-US/pinpointer/pinpointer.ftl
index d19ba84f03..cc5d260a28 100644
--- a/Resources/Locale/en-US/pinpointer/pinpointer.ftl
+++ b/Resources/Locale/en-US/pinpointer/pinpointer.ftl
@@ -1 +1 @@
-examine-pinpointer-linked = It is tracking: {$target}
+examine-pinpointer-linked = It is tracking: {$target}
diff --git a/Resources/Locale/en-US/players/play-time/play-time-commands.ftl b/Resources/Locale/en-US/players/play-time/play-time-commands.ftl
index a06e1807e6..05872e0838 100644
--- a/Resources/Locale/en-US/players/play-time/play-time-commands.ftl
+++ b/Resources/Locale/en-US/players/play-time/play-time-commands.ftl
@@ -1,4 +1,4 @@
-parse-minutes-fail = Unable to parse '{$minutes}' as minutes
+parse-minutes-fail = Unable to parse '{$minutes}' as minutes
 parse-session-fail = Did not find session for '{$username}'
 
 ## Role Timer Commands
diff --git a/Resources/Locale/en-US/pneumatic-cannon/pneumatic-cannon-component.ftl b/Resources/Locale/en-US/pneumatic-cannon/pneumatic-cannon-component.ftl
index 4b925969ef..b6f9b8b764 100644
--- a/Resources/Locale/en-US/pneumatic-cannon/pneumatic-cannon-component.ftl
+++ b/Resources/Locale/en-US/pneumatic-cannon/pneumatic-cannon-component.ftl
@@ -1,4 +1,4 @@
-### Loc for the pneumatic cannon.
+### Loc for the pneumatic cannon.
 
 pneumatic-cannon-component-itemslot-name = Gas Tank
 
diff --git a/Resources/Locale/en-US/pointing/pointing-verb.ftl b/Resources/Locale/en-US/pointing/pointing-verb.ftl
index 300a5c01b2..06f13be27f 100644
--- a/Resources/Locale/en-US/pointing/pointing-verb.ftl
+++ b/Resources/Locale/en-US/pointing/pointing-verb.ftl
@@ -1 +1 @@
-pointing-verb-get-data-text = Point at
\ No newline at end of file
+pointing-verb-get-data-text = Point at
diff --git a/Resources/Locale/en-US/points/points.ftl b/Resources/Locale/en-US/points/points.ftl
index 7b0dfe3c01..cc8e8bdaa3 100644
--- a/Resources/Locale/en-US/points/points.ftl
+++ b/Resources/Locale/en-US/points/points.ftl
@@ -1,4 +1,4 @@
-point-scoreboard-winner = The winner was [color=lime]{$player}![/color]
+point-scoreboard-winner = The winner was [color=lime]{$player}![/color]
 point-scoreboard-header = [bold]Scoreboard[/bold]
 point-scoreboard-list = {$place}. [bold][color=cyan]{$name}[/color][/bold] scored [color=yellow]{$points ->
     [one] {$points} point
diff --git a/Resources/Locale/en-US/popup/popup.ftl b/Resources/Locale/en-US/popup/popup.ftl
index 4bc677c608..82e86ce792 100644
--- a/Resources/Locale/en-US/popup/popup.ftl
+++ b/Resources/Locale/en-US/popup/popup.ftl
@@ -1 +1 @@
-popup-system-repeated-popup-stacking-wrap = {$popup-message} x{$count}
+popup-system-repeated-popup-stacking-wrap = {$popup-message} x{$count}
diff --git a/Resources/Locale/en-US/portal/portal.ftl b/Resources/Locale/en-US/portal/portal.ftl
index 8134871380..abd0d0618b 100644
--- a/Resources/Locale/en-US/portal/portal.ftl
+++ b/Resources/Locale/en-US/portal/portal.ftl
@@ -1,4 +1,4 @@
-### Portal verb text
+### Portal verb text
 
 portal-component-ghost-traverse = Traverse
 
diff --git a/Resources/Locale/en-US/power/battery.ftl b/Resources/Locale/en-US/power/battery.ftl
index 21ba96c226..e6175e6385 100644
--- a/Resources/Locale/en-US/power/battery.ftl
+++ b/Resources/Locale/en-US/power/battery.ftl
@@ -1,4 +1,4 @@
-## Strings for the battery (SMES/substation) menu
+## Strings for the battery (SMES/substation) menu
 
 battery-menu-footer-left = Danger: high voltage
 battery-menu-footer-right = 7.2 REV 6
diff --git a/Resources/Locale/en-US/power/commands.ftl b/Resources/Locale/en-US/power/commands.ftl
index 0908af1a2b..b293d6cbba 100644
--- a/Resources/Locale/en-US/power/commands.ftl
+++ b/Resources/Locale/en-US/power/commands.ftl
@@ -1,4 +1,4 @@
-cmd-power_validate-desc = Validate power network state integrity
+cmd-power_validate-desc = Validate power network state integrity
 cmd-power_validate-help = Usage: power_validate
 cmd-power_validate-error = Error while validating: { $err }
 cmd-power_validate-success = Validation succeeded without error
diff --git a/Resources/Locale/en-US/power/components/generator.ftl b/Resources/Locale/en-US/power/components/generator.ftl
index 6d5f9fdb5d..4a25aeb89a 100644
--- a/Resources/Locale/en-US/power/components/generator.ftl
+++ b/Resources/Locale/en-US/power/components/generator.ftl
@@ -1,4 +1,4 @@
-generator-clogged = {CAPITALIZE(THE($generator))} shuts off abruptly!
+generator-clogged = {CAPITALIZE(THE($generator))} shuts off abruptly!
 
 portable-generator-verb-start = Start generator
 portable-generator-verb-start-msg-unreliable = Start the generator. This may take a few tries.
diff --git a/Resources/Locale/en-US/power/teg.ftl b/Resources/Locale/en-US/power/teg.ftl
index 2ee3dac8e9..803e37c194 100644
--- a/Resources/Locale/en-US/power/teg.ftl
+++ b/Resources/Locale/en-US/power/teg.ftl
@@ -1,3 +1,3 @@
-teg-generator-examine-power = It's currently supplying [color=yellow]{ POWERWATTS($power) }[/color].
+teg-generator-examine-power = It's currently supplying [color=yellow]{ POWERWATTS($power) }[/color].
 teg-generator-examine-power-max-output = It's capable of supplying [color=yellow]{ POWERWATTS($power) }[/color].
 teg-generator-examine-connection = To function, a [color=white]circulator[/color] must be attached on both sides.
diff --git a/Resources/Locale/en-US/power/verb.ftl b/Resources/Locale/en-US/power/verb.ftl
index 611d0a2c39..4e64eb38ac 100644
--- a/Resources/Locale/en-US/power/verb.ftl
+++ b/Resources/Locale/en-US/power/verb.ftl
@@ -1,2 +1,2 @@
 # debug verb for allowing devices to work without requiring power.
-verb-debug-toggle-need-power = Toggle Power
\ No newline at end of file
+verb-debug-toggle-need-power = Toggle Power
diff --git a/Resources/Locale/en-US/prayers/prayers.ftl b/Resources/Locale/en-US/prayers/prayers.ftl
index 24b1246565..971378de9a 100644
--- a/Resources/Locale/en-US/prayers/prayers.ftl
+++ b/Resources/Locale/en-US/prayers/prayers.ftl
@@ -1,4 +1,4 @@
-prayer-verbs-subtle-message = Subtle Message
+prayer-verbs-subtle-message = Subtle Message
 prayer-verbs-pray = Pray
 prayer-verbs-call = Call
 prayer-verbs-rub = Rub
diff --git a/Resources/Locale/en-US/preferences/humanoid-character-profile.ftl b/Resources/Locale/en-US/preferences/humanoid-character-profile.ftl
index 2d0b8ebcdd..49b6eaea89 100644
--- a/Resources/Locale/en-US/preferences/humanoid-character-profile.ftl
+++ b/Resources/Locale/en-US/preferences/humanoid-character-profile.ftl
@@ -7,4 +7,4 @@ humanoid-character-profile-summary =
     [female] She is
     [epicene] They are
     *[other] It is
-} {$age} years old.
\ No newline at end of file
+} {$age} years old.
diff --git a/Resources/Locale/en-US/prototypes/roles/antags.ftl b/Resources/Locale/en-US/prototypes/roles/antags.ftl
index f0c80f9dfc..154c97191f 100644
--- a/Resources/Locale/en-US/prototypes/roles/antags.ftl
+++ b/Resources/Locale/en-US/prototypes/roles/antags.ftl
@@ -1,4 +1,4 @@
-roles-antag-generic-solo-antagonist-name = Solo Antagonist
+roles-antag-generic-solo-antagonist-name = Solo Antagonist
 
 roles-antag-generic-free-agent-name = Free Agent
 
diff --git a/Resources/Locale/en-US/pulling/pullable-component.ftl b/Resources/Locale/en-US/pulling/pullable-component.ftl
index b9d076404d..346d803988 100644
--- a/Resources/Locale/en-US/pulling/pullable-component.ftl
+++ b/Resources/Locale/en-US/pulling/pullable-component.ftl
@@ -1,4 +1,4 @@
 ## PullingVerb
 
 pulling-verb-get-data-text = Pull
-pulling-verb-get-data-text-stop-pulling = Stop pulling
\ No newline at end of file
+pulling-verb-get-data-text-stop-pulling = Stop pulling
diff --git a/Resources/Locale/en-US/quick-dialog/quick-dialog.ftl b/Resources/Locale/en-US/quick-dialog/quick-dialog.ftl
index f2b6f7f9a9..ca7ee931d3 100644
--- a/Resources/Locale/en-US/quick-dialog/quick-dialog.ftl
+++ b/Resources/Locale/en-US/quick-dialog/quick-dialog.ftl
@@ -1,4 +1,4 @@
-quick-dialog-ui-integer = Integer..
+quick-dialog-ui-integer = Integer..
 quick-dialog-ui-float = Float..
 quick-dialog-ui-short-text = Short text..
 quick-dialog-ui-long-text = Long text..
diff --git a/Resources/Locale/en-US/radio/components/intercom.ftl b/Resources/Locale/en-US/radio/components/intercom.ftl
index 63303999c2..f2336e9994 100644
--- a/Resources/Locale/en-US/radio/components/intercom.ftl
+++ b/Resources/Locale/en-US/radio/components/intercom.ftl
@@ -1,4 +1,4 @@
-intercom-menu-title = Intercom
+intercom-menu-title = Intercom
 intercom-channel-label = Channel:
 intercom-button-text-mic = Mic.
 intercom-button-text-speaker = Spkr.
diff --git a/Resources/Locale/en-US/reagents/Capsaicin.ftl b/Resources/Locale/en-US/reagents/Capsaicin.ftl
index 42202a4d38..2b196826a5 100644
--- a/Resources/Locale/en-US/reagents/Capsaicin.ftl
+++ b/Resources/Locale/en-US/reagents/Capsaicin.ftl
@@ -1,4 +1,4 @@
-### Messages that pop up when metabolizing Capsaicin Oil.
+### Messages that pop up when metabolizing Capsaicin Oil.
 
 capsaicin-effect-light-burn = You feel a slight tingle in your throat...
 capsaicin-effect-heavy-burn = You feel like hell threw up in your mouth!
diff --git a/Resources/Locale/en-US/reagents/absinthe.ftl b/Resources/Locale/en-US/reagents/absinthe.ftl
index 78d97728af..f560a743dc 100644
--- a/Resources/Locale/en-US/reagents/absinthe.ftl
+++ b/Resources/Locale/en-US/reagents/absinthe.ftl
@@ -1,4 +1,4 @@
-### Messages that pop up when metabolizing absinthe.
+### Messages that pop up when metabolizing absinthe.
 
 absinthe-effect-hear-voice = You hear a tiny voice. "Tee hee hee!"
 absinthe-effect-feel-tulips = You feel tulips brush up against your legs.
diff --git a/Resources/Locale/en-US/reagents/barozine.ftl b/Resources/Locale/en-US/reagents/barozine.ftl
index e668dcafd9..4a3f4a2915 100644
--- a/Resources/Locale/en-US/reagents/barozine.ftl
+++ b/Resources/Locale/en-US/reagents/barozine.ftl
@@ -1,2 +1,2 @@
-barozine-effect-skin-burning = You feel like your skin is burning off!
+barozine-effect-skin-burning = You feel like your skin is burning off!
 barozine-effect-muscle-contract = You can feel your muscles contracting.
diff --git a/Resources/Locale/en-US/reagents/carpetium.ftl b/Resources/Locale/en-US/reagents/carpetium.ftl
index 19d6c349f8..184277cb05 100644
--- a/Resources/Locale/en-US/reagents/carpetium.ftl
+++ b/Resources/Locale/en-US/reagents/carpetium.ftl
@@ -1,2 +1,2 @@
-carpetium-effect-blood-fibrous = Your blood feels oddly fibrous today.
+carpetium-effect-blood-fibrous = Your blood feels oddly fibrous today.
 carpetium-effect-jumpsuit-insides = You feel like there's a jumpsuit inside you, for some reason.
diff --git a/Resources/Locale/en-US/reagents/clf3.ftl b/Resources/Locale/en-US/reagents/clf3.ftl
index 9055e232b4..9cc3621139 100644
--- a/Resources/Locale/en-US/reagents/clf3.ftl
+++ b/Resources/Locale/en-US/reagents/clf3.ftl
@@ -1,3 +1,3 @@
-clf3-it-burns = It burns like hell!!
+clf3-it-burns = It burns like hell!!
 clf3-get-away = You need to get away now!
 clf3-explosion = The mixture fireballs outwards!
diff --git a/Resources/Locale/en-US/reagents/ephedrine.ftl b/Resources/Locale/en-US/reagents/ephedrine.ftl
index 27d1a6842a..1368a820ea 100644
--- a/Resources/Locale/en-US/reagents/ephedrine.ftl
+++ b/Resources/Locale/en-US/reagents/ephedrine.ftl
@@ -1,4 +1,4 @@
-### Messages that pop up when metabolizing ephedrine.
+### Messages that pop up when metabolizing ephedrine.
 
 ephedrine-effect-tight-pain = You feel a tight pain in your chest.
 ephedrine-effect-heart-pounds = Your heart pounds!
diff --git a/Resources/Locale/en-US/reagents/frezon.ftl b/Resources/Locale/en-US/reagents/frezon.ftl
index edb7311017..6a5fbc5864 100644
--- a/Resources/Locale/en-US/reagents/frezon.ftl
+++ b/Resources/Locale/en-US/reagents/frezon.ftl
@@ -1,2 +1,2 @@
-frezon-lungs-cold = Your lungs feel colder..
+frezon-lungs-cold = Your lungs feel colder..
 frezon-euphoric = You feel chilly, but euphoric..
diff --git a/Resources/Locale/en-US/reagents/frostoil.ftl b/Resources/Locale/en-US/reagents/frostoil.ftl
index f2181e7e4a..5d39863a29 100644
--- a/Resources/Locale/en-US/reagents/frostoil.ftl
+++ b/Resources/Locale/en-US/reagents/frostoil.ftl
@@ -1,3 +1,3 @@
-### Messages that pop up when metabolizing Frost Oil.
+### Messages that pop up when metabolizing Frost Oil.
 
-frost-oil-effect-light-cold = You feel a slight cold tingle in your throat...
\ No newline at end of file
+frost-oil-effect-light-cold = You feel a slight cold tingle in your throat...
diff --git a/Resources/Locale/en-US/reagents/histamine.ftl b/Resources/Locale/en-US/reagents/histamine.ftl
index 08c1beb8f7..fc6e382ea8 100644
--- a/Resources/Locale/en-US/reagents/histamine.ftl
+++ b/Resources/Locale/en-US/reagents/histamine.ftl
@@ -1,4 +1,4 @@
-### Messages that pop up when metabolizing histamine.
+### Messages that pop up when metabolizing histamine.
 
 histamine-effect-light-itchiness = You feel a little itchy...
 histamine-effect-heavy-itchiness = You feel REALLY itchy!
diff --git a/Resources/Locale/en-US/reagents/laughter.ftl b/Resources/Locale/en-US/reagents/laughter.ftl
index b9f7c583cd..378e001599 100644
--- a/Resources/Locale/en-US/reagents/laughter.ftl
+++ b/Resources/Locale/en-US/reagents/laughter.ftl
@@ -1 +1 @@
-laughter-effect-control-laughter = You can't contain your laughter!
+laughter-effect-control-laughter = You can't contain your laughter!
diff --git a/Resources/Locale/en-US/reagents/leporazine.ftl b/Resources/Locale/en-US/reagents/leporazine.ftl
index ba6bd5186e..32913b6af3 100644
--- a/Resources/Locale/en-US/reagents/leporazine.ftl
+++ b/Resources/Locale/en-US/reagents/leporazine.ftl
@@ -1 +1 @@
-leporazine-effect-temperature-adjusting = You feel your body's temperature adjust rapidly.
+leporazine-effect-temperature-adjusting = You feel your body's temperature adjust rapidly.
diff --git a/Resources/Locale/en-US/reagents/mannitol.ftl b/Resources/Locale/en-US/reagents/mannitol.ftl
index 1d35aff587..85d7f9b8aa 100644
--- a/Resources/Locale/en-US/reagents/mannitol.ftl
+++ b/Resources/Locale/en-US/reagents/mannitol.ftl
@@ -1 +1 @@
-mannitol-effect-enlightened = You feel ENLIGHTENED!
+mannitol-effect-enlightened = You feel ENLIGHTENED!
diff --git a/Resources/Locale/en-US/reagents/meta/fun.ftl b/Resources/Locale/en-US/reagents/meta/fun.ftl
index 57649d12f9..1a8d1f9405 100644
--- a/Resources/Locale/en-US/reagents/meta/fun.ftl
+++ b/Resources/Locale/en-US/reagents/meta/fun.ftl
@@ -32,7 +32,7 @@ reagent-name-hew = juice that makes you Hew
 reagent-desc-hew = Pure essence of inversed lizard plush. Makes you Hew!
 
 reagent-name-catessence = felinase
-reagent-desc-catessence = A type of carcinogenic enzyme known to break down proteins found within the vocal cords of most animals. Mixing is NOT recommended.
+reagent-desc-catessence = A type of carcinogenic enzyme known to break down proteins found within the vocal cords of most animals. Also grants cat-style night vision. Mixing is NOT recommended.
 
 reagent-name-canidessence = caninase
 reagent-desc-canidessence = A type of carcinogenic enzyme known to break down proteins found within the vocal cords of most animals. Mixing is NOT recommended.
diff --git a/Resources/Locale/en-US/reagents/meta/narcotics.ftl b/Resources/Locale/en-US/reagents/meta/narcotics.ftl
index d428da5789..acc20c3071 100644
--- a/Resources/Locale/en-US/reagents/meta/narcotics.ftl
+++ b/Resources/Locale/en-US/reagents/meta/narcotics.ftl
@@ -48,3 +48,6 @@ reagent-desc-Hydroxysomnolene = Byproduct of Methylenedioxystraquinone (aka Stra
 
 reagent-name-StrawberryIce = Methylenedioxystraquinone
 reagent-desc-StrawberryIce = A special drug designed to be even stronger than Desoxyephedrine. Known as "Strawberry Ice" or "Girl Ice" given its color and flavor, it is incredibly addictive and comes with strong withdrawal symptoms. While the highs are higher and users report flying in rainbows through space while under its influence, near-eternal horrors await those who cease consuming it.
+
+reagent-name-nyctalon = nyctalon
+reagent-desc-nyctalon = An irradiated medicine derived from oculine, this drug stimulates the rod and cone cells of the user's retina, enabling excellent night vision. This comes at a consequence of mild radiation sickness.
diff --git a/Resources/Locale/en-US/reagents/meta/toxins.ftl b/Resources/Locale/en-US/reagents/meta/toxins.ftl
index da65b8c2a9..334fd66762 100644
--- a/Resources/Locale/en-US/reagents/meta/toxins.ftl
+++ b/Resources/Locale/en-US/reagents/meta/toxins.ftl
@@ -1,5 +1,5 @@
 reagent-name-toxin = toxin
-reagent-desc-toxin = An unsurprisingly toxic chemical. Available at an emagged chem dispenser.
+reagent-desc-toxin = An unsurprisingly toxic chemical.
 
 reagent-name-carpotoxin = carpotoxin
 reagent-desc-carpotoxin = A highly toxic reagent found in space carps. Causes a painful burning sensation.
@@ -93,3 +93,6 @@ reagent-desc-hivarol = A toxin that attacks specific types of cells in the body,
 
 reagent-name-phosphoric-acid = phosphoric acid
 reagent-desc-phosphoric-acid = An acidic chemical often used in agriculture. Keep away from your eyes.
+
+reagent-name-hardlight-toxin = hardlight toxin
+reagent-desc-hardlight-toxin = A highly advanced toxin which inundates a victim's nervous system with ionizing radiation when metabolized.
diff --git a/Resources/Locale/en-US/reagents/norepinephricacid.ftl b/Resources/Locale/en-US/reagents/norepinephricacid.ftl
index da06315c0b..50e237cbc2 100644
--- a/Resources/Locale/en-US/reagents/norepinephricacid.ftl
+++ b/Resources/Locale/en-US/reagents/norepinephricacid.ftl
@@ -1,8 +1,8 @@
-norepinephricacid-effect-eyelids = Your eyelids are rapidly twitching.
+norepinephricacid-effect-eyelids = Your eyelids are rapidly twitching.
 norepinephricacid-effect-eyes-itch = Your eyes feel itchy.
 norepinephricacid-effect-vision-fade = You feel your vision fading.
 norepinephricacid-effect-vision-fail = You can feel your vision failing you.
 norepinephricacid-effect-eye-pain = You feel a deep pain in your eyes!
 norepinephricacid-effect-blindness = Your eyes cease function!
 norepinephricacid-effect-darkness = You are plunged into a world of darkness!
-norepinephricacid-effect-eye-disconnect = Your eyes feel like they're disconnecting!
\ No newline at end of file
+norepinephricacid-effect-eye-disconnect = Your eyes feel like they're disconnecting!
diff --git a/Resources/Locale/en-US/reagents/phlogiston.ftl b/Resources/Locale/en-US/reagents/phlogiston.ftl
index df43a42cad..af38ea2ce5 100644
--- a/Resources/Locale/en-US/reagents/phlogiston.ftl
+++ b/Resources/Locale/en-US/reagents/phlogiston.ftl
@@ -1 +1 @@
-phlogiston-plasma-created = The mixture bubbles, and plasma rises from it!
+phlogiston-plasma-created = The mixture bubbles, and plasma rises from it!
diff --git a/Resources/Locale/en-US/reagents/psicodine.ftl b/Resources/Locale/en-US/reagents/psicodine.ftl
index c9795b11a9..cdf9133e1a 100644
--- a/Resources/Locale/en-US/reagents/psicodine.ftl
+++ b/Resources/Locale/en-US/reagents/psicodine.ftl
@@ -1,3 +1,3 @@
-psicodine-effect-fearless = You feel totally fearless!
+psicodine-effect-fearless = You feel totally fearless!
 psicodine-effect-anxieties-wash-away = All of your anxieties wash away!
 psicodine-effect-at-peace = You feel completely at peace.
diff --git a/Resources/Locale/en-US/recycling/components/recycler-component.ftl b/Resources/Locale/en-US/recycling/components/recycler-component.ftl
index b434a918f0..9b00d3b9f5 100644
--- a/Resources/Locale/en-US/recycling/components/recycler-component.ftl
+++ b/Resources/Locale/en-US/recycling/components/recycler-component.ftl
@@ -1,4 +1,4 @@
 ## RecyclerComponent
 
 recycler-component-suicide-message-others = {$victim} tries to recycle {$victim}!
-recycler-component-suicide-message = You recycle yourself!
\ No newline at end of file
+recycler-component-suicide-message = You recycle yourself!
diff --git a/Resources/Locale/en-US/replays/replays.ftl b/Resources/Locale/en-US/replays/replays.ftl
index f488a60693..5a9a79e860 100644
--- a/Resources/Locale/en-US/replays/replays.ftl
+++ b/Resources/Locale/en-US/replays/replays.ftl
@@ -1,4 +1,4 @@
-# Loading Screen
+# Loading Screen
 
 replay-loading = Loading ({$cur}/{$total})
 replay-loading-reading = Reading Files
diff --git a/Resources/Locale/en-US/research/components/research-client-component.ftl b/Resources/Locale/en-US/research/components/research-client-component.ftl
index 9a4382103c..4757cf6b93 100644
--- a/Resources/Locale/en-US/research/components/research-client-component.ftl
+++ b/Resources/Locale/en-US/research/components/research-client-component.ftl
@@ -1,2 +1,2 @@
 research-client-server-selection-menu-title = Research Server Selection
-research-client-server-selection-menu-server-entry-text = ID: {$id} || {$serverName}
\ No newline at end of file
+research-client-server-selection-menu-server-entry-text = ID: {$id} || {$serverName}
diff --git a/Resources/Locale/en-US/revenant/revenant.ftl b/Resources/Locale/en-US/revenant/revenant.ftl
index 1d6bae7b34..b13858be74 100644
--- a/Resources/Locale/en-US/revenant/revenant.ftl
+++ b/Resources/Locale/en-US/revenant/revenant.ftl
@@ -20,4 +20,4 @@ revenant-soul-finish-harvest = {CAPITALIZE(THE($target))} slumps onto the ground
 revenant-user-interface-title = Ability Shop
 revenant-user-interface-essence-amount = [color=plum]{$amount}[/color] Stolen Essence
 
-revenant-user-interface-cost = {$price} Essence
\ No newline at end of file
+revenant-user-interface-cost = {$price} Essence
diff --git a/Resources/Locale/en-US/rotation/components/flippable-component.ftl b/Resources/Locale/en-US/rotation/components/flippable-component.ftl
index cfeb19eeae..6aa1753cc7 100644
--- a/Resources/Locale/en-US/rotation/components/flippable-component.ftl
+++ b/Resources/Locale/en-US/rotation/components/flippable-component.ftl
@@ -2,4 +2,4 @@
 flippable-component-try-flip-is-stuck = It's stuck.
 
 # FlippableVerb
-flippable-verb-get-data-text = Flip
\ No newline at end of file
+flippable-verb-get-data-text = Flip
diff --git a/Resources/Locale/en-US/sensor-monitoring/sensor-monitoring.ftl b/Resources/Locale/en-US/sensor-monitoring/sensor-monitoring.ftl
index 3450c1be3e..6c86226305 100644
--- a/Resources/Locale/en-US/sensor-monitoring/sensor-monitoring.ftl
+++ b/Resources/Locale/en-US/sensor-monitoring/sensor-monitoring.ftl
@@ -1,4 +1,4 @@
-sensor-monitoring-window-title = Sensor Monitoring Console
+sensor-monitoring-window-title = Sensor Monitoring Console
 
 sensor-monitoring-value-display = {$unit ->
     [PressureKpa] { PRESSURE($value) }
diff --git a/Resources/Locale/en-US/server-info/info-links.ftl b/Resources/Locale/en-US/server-info/info-links.ftl
index 51b6b51ecb..dc4bcaad2c 100644
--- a/Resources/Locale/en-US/server-info/info-links.ftl
+++ b/Resources/Locale/en-US/server-info/info-links.ftl
@@ -1,4 +1,4 @@
-### Strings for link buttons shown in the launcher's server description.
+### Strings for link buttons shown in the launcher's server description.
 
 info-link-discord = Discord
 info-link-forum = Forum
diff --git a/Resources/Locale/en-US/server-updates/server-updates.ftl b/Resources/Locale/en-US/server-updates/server-updates.ftl
index ae775c9931..e1b9e34367 100644
--- a/Resources/Locale/en-US/server-updates/server-updates.ftl
+++ b/Resources/Locale/en-US/server-updates/server-updates.ftl
@@ -1,3 +1,3 @@
-server-updates-received = Update has been received, server will automatically restart for update at the end of this round.
+server-updates-received = Update has been received, server will automatically restart for update at the end of this round.
 server-updates-shutdown = Server is shutting down for update and will automatically restart.
 server-updates-shutdown-uptime = Server is shutting down for periodic cleanup and will automatically restart.
diff --git a/Resources/Locale/en-US/shutter/shutter.ftl b/Resources/Locale/en-US/shutter/shutter.ftl
index 3ddcf6d084..b42adc2392 100644
--- a/Resources/Locale/en-US/shutter/shutter.ftl
+++ b/Resources/Locale/en-US/shutter/shutter.ftl
@@ -1 +1 @@
-shutter-rattle = *rattle rattle*
\ No newline at end of file
+shutter-rattle = *rattle rattle*
diff --git a/Resources/Locale/en-US/shuttles/arrivals.ftl b/Resources/Locale/en-US/shuttles/arrivals.ftl
index d720be34b4..06ba202adf 100644
--- a/Resources/Locale/en-US/shuttles/arrivals.ftl
+++ b/Resources/Locale/en-US/shuttles/arrivals.ftl
@@ -7,4 +7,4 @@ cmd-arrivals-returns-hint = Toggles allowing players to return via arrivals.
 cmd-arrivals-invalid = Invalid arg supplied.
 
 cmd-arrivals-force-hint = Forces players to arrive.
-cmd-arrivals-forced = Forced {$uid} to arrive to the station.
\ No newline at end of file
+cmd-arrivals-forced = Forced {$uid} to arrive to the station.
diff --git a/Resources/Locale/en-US/singularity/components/containment-component.ftl b/Resources/Locale/en-US/singularity/components/containment-component.ftl
index e0e7d4c039..93ef391cb7 100644
--- a/Resources/Locale/en-US/singularity/components/containment-component.ftl
+++ b/Resources/Locale/en-US/singularity/components/containment-component.ftl
@@ -1,4 +1,4 @@
-comp-containment-turned-on = The containment field generator boots up.
+comp-containment-turned-on = The containment field generator boots up.
 comp-containment-turned-off = The containment field generator shuts down.
 
 comp-containment-on = It's switched [color=green]on[/color], ready to generate a connection.
diff --git a/Resources/Locale/en-US/singularity/components/generator-component.ftl b/Resources/Locale/en-US/singularity/components/generator-component.ftl
index d2a04f9cbc..c4a81ec0e7 100644
--- a/Resources/Locale/en-US/singularity/components/generator-component.ftl
+++ b/Resources/Locale/en-US/singularity/components/generator-component.ftl
@@ -1,2 +1,2 @@
 comp-generator-failsafe = The {$target} shakes as the containment failsafe triggers!
-comp-generator-failsafe-disabled = Something fizzles out inside of {$target}...
\ No newline at end of file
+comp-generator-failsafe-disabled = Something fizzles out inside of {$target}...
diff --git a/Resources/Locale/en-US/slur/slurring.ftl b/Resources/Locale/en-US/slur/slurring.ftl
index feb5753deb..d4320f2d6c 100644
--- a/Resources/Locale/en-US/slur/slurring.ftl
+++ b/Resources/Locale/en-US/slur/slurring.ftl
@@ -1,2 +1,2 @@
-slur-accent-confused = ...huuuhhh...
+slur-accent-confused = ...huuuhhh...
 slur-accent-burp = *BURP*.
diff --git a/Resources/Locale/en-US/species/diona.ftl b/Resources/Locale/en-US/species/diona.ftl
index d0bb2d1e72..3540788785 100644
--- a/Resources/Locale/en-US/species/diona.ftl
+++ b/Resources/Locale/en-US/species/diona.ftl
@@ -1 +1 @@
-diona-hurt-by-herbicide-popup = The chemical wilts some of your greenery!
\ No newline at end of file
+diona-hurt-by-herbicide-popup = The chemical wilts some of your greenery!
diff --git a/Resources/Locale/en-US/species/skeleton.ftl b/Resources/Locale/en-US/species/skeleton.ftl
index efc8fe974f..bf1eafae05 100644
--- a/Resources/Locale/en-US/species/skeleton.ftl
+++ b/Resources/Locale/en-US/species/skeleton.ftl
@@ -1,2 +1,2 @@
-skeleton-healed-by-milk-popup = Calcium restored.
+skeleton-healed-by-milk-popup = Calcium restored.
 skeleton-sprayed-by-oat-milk-popup = Feels like fake milk. You feel nothing.
diff --git a/Resources/Locale/en-US/species/slime.ftl b/Resources/Locale/en-US/species/slime.ftl
index 87b77511ba..1a847444bd 100644
--- a/Resources/Locale/en-US/species/slime.ftl
+++ b/Resources/Locale/en-US/species/slime.ftl
@@ -1 +1 @@
-slime-hurt-by-water-popup = The water melts some of your slime away!
+slime-hurt-by-water-popup = The water melts some of your slime away!
diff --git a/Resources/Locale/en-US/species/species.ftl b/Resources/Locale/en-US/species/species.ftl
index 8c0900bb21..2ea393ba60 100644
--- a/Resources/Locale/en-US/species/species.ftl
+++ b/Resources/Locale/en-US/species/species.ftl
@@ -1,4 +1,4 @@
-## Species Names
+## Species Names
 
 species-name-human = Human
 species-name-dwarf = Dwarf
diff --git a/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl b/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl
index 907c14ce56..a80634fcdb 100644
--- a/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl
+++ b/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl
@@ -4,4 +4,4 @@ anomaly-spawn-sighting-1 = low pulsating sounds heard throughout the station
 anomaly-spawn-sighting-2 = strange sources of light
 anomaly-spawn-sighting-3 = inexplicable shapes
 anomaly-spawn-sighting-4 = forms causing severe mental distress
-anomaly-spawn-sighting-5 = strange effects on the local environment
\ No newline at end of file
+anomaly-spawn-sighting-5 = strange effects on the local environment
diff --git a/Resources/Locale/en-US/station-events/events/bluespace-artifact.ftl b/Resources/Locale/en-US/station-events/events/bluespace-artifact.ftl
index a2307d77b5..59ea8a536b 100644
--- a/Resources/Locale/en-US/station-events/events/bluespace-artifact.ftl
+++ b/Resources/Locale/en-US/station-events/events/bluespace-artifact.ftl
@@ -6,4 +6,4 @@ bluespace-artifact-sighting-3 = otherworldly structures
 bluespace-artifact-sighting-4 = incomprehensible alien objects
 bluespace-artifact-sighting-5 = unfamiliar objects in strange places
 bluespace-artifact-sighting-6 = unknown alien artifacts
-bluespace-artifact-sighting-7 = explosions of light accompanied by weird sounds
\ No newline at end of file
+bluespace-artifact-sighting-7 = explosions of light accompanied by weird sounds
diff --git a/Resources/Locale/en-US/station-events/events/breaker-flip.ftl b/Resources/Locale/en-US/station-events/events/breaker-flip.ftl
index b3ed9c8fce..907943485d 100644
--- a/Resources/Locale/en-US/station-events/events/breaker-flip.ftl
+++ b/Resources/Locale/en-US/station-events/events/breaker-flip.ftl
@@ -1 +1 @@
-station-event-breaker-flip-announcement = Based on { $data }, we have opted to disable specific APCs to avoid damage to equipment. Please contact the engineering department to re-enable them.
+station-event-breaker-flip-announcement = Based on { $data }, we have opted to disable specific APCs to avoid damage to equipment. Please contact the engineering department to re-enable them.
diff --git a/Resources/Locale/en-US/station-events/events/bureaucratic-error.ftl b/Resources/Locale/en-US/station-events/events/bureaucratic-error.ftl
index 9323c4cb8c..e68ed5af1a 100644
--- a/Resources/Locale/en-US/station-events/events/bureaucratic-error.ftl
+++ b/Resources/Locale/en-US/station-events/events/bureaucratic-error.ftl
@@ -1,2 +1,2 @@
-station-event-bureaucratic-error-announcement = A recent bureaucratic error in the Organic Resources Department may result in personnel shortages in some departments and redundant staffing in others.
+station-event-bureaucratic-error-announcement = A recent bureaucratic error in the Organic Resources Department may result in personnel shortages in some departments and redundant staffing in others.
 station-event-clerical-error-announcement = A minor clerical error in the Organic Resources Department has resulted in the permanent destruction of some of the station records.
diff --git a/Resources/Locale/en-US/station-events/events/gas-leak.ftl b/Resources/Locale/en-US/station-events/events/gas-leak.ftl
index 18429fa58d..1358ff9c76 100644
--- a/Resources/Locale/en-US/station-events/events/gas-leak.ftl
+++ b/Resources/Locale/en-US/station-events/events/gas-leak.ftl
@@ -1,2 +1,2 @@
-station-event-gas-leak-start-announcement = Attention crew, there is a gas leak on the station. We advise you to avoid the area and wear suit internals in the meantime.
+station-event-gas-leak-start-announcement = Attention crew, there is a gas leak on the station. We advise you to avoid the area and wear suit internals in the meantime.
 station-event-gas-leak-end-announcement = The source of the gas leak has been fixed. Please be cautious around areas with gas remaining.
diff --git a/Resources/Locale/en-US/station-events/events/intercept.ftl b/Resources/Locale/en-US/station-events/events/intercept.ftl
index 3f84b027be..f6867479cf 100644
--- a/Resources/Locale/en-US/station-events/events/intercept.ftl
+++ b/Resources/Locale/en-US/station-events/events/intercept.ftl
@@ -1 +1 @@
-station-event-communication-interception = Attention! Enemy communication intercepted. Security level elevated.
+station-event-communication-interception = Attention! Enemy communication intercepted. Security level elevated.
diff --git a/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl b/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl
index 0b82c7fb95..cb844dc839 100644
--- a/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl
+++ b/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl
@@ -1,4 +1,4 @@
-station-event-meteor-swarm-start-announcement = Meteors have been detected on collision course with the station.
+station-event-meteor-swarm-start-announcement = Meteors have been detected on collision course with the station.
 station-event-meteor-swarm-end-announcement = The meteor swarm has passed. Please return to your stations.
 
 station-event-space-dust-start-announcement = The station is passing through a debris cloud, expect minor damage to external fittings and fixtures.
diff --git a/Resources/Locale/en-US/station-events/events/mouse-migration.ftl b/Resources/Locale/en-US/station-events/events/mouse-migration.ftl
index 98a86ca153..518eb04b13 100644
--- a/Resources/Locale/en-US/station-events/events/mouse-migration.ftl
+++ b/Resources/Locale/en-US/station-events/events/mouse-migration.ftl
@@ -1 +1 @@
-station-event-mouse-migration-announcement = We have detected an oncoming migration of rodents to the station. Please stay out of maintenance tunnels and try and avoid excessive contact.
\ No newline at end of file
+station-event-mouse-migration-announcement = We have detected an oncoming migration of rodents to the station. Please stay out of maintenance tunnels and try and avoid excessive contact.
diff --git a/Resources/Locale/en-US/station-events/events/power-grid-check.ftl b/Resources/Locale/en-US/station-events/events/power-grid-check.ftl
index b42dbd19db..b1baca1968 100644
--- a/Resources/Locale/en-US/station-events/events/power-grid-check.ftl
+++ b/Resources/Locale/en-US/station-events/events/power-grid-check.ftl
@@ -1,4 +1,4 @@
 ## PowerGridCheck
 
 station-event-power-grid-check-start-announcement = Abnormal activity detected in the station's powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.
-station-event-power-grid-check-end-announcement = Power has been restored to the station. We apologize for the inconvenience.
\ No newline at end of file
+station-event-power-grid-check-end-announcement = Power has been restored to the station. We apologize for the inconvenience.
diff --git a/Resources/Locale/en-US/station-events/events/unknown-shuttle.ftl b/Resources/Locale/en-US/station-events/events/unknown-shuttle.ftl
index c94b32c54c..e0c1861b0a 100644
--- a/Resources/Locale/en-US/station-events/events/unknown-shuttle.ftl
+++ b/Resources/Locale/en-US/station-events/events/unknown-shuttle.ftl
@@ -1 +1 @@
-station-event-unknown-shuttle-incoming = Attention! An unidentified space shuttle has been spotted approaching your sector.
\ No newline at end of file
+station-event-unknown-shuttle-incoming = Attention! An unidentified space shuttle has been spotted approaching your sector.
diff --git a/Resources/Locale/en-US/station-events/events/vent-clog.ftl b/Resources/Locale/en-US/station-events/events/vent-clog.ftl
index f87f9e241b..5786993adc 100644
--- a/Resources/Locale/en-US/station-events/events/vent-clog.ftl
+++ b/Resources/Locale/en-US/station-events/events/vent-clog.ftl
@@ -1 +1 @@
-station-event-vent-clog-start-announcement = The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.
+station-event-vent-clog-start-announcement = The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.
diff --git a/Resources/Locale/en-US/station-events/events/vent-critters.ftl b/Resources/Locale/en-US/station-events/events/vent-critters.ftl
index ce6990d833..b9d91b397c 100644
--- a/Resources/Locale/en-US/station-events/events/vent-critters.ftl
+++ b/Resources/Locale/en-US/station-events/events/vent-critters.ftl
@@ -1 +1 @@
-station-event-vent-creatures-start-horde-announcement = Attention. A large influx of unknown life forms have been detected moving through the station's ventilation systems. They are expected to emerge near {$location}. Please evacuate the area to avoid loss of personnel.
+station-event-vent-creatures-start-horde-announcement = Attention. A large influx of unknown life forms have been detected moving through the station's ventilation systems. They are expected to emerge near {$location}. Please evacuate the area to avoid loss of personnel.
diff --git a/Resources/Locale/en-US/station-events/events/zombie-outbreak.ftl b/Resources/Locale/en-US/station-events/events/zombie-outbreak.ftl
index da6d8fa4f1..84380c4156 100644
--- a/Resources/Locale/en-US/station-events/events/zombie-outbreak.ftl
+++ b/Resources/Locale/en-US/station-events/events/zombie-outbreak.ftl
@@ -1 +1 @@
-station-event-zombie-outbreak-announcement = Confirmed sightings of various undead aboard the station. All personnel should arm themselves, barricade doors, and secure their location in order to prevent further infection.
\ No newline at end of file
+station-event-zombie-outbreak-announcement = Confirmed sightings of various undead aboard the station. All personnel should arm themselves, barricade doors, and secure their location in order to prevent further infection.
diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl
index 935f1f39c8..2f375b465e 100644
--- a/Resources/Locale/en-US/station-laws/laws.ftl
+++ b/Resources/Locale/en-US/station-laws/laws.ftl
@@ -1,4 +1,4 @@
-laws-number-wrapper = [bold]Law { $lawnumber }:[/bold] { $lawstring }
+laws-number-wrapper = [bold]Law { $lawnumber }:[/bold] { $lawstring }
 
 law-crewsimov-name = Crewsimov
 law-crewsimov-1 = You may not injure a crew member or, through inaction, allow a crew member to come to harm.
diff --git a/Resources/Locale/en-US/station-records/general-station-records.ftl b/Resources/Locale/en-US/station-records/general-station-records.ftl
index f5b70761e1..d1ff16f13c 100644
--- a/Resources/Locale/en-US/station-records/general-station-records.ftl
+++ b/Resources/Locale/en-US/station-records/general-station-records.ftl
@@ -1,4 +1,4 @@
-general-station-record-console-window-title = Station Records Computer
+general-station-record-console-window-title = Station Records Computer
 general-station-record-console-select-record-info = Select a record on the left.
 general-station-record-console-empty-state = No records found!
 general-station-record-console-no-record-found = No record was found for the selected person.
diff --git a/Resources/Locale/en-US/step-trigger/shoes-required.ftl b/Resources/Locale/en-US/step-trigger/shoes-required.ftl
index 07a4b8a84f..1aa4c18e58 100644
--- a/Resources/Locale/en-US/step-trigger/shoes-required.ftl
+++ b/Resources/Locale/en-US/step-trigger/shoes-required.ftl
@@ -1 +1 @@
-clothing-required-step-trigger-examine = You probably shouldn't step on this barefoot.
+clothing-required-step-trigger-examine = You probably shouldn't step on this barefoot.
diff --git a/Resources/Locale/en-US/sticky/sticky-component.ftl b/Resources/Locale/en-US/sticky/sticky-component.ftl
index 9464a602a7..901f0566f2 100644
--- a/Resources/Locale/en-US/sticky/sticky-component.ftl
+++ b/Resources/Locale/en-US/sticky/sticky-component.ftl
@@ -1,4 +1,4 @@
-# Bomb planting strings
+# Bomb planting strings
 
 comp-sticky-start-stick-bomb = You start planting the bomb...
 comp-sticky-success-stick-bomb = You planted the bomb
diff --git a/Resources/Locale/en-US/storage/components/entity-provider-component.ftl b/Resources/Locale/en-US/storage/components/entity-provider-component.ftl
index ed614aeb1b..20528b769a 100644
--- a/Resources/Locale/en-US/storage/components/entity-provider-component.ftl
+++ b/Resources/Locale/en-US/storage/components/entity-provider-component.ftl
@@ -1,4 +1,4 @@
-# Refill Messages
+# Refill Messages
 comp-entity-provider-cannot-receive = {CAPITALIZE(THE($refillTarget))} cannot be refilled!
 comp-entity-provider-cannot-transfer = {CAPITALIZE(THE($provider))} cannot be used to refill!
 
diff --git a/Resources/Locale/en-US/store/changeling-catalog.ftl b/Resources/Locale/en-US/store/changeling-catalog.ftl
index 261ca56396..125bb3c528 100644
--- a/Resources/Locale/en-US/store/changeling-catalog.ftl
+++ b/Resources/Locale/en-US/store/changeling-catalog.ftl
@@ -1,5 +1,5 @@
-changeling-catalog-arm-blade-name = Retractable Arm Blade
-changeling-catalog-arm-blade-desc = Transform your arm into a terrifying flesh blade. Can be toggled.
+changeling-catalog-arm-blade-name = Retractable Armblade
+changeling-catalog-arm-blade-desc = Transform your arm into a terrifying blade made of flesh and bone. Can double as means of prying open powered doors. Can be toggled.
 
 changeling-catalog-flesh-clothing-name = Flesh Clothing
 changeling-catalog-flesh-clothing-desc = Your body's surface will adapt to mirror the clothing of any person you are transforming into. However, these clothing items are non-functional and will make you easy to identify as a changeling if someone tries to remove them. Can be toggled.
@@ -28,6 +28,9 @@ changeling-catalog-hallucinogenic-sting-desc = Causes the target to get high and
 changeling-catalog-mute-sting-name = Mute Sting
 changeling-catalog-mute-sting-desc = Causes the target to be incapable of speech. Imperceptible until the target tries to speak. Can be used on self.
 
+changeling-catalog-armblade-sting-name = Armblade Sting
+changeling-catalog-armblade-sting-desc = Causes the target to spontaneously grow a dulled armblade after a lengthy delay. Instant with increased duration when used on corpses. Can be used on self.
+
 changeling-catalog-screech-name = Screech [TEMPORARY]
 changeling-catalog-screech-desc = We let out a powerful screech that disarms people who hear it without adequate ear protection. THIS ACTION WILL BE MOVED TO THE HORROR FORM WHEN IT IS IMPLEMENTED.
 
diff --git a/Resources/Locale/en-US/store/uplink-catalog/ammo.ftl b/Resources/Locale/en-US/store/uplink-catalog/ammo.ftl
index 4bb28020dd..1d95549c55 100644
--- a/Resources/Locale/en-US/store/uplink-catalog/ammo.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog/ammo.ftl
@@ -26,3 +26,9 @@ uplink-sniper-ammo-desc = A box of 10 cartridges for the Hristov sniper rifle.
 
 uplink-ammo-bundle-name = Ammo Bundle
 uplink-ammo-bundle-desc = Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, 3 magazines for the Estoc DMR, and 2 ammo boxes for the L6 SAW.
+
+uplink-ammo-frag-name = Frag Grenade
+uplink-ammo-frag-desc = A spare frag grenade for your China Lake grenade launcher.
+
+uplink-ammo-blast-name = Blast Grenade
+uplink-ammo-blast-desc = A spare blast grenade for your China Lake grenade launcher.
diff --git a/Resources/Locale/en-US/store/uplink-catalog/weaponry.ftl b/Resources/Locale/en-US/store/uplink-catalog/weaponry.ftl
index 4aec3413c1..128c276220 100644
--- a/Resources/Locale/en-US/store/uplink-catalog/weaponry.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog/weaponry.ftl
@@ -54,11 +54,11 @@ uplink-bulldog-bundle-desc = Lean and mean: Contains the popular Bulldog Shotgun
 uplink-estoc-bundle-name = Estoc DMR bundle
 uplink-estoc-bundle-desc = A designated marksman rifle, fitted with a mid-range optic for longer-range combat. Bundled with three rifle magazines (.20 rifle).
 
-uplink-grenade-launcher-name = China-Lake
-uplink-grenade-launcher-desc = An old China-Lake grenade launcher bundled with 5 rounds of anti-personnel ammo.
+uplink-grenade-launcher-name = China Lake
+uplink-grenade-launcher-desc = An old China Lake grenade launcher bundled with 5 rounds of anti-personnel ammo.
 
-uplink-grenade-launcher-bundle-name = China-Lake Bundle
-uplink-grenade-launcher-bundle-desc = An old China-Lake grenade launcher bundled with 11 rounds of varying destructive capability.
+uplink-grenade-launcher-bundle-name = China Lake Bundle
+uplink-grenade-launcher-bundle-desc = An old China Lake grenade launcher bundled with 11 rounds of varying destructive capability.
 
 uplink-l6-saw-bundle-name = L6 Saw Bundle
 uplink-l6-saw-bundle-desc = More dakka: The iconic L6 light machine gun, bundled with 2 box magazines.
diff --git a/Resources/Locale/en-US/suicide/suicide.ftl b/Resources/Locale/en-US/suicide/suicide.ftl
index 2207e22413..6647970e01 100644
--- a/Resources/Locale/en-US/suicide/suicide.ftl
+++ b/Resources/Locale/en-US/suicide/suicide.ftl
@@ -1 +1 @@
-suicide-prevented = You tried to suicide, but only your spirit escapes.
+suicide-prevented = You tried to suicide, but only your spirit escapes.
diff --git a/Resources/Locale/en-US/suspicion/roles/suspicion-role-component.ftl b/Resources/Locale/en-US/suspicion/roles/suspicion-role-component.ftl
index 1eb737b616..6a48b71db3 100644
--- a/Resources/Locale/en-US/suspicion/roles/suspicion-role-component.ftl
+++ b/Resources/Locale/en-US/suspicion/roles/suspicion-role-component.ftl
@@ -1,3 +1,3 @@
 suspicion-role-component-role-traitor = traitor
 suspicion-role-component-role-innocent = innocent
-suspicion-role-component-on-examine-tooltip = They were {$article} [color={$colorName}]{$role}[/color]!
\ No newline at end of file
+suspicion-role-component-on-examine-tooltip = They were {$article} [color={$colorName}]{$role}[/color]!
diff --git a/Resources/Locale/en-US/suspicion/suspicion-gui.ftl b/Resources/Locale/en-US/suspicion/suspicion-gui.ftl
index fdbd400b77..1c9e6b227c 100644
--- a/Resources/Locale/en-US/suspicion/suspicion-gui.ftl
+++ b/Resources/Locale/en-US/suspicion/suspicion-gui.ftl
@@ -5,4 +5,4 @@ suspicion-ally-count-display = {$allyCount ->
     *[zero] You have no allies
     [one] Your ally is {$allyNames}
     [other] Your allies are {$allyNames}
-}
\ No newline at end of file
+}
diff --git a/Resources/Locale/en-US/suspicion/traitor-overlay.ftl b/Resources/Locale/en-US/suspicion/traitor-overlay.ftl
index 01dc1011a2..872a225c03 100644
--- a/Resources/Locale/en-US/suspicion/traitor-overlay.ftl
+++ b/Resources/Locale/en-US/suspicion/traitor-overlay.ftl
@@ -1 +1 @@
-traitor-overlay-traitor-text = Traitor
\ No newline at end of file
+traitor-overlay-traitor-text = Traitor
diff --git a/Resources/Locale/en-US/tabletop/tabletop.ftl b/Resources/Locale/en-US/tabletop/tabletop.ftl
index b2bacd1649..1fd9a5ae21 100644
--- a/Resources/Locale/en-US/tabletop/tabletop.ftl
+++ b/Resources/Locale/en-US/tabletop/tabletop.ftl
@@ -1,4 +1,4 @@
-## TabletopGameComponent
+## TabletopGameComponent
 tabletop-verb-play-game = Play Game
 tabletop-verb-dump-pieces = Dump Pieces
 tabletop-default-board-name = Board Game
diff --git a/Resources/Locale/en-US/telephone/telephone.ftl b/Resources/Locale/en-US/telephone/telephone.ftl
index b279111d23..9f26b2ac01 100644
--- a/Resources/Locale/en-US/telephone/telephone.ftl
+++ b/Resources/Locale/en-US/telephone/telephone.ftl
@@ -1,4 +1,4 @@
-# Chat window telephone wrap (prefix and postfix)
+# Chat window telephone wrap (prefix and postfix)
 chat-telephone-message-wrap = [color={$color}][bold]{$name}[/bold] {$verb}, [font={$fontType} size={$fontSize}]"{$message}"[/font][/color]
 chat-telephone-message-wrap-bold = [color={$color}][bold]{$name}[/bold] {$verb}, [font={$fontType} size={$fontSize}][bold]"{$message}"[/bold][/font][/color]
 
@@ -10,4 +10,4 @@ chat-telephone-unknown-device = [color={$color}][font={$fontType} size={$fontSiz
 chat-telephone-device-id = [color={$color}][font={$fontType} size={$fontSize}][bold]{CAPITALIZE($deviceName)}[/bold][/font][/color]
 
 # Chat text
-chat-telephone-name-relay = {$originalName} ({$speaker})
\ No newline at end of file
+chat-telephone-name-relay = {$originalName} ({$speaker})
diff --git a/Resources/Locale/en-US/teleportation/handheld-teleporter.ftl b/Resources/Locale/en-US/teleportation/handheld-teleporter.ftl
index 28f526f0d5..60f0fdd657 100644
--- a/Resources/Locale/en-US/teleportation/handheld-teleporter.ftl
+++ b/Resources/Locale/en-US/teleportation/handheld-teleporter.ftl
@@ -1 +1 @@
-handheld-teleporter-instability-fizzle = The portal fizzles as you try to place it, destroying both ends!
+handheld-teleporter-instability-fizzle = The portal fizzles as you try to place it, destroying both ends!
diff --git a/Resources/Locale/en-US/teleportation/teleportation-menu-gui.ftl b/Resources/Locale/en-US/teleportation/teleportation-menu-gui.ftl
index 74e5a1804b..a2848bbe1c 100644
--- a/Resources/Locale/en-US/teleportation/teleportation-menu-gui.ftl
+++ b/Resources/Locale/en-US/teleportation/teleportation-menu-gui.ftl
@@ -1,4 +1,4 @@
-## Default
+## Default
 teleportation-menu-default-window-title = Teleportation Menu
 teleportation-menu-destination-obstructed = You don't feel like you went anywhere...
 
diff --git a/Resources/Locale/en-US/tesla/tesla-components.ftl b/Resources/Locale/en-US/tesla/tesla-components.ftl
index 61f4970457..12dac4bff1 100644
--- a/Resources/Locale/en-US/tesla/tesla-components.ftl
+++ b/Resources/Locale/en-US/tesla/tesla-components.ftl
@@ -2,4 +2,4 @@ tesla-coil-on = The tesla coil turns on.
 tesla-coil-off = The tesla coil turns off.
 
 tesla-grounding-on = The grounding rod turns on.
-tesla-grounding-off = The grounding rod turns off.
\ No newline at end of file
+tesla-grounding-off = The grounding rod turns off.
diff --git a/Resources/Locale/en-US/thief/beacon.ftl b/Resources/Locale/en-US/thief/beacon.ftl
index 9fbbcaf419..cff3f71b2b 100644
--- a/Resources/Locale/en-US/thief/beacon.ftl
+++ b/Resources/Locale/en-US/thief/beacon.ftl
@@ -5,4 +5,4 @@ thief-fulton-examined-set = Coordinates entered. Bluespace teleportation of the
 thief-fulton-examined-unset = Beacon coordinates are not set.
 
 thief-fulton-verb-text = Set coordinates
-thief-fulton-verb-message = Set the coordinates of your thief's hideout, where all nearby items will be sent at the end of the round.
\ No newline at end of file
+thief-fulton-verb-message = Set the coordinates of your thief's hideout, where all nearby items will be sent at the end of the round.
diff --git a/Resources/Locale/en-US/tiles/placement.ftl b/Resources/Locale/en-US/tiles/placement.ftl
index e4f148e273..61124dc799 100644
--- a/Resources/Locale/en-US/tiles/placement.ftl
+++ b/Resources/Locale/en-US/tiles/placement.ftl
@@ -1 +1 @@
-invalid-floor-placement = Unable to place there
\ No newline at end of file
+invalid-floor-placement = Unable to place there
diff --git a/Resources/Locale/en-US/tips/tips-system.ftl b/Resources/Locale/en-US/tips/tips-system.ftl
index 5ae3ce9d83..1bb593b1a0 100644
--- a/Resources/Locale/en-US/tips/tips-system.ftl
+++ b/Resources/Locale/en-US/tips/tips-system.ftl
@@ -1 +1 @@
-tips-system-chat-message-wrap = Tip: {$tip}
+tips-system-chat-message-wrap = Tip: {$tip}
diff --git a/Resources/Locale/en-US/tools/components/lattice-cutting-component.ftl b/Resources/Locale/en-US/tools/components/lattice-cutting-component.ftl
index 2fa76d83fc..dbf5054239 100644
--- a/Resources/Locale/en-US/tools/components/lattice-cutting-component.ftl
+++ b/Resources/Locale/en-US/tools/components/lattice-cutting-component.ftl
@@ -1 +1 @@
-comp-lattice-cutting-unsafe-warning = You feel air blow past your fingers... Maybe you should reconsider?
+comp-lattice-cutting-unsafe-warning = You feel air blow past your fingers... Maybe you should reconsider?
diff --git a/Resources/Locale/en-US/traitor/uplink/telecrystal-component.ftl b/Resources/Locale/en-US/traitor/uplink/telecrystal-component.ftl
index 061799fcfe..af344e74b2 100644
--- a/Resources/Locale/en-US/traitor/uplink/telecrystal-component.ftl
+++ b/Resources/Locale/en-US/traitor/uplink/telecrystal-component.ftl
@@ -1 +1 @@
-telecrystal-component-sucs-inserted = You slot {THE($source)} into {THE($target)}.
\ No newline at end of file
+telecrystal-component-sucs-inserted = You slot {THE($source)} into {THE($target)}.
diff --git a/Resources/Locale/en-US/transform/verbs/attach-to-grandparent-verb.ftl b/Resources/Locale/en-US/transform/verbs/attach-to-grandparent-verb.ftl
index 17bb0a7d46..a737126f39 100644
--- a/Resources/Locale/en-US/transform/verbs/attach-to-grandparent-verb.ftl
+++ b/Resources/Locale/en-US/transform/verbs/attach-to-grandparent-verb.ftl
@@ -1 +1 @@
-attach-to-grandparent-verb-get-data-text = Attach to grid
\ No newline at end of file
+attach-to-grandparent-verb-get-data-text = Attach to grid
diff --git a/Resources/Locale/en-US/transform/verbs/attach-to-grid-verb.ftl b/Resources/Locale/en-US/transform/verbs/attach-to-grid-verb.ftl
index 9d60979a42..1aa91aa741 100644
--- a/Resources/Locale/en-US/transform/verbs/attach-to-grid-verb.ftl
+++ b/Resources/Locale/en-US/transform/verbs/attach-to-grid-verb.ftl
@@ -1 +1 @@
-attach-to-grid-verb-get-data-text = Attach to grid
\ No newline at end of file
+attach-to-grid-verb-get-data-text = Attach to grid
diff --git a/Resources/Locale/en-US/transform/verbs/attach-to-self-verb.ftl b/Resources/Locale/en-US/transform/verbs/attach-to-self-verb.ftl
index a6abcd239d..dff00dc8b7 100644
--- a/Resources/Locale/en-US/transform/verbs/attach-to-self-verb.ftl
+++ b/Resources/Locale/en-US/transform/verbs/attach-to-self-verb.ftl
@@ -1 +1 @@
-attach-to-self-verb-get-data-text = Attach to self
\ No newline at end of file
+attach-to-self-verb-get-data-text = Attach to self
diff --git a/Resources/Locale/en-US/triggers/trigger-on-verb.ftl b/Resources/Locale/en-US/triggers/trigger-on-verb.ftl
index d9342e7bdd..153763f1f3 100644
--- a/Resources/Locale/en-US/triggers/trigger-on-verb.ftl
+++ b/Resources/Locale/en-US/triggers/trigger-on-verb.ftl
@@ -1,2 +1,2 @@
 trigger-on-verb-default = Trigger
-trigger-on-verb-detonation = Start detonation
\ No newline at end of file
+trigger-on-verb-detonation = Start detonation
diff --git a/Resources/Locale/en-US/ui/actionmenu.ftl b/Resources/Locale/en-US/ui/actionmenu.ftl
index 924ed0710b..712d2b8e3c 100644
--- a/Resources/Locale/en-US/ui/actionmenu.ftl
+++ b/Resources/Locale/en-US/ui/actionmenu.ftl
@@ -1,4 +1,4 @@
 # Action menu stuff (left panel, with hotbars etc)
 
 ui-actionmenu-function-lock-action-slots = (Un)lock dragging and clearing action slots
-ui-actionmenu-function-open-abilities-menu = Open action menu
\ No newline at end of file
+ui-actionmenu-function-open-abilities-menu = Open action menu
diff --git a/Resources/Locale/en-US/ui/controls.ftl b/Resources/Locale/en-US/ui/controls.ftl
index 575c6499f4..30a0840aaa 100644
--- a/Resources/Locale/en-US/ui/controls.ftl
+++ b/Resources/Locale/en-US/ui/controls.ftl
@@ -1,4 +1,4 @@
-## Loc strings for generic "on/off button" control.
+## Loc strings for generic "on/off button" control.
 ui-button-off = Off
 ui-button-on = On
 
diff --git a/Resources/Locale/en-US/ui/navmap.ftl b/Resources/Locale/en-US/ui/navmap.ftl
index c5d7a1e612..299177c5c1 100644
--- a/Resources/Locale/en-US/ui/navmap.ftl
+++ b/Resources/Locale/en-US/ui/navmap.ftl
@@ -1,4 +1,4 @@
-navmap-zoom = Zoom: {$value}x
+navmap-zoom = Zoom: {$value}x
 navmap-recenter = Recenter
 navmap-toggle-beacons = Show departments
 navmap-location = Location: [x = {$x}, y = {$y}]
diff --git a/Resources/Locale/en-US/ui/spray-painter-window.ftl b/Resources/Locale/en-US/ui/spray-painter-window.ftl
index 5466810e11..d06f3c8c04 100644
--- a/Resources/Locale/en-US/ui/spray-painter-window.ftl
+++ b/Resources/Locale/en-US/ui/spray-painter-window.ftl
@@ -1 +1 @@
-pipe-painter-no-color-selected = (No color selected)
\ No newline at end of file
+pipe-painter-no-color-selected = (No color selected)
diff --git a/Resources/Locale/en-US/ui/transfer-amount.ftl b/Resources/Locale/en-US/ui/transfer-amount.ftl
index a1f549d934..c86e521769 100644
--- a/Resources/Locale/en-US/ui/transfer-amount.ftl
+++ b/Resources/Locale/en-US/ui/transfer-amount.ftl
@@ -1,4 +1,4 @@
-### Loc for the transfer amount eui window
+### Loc for the transfer amount eui window
 
 ## Title
 
diff --git a/Resources/Locale/en-US/vehicle/vehicle.ftl b/Resources/Locale/en-US/vehicle/vehicle.ftl
index 417a1a17ac..521caf5a87 100644
--- a/Resources/Locale/en-US/vehicle/vehicle.ftl
+++ b/Resources/Locale/en-US/vehicle/vehicle.ftl
@@ -1,4 +1,4 @@
-vehicle-slot-component-slot-name-keys = keys
+vehicle-slot-component-slot-name-keys = keys
 container-vehicle-verb-enter = Enter
 container-vehicle-verb-remove-operator = Remove operator
 container-vehicle-entry-denied = You cannot operate this.
diff --git a/Resources/Locale/en-US/verbs/invoke-verb-command.ftl b/Resources/Locale/en-US/verbs/invoke-verb-command.ftl
index c805eb6364..dbb92df653 100644
--- a/Resources/Locale/en-US/verbs/invoke-verb-command.ftl
+++ b/Resources/Locale/en-US/verbs/invoke-verb-command.ftl
@@ -1,4 +1,4 @@
-### Localization used for the invoke verb command.
+### Localization used for the invoke verb command.
 # Mostly help + error messages.
 
 invoke-verb-command-description = Invokes a verb with the given name on an entity, with the player entity
diff --git a/Resources/Locale/en-US/verbs/list-verbs-command.ftl b/Resources/Locale/en-US/verbs/list-verbs-command.ftl
index 75a1df3ffa..53b85559de 100644
--- a/Resources/Locale/en-US/verbs/list-verbs-command.ftl
+++ b/Resources/Locale/en-US/verbs/list-verbs-command.ftl
@@ -1,4 +1,4 @@
-### Localization used for the list verbs command.
+### Localization used for the list verbs command.
 # Mostly help + error messages.
 
 list-verbs-command-description = Lists all verbs that a player can use on a given entity.
diff --git a/Resources/Locale/en-US/verbs/verbs.ftl b/Resources/Locale/en-US/verbs/verbs.ftl
index e39e0727f0..2b2becd6ff 100644
--- a/Resources/Locale/en-US/verbs/verbs.ftl
+++ b/Resources/Locale/en-US/verbs/verbs.ftl
@@ -1,2 +1,2 @@
 # Default text that gets shown in the context menu for examining something with a GroupExamineComponent
-verb-examine-group-other = Other
\ No newline at end of file
+verb-examine-group-other = Other
diff --git a/Resources/Locale/en-US/virtual/virtual-item.ftl b/Resources/Locale/en-US/virtual/virtual-item.ftl
index cb91f24cf7..a83c58c337 100644
--- a/Resources/Locale/en-US/virtual/virtual-item.ftl
+++ b/Resources/Locale/en-US/virtual/virtual-item.ftl
@@ -1 +1 @@
-virtual-item-dropped-other = You dropped {THE($dropped)}!
+virtual-item-dropped-other = You dropped {THE($dropped)}!
diff --git a/Resources/Locale/en-US/voting/ui/vote-call-menu-button.ftl b/Resources/Locale/en-US/voting/ui/vote-call-menu-button.ftl
index eee71abf10..912529d389 100644
--- a/Resources/Locale/en-US/voting/ui/vote-call-menu-button.ftl
+++ b/Resources/Locale/en-US/voting/ui/vote-call-menu-button.ftl
@@ -1,2 +1,2 @@
 # Button text in lobby/escape menu
-ui-vote-menu-button = Call vote
\ No newline at end of file
+ui-vote-menu-button = Call vote
diff --git a/Resources/Locale/en-US/voting/vote-options.ftl b/Resources/Locale/en-US/voting/vote-options.ftl
index dffd61b3b5..9f13324c91 100644
--- a/Resources/Locale/en-US/voting/vote-options.ftl
+++ b/Resources/Locale/en-US/voting/vote-options.ftl
@@ -1 +1 @@
-vote-options-server-initiator-text = The server
\ No newline at end of file
+vote-options-server-initiator-text = The server
diff --git a/Resources/Locale/en-US/weapons/ranged/recharge-basic-entity-ammo.ftl b/Resources/Locale/en-US/weapons/ranged/recharge-basic-entity-ammo.ftl
index 49ebe25dc3..4014a9295d 100644
--- a/Resources/Locale/en-US/weapons/ranged/recharge-basic-entity-ammo.ftl
+++ b/Resources/Locale/en-US/weapons/ranged/recharge-basic-entity-ammo.ftl
@@ -1,2 +1,2 @@
-recharge-basic-entity-ammo-can-recharge = It will recharge its ammo in [color=yellow]{$seconds}[/color] seconds.
+recharge-basic-entity-ammo-can-recharge = It will recharge its ammo in [color=yellow]{$seconds}[/color] seconds.
 recharge-basic-entity-ammo-full = It doesn't need to recharge its ammo yet.
diff --git a/Resources/Locale/en-US/weapons/ranged/turrets.ftl b/Resources/Locale/en-US/weapons/ranged/turrets.ftl
index 8a21647075..16c85f052d 100644
--- a/Resources/Locale/en-US/weapons/ranged/turrets.ftl
+++ b/Resources/Locale/en-US/weapons/ranged/turrets.ftl
@@ -10,4 +10,4 @@ deployable-turret-component-cannot-access-wires = You can't reach the maintenanc
 
 # Turret notification for station AI
 station-ai-turret-component-name = {$name} ({$address})
-station-ai-turret-component-is-attacking-warning = {CAPITALIZE($source)} has engaged a hostile target.
\ No newline at end of file
+station-ai-turret-component-is-attacking-warning = {CAPITALIZE($source)} has engaged a hostile target.
diff --git a/Resources/Locale/en-US/xenoarchaeology/artifact-component.ftl b/Resources/Locale/en-US/xenoarchaeology/artifact-component.ftl
index c131be8859..236fe3b99e 100644
--- a/Resources/Locale/en-US/xenoarchaeology/artifact-component.ftl
+++ b/Resources/Locale/en-US/xenoarchaeology/artifact-component.ftl
@@ -1,4 +1,4 @@
-### Verbs
+### Verbs
 artifact-verb-make-always-active = Make artifact always active
 artifact-verb-activate = Activate artifact
 
diff --git a/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl b/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl
index bfffcde8cb..bc9df24f4d 100644
--- a/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl
+++ b/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl
@@ -22,65 +22,6 @@ artifact-effect-hint-polymorph = Transmogrificational activity
 artifact-effect-hint-magnet = Magnetic waves
 artifact-effect-hint-visual = Visual distortions
 
-# the triggers should be more obvious than the effects
-# gives people an idea of what to do: don't be too specific (i.e. no "welders")
-
-artifact-trigger-hint-electricity = Electricity
-artifact-trigger-hint-heat = High temperatures
-artifact-trigger-hint-physical = Physical trauma
-artifact-trigger-hint-tool = Tool usage
-artifact-trigger-hint-music = Sonic vibrations
-artifact-trigger-hint-water = Hydro-reactive
-artifact-trigger-hint-blood = Reaction with hematological fluid
-artifact-trigger-hint-magnet = Magnetic waves
-artifact-trigger-hint-death = Life essence
-artifact-trigger-hint-radiation = Radiation
-artifact-trigger-hint-pressure = Extreme pressure
-artifact-trigger-hint-regular-gases = Standard atmospheric gases
-artifact-trigger-hint-plasma = Gaseous plasma
-artifact-trigger-hint-land = Active deceleration
-artifact-trigger-hint-examine = Examination
-artifact-trigger-hint-medical = Therapeutic chemicals
-
-xenoarch-trigger-tip-music = Harmonical sound vibrations
-xenoarch-trigger-tip-heat = High temperature gas
-xenoarch-trigger-tip-cold = Low temperature gas
-xenoarch-trigger-tip-no-oxygen = Oxygen-free environment
-xenoarch-trigger-tip-water = Water
-xenoarch-trigger-tip-co2 = Carbon dioxide
-xenoarch-trigger-tip-plasma = Non-solid plasma
-xenoarch-trigger-tip-tritium = Tritium
-xenoarch-trigger-tip-ammonia = Ammonia
-xenoarch-trigger-tip-n2o = Nitrous oxide
-xenoarch-trigger-tip-frezon = Frezon
-xenoarch-trigger-tip-radiation = Heavy-ion radiation
-xenoarch-trigger-tip-microwave = Microwave radiation
-xenoarch-trigger-tip-brute-damage = Physical damage
-xenoarch-trigger-tip-interaction = Physical interaction
-xenoarch-trigger-tip-wrenching = Tightening
-xenoarch-trigger-tip-prying = Prying
-xenoarch-trigger-tip-screwing = Screwing
-xenoarch-trigger-tip-pulsing = Pulsing
-xenoarch-trigger-tip-pressure-low = Low pressure
-xenoarch-trigger-tip-pressure-high = High pressure
-xenoarch-trigger-tip-examine = Close inspection
-xenoarch-trigger-tip-timer = Regular self-activation
-xenoarch-trigger-tip-blood = Blood
-xenoarch-trigger-tip-throw = Being thrown
-xenoarch-trigger-tip-death = Death
-xenoarch-trigger-tip-magnet = Magnetic waves
-xenoarch-trigger-tip-money = Bribery
-xenoarch-trigger-tip-knowledge = Knowledge Intake
-xenoarch-trigger-tip-carbs = Carbohydrate Intake
-xenoarch-trigger-tip-meat = Protein Intake
-xenoarch-trigger-tip-produce = Healthy Produce Intake
-xenoarch-trigger-tip-stamp = Bureaucratic Approval
-xenoarch-trigger-tip-shock = Electrical Shock
-xenoarch-trigger-tip-particle = Singularity-Effecting Particles
-xenoarch-trigger-tip-anomparticle = Anomaly-Effecting Particles
-xenoarch-trigger-tip-stamina-damage = Organic Exhaustion
-xenoarch-trigger-tip-laser = High-Intensity photon impacts
-
 ### Description hints
 xenoarch-trigger-examine-wrenching = There's a loose bit spinning around.
 xenoarch-trigger-examine-prying = There's a panel coming up from the surface.
diff --git a/Resources/Locale/ru-RU/contraband/contraband-severity.ftl b/Resources/Locale/ru-RU/contraband/contraband-severity.ftl
index 2c80a102a6..4fa96e38d3 100644
--- a/Resources/Locale/ru-RU/contraband/contraband-severity.ftl
+++ b/Resources/Locale/ru-RU/contraband/contraband-severity.ftl
@@ -46,7 +46,7 @@ contraband-examine-text-Magical =
         [reagent] [color={ $color }]Этот реагент является крайне незаконной магической контрабандой![/color]
     }
 
-contraband-examine-text-avoid-carrying-around = [color=red][italic]Вам, вероятно, не стоит носить его с собой без веской причины.[/italic][/color]
+contraband-examine-text-avoid-carrying-around = [color=orange][italic]Вам, вероятно, не стоит носить его с собой без причины.(см. КЗ контрабанды)[/italic][/color]
 contraband-examine-text-in-the-clear = [color=green][italic]Вам ничто не мешает носить это на виду.[/italic][/color]
 
 contraband-examinable-verb-text = Легальность
diff --git a/Resources/Locale/ru-RU/corvax/guidebook/SOP/security.ftl b/Resources/Locale/ru-RU/corvax/guidebook/SOP/security.ftl
index 5c149cfc86..10ee6300b6 100644
--- a/Resources/Locale/ru-RU/corvax/guidebook/SOP/security.ftl
+++ b/Resources/Locale/ru-RU/corvax/guidebook/SOP/security.ftl
@@ -1,6 +1,6 @@
 # Общие СРП
 guidebook-SOP-security-general-must =
-    1. Соблюдать все установленные процедуры отдела службы безопасности в рамках своей должности.
+    1. Соблюдать все установленные процедуры отдела Службы безопасности в рамках своей должности.
     1. Применять меры подавления в отношении нарушителей в соответствии с уровнем угрозы, который они представляют.
     1. Поддерживать датчики костюма в режиме «Координаты».
     1. Соблюдать субординацию и использовать [tooltip="guidebook-SOP-security-tooltip-regulation-speech" text="уставную речь"] при общении с сотрудниками СБ, членами командования, сотрудниками юридического департамента, представителями Центрального Командования и ДСО.
@@ -24,15 +24,21 @@ guidebook-SOP-security-general-right =
       - В [color=dodgerblue][bold]синий код[/bold][/color] с устного разрешения капитана получить [tooltip="guidebook-SOP-security-tooltip-extended-access" text="расширенный доступ"].
       - В [color=red][bold]красный код[/bold][/color] по своему запросу получить [tooltip="guidebook-SOP-security-tooltip-extended-access" text="расширенный доступ"].
       - В [color=gold][bold]гамма код[/bold][/color] получить [tooltip="guidebook-SOP-security-tooltip-full-access" text="полный доступ"].
-    1. В рамках проведения процедур службы безопасности подавать запросы главам станции для получения требуемой информации.
+    1. В рамках проведения процедур Службы безопасности подавать запросы главам станции для получения требуемой информации.
     1. Составить рапорт о задержании, в котором подробно описываются обстоятельства задержания, основания, ход и результаты обыска, свидетели, а также иные сведения, имеющие значение для разбирательства.
+    1. Оцепить место преступления с помощью щитов, голобарьеров,  маркеров улик и прочих инструментов Службы безопасности (исключая барьеры и стационарные вспышки) в целях проведения расследования.
+      - Для создания оцепления необходимо одобрение ГСБ или капитана. Обязательно уведомление экипажа о создании оцепления в общий канал связи.
+      - Район не может быть оцеплен более, чем на 5 минут и не может оцепляться повторно в рамках того же дела.
+      - Пересечение оцепленной территории членами экипажа расценивается как помеха при проведении следственных мероприятий.
+
 
 guidebook-SOP-security-general-prohibited =
-    1. Проводить процедуры СБ в отношении равных либо старших по иерархии сотрудников СБ, лиц с [tooltip="guidebook-SOP-security-tooltip-legal-immunity" text="юридической неприкосновенностью"] без приказа уполномоченного лица.
+    1. Проводить процедуры СБ и применять силу в отношении равных либо старших по иерархии сотрудников СБ, лиц с [tooltip="guidebook-SOP-security-tooltip-legal-immunity" text="юридической неприкосновенностью"] без приказа уполномоченного лица.
       - Приказ в отношении сотрудника СБ может быть издан вышестоящим сотрудником СБ.
       - Приказ в отношении главы СБ может быть издан капитаном.
       - Лица с [tooltip="guidebook-SOP-security-tooltip-legal-immunity" text="юридической неприкосновенностью"] могут быть подвергнуты процедурам СБ только после снятия неприкосновенности.
       - Все вышеперечисленные лица могут быть задержаны до издания приказа в случае, если они представляют [tooltip="guidebook-SOP-security-tooltip-significant-threat" text="значительную угрозу безопасности"].
+      - Исключением является проведение тренировочного мероприятия в специально отведенном месте в бриге, либо в пределах ринга.
     1. Находиться в состоянии опьянения или нести службу при наличии серьёзных травм.
     1. При пилотировании шаттлов допускать столкновения со станцией и иными объектами, кроме случаев, когда столкновение необходимо для исполнения служебных обязанностей.
     1. Переодевать свою [tooltip="guidebook-SOP-security-tooltip-uniform" text="униформу"]. Также запрещено надевать элементы униформы и брони других должностей внутри отдела.
@@ -40,19 +46,19 @@ guidebook-SOP-security-general-prohibited =
 # Должностные СРП
 ## Глава службы безопасности
 guidebook-SOP-HeadOfSecurity-must =
-    1. Координировать работу отдела службы безопасности, обеспечивать поддержание порядка на станции и в ближайшем космическом пространстве.
-    1. Контролировать исполнение процедур службы безопасности сотрудниками отдела, в случае необходимости исполнять процедуры лично либо передать их исполнение уполномоченным лицам.
+    1. Координировать работу отдела Службы безопасности, обеспечивать поддержание порядка на станции и в ближайшем космическом пространстве.
+    1. Контролировать исполнение процедур Службы безопасности сотрудниками отдела, в случае необходимости исполнять процедуры лично либо передать их исполнение уполномоченным лицам.
     1. Обеспечивать сохранность диска ядерной авторизации.
     1. Организовать патрульные группы для поддержания порядка на станции.
     1. В случае отсутствия в отделе смотрителя назначить на пост ВрИО помощника смотрителя, а при его отсутствии — выбрать сотрудника из числа офицеров или самому исполнять его обязанности.
     1. Назначить кадетов в помощники офицеру, смотрителю, детективу или пилоту; при отсутствии таковых назначить кадетов в помощники себе.
 
 guidebook-SOP-HeadOfSecurity-right =
-    1. Проводить и контролировать проведение любых процедур отдела службы безопасности.
+    1. Проводить и контролировать проведение любых процедур отдела Службы безопасности.
     1. При приёме в отдел нового сотрудника из числа членов экипажа обязать кандидата пройти процедуру установки импланта «Щит разума».
     1. При выдаче сотруднику станции доступов уровней «бриг», «служба безопасности» или «оружейная» потребовать от него пройти процедуру установки импланта «Щит разума».
     1. В любой код держать при себе личный энергетический пистолет/револьвер и/или энергетический меч «Правосудие» (при наличии).
-    1. Провести процедуру личного досмотра в отношении любого нижестоящего сотрудника службы безопасности при подозрении в хранении контрабандных предметов или недопустимого для текущего уровня угрозы вооружения.
+    1. Провести процедуру личного досмотра в отношении любого нижестоящего сотрудника Службы безопасности при подозрении в хранении контрабандных предметов или недопустимого для текущего уровня угрозы вооружения.
     1. При отсутствии пилота/помощника смотрителя одобрить перевод сотрудника из числа офицеров на данную должность.
     1. Временно отстранить от службы любого сотрудника СБ при подтверждении состояния опьянения или при наличии серьёзных травм, а также в случае нарушения корпоративного закона или СРП сотрудником.
       - Отстранение может отменить капитан.
@@ -74,7 +80,7 @@ guidebook-SOP-HeadOfSecurity-prohibited =
 ## Смотритель
 guidebook-SOP-Warden-must =
     1. На постоянной основе нести службу в бриге.
-    1. Выдавать оружие сотрудникам службы безопасности в соответствии с положением о вооружении отдела.
+    1. Выдавать оружие сотрудникам Службы безопасности в соответствии с положением о вооружении отдела.
     1. Следить за достаточным количеством вооружения в арсенале, вести учёт выданного и полученного снаряжения, следить за своевременной сдачей оружия при понижении кода.
     1. При наличии задержанных лиц проводить процедуры допроса, вынесения вердикта и реализации наказания.
       - При наличии нескольких задержанных или при необходимости срочной выдачи оружия поручить исполнение нижестоящему сотруднику СБ.
@@ -84,12 +90,12 @@ guidebook-SOP-Warden-must =
     1. Обеспечивать поддержание чистоты и порядка в бриге.
 
 guidebook-SOP-Warden-right =
-    1. Проводить любые процедуры службы безопасности в рамках, установленных процедурами.
+    1. Проводить любые процедуры Службы безопасности в рамках, установленных процедурами.
     1. Отдавать [tooltip="guidebook-SOP-security-tooltip-lawful-orders" text="правомерные приказы"] помощнику и сотрудникам на территории брига, если они не противоречат указаниям ГСБ или капитана.
     1. При отсутствии связи с главой службы безопасности в течение 5 минут временно заменить его до выяснения обстоятельств.
-    1. В любой код держать при себе личный энергетический дробовик.
-      - В [color=dodgerblue][bold]синий код[/bold][/color] передать энергетический дробовик одному из сотрудников СБ на основании письменного разрешения.
-      - В [color=red][bold]красный код[/bold][/color] и выше передать энергетический дробовик одному из сотрудников СБ на основании устного разрешения.
+    1. В любой код держать при себе личный энергетический дробовик и перчатки крав-мага.
+      - В [color=dodgerblue][bold]синий код[/bold][/color] возможна передача этих предметов одному из сотрудников СБ на основании письменного разрешения.
+        - В [color=red][bold]красный код[/bold][/color] и выше передача возможна с устного разрешения.
     1. Проводить личный досмотр нижестоящих сотрудников при подозрении в хранении контрабанды или недопустимого вооружения.
     1. Временно отстранить от службы любого сотрудника СБ, кроме ГСБ, при подтверждении состояния опьянения или при наличии серьёзных травм, а также в случае нарушения корпоративного закона или СРП сотрудником.
       - Отстранение могут отменить ГСБ и капитан;
@@ -109,7 +115,7 @@ guidebook-SOP-WardenHelper-must =
     1. Поддерживать чистоту и порядок в бриге.
 
 guidebook-SOP-WardenHelper-right =
-    1. Проводить процедуры службы безопасности в рамках установленных процедур.
+    1. Проводить процедуры Службы безопасности в рамках установленных процедур.
     1. При проверке карцера, пермабрига или каторги иметь при себе летальное оружие и средства подавления вне зависимости от уровня угрозы.
       - По окончании проверки вооружение, запрещенное для текущего уровня угрозы, должно быть возвращено в арсенал.
     1. В [color=dodgerblue][bold]синий код[/bold][/color] и выше размещать переносные вспышки и развертываемые барьеры в бриге; при снижении уровня угрозы возвращать их в место хранения.
@@ -124,7 +130,7 @@ guidebook-SOP-Security-must =
     1. Поддерживать порядок на станции и среди персонала, предотвращая нарушения закона.
 
 guidebook-SOP-Security-right =
-    1. Проводить любые процедуры службы безопасности в рамках, установленных самими процедурами.
+    1. Проводить любые процедуры Службы безопасности в рамках, установленных самими процедурами.
     1. Изменять статус представителей персонала станции в консоли криминалистических записей с разрешения уполномоченных лиц или при личном свидетельстве нарушения корпоративного закона.
     1. С разрешения смотрителя и главы службы безопасности перейти на должность помощника смотрителя в качестве специализации.
     1. С разрешения главы службы безопасности пройти обучение навыку пилотирования и перейти на должность пилота в качестве специализации.
@@ -132,16 +138,14 @@ guidebook-SOP-Security-right =
 ## Детектив
 guidebook-SOP-Detective-must =
     1. Проводить следственные мероприятия с целью установления деталей преступления и привлечения виновных лиц к ответственности.
-    1. Оказывать содействие офицерам службы безопасности в поддержании порядка на станции.
+    1. Оказывать содействие офицерам СБ в поддержании порядка на станции.
 
 guidebook-SOP-Detective-right =
-    1. Проводить любые процедуры службы безопасности в рамках, установленных процедурами.
+    1. Проводить любые процедуры Службы безопасности в рамках, установленных процедурами.
       - Исключение — процедура задержания. Детектив может проводить задержание в следующих случаях:
         - В условиях [color=red][bold]красного кода[/bold][/color].
         - Если детектив является свидетелем [tooltip="guidebook-SOP-security-tooltip-public-dangerous-crime" text="общественно опасного преступления"].
         - В отношении лиц в розыске.
-    1. Оцепить место преступления с помощью голобарьеров и маркеров улик.
-      - Детектив обязан оповестить главу службы безопасности и ответственного за отсек об оцеплении, убрать оцепление по их первому требованию.
     1. Изъять у члена экипажа имущество, если есть основания полагать, что они являются орудием преступления.
       - Запрещено изъятие особо ценного имущества без разрешения капитана.
       - Запрещено изъятие имущества у лиц с [tooltip="guidebook-SOP-security-tooltip-legal-immunity" text="юридической неприкосновенностью"].
@@ -149,13 +153,13 @@ guidebook-SOP-Detective-right =
 
 ## Пилот службы безопасности
 guidebook-SOP-SecurityPilot-must =
-    1. Проверять космическое пространство, ИИ и каторжный лагерь с челнока службы безопасности или вне его.
+    1. Проверять космическое пространство, ИИ и каторжный лагерь с челнока Службы безопасности или вне его.
     1. Поддерживать станцию в неподвижном состоянии. При её движении — стабилизировать её.
     1. Конвоировать приговорённых к каторжным работам на каторгу.
     1. Следить за техническим состоянием челнока СБ и сообщать инженерам о поломках.
 
 guidebook-SOP-SecurityPilot-right =
-    1. Проводить процедуры службы безопасности в рамках установленных процедур.
+    1. Проводить процедуры Службы безопасности в рамках установленных процедур.
     1. Носить и использовать лучевое вооружение за пределами станции вне зависимости от уровня угрозы.
     1. Носить и использовать летальное вооружение и средства подавления при проверке каторжного лагеря, если там есть заключённые.
 
@@ -167,6 +171,8 @@ guidebook-SOP-SecurityPilot-prohibited =
 
 ## Бригмедик
 guidebook-SOP-Brigmedic-must =
+    1. На постоянной основе находиться в пределах брига или лазарета Службы безопасности.
+      - Допускается покинуть бриг на короткий срок с разрешения смотрителя или ГСБ 
     1. Оказывать медицинскую помощь сотрудникам СБ, заключённым и лицам под следствием.
       - Оказывать помощь любым членам экипажа в критическом состоянии.
     1. Проводить принудительное хирургическое вмешательство на законных основаниях.
@@ -175,7 +181,11 @@ guidebook-SOP-Brigmedic-must =
     1. Обеспечивать заключённым питание, питьё и поддерживать чистоту в бриге.
 
 guidebook-SOP-Brigmedic-right =
-    1. Проводить процедуру задержания если бригмедик свидетель [tooltip="guidebook-SOP-security-tooltip-public-dangerous-crime" text="общественно опасного преступления"].
+    1. Проводить любые процедуры Службы безопасности в рамках, установленных процедурами, за исключением процедуры задержания.
+      - Проведение процедуры задержания возможно в следующих случаях:
+        - В условиях [color=red][bold]красного кода[/bold][/color].
+        - Если бригмедик является свидетелем [tooltip="guidebook-SOP-security-tooltip-public-dangerous-crime" text="общественно опасного преступления"].
+        - В отношении лиц в розыске или доставленных для лечения заключенных и подозреваемых.
     1. Отказать в помощи при самоповреждении.
     1. Временно отстранить сотрудника СБ, кроме смотрителя и ГСБ, при подтверждённом опьянении или тяжёлой травме.
       - Отстранение могут отменить ГСБ и капитан;
@@ -196,33 +206,33 @@ guidebook-SOP-SecurityCadet-must =
     1. Исполнять правомерные приказы назначенного сотрудника СБ и находиться рядом при выполнении задач.
 
 guidebook-SOP-SecurityCadet-prohibited =
-    1. Самостоятельно проводить процедуры службы безопасности.
+    1. Самостоятельно проводить процедуры Службы безопасности.
 
 # Процедуры и протоколы
 ## Общее положение о вооружении отдела СБ
 guidebook-SOP-security-procedure-weapons-regulation =
     1. Глава службы безопасности и смотритель заведуют арсеналом: выдавать и принимать вооружение в соответствии с уровнем угроз.
-      - По усмотрению главы службы безопасности или смотрителя может быть заказано дополнительное оружие в отделе снабжения и доставлено в арсенал.
-      - По усмотрению главы службы безопасности или смотрителя может быть заказано дополнительное оружие в научном отделе и доставлено в арсенал.
+      - По усмотрению главы службы безопасности или смотрителя может быть заказано дополнительное оружие в отделе Снабжения или в Научном отделе и доставлено в арсенал.
       - По усмотрению главы службы безопасности или смотрителя может быть создано новое вооружение и гранаты на ОхранФабе.
     1. Сотрудник службы безопасности обязан соблюдать следующие правила обращения с оружием:
       - В [color=green][bold]зелёный код[/bold][/color] допустимо держать оружие в руках лишь при необходимости его применения.
-      - В [color=dodgerblue][bold]синий код[/bold][/color] допустимо держать оружие в руках при необходимости его применения или при исполнении процедур службы безопасности.
+      - В [color=dodgerblue][bold]синий код[/bold][/color] допустимо держать оружие в руках при необходимости его применения или при исполнении процедур Службы безопасности.
       - В [color=red][bold]красный код[/bold][/color] и выше допускается свободное ношение оружия на постоянной основе.
-    1. В штатном режиме сотрудники службы безопасности могут владеть оружием только в соответствии с таблицей стандартного вооружения или особыми разрешениями в личных СРП.
-      - Сотрудник службы безопасности имеет право получить бронированный скафандр вне зависимости от текущего уровня угрозы в случае необходимости работы в условиях экстремального давления.
+    1. В штатном режиме сотрудники Службы безопасности могут владеть оружием только в соответствии с таблицей стандартного вооружения или особыми разрешениями в личных СРП.
+      - Сотрудник Службы безопасности имеет право получить бронированный скафандр вне зависимости от текущего уровня угрозы в случае необходимости работы в условиях экстремального давления.
       - Пилот во время работы в космическом пространстве может иметь при себе лучевое вооружение при любом уровне угрозы.
       - Пилот во время проверки каторжного лагеря при наличии в нём заключённых может иметь при себе любое неконтрабандное летальное вооружение при любом уровне угрозы.
       - Смотритель во время проверки пермабрига, каторжного лагеря и карцера при наличии в них заключённых может иметь при себе любое неконтрабандное летальное вооружение при любом уровне угрозы.
       - Помощник смотрителя во время проверки пермабрига, каторжного лагеря и карцера при наличии в них заключённых может иметь при себе любое неконтрабандное летальное вооружение при любом уровне угрозы.
       - Смотритель имеет  право держать при себе личный энергетический дробовик.
       - Глава службы безопасности имеет право держать при себе личный энергетический пистолет/револьвер и/или личный энергетический меч.
+      - Корабельные орудия доступны для установки только на шаттлах Службы безопасности. Исключением является дематерилизатор материи как рабочее оборудование утилизаторов.
     1. Главе службы безопасности разрешается выдать разрешение на ношение оружия гражданским лицам, если на то есть причины.
       - Разрешение на оружие без печати главы службы безопасности является недействительным, ношение оружия гражданскими лицами без разрешения является незаконным.
       - Глава службы безопасности может в любой момент времени отозвать разрешение на ношение оружия у любого члена экипажа с изъятием оружия.
-      - Сотрудникам службы безопасности запрещено получать разрешение на ношение оружия.
-    1. После понижения кода, сотрудники службы безопасности обязаны сдать неразрешённое в текущий код оружие в арсенал в течение 5 минут.
-      - Смотрителю и главе службы безопасности разрешено проводить личный досмотр нижестоящих сотрудников службы безопасности с целью выявления несданного оружия.
+      - Сотрудникам Службы безопасности запрещено получать разрешение на ношение оружия.
+    1. После понижения кода, сотрудники Службы безопасности обязаны сдать неразрешённое в текущий код оружие в арсенал в течение 5 минут.
+      - Смотрителю и главе службы безопасности разрешено проводить личный досмотр нижестоящих сотрудников Службы безопасности с целью выявления несданного оружия.
 
 ### Таблица вооружения
 guidebook-SOP-security-weapons-table-green = [tooltip="guidebook-SOP-security-weapons-tooltip-pistols" text="Пистолеты"], станнер, шоковая дубинка, DT-8 «Терминус», [tooltip="guidebook-SOP-security-weapons-tooltip-melee-list" text="личное холодное оружие"], вспышка, [tooltip="guidebook-SOP-security-weapons-tooltip-special-grenades" text="специальные гранаты"], [tooltip="guidebook-SOP-security-weapons-tooltip-restraints" text="средства ограничения мобильности"], [tooltip="guidebook-SOP-security-weapons-tooltip-standard-armor" text="стандартная броня"], пояс корпоративного дзюдо.
@@ -259,11 +269,11 @@ guidebook-SOP-security-procedure-search =
 guidebook-SOP-security-procedure-search-personal =
     {"[italic]Личный досмотр — процедура проверки имущества, которое находится в непосредственном распоряжении у обыскиваемого лица.[/italic]"}
     1. В ходе данной процедуры досматривающий имеет право осмотреть любое имущество, которое в данный момент имеется в распоряжении досматриваемого.
-    1. Сотрудник службы безопасности имеет право выбрать, каким способом будет проводиться процедура досмотра:
+    1. Сотрудник Службы безопасности имеет право выбрать, каким способом будет проводиться процедура досмотра:
       - Досматриваемый самостоятельно предъявляет необходимое имущество.
-      - Сотрудник службы безопасности принудительно изымает требуемые для досмотра предметы.
+      - Сотрудник Службы безопасности принудительно изымает требуемые для досмотра предметы.
       - В случае оказания сопротивления обыску, допустимо ограничить свободу перемещения обыскиваемого.
-    1. В рамках процедуры досмотра сотрудник службы безопасности уполномочен снять отпечатки пальцев и изучить образцы ДНК с любой вещи обыскиваемого.
+    1. В рамках процедуры досмотра сотрудник Службы безопасности уполномочен снять отпечатки пальцев и изучить образцы ДНК с любой вещи обыскиваемого.
     1. В рамках процедуры досмотра допускается взятие образца ДНК и отпечатков пальцев у досматриваемого лица.
     1. При выявлении у досматриваемого лица незаконного имущества, оно должно быть незамедлительно изъято, а лицо задержано.
     1. При наличии подозрений касательно законности какого-либо предмета, он может быть временно изъят для подтверждения его законности.
@@ -282,10 +292,10 @@ guidebook-SOP-security-procedure-search-personal =
 ### Обыск отдела
 guidebook-SOP-security-procedure-search-department =
     {"[italic]Обыск отдела — процедура обыска территории целого отдела, включающая в себя доскональное исследование всего отдела.[/italic]"}
-    1. При проведении обыска отдела сотрудники службы безопасности могут запросить набор доступов к обыскиваемому отделу.
+    1. При проведении обыска отдела сотрудники Службы безопасности могут запросить набор доступов к обыскиваемому отделу.
     1. На время проведения обыска все выходы из отдела могут быть заблокированы.
-    1. При проведении обыска все сотрудники отдела обязаны исполнять правомерные приказы сотрудников службы безопасности и содействовать в проведении процедуры.
-    1. В рамках процедуры обыска, сотрудники службы безопасности уполномочены снять отпечатки пальцев и изучить образцы ДНК на любом обыскиваемом предмете.
+    1. При проведении обыска все сотрудники отдела обязаны исполнять правомерные приказы сотрудников Службы безопасности и содействовать в проведении процедуры.
+    1. В рамках процедуры обыска, сотрудники Службы безопасности уполномочены снять отпечатки пальцев и изучить образцы ДНК на любом обыскиваемом предмете.
     1. При выявлении незаконного имущества, оно должно быть незамедлительно изъято.
     1. При наличии подозрений касательно законности какого-либо предмета, он может быть временно изъят для подтверждения его законности.
 
@@ -296,8 +306,8 @@ guidebook-SOP-security-procedure-search-department =
 ### Опознание
 guidebook-SOP-security-procedure-search-identification =
     {"[italic]Опознание — процедура, направленная на подтверждение личности определённого лица.[/italic]"}
-    1. При проведении опознания сотрудник службы безопасности уполномочен получить у опознаваемого лица образец ДНК и отпечатки пальцев.
-    1. В рамках процедуры опознания сотрудник службы безопасности имеет право снять любые предметы одежды, скрывающие лицо и прочие отличительные признаки опознаваемого.
+    1. При проведении опознания сотрудник Службы безопасности уполномочен получить у опознаваемого лица образец ДНК и отпечатки пальцев.
+    1. В рамках процедуры опознания сотрудник Службы безопасности имеет право снять любые предметы одежды, скрывающие лицо и прочие отличительные признаки опознаваемого.
     1. В случае несоответствия каких-либо данных опознаваемое лицо должно быть задержано и подвергнуто протоколу работы с незарегистрированными лицами.
 
     {"[head=3]Основания для проведения процедуры опознания[/head]"}
@@ -314,7 +324,7 @@ guidebook-SOP-security-procedure-search-surgical =
     1. Достаточно устного приказа, если на станции действует [color=gold][bold]гамма код[/bold][/color].
     1. Для проведения хирургических процедур в отношении лиц, осуждённых по статьям ХХ5 и ХХ6, разрешение не требуется.
     1. Внедрение импланта "Трекер" лицам, освобожденным по УДО, является добровольной процедурой и не требует приказа.
-    1. Внедрение импланта "Щит разума" лицам, заступающим на пост ВрИО главы, поступающим на службу в СБ или получающим доступы службы безопасности, является добровольной процедурой и не требует приказа.
+    1. Внедрение импланта "Щит разума" лицам, заступающим на пост ВрИО главы, поступающим на службу в СБ или получающим доступы Службы безопасности, является добровольной процедурой и не требует приказа.
     1. Проведение данной процедуры возможно непосредственно в месте заключения, лазарете брига или в операционной медицинского отдела.
     1. Лицо, подвергаемое процедуре, должно быть ограничено в свободе перемещения, а при необходимости, возможно введение анестезии.
     1. При извлечении голопаразитов допускается временное умертвление владельца с последующей реанимацией.
@@ -352,8 +362,8 @@ guidebook-SOP-security-procedure-investigation-rozysk =
     {"[head=3]Основания для объявления лица в розыск[/head]"}
     1. Сообщение о правонарушении со стороны свидетелей. Правонарушение может быть обнаружено непосредственно, либо при помощи средств связи.
     1. Для объявления лица в розыск требуются показания как минимум двух свидетелей.
-    1. Достаточно показаний одного свидетеля, если он является членом командования, сотрудником службы безопасности, сотрудником юридического департамента, центрального командования или департамента специальных операций.
-    1. В распоряжении службы безопасности имеются [tooltip="guidebook-SOP-security-procedure-tooltip-direct-evidence" text="прямые доказательства"] причастности подозреваемого к преступлению.
+    1. Достаточно показаний одного свидетеля, если он является членом командования, сотрудником Службы безопасности, сотрудником юридического департамента, центрального командования или департамента специальных операций.
+    1. В распоряжении Службы безопасности имеются [tooltip="guidebook-SOP-security-procedure-tooltip-direct-evidence" text="прямые доказательства"] причастности подозреваемого к преступлению.
     1. Лицо отказалось прибыть в бриг на законный вызов от сотрудника СБ.
     1. Имеется обвинительное заключение, заверенное печатью главы службы безопасности.
 
@@ -361,20 +371,20 @@ guidebook-SOP-security-procedure-investigation-rozysk =
 guidebook-SOP-security-procedure-investigation-arrest =
     {"[italic]Задержание — кратковременное ограничение свободы перемещения какого-либо лица с последующим сопровождением в бриг для установления причастности лица к совершению преступления.[/italic]"}
     1. Перед началом задержания оценить ситуацию и принять меры для задержания, которые будут наиболее эффективны в данной ситуации и соответствовать дозволенному уровню применения силы.
-    1. В случае отсутствия прямой угрозы со стороны подозреваемого, сотрудник службы безопасности обязан сообщить подозреваемому о факте его задержания, а также о составе инкриминируемого преступления.
-    1. В случае добровольного согласия задержанного следовать в бриг, сотрудник службы безопасности имеет право не применять средства ограничения мобильности.
+    1. В случае отсутствия прямой угрозы со стороны подозреваемого, сотрудник Службы безопасности обязан сообщить подозреваемому о факте его задержания, а также о составе инкриминируемого преступления.
+    1. В случае добровольного согласия задержанного следовать в бриг, сотрудник Службы безопасности имеет право не применять средства ограничения мобильности.
     1. Отказ добровольно следовать в бриг является поводом для перехода на более высокий уровень воздействия.
-    1. Ситуации, в которых сотрудник службы безопасности имеет право сообщить о задержании после нейтрализации правонарушителя:
+    1. Ситуации, в которых сотрудник Службы безопасности имеет право сообщить о задержании после нейтрализации правонарушителя:
       - Правонарушитель находится в нетрезвом состоянии.
       - Правонарушитель захватил заложника.
       - Правонарушитель вооружен холодным или стрелковым оружием, либо имеет при себе взрывчатые вещества.
-      - Правонарушитель совершает общественно опасное деяние на глазах сотрудника службы безопасности.
+      - Правонарушитель совершает общественно опасное деяние на глазах сотрудника Службы безопасности.
     1. После доставки в бриг в отношении задержанного должна быть инициирована процедура допроса.
     1. Допускается вынесение вердикта на месте правонарушения, согласно пункту 5 процедуры вынесения вердикта.
 
     {"[head=3]Основания для задержания лица[/head]"}
     1. Лицо находится в розыске.
-    1. Лицо совершает правонарушение непосредственно на глазах сотрудника службы безопасности.
+    1. Лицо совершает правонарушение непосредственно на глазах сотрудника Службы безопасности.
     1. Лицо нарушает процедуры экипажа, предусмотренные для текущего уровня угрозы.
     1. Лицо не является членом экипажа, либо принадлежность к экипажу невозможно установить.
 
@@ -384,17 +394,17 @@ guidebook-SOP-security-procedure-investigation-interrogation =
     1. Процедура допроса может быть пропущена при следующих условиях:
       - В случае получения письменного признания вины, заверенного подписью задержанного.
       - На станции действует [color=gold][bold]гамма код[/bold][/color], либо введен режим ЧС, требующий [tooltip="guidebook-SOP-security-procedure-tooltip-emergencies" text="непосредственного участия сотрудников службы безопасности"].
-    1. С момента доставки в бриг у сотрудников службы безопасности имеется 10 минут для вынесения вердикта, всё время, проведённое в бриге сверх данного времени, должно быть вычтено из срока заключения, если подозреваемый был признан виновным в правонарушении.
+    1. С момента доставки в бриг у сотрудников Службы безопасности имеется 10 минут для вынесения вердикта, всё время, проведённое в бриге сверх данного времени, должно быть вычтено из срока заключения, если подозреваемый был признан виновным в правонарушении.
       - Сокращение срока не предусмотрено, если итоговый срок заключения, к которому может быть приговорён подозреваемый составляет более 75 минут.
       - Суммарное время допроса не может превышать срок, равный 10 минутам в сумме с потенциальным сроком заключения, к которому подозреваемый может быть приговорён при подтверждении его виновности.
       - Если в результате сокращения срока заключения фактический срок заключения равен 0, подозреваемый должен быть признан как отбывший срок заключения в полном объеме.
       - В случае направления задержанного в корпоративный суд, допрос ограничивается сроком до 5 минут, после чего задержанный должен быть незамедлительно направлен в суд. Магистрат может отменить это требование в случае занятости судебными делами.
     1. В процедуре допроса принимают участие задержанный, допрашивающий, а также адвокат, свидетели и эксперты, если таковые имеются.
-      - В роли допрашивающего может выступать смотритель, помощник смотрителя, глава службы безопасности, капитан, либо иной сотрудник службы безопасности — с разрешения ранее упомянутых лиц.
+      - В роли допрашивающего может выступать смотритель, помощник смотрителя, глава службы безопасности, капитан, либо иной сотрудник Службы безопасности — с разрешения ранее упомянутых лиц.
       - При нарушении порядка проведения процедуры агент внутренних дел уполномочен отстранить допрашивающего от дальнейшего проведения допроса, в таком случае проведение допроса должно быть передано вышестоящему сотруднику, вплоть до капитана. Агент внутренних дел не может отстранить допрашивающего в [color=red][bold]красном коде[/bold][/color] и выше.
       - В роли адвоката может выступать агент внутренних дел, адвокат либо глава отдела, к которому относится подозреваемый.
       - Адвокат должен быть приглашен на допрос непосредственно перед началом процедуры.
-      - При допросе главы отдела обязательным условием должно быть присутствие агента внутренних дел либо капитана.
+      - При допросе главы отдела обязательным условием должно быть присутствие агента внутренних дел, представителя NT, либо капитана.
       - В роли свидетелей выступают лица, которые могут дать показания, подтверждающие причастность либо непричастность задержанного к совершению правонарушения.
       - В роли экспертов могут выступать лица, профессиональные навыки которых способствуют установлению виновности или невиновности задержанного.
       - Личное присутствие экспертов и свидетелей может быть исключено, если данные ими показания представлены в виде документа, заверенного личной подписью эксперта/свидетеля и печатью АВД.
@@ -433,7 +443,7 @@ guidebook-SOP-security-procedure-investigation-analysis =
       - Наличие у подозреваемого судимостей.
       - Нахождение подозреваемого в состоянии алкогольного или наркотического опьянения.
     1. Если собранной доказательной базы недостаточно для вынесения обвинительного приговора, то подозреваемый не может быть признан виновным.
-    1. Если сотрудник службы безопасности не уполномочен вынести вердикт, который должен быть вынесен в отношении подозреваемого, он обязан предоставить все материалы дела лицу, уполномоченному вынести требуемый вердикт.
+    1. Если сотрудник Службы безопасности не уполномочен вынести вердикт, который должен быть вынесен в отношении подозреваемого, он обязан предоставить все материалы дела лицу, уполномоченному вынести требуемый вердикт.
 
 ### Вынесение вердикта
 guidebook-SOP-security-procedure-investigation-verdict =
@@ -446,11 +456,11 @@ guidebook-SOP-security-procedure-investigation-verdict =
     1. капитан;
     1. глава службы безопасности;
     1. смотритель, помощник смотрителя;
-    1. иные сотрудники службы безопасности, исключая кадетов.
+    1. иные сотрудники Службы безопасности, исключая кадетов.
 
     {"[head=3]Уровни наказаний[/head]"}
     {"[italic]В зависимости от тяжести совершённого правонарушения осуждённому лицу могут быть назначены различные виды наказания. В зависимости от тяжести наказания одобрить его вынесение могут лишь лица, занимающие определённые должности.[/italic]"}
-    1. Предупреждение. Вынести приговор о выдаче предупреждения может любой сотрудник службы безопасности, исключая кадетов, а также все вышестоящие лица.
+    1. Предупреждение. Вынести приговор о выдаче предупреждения может любой сотрудник Службы безопасности, исключая кадетов, а также все вышестоящие лица.
     1. Временное заключение. Вынести приговор о временном заключении могут смотритель, либо помощник смотрителя с разрешения самого смотрителя и все вышестоящие лица.
     1. Пожизненное лишение свободы. Вынести приговор о пожизненном лишении свободы могут глава службы безопасности и все вышестоящие лица.
     1. Высшая мера наказания. Вынести приговор о высшей мере наказания могут капитан и все вышестоящие лица.
@@ -537,7 +547,7 @@ guidebook-SOP-security-procedure-seizure-storage =
     1. Изъятое имущество первоначально должно быть доставлено в бриг.
     1. Изъятое имущество может быть исследовано при помощи криминалистического сканера для получения следов.
     1. В случае затруднения в определении свойств предмета, он может быть доставлен в соответствующий отдел для идентификации.
-      - В условиях [color=red][bold]красного кода[/bold][/color] сотрудники службы безопасности уполномочены вызвать эксперта непосредственно в бриг.
+      - В условиях [color=red][bold]красного кода[/bold][/color] сотрудники Службы безопасности уполномочены вызвать эксперта непосредственно в бриг.
     1. После оценки всех свойств предмета, его дальнейшее перемещение регламентируется соответствующими процедурами.
 
 ### Оборот изъятого имущества
@@ -549,7 +559,7 @@ guidebook-SOP-security-procedure-seizure-turnover =
       - Изъятое имущество может быть передано в пользу отдела (сотрудника) с законным правом владения изъятыми предметами.
     1. Предметы, регулируемые статьями 435 и 436 подлежат хранению в запираемом шкафу. Его оборот и использование без надлежащего разрешения строго запрещены.
       - В рамках любого кода ГСБ может одобрить использование [tooltip="guidebook-SOP-security-procedure-tooltip-limited-contraband-use" text="некоторых"] запрещенных к обороту предметов в интересах следствия.
-      - В рамках [color=gold][bold]гамма кода[/bold][/color] глава службы безопасности может одобрить использование любых запрещенных к обороту предметов.
+      - В рамках [color=gold][bold]гамма кода[/bold][/color], либо в условиях ЧС при отсутствии ответа от ЦК на запрос [color=gold][bold]гамма кода[/bold][/color], глава службы безопасности может одобрить использование любых запрещенных к обороту предметов.
 
 ## Процедура выдачи УДО
 guidebook-SOP-security-procedure-parole =
@@ -700,11 +710,11 @@ guidebook-SOP-security-procedure-prisoner-cell =
 
 ## Уровни Применения Силы
 guidebook-SOP-security-procedure-force-levels =
-    {"[italic]Сотрудник службы безопасности должен применять рекомендуемый данным положением уровень силы в отношении цели, стремясь снизить его до минимального. Если конкретная ситуация не предусмотрена в данном положении, сотрудник службы безопасности обязан снизить уровень воздействия до минимального, при котором будет возможна нейтрализация цели.[/italic]"}
+    {"[italic]Сотрудник службы безопасности должен применять рекомендуемый данным положением уровень силы в отношении цели, стремясь снизить его до минимального. Если конкретная ситуация не предусмотрена в данном положении, сотрудник Службы безопасности обязан снизить уровень воздействия до минимального, при котором будет возможна нейтрализация цели.[/italic]"}
 
 ### Уровень 1
 guidebook-SOP-security-procedure-force-level-1 =
-    {"[italic]Вербальное воздействие — ненасильственные методы воздействия в отношении какого-либо лица, направленные на добровольную сдачу и содействие сотрудникам службы безопасности.[/italic]"}
+    {"[italic]Вербальное воздействие — ненасильственные методы воздействия в отношении какого-либо лица, направленные на добровольную сдачу и содействие сотрудникам Службы безопасности.[/italic]"}
 
     {"[head=3]Меры воздействия[/head]"}
     1. Вербальное обращение к лицу с прямым приказом о сдаче, сообщением о задержании, указанием следовать в бриг и т. д.
@@ -732,7 +742,7 @@ guidebook-SOP-security-procedure-force-level-2 =
     {"[head=3]Основания для применения[/head]"}
     1. Применяется в ситуациях, когда предыдущий уровень силы не оказал должного влияния на цель.
     1. Применяется в ситуациях, когда цель представляет угрозу для себя или окружающих.
-    1. Применяется в отношении лиц, отказавшихся от сотрудничества с сотрудниками службы безопасности при проведении процедур обыска и следствия.
+    1. Применяется в отношении лиц, отказавшихся от сотрудничества с сотрудниками Службы безопасности при проведении процедур обыска и следствия.
 
     {"[head=3]Рекомендуемые случаи[/head]"}
     1. В отношении лиц, ранее скрывшихся при задержании или обыске.
@@ -757,7 +767,7 @@ guidebook-SOP-security-procedure-force-level-3 =
     {"[head=3]Основания для применения[/head]"}
     1. Применяется в ситуациях, когда предыдущий уровень силы не оказал должного влияния на цель.
     1. Применяется в ситуациях, когда цель представляет значительную угрозу для себя и/или окружающих.
-    1. Применяется в отношении лиц, оказывающих агрессивное сопротивление сотрудникам службы безопасности.
+    1. Применяется в отношении лиц, оказывающих агрессивное сопротивление сотрудникам Службы безопасности.
 
     {"[head=3]Рекомендуемые случаи[/head]"}
     1. При нарушении норм экипажа в условиях [color=gold][bold]гамма кода[/bold][/color].
@@ -782,6 +792,7 @@ guidebook-SOP-security-procedure-force-level-4 =
     1. Применяется в ситуациях, когда предыдущие уровни силы [tooltip="guidebook-SOP-security-procedure-tooltip-previous-levels" text="полностью исчерпали себя"].
     1. Применяется в ситуациях, когда цель представляет значительную угрозу для безопасности станции.
     1. В случае, если нарушители больше не соответствуют рекомендуемым уровням применения силы и/или сдались/прекратили оказывать сопротивление — необходимо немедленно понизить уровень применения силы.
+    1. С целью подавления транспортного средства, включая сегвеи и их аналоги, а также шаттлы. Целью должно быть устранение мобильности, после чего уровень силы необходимо понизить до актуального.
 
     {"[head=3]Рекомендуемые случаи[/head]"}
     1. В отношении лиц, оказывающих агрессивное сопротивление при помощи холодного оружия.
diff --git a/Resources/Locale/ru-RU/corvax/guidebook/corporatelaw/articles.ftl b/Resources/Locale/ru-RU/corvax/guidebook/corporatelaw/articles.ftl
index 8928ce2d8d..8ed009a4d5 100644
--- a/Resources/Locale/ru-RU/corvax/guidebook/corporatelaw/articles.ftl
+++ b/Resources/Locale/ru-RU/corvax/guidebook/corporatelaw/articles.ftl
@@ -22,6 +22,7 @@ guidebook-corporatelaw-112-note =
 
     { -guidebook-corporatelaw-article }
     - Побег, попытка побега, отказ, помеха при проведении следственных мероприятий.
+    - Попытка завладеть нелетальным снаряжением СБ, не повлиявшая на успех задержания.
     - Нарушение норм экипажа.
 
 guidebook-corporatelaw-113-desc = [italic]Несанкционированное отказ от работы сотрудников или призывы к забастовке с целью требования от командования станции выполнения условий забастовщиков.[/italic]
diff --git a/Resources/Maps/Corvax/corvax_cluster.yml b/Resources/Maps/Corvax/corvax_cluster.yml
index 742f7b9b94..dce0831b51 100644
--- a/Resources/Maps/Corvax/corvax_cluster.yml
+++ b/Resources/Maps/Corvax/corvax_cluster.yml
@@ -4,8 +4,8 @@ meta:
   engineVersion: 289.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/23/2026 09:11:21
-  entityCount: 12753
+  time: 09/14/2026 11:25:28
+  entityCount: 12754
 maps:
 - 12281
 grids:
@@ -13,7 +13,6 @@ grids:
 - 10949
 orphans: []
 nullspace:
-- 12723
 - 12724
 - 12725
 - 12726
@@ -44,6 +43,7 @@ nullspace:
 - 12751
 - 12752
 - 12753
+- 12754
 tilemap:
   0: Space
   2: FloorArcadeBlue
@@ -1445,7 +1445,6 @@ entities:
     - type: ExplosionAirtightGrid
     - type: ChunkContainer
       chunkEntities:
-      - 12723
       - 12724
       - 12725
       - 12726
@@ -1476,6 +1475,7 @@ entities:
       - 12751
       - 12752
       - 12753
+      - 12754
     - type: TileHistory
       chunkHistory: {}
     - type: GridSplitNode
@@ -23951,7 +23951,7 @@ entities:
       pos: -26.5,24.5
 - proto: ChunkEntity
   entities:
-  - uid: 12723
+  - uid: 12724
     components:
     - type: ChunkEntity
       root: 1
@@ -24258,7 +24258,7 @@ entities:
             2614: 27,21
             2615: 27,20
             2616: 27,19
-  - uid: 12724
+  - uid: 12725
     components:
     - type: ChunkEntity
       root: 1
@@ -24662,7 +24662,7 @@ entities:
             2688: 22.750717,9.677307
             2689: 22.656967,9.521057
             2690: 27.000717,5.786682
-  - uid: 12725
+  - uid: 12726
     components:
     - type: ChunkEntity
       root: 1
@@ -24744,7 +24744,7 @@ entities:
             1183: 20.983843,34.62477
             1184: 19.968218,33.077896
             1185: 23.34307,34.234146
-  - uid: 12726
+  - uid: 12727
     components:
     - type: ChunkEntity
       root: 1
@@ -24857,7 +24857,7 @@ entities:
             color: '#F9801DFF'
           decals:
             1114: 45,33
-  - uid: 12727
+  - uid: 12728
     components:
     - type: ChunkEntity
       root: 1
@@ -25205,7 +25205,7 @@ entities:
             227: 3,11
             228: 3,9
             229: 3,10
-  - uid: 12728
+  - uid: 12729
     components:
     - type: ChunkEntity
       root: 1
@@ -25310,7 +25310,7 @@ entities:
             color: '#2BAF9D93'
           decals:
             1234: 31,-19
-  - uid: 12729
+  - uid: 12730
     components:
     - type: ChunkEntity
       root: 1
@@ -25524,7 +25524,7 @@ entities:
             962: 14,-28
             963: 12,-28
             1028: 10,-28
-  - uid: 12730
+  - uid: 12731
     components:
     - type: ChunkEntity
       root: 1
@@ -25804,7 +25804,7 @@ entities:
             1942: -11,19
             1943: -11.431358,19.09242
             1944: -11.618858,19.233046
-  - uid: 12731
+  - uid: 12732
     components:
     - type: ChunkEntity
       root: 1
@@ -26036,7 +26036,7 @@ entities:
             color: '#4B362BFF'
           decals:
             2613: 15,22
-  - uid: 12732
+  - uid: 12733
     components:
     - type: ChunkEntity
       root: 1
@@ -26320,7 +26320,7 @@ entities:
             1398: -17,-16
             1400: -18,-12
             1401: -17,-12
-  - uid: 12733
+  - uid: 12734
     components:
     - type: ChunkEntity
       root: 1
@@ -26537,7 +26537,7 @@ entities:
           decals:
             74: -7,49
             1089: -7,53
-  - uid: 12734
+  - uid: 12735
     components:
     - type: ChunkEntity
       root: 1
@@ -26640,7 +26640,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             128: -1,44
-  - uid: 12735
+  - uid: 12736
     components:
     - type: ChunkEntity
       root: 1
@@ -26823,7 +26823,7 @@ entities:
             1983: -17,21
             1984: -17,20
             1985: -17,19
-  - uid: 12736
+  - uid: 12737
     components:
     - type: ChunkEntity
       root: 1
@@ -26995,7 +26995,7 @@ entities:
             2351: 32,12
             2352: 32,13
             2353: 33,13
-  - uid: 12737
+  - uid: 12738
     components:
     - type: ChunkEntity
       root: 1
@@ -27323,7 +27323,7 @@ entities:
             cleanable: True
           decals:
             1978: -2.1235144,-2.16181
-  - uid: 12738
+  - uid: 12739
     components:
     - type: ChunkEntity
       root: 1
@@ -27586,7 +27586,7 @@ entities:
             1824: -27,8
             1825: -27,6
             1826: -26,5
-  - uid: 12739
+  - uid: 12740
     components:
     - type: ChunkEntity
       root: 1
@@ -27788,7 +27788,7 @@ entities:
             color: '#D381C9FF'
           decals:
             146: 1,51
-  - uid: 12740
+  - uid: 12741
     components:
     - type: ChunkEntity
       root: 1
@@ -27839,7 +27839,7 @@ entities:
           decals:
             1213: -12,-53
             1214: -12,-54
-  - uid: 12741
+  - uid: 12742
     components:
     - type: ChunkEntity
       root: 1
@@ -27893,7 +27893,7 @@ entities:
           decals:
             1079: -44,-19
             1080: -44,-20
-  - uid: 12742
+  - uid: 12743
     components:
     - type: ChunkEntity
       root: 1
@@ -27948,7 +27948,7 @@ entities:
             1471: -18,-28
             1472: -18,-28
             1473: -20,-25
-  - uid: 12743
+  - uid: 12744
     components:
     - type: ChunkEntity
       root: 1
@@ -28049,7 +28049,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1062: -7,-27
-  - uid: 12744
+  - uid: 12745
     components:
     - type: ChunkEntity
       root: 1
@@ -28262,7 +28262,7 @@ entities:
           decals:
             850: 16,-4
             1263: 17,-1
-  - uid: 12745
+  - uid: 12746
     components:
     - type: ChunkEntity
       root: 1
@@ -28424,7 +28424,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1094: 44,30
-  - uid: 12746
+  - uid: 12747
     components:
     - type: ChunkEntity
       root: 1
@@ -28732,7 +28732,7 @@ entities:
           decals:
             237: -1,10
             238: -1,11
-  - uid: 12747
+  - uid: 12748
     components:
     - type: ChunkEntity
       root: 1
@@ -28975,7 +28975,7 @@ entities:
           decals:
             1961: 1,-3
             1973: 1,-6
-  - uid: 12748
+  - uid: 12749
     components:
     - type: ChunkEntity
       root: 1
@@ -29051,7 +29051,7 @@ entities:
             color: '#EFB34196'
           decals:
             1162: -2,-35
-  - uid: 12749
+  - uid: 12750
     components:
     - type: ChunkEntity
       root: 1
@@ -29123,7 +29123,7 @@ entities:
             1054: -40,21
             1055: -40,22
             1810: -40,23
-  - uid: 12750
+  - uid: 12751
     components:
     - type: ChunkEntity
       root: 1
@@ -29150,7 +29150,7 @@ entities:
             1411: -42,6
             1412: -42,9
             1413: -33,0
-  - uid: 12751
+  - uid: 12752
     components:
     - type: ChunkEntity
       root: 1
@@ -29172,7 +29172,7 @@ entities:
             cleanable: True
           decals:
             1476: 2,-34
-  - uid: 12752
+  - uid: 12753
     components:
     - type: ChunkEntity
       root: 1
@@ -29213,7 +29213,7 @@ entities:
             color: '#2BAF9D93'
           decals:
             1232: 33,-17
-  - uid: 12753
+  - uid: 12754
     components:
     - type: ChunkEntity
       root: 1
@@ -69585,6 +69585,13 @@ entities:
     - type: Transform
       parent: 1
       pos: 17.5,22.5
+- proto: SpawnPointWardenWeapon
+  entities:
+  - uid: 12723
+    components:
+    - type: Transform
+      parent: 1
+      pos: 17.5,23.5
 - proto: SpawnVendingMachineRestockDrink
   entities:
   - uid: 3058
diff --git a/Resources/Maps/Corvax/corvax_delta.yml b/Resources/Maps/Corvax/corvax_delta.yml
index bf2189e1b2..b0db6fb16d 100644
--- a/Resources/Maps/Corvax/corvax_delta.yml
+++ b/Resources/Maps/Corvax/corvax_delta.yml
@@ -4,7 +4,7 @@ meta:
   engineVersion: 289.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/23/2026 09:41:35
+  time: 09/14/2026 11:02:03
   entityCount: 41191
 maps:
 - 1
@@ -13,15 +13,15 @@ grids:
 - 38569
 orphans: []
 nullspace:
-- 25416
-- 25417
 - 25418
 - 25603
 - 25604
 - 25605
 - 26761
 - 27386
+- 27492
 - 27494
+- 27764
 - 29716
 - 29718
 - 29721
@@ -4484,15 +4484,15 @@ entities:
     - type: GridSplitNode
     - type: ChunkContainer
       chunkEntities:
-      - 25416
-      - 25417
       - 25418
       - 25603
       - 25604
       - 25605
       - 26761
       - 27386
+      - 27492
       - 27494
+      - 27764
       - 29716
       - 29718
       - 29721
@@ -83746,7 +83746,7 @@ entities:
       pos: 63.66099,-25.833206
 - proto: ChunkEntity
   entities:
-  - uid: 25416
+  - uid: 25418
     components:
     - type: ChunkEntity
       root: 2
@@ -84259,7 +84259,7 @@ entities:
           decals:
             7095: 33,0
             7125: 34,0
-  - uid: 25417
+  - uid: 25603
     components:
     - type: ChunkEntity
       root: 2
@@ -84992,7 +84992,7 @@ entities:
             20848: 5,24
             20849: 7,24
             20850: 8,24
-  - uid: 25418
+  - uid: 25604
     components:
     - type: ChunkEntity
       root: 2
@@ -85151,7 +85151,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             438: 0,-84
-  - uid: 25603
+  - uid: 25605
     components:
     - type: ChunkEntity
       root: 2
@@ -85797,7 +85797,7 @@ entities:
             11782: -16,-80
             14444: -8,-78
             14446: -3,-78
-  - uid: 25604
+  - uid: 26761
     components:
     - type: ChunkEntity
       root: 2
@@ -86032,7 +86032,7 @@ entities:
             color: '#DABC8BFF'
           decals:
             11783: -16,-81
-  - uid: 25605
+  - uid: 27386
     components:
     - type: ChunkEntity
       root: 2
@@ -86723,7 +86723,7 @@ entities:
             5692: -13,-4
             5738: -10,-2
             6084: -4,-12
-  - uid: 26761
+  - uid: 27492
     components:
     - type: ChunkEntity
       root: 2
@@ -87354,7 +87354,7 @@ entities:
             3977: -27,22
             3981: -29,20
             4014: -21,20
-  - uid: 27386
+  - uid: 27494
     components:
     - type: ChunkEntity
       root: 2
@@ -87864,7 +87864,7 @@ entities:
             5765: -16,9
             5766: -16,10
             5792: -3,13
-  - uid: 27494
+  - uid: 27764
     components:
     - type: ChunkEntity
       root: 2
@@ -225603,14 +225603,6 @@ entities:
       pos: -50.5,37.5
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 27492
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -17.5,5.5
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 27493
     components:
     - type: Transform
@@ -228713,6 +228705,11 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -63.5,-35.5
+  - uid: 25417
+    components:
+    - type: Transform
+      parent: 2
+      pos: -15.5,5.5
   - uid: 27734
     components:
     - type: Transform
@@ -228866,13 +228863,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -59.5,61.5
-  - uid: 27764
-    components:
-    - type: Transform
-      parent: 2
-      pos: -15.5,5.5
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 27765
     components:
     - type: Transform
@@ -245118,6 +245108,15 @@ entities:
     - type: Transform
       parent: 2
       pos: 17.5,-22.5
+- proto: SignPlaque
+  entities:
+  - uid: 25416
+    components:
+    - type: MetaData
+      desc: Старая доска почета, жаль, что доска слишком изношена, чтобы можно было её прочитать, кроме нескольких слов "no_mad" "Aurora" "Bollo" "DanTheSynth", вот только что означают эти слова, вы никогда не узнаете.
+    - type: Transform
+      parent: 2
+      pos: -16.5,5.5
 - proto: SignPrison
   entities:
   - uid: 30362
diff --git a/Resources/Maps/Corvax/corvax_omega.yml b/Resources/Maps/Corvax/corvax_omega.yml
index c7f3f56472..64ab967f79 100644
--- a/Resources/Maps/Corvax/corvax_omega.yml
+++ b/Resources/Maps/Corvax/corvax_omega.yml
@@ -4,15 +4,14 @@ meta:
   engineVersion: 289.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/23/2026 09:03:14
-  entityCount: 14249
+  time: 09/12/2026 14:09:59
+  entityCount: 14250
 maps:
 - 473
 grids:
 - 4812
 orphans: []
 nullspace:
-- 12570
 - 12656
 - 12975
 - 13076
@@ -54,6 +53,7 @@ nullspace:
 - 14247
 - 14248
 - 14249
+- 14250
 tilemap:
   0: Space
   41: FloorArcadeBlue
@@ -354,6 +354,11 @@ entities:
           moles:
             Oxygen: 27.225372
             Nitrogen: 102.419266
+        - temperature: 293.14975
+          volume: 2500
+          moles:
+            Oxygen: 21.824879
+            Nitrogen: 82.10312
         - temperature: 293.15
           volume: 2500
           moles: {}
@@ -665,7 +670,8 @@ entities:
           -8,8:
             0: 3292
           -7,4:
-            0: 32631
+            0: 16247
+            3: 16384
           -7,5:
             0: 65287
           -7,6:
@@ -874,13 +880,13 @@ entities:
             1: 3584
           0,12:
             0: 8448
-            3: 2176
+            4: 2176
           0,13:
             0: 66
           0,14:
             0: 2180
           1,12:
-            3: 4352
+            4: 4352
             0: 34944
           1,14:
             0: 28928
@@ -899,7 +905,7 @@ entities:
           3,13:
             0: 13107
           4,12:
-            3: 32
+            4: 32
             0: 32768
           4,13:
             0: 25612
@@ -910,12 +916,12 @@ entities:
           -9,8:
             0: 136
           -8,9:
-            3: 16
+            4: 16
             0: 8
           -9,9:
-            3: 142
+            4: 142
           -8,10:
-            3: 3
+            4: 3
             0: 3072
           -7,9:
             0: 17535
@@ -1186,12 +1192,12 @@ entities:
             0: 65529
           8,-8:
             0: 62003
-            3: 128
+            4: 128
           8,-7:
             0: 65535
           8,-6:
             0: 15
-            3: 26368
+            4: 26368
           8,-9:
             0: 48112
           9,-5:
@@ -1201,7 +1207,7 @@ entities:
           9,-8:
             0: 36072
           9,-7:
-            3: 64
+            4: 64
           9,-6:
             0: 19584
           10,-8:
@@ -1397,11 +1403,11 @@ entities:
           -9,10:
             0: 17
           -12,4:
-            3: 546
-            4: 2184
+            4: 546
+            5: 2184
           -13,4:
-            3: 2184
-            5: 546
+            4: 2184
+            6: 546
           -12,5:
             0: 1
             1: 3856
@@ -1410,7 +1416,7 @@ entities:
           -11,5:
             1: 272
           -11,4:
-            6: 546
+            7: 546
           -11,7:
             0: 35904
           -11,3:
@@ -1423,7 +1429,7 @@ entities:
           -10,6:
             0: 238
           -10,7:
-            3: 1632
+            4: 1632
           -10,3:
             0: 61007
           -13,0:
@@ -1462,7 +1468,7 @@ entities:
             0: 12288
           -16,0:
             1: 4369
-            3: 3276
+            4: 3276
           -17,0:
             1: 8930
           -16,1:
@@ -1472,19 +1478,19 @@ entities:
             1: 43746
           -16,2:
             1: 13090
-            3: 34944
+            4: 34944
           -17,2:
             1: 34986
           -16,3:
             1: 58594
           -15,0:
-            3: 273
+            4: 273
             0: 52428
           -15,1:
             0: 239
             1: 61440
           -15,2:
-            3: 13104
+            4: 13104
             1: 34952
           -15,3:
             1: 16120
@@ -1501,20 +1507,20 @@ entities:
             0: 61166
           -14,4:
             1: 12561
-            3: 2184
+            4: 2184
           -16,-2:
             0: 1772
           -16,-3:
             0: 51200
           -15,-3:
             0: 4368
-            3: 1024
+            4: 1024
           -15,-2:
             0: 2295
           -15,-1:
-            3: 1
+            4: 1
           -15,-4:
-            3: 16384
+            4: 16384
           -14,-2:
             0: 61424
           -14,-1:
@@ -1524,7 +1530,7 @@ entities:
           -14,-3:
             0: 61166
           -14,-5:
-            3: 27848
+            4: 27848
           -16,-8:
             1: 61440
           -17,-8:
@@ -1675,7 +1681,6 @@ entities:
     - type: GridSplitNode
     - type: ChunkContainer
       chunkEntities:
-      - 12570
       - 12656
       - 12975
       - 13076
@@ -1717,6 +1722,7 @@ entities:
       - 14247
       - 14248
       - 14249
+      - 14250
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 1755
@@ -29273,7 +29279,7 @@ entities:
       pos: -2.493187,-34.40246
 - proto: ChunkEntity
   entities:
-  - uid: 12570
+  - uid: 12656
     components:
     - type: ChunkEntity
       root: 4812
@@ -29649,7 +29655,7 @@ entities:
             angle: 1.5707963267948966 rad
           decals:
             721: -39,-3
-  - uid: 12656
+  - uid: 12975
     components:
     - type: ChunkEntity
       root: 4812
@@ -29863,7 +29869,7 @@ entities:
             angle: -1.5707963267948966 rad
           decals:
             405: 27,-31
-  - uid: 12975
+  - uid: 13076
     components:
     - type: ChunkEntity
       root: 4812
@@ -30056,7 +30062,7 @@ entities:
             2422: -60,9
             2427: -60,1
             2432: -61,2
-  - uid: 13076
+  - uid: 13088
     components:
     - type: ChunkEntity
       root: 4812
@@ -30126,7 +30132,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2141: 34,-5
-  - uid: 13088
+  - uid: 13201
     components:
     - type: ChunkEntity
       root: 4812
@@ -30199,7 +30205,7 @@ entities:
             1924: 53,-1
             1927: 51,-1
             1928: 52,-1
-  - uid: 13201
+  - uid: 13202
     components:
     - type: ChunkEntity
       root: 4812
@@ -30576,7 +30582,7 @@ entities:
             color: '#A88661FF'
           decals:
             3446: -7,-7
-  - uid: 13202
+  - uid: 13203
     components:
     - type: ChunkEntity
       root: 4812
@@ -30827,7 +30833,7 @@ entities:
             3435: -19,-9
             3436: -19,-8
             3437: -19,-7
-  - uid: 13203
+  - uid: 13549
     components:
     - type: ChunkEntity
       root: 4812
@@ -31089,7 +31095,7 @@ entities:
             963: 7,26
             964: 8,26
             965: 9,26
-  - uid: 13549
+  - uid: 13744
     components:
     - type: ChunkEntity
       root: 4812
@@ -31335,7 +31341,7 @@ entities:
             928: 24,1
             930: 22,5
             3088: 22,7
-  - uid: 13744
+  - uid: 13749
     components:
     - type: ChunkEntity
       root: 4812
@@ -31442,7 +31448,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1901: 26,16
-  - uid: 13749
+  - uid: 14219
     components:
     - type: ChunkEntity
       root: 4812
@@ -31614,7 +31620,7 @@ entities:
             214: 15,46
             215: 14,46
             216: 13,46
-  - uid: 14219
+  - uid: 14220
     components:
     - type: ChunkEntity
       root: 4812
@@ -31808,7 +31814,7 @@ entities:
           decals:
             417: 3,-22
             418: 3,-21
-  - uid: 14220
+  - uid: 14221
     components:
     - type: ChunkEntity
       root: 4812
@@ -32014,7 +32020,7 @@ entities:
             color: '#EFB34196'
           decals:
             619: -18,11
-  - uid: 14221
+  - uid: 14222
     components:
     - type: ChunkEntity
       root: 4812
@@ -32182,7 +32188,7 @@ entities:
           decals:
             2960: -37,15
             3077: -37,14
-  - uid: 14222
+  - uid: 14223
     components:
     - type: ChunkEntity
       root: 4812
@@ -32291,7 +32297,7 @@ entities:
             871: -53,-12
             872: -54,-12
             873: -55,-12
-  - uid: 14223
+  - uid: 14224
     components:
     - type: ChunkEntity
       root: 4812
@@ -32340,7 +32346,7 @@ entities:
             997: 35,-28
             998: 35,-27
             999: 35,-26
-  - uid: 14224
+  - uid: 14225
     components:
     - type: ChunkEntity
       root: 4812
@@ -32489,7 +32495,7 @@ entities:
           decals:
             799: 13.296297,-42.144028
             800: 3.8275461,-36.737778
-  - uid: 14225
+  - uid: 14226
     components:
     - type: ChunkEntity
       root: 4812
@@ -32504,7 +32510,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1896: 32,14
-  - uid: 14226
+  - uid: 14227
     components:
     - type: ChunkEntity
       root: 4812
@@ -32519,7 +32525,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1897: 32,16
-  - uid: 14227
+  - uid: 14228
     components:
     - type: ChunkEntity
       root: 4812
@@ -32569,7 +32575,7 @@ entities:
             cleanable: True
           decals:
             2518: -50,-18
-  - uid: 14228
+  - uid: 14229
     components:
     - type: ChunkEntity
       root: 4812
@@ -32676,7 +32682,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2795: 7,14
-  - uid: 14229
+  - uid: 14230
     components:
     - type: ChunkEntity
       root: 4812
@@ -32929,7 +32935,7 @@ entities:
             color: '#DE3A3A96'
           decals:
             2919: -28,16
-  - uid: 14230
+  - uid: 14231
     components:
     - type: ChunkEntity
       root: 4812
@@ -33107,7 +33113,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3076: -37,16
-  - uid: 14231
+  - uid: 14232
     components:
     - type: ChunkEntity
       root: 4812
@@ -33142,7 +33148,7 @@ entities:
             3107: -28,32
             3108: -27,32
             3109: -26,32
-  - uid: 14232
+  - uid: 14233
     components:
     - type: ChunkEntity
       root: 4812
@@ -33270,7 +33276,7 @@ entities:
           decals:
             980: -8,0
             981: -8,1
-  - uid: 14233
+  - uid: 14234
     components:
     - type: ChunkEntity
       root: 4812
@@ -33426,7 +33432,7 @@ entities:
             2805: -13,28
             2806: -12,28
             2807: -11,28
-  - uid: 14234
+  - uid: 14235
     components:
     - type: ChunkEntity
       root: 4812
@@ -33536,7 +33542,7 @@ entities:
             2572: 9,50
             2573: 10,50
             2574: 11,50
-  - uid: 14235
+  - uid: 14236
     components:
     - type: ChunkEntity
       root: 4812
@@ -33637,7 +33643,7 @@ entities:
             cleanable: True
           decals:
             1035: -44,-27
-  - uid: 14236
+  - uid: 14237
     components:
     - type: ChunkEntity
       root: 4812
@@ -33861,7 +33867,7 @@ entities:
           decals:
             970: -29,-17
             971: -28,-17
-  - uid: 14237
+  - uid: 14238
     components:
     - type: ChunkEntity
       root: 4812
@@ -34017,7 +34023,7 @@ entities:
             angle: 1.5707963267948966 rad
           decals:
             1608: -13,-40
-  - uid: 14238
+  - uid: 14239
     components:
     - type: ChunkEntity
       root: 4812
@@ -34049,7 +34055,7 @@ entities:
             1020: -25,-37
             1021: -24,-37
             1022: -23,-37
-  - uid: 14239
+  - uid: 14240
     components:
     - type: ChunkEntity
       root: 4812
@@ -34447,7 +34453,7 @@ entities:
           decals:
             1272: -7,-23
             1273: -7,-22
-  - uid: 14240
+  - uid: 14241
     components:
     - type: ChunkEntity
       root: 4812
@@ -34524,7 +34530,7 @@ entities:
             1350: -11,-53
             1351: -11,-52
             1352: -11,-51
-  - uid: 14241
+  - uid: 14242
     components:
     - type: ChunkEntity
       root: 4812
@@ -34635,7 +34641,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             953: 0,-13
-  - uid: 14242
+  - uid: 14243
     components:
     - type: ChunkEntity
       root: 4812
@@ -34721,7 +34727,7 @@ entities:
             645: -38,-36
             646: -38,-35
             647: -38,-34
-  - uid: 14243
+  - uid: 14244
     components:
     - type: ChunkEntity
       root: 4812
@@ -34790,7 +34796,7 @@ entities:
             2730: 29,-8
             2731: 30,-8
             2732: 31,-8
-  - uid: 14244
+  - uid: 14245
     components:
     - type: ChunkEntity
       root: 4812
@@ -34835,7 +34841,7 @@ entities:
           decals:
             883: 17,32
             886: 17,35
-  - uid: 14245
+  - uid: 14246
     components:
     - type: ChunkEntity
       root: 4812
@@ -34870,7 +34876,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1880: 53,0
-  - uid: 14246
+  - uid: 14247
     components:
     - type: ChunkEntity
       root: 4812
@@ -34933,7 +34939,7 @@ entities:
             1125: -6,32
             1126: -6,33
             1127: -7,33
-  - uid: 14247
+  - uid: 14248
     components:
     - type: ChunkEntity
       root: 4812
@@ -34948,7 +34954,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1907: 66,-23
-  - uid: 14248
+  - uid: 14249
     components:
     - type: ChunkEntity
       root: 4812
@@ -34972,7 +34978,7 @@ entities:
             cleanable: True
           decals:
             861: 27.509422,-40.416092
-  - uid: 14249
+  - uid: 14250
     components:
     - type: ChunkEntity
       root: 4812
@@ -66507,6 +66513,17 @@ entities:
     - type: Transform
       parent: 4812
       pos: -25.5,19.5
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          ents:
+          - 12570
+          showEnts: False
+          occludes: True
+        paper_label: !type:ContainerSlot
+          ent: null
+          showEnts: False
+          occludes: True
 - proto: LockerWeldingSuppliesFilled
   entities:
   - uid: 11898
@@ -91278,6 +91295,16 @@ entities:
     - type: Transform
       parent: 4812
       pos: -37.57921,10.753048
+- proto: WeaponEnergyShotgun
+  entities:
+  - uid: 12570
+    components:
+    - type: Transform
+      parent: 7820
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 7820
 - proto: WeaponEnergyTurretAI
   entities:
   - uid: 12270
diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml
index 557ac0bffd..cfe1a081c7 100644
--- a/Resources/Maps/Nonstations/nukieplanet.yml
+++ b/Resources/Maps/Nonstations/nukieplanet.yml
@@ -4,26 +4,26 @@ meta:
   engineVersion: 289.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/22/2026 18:07:05
-  entityCount: 2565
+  time: 09/05/2026 14:50:38
+  entityCount: 2549
 maps:
 - 1295
 grids:
 - 104
 orphans: []
 nullspace:
+- 1759
+- 2257
+- 2291
+- 2327
 - 2463
 - 2464
-- 2540
-- 2541
-- 2542
-- 2543
-- 2544
-- 2545
-- 2546
-- 2547
-- 2548
-- 2549
+- 2525
+- 2527
+- 2528
+- 2529
+- 2530
+- 2531
 tilemap:
   0: Space
   14: FloorBar
@@ -50,6 +50,8 @@ entities:
       name: Syndicate Outpost
     - type: Transform
       parent: 1295
+    - type: MapLight
+      ambientLightColor: '#CCCCCCFF'
     - type: MapGrid
       chunks:
         -1,-1:
@@ -58,7 +60,7 @@ entities:
           version: 7
         0,-1:
           ind: 0,-1
-          tiles: bgAAAAAAAG4AAAAAAAB8AAAAAAAAbgAAAAAAAG4AAAAAAABuAAAAAAAAbgAAAAAAAG4AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAE8AAAAAAABuAAAAAAAAbgAAAAAAAG4AAAAAAABuAAAAAAAAbgAAAAAAAG4AAAAAAABuAAAAAAAAfAAAAAAAAFYAAAAAAAAdAAAAAAAAVgAAAAAAAB0AAAAAAABWAAAAAAAAHQAAAAAAAB0AAAAAAABuAAAAAAAAbgAAAAAAAHwAAAAAAABuAAAAAAAAbgAAAAAAAG4AAAAAAABuAAAAAAAAbgAAAAAAAHwAAAAAAABWAAAAAAAAHQAAAAAAAFYAAAAAAAAdAAAAAAAAVgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAAbgAAAAAAAG4AAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAG4AAAAAAABuAAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABZAAAAAAAAWQAAAAABAG4AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABuAAAAAAAAbgAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAB8AAAAAAAAHQAAAAAAAHwAAAAAAAB8AAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAFYAAAAAAABWAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAFYAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAABWAAAAAAAADgAAAAAAAE8AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAVgAAAAAAAA4AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAATwAAAAAAAE8AAAAAAAAsAAAAAAAATwAAAAAAAE8AAAAAAAB8AAAAAAAAfAAAAAAAAA==
+          tiles: bgAAAAAAAG4AAAAAAAB8AAAAAAAAbgAAAAAAAG4AAAAAAABuAAAAAAAAbgAAAAAAAG4AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAfAAAAAAAAE8AAAAAAABuAAAAAAAAbgAAAAAAAG4AAAAAAABuAAAAAAAAbgAAAAAAAG4AAAAAAABuAAAAAAAAfAAAAAAAAFYAAAAAAAAdAAAAAAAAVgAAAAAAAB0AAAAAAABWAAAAAAAAHQAAAAAAAB0AAAAAAABuAAAAAAAAbgAAAAAAAHwAAAAAAABuAAAAAAAAbgAAAAAAAG4AAAAAAABuAAAAAAAAbgAAAAAAAHwAAAAAAABWAAAAAAAAHQAAAAAAAFYAAAAAAAAdAAAAAAAAVgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB8AAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAAbgAAAAAAAG4AAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAG4AAAAAAABuAAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABZAAAAAAAAWQAAAAABAG4AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABuAAAAAAAAbgAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAB8AAAAAAAAHQAAAAAAAHwAAAAAAAB8AAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAFYAAAAAAABWAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAFYAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAABWAAAAAAAADgAAAAAAAE8AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAVgAAAAAAAA4AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAATwAAAAAAAE8AAAAAAAAsAAAAAAAATwAAAAAAAE8AAAAAAAB8AAAAAAAAfAAAAAAAAA==
           version: 7
         0,0:
           ind: 0,0
@@ -66,15 +68,15 @@ entities:
           version: 7
         -1,0:
           ind: -1,0
-          tiles: ewAAAAABAHsAAAAAAAB7AAAAAAIAewAAAAABAHsAAAAAAgB7AAAAAAAAewAAAAACAE8AAAAAAABPAAAAAAAATwAAAAAAAFkAAAAABQBZAAAAAAUAWQAAAAAEAFkAAAAABAB8AAAAAAAAfAAAAAAAAHsAAAAAAAB7AAAAAAAAewAAAAACAHsAAAAAAAB7AAAAAAIAewAAAAAAAHsAAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABZAAAAAAIAWQAAAAABAFkAAAAABQBZAAAAAAIAWQAAAAAAAHwAAAAAAAB7AAAAAAEAewAAAAAAAHsAAAAAAQB7AAAAAAAAewAAAAAAAHsAAAAAAAB7AAAAAAAATwAAAAAAAE8AAAAAAABZAAAAAAQAWQAAAAADAFkAAAAABQBZAAAAAAEAWQAAAAACAFkAAAAABABZAAAAAAEAewAAAAAAAHsAAAAAAQB7AAAAAAIAewAAAAAAAHsAAAAAAQB7AAAAAAEAewAAAAAAAE8AAAAAAABPAAAAAAAAWQAAAAABAFkAAAAAAwBZAAAAAAAAWQAAAAADAFkAAAAABABZAAAAAAAAWQAAAAAEAHsAAAAAAAB7AAAAAAEAewAAAAAAAHsAAAAAAAB7AAAAAAIAewAAAAABAHsAAAAAAgBPAAAAAAAAWQAAAAAEAFkAAAAABQBZAAAAAAIAWQAAAAAFAFkAAAAAAgBZAAAAAAMAWQAAAAAAAFkAAAAABABZAAAAAAQAHQAAAAAAAB0AAAAAAAAdAAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAWQAAAAADAFkAAAAAAwBZAAAAAAAAWQAAAAACAFkAAAAAAQBZAAAAAAMAWQAAAAAEAFkAAAAABABZAAAAAAUAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAFkAAAAAAwBZAAAAAAIAWQAAAAAFAFkAAAAABABZAAAAAAEAWQAAAAACAFkAAAAAAQBZAAAAAAAAWQAAAAACAHwAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAABZAAAAAAIAWQAAAAACAFkAAAAAAgBZAAAAAAMAWQAAAAADAFkAAAAAAABZAAAAAAUAWQAAAAABAFkAAAAAAABPAAAAAAAAHQAAAAAAAB0AAAAAAAB8AAAAAAAAfAAAAAAAAE8AAAAAAABPAAAAAAAAWQAAAAACAFkAAAAAAgBZAAAAAAQAWQAAAAABAFkAAAAAAgBZAAAAAAUAWQAAAAACAFkAAAAAAABZAAAAAAMATwAAAAAAAE8AAAAAAABPAAAAAAAAfAAAAAAAAHwAAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAAA7AAAAAAEAWQAAAAAFAFkAAAAABQBZAAAAAAIAWQAAAAADAFkAAAAABABZAAAAAAIAWQAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAAOwAAAAABAFkAAAAAAQBZAAAAAAQAWQAAAAACAFkAAAAAAgBZAAAAAAQAWQAAAAABAFkAAAAABQBZAAAAAAQAWQAAAAAAAFkAAAAAAgBZAAAAAAQAWQAAAAAEAFkAAAAAAwBZAAAAAAEATwAAAAAAADsAAAAAAwA7AAAAAAIAOwAAAAABAFkAAAAABQBZAAAAAAMAWQAAAAADAFkAAAAABABZAAAAAAIAWQAAAAADAFkAAAAABABZAAAAAAEAWQAAAAABAFkAAAAAAQBZAAAAAAMAWQAAAAAEAE8AAAAAAABZAAAAAAAAWQAAAAAAADsAAAAAAwA7AAAAAAAAOwAAAAACAFkAAAAABQBZAAAAAAEAWQAAAAABAFkAAAAABABZAAAAAAEAWQAAAAAEAFkAAAAAAwBZAAAAAAMAWQAAAAACAFkAAAAAAABPAAAAAAAAWQAAAAABAFkAAAAABQA7AAAAAAAAOwAAAAAAAFkAAAAAAwBZAAAAAAMAWQAAAAAEAFkAAAAAAABZAAAAAAAAWQAAAAAFAFkAAAAABABZAAAAAAEAWQAAAAADAFkAAAAABABZAAAAAAIATwAAAAAAAFkAAAAABQBZAAAAAAQAWQAAAAAAAFkAAAAAAgBZAAAAAAUAWQAAAAAFAFkAAAAABQBZAAAAAAUAWQAAAAADAFkAAAAAAQBZAAAAAAIAWQAAAAACAFkAAAAAAwBZAAAAAAMAWQAAAAAEAFkAAAAAAQBZAAAAAAQAWQAAAAAFAFkAAAAAAQBZAAAAAAMAWQAAAAABAFkAAAAAAgBZAAAAAAQAWQAAAAAEAA==
+          tiles: ewAAAAABAHsAAAAAAAB7AAAAAAIAewAAAAABAHsAAAAAAgB7AAAAAAAAewAAAAACAE8AAAAAAABPAAAAAAAATwAAAAAAAFkAAAAABQBZAAAAAAUAWQAAAAAEAFkAAAAABAB8AAAAAAAAfAAAAAAAAHsAAAAAAAB7AAAAAAAAewAAAAACAHsAAAAAAAB7AAAAAAIAewAAAAAAAHsAAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABZAAAAAAIAWQAAAAABAFkAAAAABQBZAAAAAAIAWQAAAAAAAHwAAAAAAAB7AAAAAAEAewAAAAAAAHsAAAAAAQB7AAAAAAAAewAAAAAAAHsAAAAAAAB7AAAAAAAATwAAAAAAAE8AAAAAAABZAAAAAAQAWQAAAAADAFkAAAAABQBZAAAAAAEAWQAAAAACAFkAAAAABABZAAAAAAEAewAAAAAAAHsAAAAAAQB7AAAAAAIAewAAAAAAAHsAAAAAAQB7AAAAAAEAewAAAAAAAE8AAAAAAABPAAAAAAAAWQAAAAABAFkAAAAAAwBZAAAAAAAAWQAAAAADAFkAAAAABABZAAAAAAAAWQAAAAAEAHsAAAAAAAB7AAAAAAEAewAAAAAAAHsAAAAAAAB7AAAAAAIAewAAAAABAHsAAAAAAgBPAAAAAAAAWQAAAAAEAFkAAAAABQBZAAAAAAIAWQAAAAAFAFkAAAAAAgBZAAAAAAMAWQAAAAAAAFkAAAAABABZAAAAAAQAHQAAAAAAAB0AAAAAAAAdAAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAWQAAAAADAFkAAAAAAwBZAAAAAAAAWQAAAAACAFkAAAAAAQBZAAAAAAMAWQAAAAAEAFkAAAAABABZAAAAAAUAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAFkAAAAAAwBZAAAAAAIAWQAAAAAFAFkAAAAABABZAAAAAAEAWQAAAAACAFkAAAAAAQBZAAAAAAAAWQAAAAACAHwAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAABZAAAAAAIAWQAAAAACAFkAAAAAAgBZAAAAAAMAWQAAAAADAFkAAAAAAABZAAAAAAUAWQAAAAABAFkAAAAAAABPAAAAAAAAHQAAAAAAAB0AAAAAAAB8AAAAAAAAfAAAAAAAAE8AAAAAAABPAAAAAAAAWQAAAAACAFkAAAAAAgBZAAAAAAQAWQAAAAABAFkAAAAAAgBZAAAAAAUAWQAAAAACAFkAAAAAAABZAAAAAAMATwAAAAAAAE8AAAAAAABPAAAAAAAAfAAAAAAAAHwAAAAAAABPAAAAAAAATwAAAAAAAFkAAAAAAAA7AAAAAAEAWQAAAAAFAFkAAAAABQBZAAAAAAIAWQAAAAADAFkAAAAABABZAAAAAAIAWQAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAATwAAAAAAAE8AAAAAAABZAAAAAAAAOwAAAAABAFkAAAAAAQBZAAAAAAQAWQAAAAACAFkAAAAAAgBZAAAAAAQAWQAAAAABAFkAAAAABQBZAAAAAAQAWQAAAAAAAFkAAAAAAgBZAAAAAAQAWQAAAAAEAFkAAAAAAwBZAAAAAAEAWQAAAAAAADsAAAAAAwA7AAAAAAIAOwAAAAABAFkAAAAABQBZAAAAAAMAWQAAAAADAFkAAAAABABZAAAAAAIAWQAAAAADAFkAAAAABABZAAAAAAEAWQAAAAABAFkAAAAAAQBZAAAAAAMAWQAAAAAEAFkAAAAAAABZAAAAAAAAWQAAAAAAADsAAAAAAwA7AAAAAAAAOwAAAAACAFkAAAAABQBZAAAAAAEAWQAAAAABAFkAAAAABABZAAAAAAEAWQAAAAAEAFkAAAAAAwBZAAAAAAMAWQAAAAACAFkAAAAAAABZAAAAAAAAWQAAAAAAAFkAAAAAAAA7AAAAAAAAOwAAAAAAAFkAAAAAAwBZAAAAAAMAWQAAAAAEAFkAAAAAAABZAAAAAAAAWQAAAAAFAFkAAAAABABZAAAAAAEAWQAAAAADAFkAAAAABABZAAAAAAIAWQAAAAAAAFkAAAAABQBZAAAAAAQAWQAAAAAAAFkAAAAAAgBZAAAAAAUAWQAAAAAFAFkAAAAABQBZAAAAAAUAWQAAAAADAFkAAAAAAQBZAAAAAAIAWQAAAAACAFkAAAAAAwBZAAAAAAMAWQAAAAAEAFkAAAAAAQBZAAAAAAQAWQAAAAAFAFkAAAAAAQBZAAAAAAMAWQAAAAABAFkAAAAAAgBZAAAAAAQAWQAAAAAEAA==
           version: 7
         1,-1:
           ind: 1,-1
-          tiles: HQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAfAAAAAAAAFkAAAAABQBZAAAAAAEAWQAAAAAEAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAABZAAAAAAQAWQAAAAAEAFkAAAAAAwAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB8AAAAAAAAWQAAAAABAFkAAAAAAwBZAAAAAAQAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAFkAAAAAAQBZAAAAAAUAWQAAAAAEAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABZAAAAAAQAWQAAAAAEAFkAAAAAAQBZAAAAAAIAWQAAAAAEAAAAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAWQAAAAACAFkAAAAAAwBPAAAAAAAAWQAAAAADAFkAAAAABAAAAAAAAAAAHQAAAAAAAB0AAAAAAABWAAAAAAAAVgAAAAAAAFYAAAAAAABWAAAAAAAAVgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAFkAAAAAAgBZAAAAAAEAWQAAAAADAFkAAAAAAQBZAAAAAAQAAAAAAAAAAHwAAAAAAAAdAAAAAAAAVgAAAAAAAFYAAAAAAABWAAAAAAAAVgAAAAAAAFYAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABZAAAAAAQATwAAAAAAAFkAAAAABABZAAAAAAIAWQAAAAADAAAAAAAAAAAdAAAAAAAAHQAAAAAAAFYAAAAAAABWAAAAAAAAVgAAAAAAAFYAAAAAAABWAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAWQAAAAAFAE8AAAAAAABPAAAAAAAAWQAAAAAFAFkAAAAABABZAAAAAAMAfAAAAAAAAB0AAAAAAABWAAAAAAAAVgAAAAAAAFYAAAAAAABWAAAAAAAAVgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAFkAAAAAAQBPAAAAAAAAWQAAAAAFAFkAAAAAAgBZAAAAAAIAWQAAAAACAHwAAAAAAAAdAAAAAAAAVgAAAAAAAFYAAAAAAABWAAAAAAAAVgAAAAAAAFYAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABZAAAAAAQAWQAAAAACAFkAAAAABABZAAAAAAIAWQAAAAACAFkAAAAAAQB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAWQAAAAAFAE8AAAAAAABZAAAAAAEAWQAAAAACAFkAAAAAAQBZAAAAAAQAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAFkAAAAAAABZAAAAAAMAWQAAAAAEAFkAAAAAAwBZAAAAAAMAWQAAAAABAHwAAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABZAAAAAAQATwAAAAAAAE8AAAAAAABZAAAAAAQAWQAAAAABAFkAAAAAAwB8AAAAAAAAWQAAAAAFAFkAAAAABQBZAAAAAAAAWQAAAAADAFkAAAAAAQBZAAAAAAAAWQAAAAACAFkAAAAAAwBZAAAAAAEAWQAAAAAAAFkAAAAAAwBZAAAAAAQAWQAAAAABAFkAAAAABABZAAAAAAEAfAAAAAAAAFkAAAAABQBPAAAAAAAAWQAAAAADAFkAAAAAAABZAAAAAAAATwAAAAAAAFkAAAAAAgBZAAAAAAAAWQAAAAAEAE8AAAAAAABPAAAAAAAAWQAAAAAFAFkAAAAAAgBZAAAAAAAAWQAAAAABAA==
+          tiles: fAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAfAAAAAAAAFkAAAAABQBZAAAAAAEAWQAAAAAEAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAABZAAAAAAQAWQAAAAAEAFkAAAAAAwAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB8AAAAAAAAWQAAAAABAFkAAAAAAwBZAAAAAAQAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAFkAAAAAAQBZAAAAAAUAWQAAAAAEAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABZAAAAAAQAWQAAAAAEAFkAAAAAAQBZAAAAAAIAWQAAAAAEAAAAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAWQAAAAACAFkAAAAAAwBPAAAAAAAAWQAAAAADAFkAAAAABAAAAAAAAAAAHQAAAAAAAB0AAAAAAABWAAAAAAAAVgAAAAAAAFYAAAAAAABWAAAAAAAAVgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAFkAAAAAAgBZAAAAAAEAWQAAAAADAFkAAAAAAQBZAAAAAAQAAAAAAAAAAHwAAAAAAAAdAAAAAAAAVgAAAAAAAFYAAAAAAABWAAAAAAAAVgAAAAAAAFYAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABZAAAAAAQATwAAAAAAAFkAAAAABABZAAAAAAIAWQAAAAADAAAAAAAAAAAdAAAAAAAAHQAAAAAAAFYAAAAAAABWAAAAAAAAVgAAAAAAAFYAAAAAAABWAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAWQAAAAAFAE8AAAAAAABPAAAAAAAAWQAAAAAFAFkAAAAABABZAAAAAAMAfAAAAAAAAB0AAAAAAABWAAAAAAAAVgAAAAAAAFYAAAAAAABWAAAAAAAAVgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAFkAAAAAAQBPAAAAAAAAWQAAAAAFAFkAAAAAAgBZAAAAAAIAWQAAAAACAHwAAAAAAAAdAAAAAAAAVgAAAAAAAFYAAAAAAABWAAAAAAAAVgAAAAAAAFYAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABZAAAAAAQAWQAAAAACAFkAAAAABABZAAAAAAIAWQAAAAACAFkAAAAAAQB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAWQAAAAAFAE8AAAAAAABZAAAAAAEAWQAAAAACAFkAAAAAAQBZAAAAAAQAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAFkAAAAAAABZAAAAAAMAWQAAAAAEAFkAAAAAAwBZAAAAAAMAWQAAAAABAHwAAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABZAAAAAAQATwAAAAAAAE8AAAAAAABZAAAAAAQAWQAAAAABAFkAAAAAAwB8AAAAAAAAWQAAAAAFAFkAAAAABQBZAAAAAAAAWQAAAAADAFkAAAAAAQBZAAAAAAAAWQAAAAACAFkAAAAAAwBZAAAAAAEAWQAAAAAAAFkAAAAAAwBZAAAAAAQAWQAAAAABAFkAAAAABABZAAAAAAEAfAAAAAAAAFkAAAAABQBPAAAAAAAAWQAAAAADAFkAAAAAAABZAAAAAAAATwAAAAAAAFkAAAAAAgBZAAAAAAAAWQAAAAAEAE8AAAAAAABPAAAAAAAAWQAAAAAFAFkAAAAAAgBZAAAAAAAAWQAAAAABAA==
           version: 7
         0,-2:
           ind: 0,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABZAAAAAAMAWQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAFkAAAAAAgBZAAAAAAEAWQAAAAAFAFkAAAAAAQBZAAAAAAMAWQAAAAADAFkAAAAABQBZAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFkAAAAABABZAAAAAAIAWQAAAAAFAFkAAAAAAABZAAAAAAMAWQAAAAADAFkAAAAAAABZAAAAAAQAWQAAAAAEAFkAAAAAAQBZAAAAAAMAWQAAAAADAFkAAAAABABZAAAAAAAAWQAAAAAAAFkAAAAABQBZAAAAAAAAWQAAAAAAAFkAAAAAAwBZAAAAAAQAWQAAAAACAFkAAAAAAgBPAAAAAAAAWQAAAAACAFkAAAAAAwB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAWQAAAAADAFkAAAAABQBZAAAAAAUAWQAAAAADAFkAAAAAAgBZAAAAAAIAWQAAAAACAFkAAAAABQBZAAAAAAEAfAAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAfAAAAAAAAFkAAAAABQBZAAAAAAUAWQAAAAACAFkAAAAABABZAAAAAAMAWQAAAAACAFkAAAAAAABZAAAAAAAAWQAAAAADAHwAAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAHwAAAAAAABZAAAAAAUAWQAAAAAEAFkAAAAAAwBZAAAAAAEAWQAAAAABAFkAAAAAAwBZAAAAAAQAWQAAAAAAAFkAAAAAAgB8AAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAB8AAAAAAAAWQAAAAADAFkAAAAAAgBZAAAAAAMAWQAAAAAFAFkAAAAAAgBZAAAAAAEAWQAAAAAEAFkAAAAAAQBZAAAAAAAAfAAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAfAAAAAAAAFkAAAAAAgBZAAAAAAIAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAFkAAAAAAABuAAAAAAAAbgAAAAAAAG4AAAAAAABuAAAAAAAAbgAAAAAAAHwAAAAAAABqAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAABZAAAAAAQAbgAAAAAAAG4AAAAAAABuAAAAAAAAbgAAAAAAAG4AAAAAAABqAAAAAAAAagAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAAfAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABZAAAAAAMAWQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAFkAAAAAAgBZAAAAAAEAWQAAAAAFAFkAAAAAAQBZAAAAAAMAWQAAAAADAFkAAAAABQBZAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFkAAAAABABZAAAAAAIAWQAAAAAFAFkAAAAAAABZAAAAAAMAWQAAAAADAFkAAAAAAABZAAAAAAQAWQAAAAAEAFkAAAAAAQBZAAAAAAMAWQAAAAADAFkAAAAABABZAAAAAAAAWQAAAAAAAFkAAAAABQBZAAAAAAAAWQAAAAAAAFkAAAAAAwBZAAAAAAQAWQAAAAACAFkAAAAAAgBPAAAAAAAAWQAAAAACAFkAAAAAAwB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAWQAAAAADAFkAAAAABQBZAAAAAAUAWQAAAAADAFkAAAAAAgBZAAAAAAIAWQAAAAACAFkAAAAABQBZAAAAAAEAfAAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAfAAAAAAAAFkAAAAABQBZAAAAAAUAWQAAAAACAFkAAAAABABZAAAAAAMAWQAAAAACAFkAAAAAAABZAAAAAAAAWQAAAAADAHwAAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAHwAAAAAAABZAAAAAAUAWQAAAAAEAFkAAAAAAwBZAAAAAAEAWQAAAAABAFkAAAAAAwBZAAAAAAQAWQAAAAAAAFkAAAAAAgB8AAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAB8AAAAAAAAWQAAAAADAFkAAAAAAgBZAAAAAAMAWQAAAAAFAFkAAAAAAgBZAAAAAAEAWQAAAAAEAFkAAAAAAQBZAAAAAAAAfAAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAfAAAAAAAAFkAAAAAAgBZAAAAAAIAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAABuAAAAAAAAbgAAAAAAAG4AAAAAAABuAAAAAAAAbgAAAAAAAHwAAAAAAABqAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAB8AAAAAAAAbgAAAAAAAG4AAAAAAABuAAAAAAAAbgAAAAAAAG4AAAAAAABqAAAAAAAAagAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAAfAAAAAAAAA==
           version: 7
         -1,-2:
           ind: -1,-2
@@ -94,11 +96,11 @@ entities:
           version: 7
         1,0:
           ind: 1,0
-          tiles: WQAAAAAAAE8AAAAAAABPAAAAAAAAWQAAAAADADsAAAAAAQBZAAAAAAQAWQAAAAAAAFkAAAAAAQBZAAAAAAUAWQAAAAAEAFkAAAAAAABZAAAAAAMAWQAAAAAAAFkAAAAABQBZAAAAAAAAWQAAAAABAFkAAAAAAABZAAAAAAQAWQAAAAADADsAAAAAAAA7AAAAAAAAOwAAAAABAFkAAAAAAwBZAAAAAAIAOwAAAAAAADsAAAAAAABZAAAAAAEAWQAAAAADAFkAAAAAAwBZAAAAAAQAWQAAAAAAAFkAAAAAAgBZAAAAAAAAWQAAAAADAFkAAAAABQA7AAAAAAIAOwAAAAADADsAAAAAAAA7AAAAAAEAOwAAAAABADsAAAAAAAA7AAAAAAEAOwAAAAADAFkAAAAAAABZAAAAAAQAWQAAAAACAFkAAAAAAQBZAAAAAAIAWQAAAAADAFkAAAAAAQBZAAAAAAUAOwAAAAAAADsAAAAAAQA7AAAAAAMAOwAAAAAAADsAAAAAAQA7AAAAAAIAOwAAAAACADsAAAAAAQBZAAAAAAMAWQAAAAAEAFkAAAAAAABZAAAAAAQAWQAAAAAFAFkAAAAAAABZAAAAAAEAWQAAAAAEADsAAAAAAwA7AAAAAAIAOwAAAAACAFkAAAAAAwBZAAAAAAEAWQAAAAABADsAAAAAAwA7AAAAAAMAWQAAAAAFAE8AAAAAAABPAAAAAAAATwAAAAAAAFkAAAAAAABZAAAAAAAAWQAAAAACAFkAAAAAAgA7AAAAAAEAOwAAAAADAFkAAAAAAgBZAAAAAAEAWQAAAAABAFkAAAAAAwA7AAAAAAIAOwAAAAADAFkAAAAAAgBZAAAAAAQAWQAAAAADAFkAAAAAAwBZAAAAAAMAWQAAAAACAFkAAAAAAABZAAAAAAAAOwAAAAACADsAAAAAAwA7AAAAAAAAOwAAAAABADsAAAAAAgA7AAAAAAEAOwAAAAADADsAAAAAAgBZAAAAAAAAWQAAAAACAFkAAAAAAwBZAAAAAAIAWQAAAAADAFkAAAAABQBZAAAAAAEAWQAAAAAEAFkAAAAABQA7AAAAAAAAOwAAAAADADsAAAAAAQA7AAAAAAAAOwAAAAADADsAAAAAAwA7AAAAAAMAWQAAAAABAFkAAAAAAQBZAAAAAAIAAAAAAAAAAAAAAAAAAABZAAAAAAAAWQAAAAACAFkAAAAAAgBZAAAAAAMAWQAAAAAFAFkAAAAAAwBZAAAAAAEAOwAAAAABADsAAAAAAAA7AAAAAAIAWQAAAAAAAFkAAAAAAwBZAAAAAAIAWQAAAAADAAAAAAAAAAAAAAAAAAAAWQAAAAAEAFkAAAAAAABZAAAAAAIAWQAAAAADAFkAAAAABQBZAAAAAAEAWQAAAAAEAFkAAAAAAgBZAAAAAAQAWQAAAAAAAFkAAAAAAABZAAAAAAEAWQAAAAACAFkAAAAAAQAAAAAAAAAAAAAAAAAAAFkAAAAAAABZAAAAAAMAWQAAAAAEAFkAAAAABABZAAAAAAIAWQAAAAABAFkAAAAAAQBZAAAAAAAAWQAAAAAAAFkAAAAABQBZAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABZAAAAAAUAWQAAAAACAFkAAAAABABZAAAAAAEAWQAAAAACAFkAAAAAAwBZAAAAAAMAWQAAAAABAFkAAAAAAwBZAAAAAAIAWQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACAFkAAAAAAwBZAAAAAAMAWQAAAAAAAFkAAAAAAgBZAAAAAAQAWQAAAAAEAFkAAAAAAgBZAAAAAAAAWQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFkAAAAAAgBZAAAAAAAAWQAAAAAEAFkAAAAAAgBZAAAAAAAAWQAAAAAAAFkAAAAAAQBZAAAAAAIAWQAAAAADAFkAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABZAAAAAAAAWQAAAAADAFkAAAAAAwBZAAAAAAIAWQAAAAAEAFkAAAAAAgBZAAAAAAEAWQAAAAAAAFkAAAAAAwBZAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAFkAAAAAAwBZAAAAAAUATwAAAAAAAFkAAAAAAQBZAAAAAAAAWQAAAAADAFkAAAAABQBZAAAAAAQAWQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: WQAAAAAAAE8AAAAAAABPAAAAAAAAWQAAAAADADsAAAAAAQBZAAAAAAQAWQAAAAAAAFkAAAAAAQBZAAAAAAUAWQAAAAAEAFkAAAAAAABZAAAAAAMAWQAAAAAAAFkAAAAABQBZAAAAAAAAWQAAAAABAFkAAAAAAABZAAAAAAQAWQAAAAADADsAAAAAAAA7AAAAAAAAOwAAAAABAFkAAAAAAwBZAAAAAAIAOwAAAAAAADsAAAAAAABZAAAAAAEAWQAAAAADAFkAAAAAAwBZAAAAAAQAWQAAAAAAAFkAAAAAAgBZAAAAAAAAWQAAAAADAFkAAAAABQA7AAAAAAIAOwAAAAADADsAAAAAAAA7AAAAAAEAOwAAAAABADsAAAAAAAA7AAAAAAEAOwAAAAADAFkAAAAAAABZAAAAAAQAWQAAAAACAFkAAAAAAQBZAAAAAAIAWQAAAAADAFkAAAAAAQBZAAAAAAUAOwAAAAAAADsAAAAAAQA7AAAAAAMAOwAAAAAAADsAAAAAAQA7AAAAAAIAOwAAAAACADsAAAAAAQBZAAAAAAMAWQAAAAAEAFkAAAAAAABZAAAAAAQAWQAAAAAFAFkAAAAAAABZAAAAAAEAWQAAAAAEADsAAAAAAwA7AAAAAAIAOwAAAAACAFkAAAAAAwBZAAAAAAEAWQAAAAABADsAAAAAAwA7AAAAAAMAWQAAAAAFAE8AAAAAAABPAAAAAAAATwAAAAAAAFkAAAAAAABZAAAAAAAAWQAAAAACAFkAAAAAAgA7AAAAAAAAOwAAAAADAFkAAAAAAgBZAAAAAAEAWQAAAAABAFkAAAAAAwA7AAAAAAIAOwAAAAADAFkAAAAAAgBZAAAAAAQAWQAAAAADAFkAAAAAAwBZAAAAAAMAWQAAAAACAFkAAAAAAABZAAAAAAAAOwAAAAACADsAAAAAAwA7AAAAAAAAOwAAAAABADsAAAAAAgA7AAAAAAEAOwAAAAADADsAAAAAAgBZAAAAAAAAWQAAAAACAFkAAAAAAwBZAAAAAAIAWQAAAAADAFkAAAAABQBZAAAAAAEAWQAAAAAEAFkAAAAABQA7AAAAAAAAOwAAAAADADsAAAAAAQA7AAAAAAAAOwAAAAADADsAAAAAAwA7AAAAAAMAWQAAAAABAFkAAAAAAQBZAAAAAAIAAAAAAAAAAAAAAAAAAABZAAAAAAAAWQAAAAACAFkAAAAAAgBZAAAAAAMAWQAAAAAFAFkAAAAAAwBZAAAAAAEAOwAAAAABADsAAAAAAAA7AAAAAAIAWQAAAAAAAFkAAAAAAwBZAAAAAAIAWQAAAAADAAAAAAAAAAAAAAAAAAAAWQAAAAAEAFkAAAAAAABZAAAAAAIAWQAAAAADAFkAAAAABQBZAAAAAAEAWQAAAAAEAFkAAAAAAgBZAAAAAAQAWQAAAAAAAFkAAAAAAABZAAAAAAEAWQAAAAACAFkAAAAAAQAAAAAAAAAAAAAAAAAAAFkAAAAAAABZAAAAAAMAWQAAAAAEAFkAAAAABABZAAAAAAIAWQAAAAABAFkAAAAAAQBZAAAAAAAAWQAAAAAAAFkAAAAABQBZAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABZAAAAAAUAWQAAAAACAFkAAAAABABZAAAAAAEAWQAAAAACAFkAAAAAAwBZAAAAAAMAWQAAAAABAFkAAAAAAwBZAAAAAAIAWQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACAFkAAAAAAwBZAAAAAAMAWQAAAAAAAFkAAAAAAgBZAAAAAAQAWQAAAAAEAFkAAAAAAgBZAAAAAAAAWQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFkAAAAAAgBZAAAAAAAAWQAAAAAEAFkAAAAAAgBZAAAAAAAAWQAAAAAAAFkAAAAAAQBZAAAAAAIAWQAAAAADAFkAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABZAAAAAAAAWQAAAAADAFkAAAAAAwBZAAAAAAIAWQAAAAAEAFkAAAAAAgBZAAAAAAEAWQAAAAAAAFkAAAAAAwBZAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAFkAAAAAAwBZAAAAAAUATwAAAAAAAFkAAAAAAQBZAAAAAAAAWQAAAAADAFkAAAAABQBZAAAAAAQAWQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         1,-2:
           ind: 1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFkAAAAAAwBZAAAAAAIAWQAAAAADAFkAAAAAAgBZAAAAAAQAWQAAAAACAFkAAAAABABZAAAAAAUAWQAAAAABAFkAAAAAAgBZAAAAAAMAWQAAAAADAFkAAAAAAABZAAAAAAIAWQAAAAAEAAAAAAAAAABZAAAAAAUAWQAAAAAEAFkAAAAAAwBZAAAAAAQAWQAAAAADAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABZAAAAAAAAWQAAAAAAAFkAAAAAAwBZAAAAAAAAWQAAAAABAFkAAAAAAgBZAAAAAAIAWQAAAAAAAFkAAAAAAABZAAAAAAIAWQAAAAADAFkAAAAAAABZAAAAAAUAWQAAAAACAFkAAAAABABZAAAAAAIAWQAAAAAEAFkAAAAAAABZAAAAAAQAWQAAAAACAFkAAAAAAwBZAAAAAAQAWQAAAAAFAFkAAAAAAQBZAAAAAAUAWQAAAAABAFkAAAAABQBZAAAAAAEAWQAAAAAEAFkAAAAAAgBZAAAAAAUAWQAAAAABAFkAAAAAAABZAAAAAAQAWQAAAAAEAFkAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAWQAAAAABAFkAAAAAAABZAAAAAAIAfAAAAAAAAGoAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABqAAAAAAAAfAAAAAAAAFkAAAAABABZAAAAAAEAWQAAAAACAHwAAAAAAABqAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAagAAAAAAAHwAAAAAAABZAAAAAAMAWQAAAAABAFkAAAAAAAB8AAAAAAAAagAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAGoAAAAAAAB8AAAAAAAAWQAAAAADAFkAAAAAAQBZAAAAAAAAWQAAAAADAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAfAAAAAAAAFkAAAAAAQBZAAAAAAEAWQAAAAAFAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFkAAAAAAwBZAAAAAAIAWQAAAAADAFkAAAAAAgBZAAAAAAQAWQAAAAACAFkAAAAABABZAAAAAAUAWQAAAAABAFkAAAAAAgBZAAAAAAMAWQAAAAADAFkAAAAAAABZAAAAAAIAWQAAAAAEAAAAAAAAAABZAAAAAAUAWQAAAAAEAFkAAAAAAwBZAAAAAAQAWQAAAAADAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABZAAAAAAAAWQAAAAAAAFkAAAAAAwBZAAAAAAAAWQAAAAABAFkAAAAAAgBZAAAAAAIAWQAAAAAAAFkAAAAAAABZAAAAAAIAWQAAAAADAFkAAAAAAABZAAAAAAUAWQAAAAACAFkAAAAABABZAAAAAAIAWQAAAAAEAFkAAAAAAABZAAAAAAQAWQAAAAACAFkAAAAAAwBZAAAAAAQAWQAAAAAFAFkAAAAAAQBZAAAAAAUAWQAAAAABAFkAAAAABQBZAAAAAAEAWQAAAAAEAFkAAAAAAgBZAAAAAAUAWQAAAAABAFkAAAAAAABZAAAAAAQAWQAAAAAEAFkAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAWQAAAAABAFkAAAAAAABZAAAAAAIAfAAAAAAAAGoAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABqAAAAAAAAfAAAAAAAAFkAAAAABABZAAAAAAEAWQAAAAACAHwAAAAAAABqAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAagAAAAAAAHwAAAAAAABZAAAAAAMAWQAAAAABAFkAAAAAAAB8AAAAAAAAagAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAGoAAAAAAAB8AAAAAAAAWQAAAAADAFkAAAAAAQBZAAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAfAAAAAAAAFkAAAAAAQBZAAAAAAEAWQAAAAAFAA==
           version: 7
         -2,0:
           ind: -2,0
@@ -160,17 +162,17 @@ entities:
       version: 2
       data:
         uniqueMixes:
-        - temperature: 293.15
+        - temperature: 248.15
           volume: 2500
           moles:
             Oxygen: 21.824879
             Nitrogen: 82.10312
-        - temperature: 293.15
+        - temperature: 248.15
           volume: 2500
           moles:
             Oxygen: 21.213781
             Nitrogen: 79.80423
-        - temperature: 293.15
+        - temperature: 248.15
           volume: 2500
           moles: {}
         tiles:
@@ -825,25 +827,79 @@ entities:
     - type: GasTileOverlay
     - type: SpreaderGrid
     - type: GridPathfinding
-    - type: ImplicitRoof
+    - type: Roof
+      data:
+        -3,1: 18446682229954902264
+        -2,1: 18446744073709551487
+        -2,0: 9187201402835828736
+        -3,0: 17361640446303928320
+        -1,1: 108371727217590272
+        -3,2: 18446744073692708863
+        -2,2: 18446744073709551487
+        -2,3: 212175628992511
+        -3,3: 2251588155536834559
+        -1,3: 16626342641471
+        -1,2: 4611681499098447872
+        -4,3: 13889101250810642560
+        -4,2: 9259541571362095104
+        -4,4: 192
+        -3,4: 3
+        1,2: 18230287884387090432
+        1,3: 17361650328973147388
+        2,3: 1085120253746155279
+        2,2: 1089659176801333496
+        2,4: 7
+        1,4: 192
+        2,1: 18228584461148680288
+        3,1: 72340172871763740
+        3,2: 257
+        3,0: 1736262388383546623
+        2,0: 247115238459375
+        3,-1: 18446744073709551615
+        4,0: 1
+        4,-1: 72057598332895232
+        2,-1: 18446744073709551615
+        1,0: 3233873919
+        3,-2: 9187131308969558015
+        3,-3: 18446744072621072159
+        4,-2: 50529027
+        4,-3: 217020518514229248
+        2,-3: 18446744073709551356
+        2,-4: 17293822569102704640
+        3,-4: 1080863910568919040
+        1,-3: 18446744073709551615
+        0,-3: 18446742969852162272
+        0,-4: 16140901064495857664
+        -1,-3: 18229511620555181060
+        -1,-2: 18229723555195321596
+        -1,-1: 16212110922133339388
+        0,-1: 18446744073709551615
+        0,-2: 18446744073709551615
+        -1,0: 32960
+        0,0: 471662591
+        1,-1: 18446744073709551615
+        1,-2: 18446744073709551615
+        2,-2: 18446744073709551615
+        0,1: 63297651233259520
+      color: '#000000F4'
     - type: ExplosionAirtightGrid
     - type: TileHistory
       chunkHistory: {}
     - type: GridSplitNode
     - type: ChunkContainer
       chunkEntities:
+      - 1759
+      - 2257
+      - 2291
+      - 2327
       - 2463
       - 2464
-      - 2540
-      - 2541
-      - 2542
-      - 2543
-      - 2544
-      - 2545
-      - 2546
-      - 2547
-      - 2548
-      - 2549
+      - 2525
+      - 2527
+      - 2528
+      - 2529
+      - 2530
+      - 2531
   - uid: 1295
     components:
     - type: MetaData
@@ -858,7 +914,7 @@ entities:
     - type: Broadphase
     - type: OccluderTree
     - type: MapLight
-      ambientLightColor: '#AFAEAEFF'
+      ambientLightColor: '#CCCCCCFF'
     - type: Parallax
       parallax: Sky
     - type: MapAtmosphere
@@ -1075,12 +1131,30 @@ entities:
       pos: -15.5,23.5
 - proto: AlwaysPoweredLightLED
   entities:
+  - uid: 22
+    components:
+    - type: Transform
+      parent: 104
+      rot: 3.141592653589793 rad
+      pos: -2.5,-0.5
   - uid: 135
     components:
     - type: Transform
       parent: 104
       rot: -1.5707963267948966 rad
       pos: -6.5,-1.5
+  - uid: 222
+    components:
+    - type: Transform
+      parent: 104
+      rot: 3.141592653589793 rad
+      pos: -0.5,2.5
+  - uid: 540
+    components:
+    - type: Transform
+      parent: 104
+      rot: 3.141592653589793 rad
+      pos: 8.5,2.5
   - uid: 974
     components:
     - type: Transform
@@ -1119,6 +1193,17 @@ entities:
       parent: 104
       rot: -1.5707963267948966 rad
       pos: 22.5,-6.5
+  - uid: 541
+    components:
+    - type: Transform
+      parent: 104
+      rot: 3.141592653589793 rad
+      pos: 5.5,10.5
+  - uid: 629
+    components:
+    - type: Transform
+      parent: 104
+      pos: 5.5,14.5
   - uid: 1356
     components:
     - type: Transform
@@ -1187,12 +1272,6 @@ entities:
       parent: 104
       rot: 1.5707963267948966 rad
       pos: -10.5,5.5
-  - uid: 1759
-    components:
-    - type: Transform
-      parent: 104
-      rot: -1.5707963267948966 rad
-      pos: -1.5,12.5
   - uid: 1760
     components:
     - type: Transform
@@ -1217,17 +1296,6 @@ entities:
       parent: 104
       rot: 3.141592653589793 rad
       pos: -2.5,-16.5
-  - uid: 2257
-    components:
-    - type: Transform
-      parent: 104
-      rot: 3.141592653589793 rad
-      pos: 5.5,10.5
-  - uid: 2291
-    components:
-    - type: Transform
-      parent: 104
-      pos: 5.5,14.5
   - uid: 2397
     components:
     - type: Transform
@@ -9453,7 +9521,7 @@ entities:
       pos: 13.499366,-8.433407
 - proto: ChunkEntity
   entities:
-  - uid: 2463
+  - uid: 1759
     components:
     - type: ChunkEntity
       root: 104
@@ -9615,7 +9683,7 @@ entities:
             angle: 4.71238898038469 rad
           decals:
             18: 24,-10
-  - uid: 2464
+  - uid: 2257
     components:
     - type: ChunkEntity
       root: 104
@@ -9716,7 +9784,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             293: 24,-18
-  - uid: 2540
+  - uid: 2291
     components:
     - type: ChunkEntity
       root: 104
@@ -9802,7 +9870,7 @@ entities:
             color: '#AB0000FF'
           decals:
             371: 20.568506,2.9319348
-  - uid: 2541
+  - uid: 2327
     components:
     - type: ChunkEntity
       root: 104
@@ -10104,7 +10172,7 @@ entities:
             337: 5,-9
             338: 5,-8
             360: 5,-7
-  - uid: 2542
+  - uid: 2463
     components:
     - type: ChunkEntity
       root: 104
@@ -10205,7 +10273,7 @@ entities:
           decals:
             227: 10,-18
             228: 10,-17
-  - uid: 2543
+  - uid: 2464
     components:
     - type: ChunkEntity
       root: 104
@@ -10267,6 +10335,11 @@ entities:
             color: '#FFFFFFFF'
           decals:
             124: -5,-3
+        - node:
+            id: WarnCornerSmallNW
+            color: '#FFFFFFFF'
+          decals:
+            0: -9,-1
         - node:
             id: WoodTrimThinLineS
             color: '#FFFFFFFF'
@@ -10287,7 +10360,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             24: -3.9999733,-6.081314
-  - uid: 2544
+  - uid: 2525
     components:
     - type: ChunkEntity
       root: 104
@@ -10312,17 +10385,26 @@ entities:
             color: '#DE3A3A96'
           decals:
             244: -1,-17
+        - node:
+            id: WarnCornerSmallSW
+            color: '#FFFFFFFF'
+          decals:
+            0: -9,-19
         - node:
             id: WarnLineS
             color: '#FFFFFFFF'
           decals:
+            3: -9,-20
+            4: -9,-21
+            5: -9,-22
+            6: -9,-23
             122: -9,-24
         - node:
             id: grasssnowb3
             color: '#FFFFFFFF'
           decals:
             23: -3.3477993,-19.991972
-  - uid: 2545
+  - uid: 2527
     components:
     - type: ChunkEntity
       root: 104
@@ -10354,6 +10436,9 @@ entities:
             id: WarnLineS
             color: '#FFFFFFFF'
           decals:
+            0: -9,4
+            1: -9,1
+            2: -9,0
             95: -9,3
             96: -9,2
         - node:
@@ -10407,7 +10492,7 @@ entities:
           decals:
             46: -4.0458164,7.6303444
             66: -1.9470882,14.409473
-  - uid: 2546
+  - uid: 2528
     components:
     - type: ChunkEntity
       root: 104
@@ -10524,7 +10609,7 @@ entities:
             37: 9.0946245,2.0440664
             59: 0.45371246,11.270374
             60: 9.166802,10.222887
-  - uid: 2547
+  - uid: 2529
     components:
     - type: ChunkEntity
       root: 104
@@ -10560,7 +10645,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             43: -2.8895664,16.211998
-  - uid: 2548
+  - uid: 2530
     components:
     - type: ChunkEntity
       root: 104
@@ -10601,7 +10686,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             77: 6.122473,18.001226
-  - uid: 2549
+  - uid: 2531
     components:
     - type: ChunkEntity
       root: 104
@@ -11144,13 +11229,11 @@ entities:
       pos: 27.5,-18.5
 - proto: GravityGenerator
   entities:
-  - uid: 2327
+  - uid: 291
     components:
     - type: Transform
       parent: 104
       pos: 22.5,-15.5
-    - type: PointLight
-      radius: 175.75
 - proto: Grille
   entities:
   - uid: 95
@@ -11405,78 +11488,54 @@ entities:
       pos: 3.9919167,-12.28661
 - proto: LightPostSmall
   entities:
-  - uid: 221
-    components:
-    - type: Transform
-      parent: 104
-      pos: 15.5,16.5
-  - uid: 222
-    components:
-    - type: Transform
-      parent: 104
-      rot: 1.5707963267948966 rad
-      pos: -2.5,3.5
-  - uid: 291
-    components:
-    - type: Transform
-      parent: 104
-      pos: 17.5,3.5
-  - uid: 540
-    components:
-    - type: Transform
-      parent: 104
-      pos: 27.5,4.5
-  - uid: 541
-    components:
-    - type: Transform
-      parent: 104
-      pos: 18.5,8.5
-  - uid: 629
-    components:
-    - type: Transform
-      parent: 104
-      rot: 1.5707963267948966 rad
-      pos: -0.5,8.5
-  - uid: 1226
-    components:
-    - type: Transform
-      parent: 104
-      pos: -4.5,-0.5
   - uid: 1276
     components:
     - type: Transform
       parent: 104
-      pos: -34.5,4.5
+      rot: 3.141592653589793 rad
+      pos: -23.5,-19.5
   - uid: 1279
     components:
     - type: Transform
       parent: 104
-      pos: -35.5,-23.5
+      rot: 3.141592653589793 rad
+      pos: -31.5,0.5
   - uid: 1413
     components:
     - type: Transform
       parent: 104
-      pos: 0.5,-22.5
+      rot: 3.141592653589793 rad
+      pos: -23.5,0.5
+  - uid: 3999
+    components:
+    - type: Transform
+      parent: 104
+      rot: 3.141592653589793 rad
+      pos: -15.5,0.5
   - uid: 1668
     components:
     - type: Transform
       parent: 104
-      pos: 5.5,17.5
+      rot: 3.141592653589793 rad
+      pos: -31.5,-19.5
   - uid: 1669
     components:
     - type: Transform
       parent: 104
-      pos: 10.5,11.5
+      rot: 3.141592653589793 rad
+      pos: -15.5,-19.5
   - uid: 1671
     components:
     - type: Transform
       parent: 104
-      pos: -3.5,17.5
+      rot: 3.141592653589793 rad
+      pos: 18.5,3.5
   - uid: 1675
     components:
     - type: Transform
       parent: 104
-      pos: 10.5,2.5
+      rot: 3.141592653589793 rad
+      pos: 27.5,4.5
 - proto: LockerSyndicatePersonalFilled
   entities:
   - uid: 178
@@ -12343,74 +12402,18 @@ entities:
       pos: 5.5,-8.5
 - proto: Poweredlight
   entities:
+  - uid: 1226
+    components:
+    - type: Transform
+      parent: 104
+      rot: 1.5707963267948966 rad
+      pos: 9.5,0.5
   - uid: 1333
     components:
     - type: Transform
       parent: 104
       rot: -1.5707963267948966 rad
-      pos: 13.5,-0.5
-- proto: PoweredLightPostSmall
-  entities:
-  - uid: 2525
-    components:
-    - type: Transform
-      parent: 104
-      pos: -10.5,0.5
-  - uid: 2527
-    components:
-    - type: Transform
-      parent: 104
-      pos: -31.5,0.5
-  - uid: 2528
-    components:
-    - type: Transform
-      parent: 104
-      pos: -27.5,0.5
-  - uid: 2529
-    components:
-    - type: Transform
-      parent: 104
-      pos: -23.5,0.5
-  - uid: 2530
-    components:
-    - type: Transform
-      parent: 104
-      pos: -19.5,0.5
-  - uid: 2531
-    components:
-    - type: Transform
-      parent: 104
-      pos: -15.5,0.5
-  - uid: 2532
-    components:
-    - type: Transform
-      parent: 104
-      pos: -10.5,-19.5
-  - uid: 2533
-    components:
-    - type: Transform
-      parent: 104
-      pos: -15.5,-19.5
-  - uid: 2534
-    components:
-    - type: Transform
-      parent: 104
-      pos: -19.5,-19.5
-  - uid: 2535
-    components:
-    - type: Transform
-      parent: 104
-      pos: -23.5,-19.5
-  - uid: 2536
-    components:
-    - type: Transform
-      parent: 104
-      pos: -27.5,-19.5
-  - uid: 2537
-    components:
-    - type: Transform
-      parent: 104
-      pos: -31.5,-19.5
+      pos: 13.5,0.5
 - proto: PoweredSmallLight
   entities:
   - uid: 23
@@ -13212,13 +13215,6 @@ entities:
     - type: Transform
       parent: 104
       pos: 8.5,-15.5
-- proto: SinkStemlessWater
-  entities:
-  - uid: 22
-    components:
-    - type: Transform
-      parent: 104
-      pos: 15.5,-1.5
 - proto: SinkWide
   entities:
   - uid: 144
diff --git a/Resources/Maps/Shuttles/emergency_exo.yml b/Resources/Maps/Shuttles/emergency_exo.yml
index bc41a5a6b6..b23afb35ec 100644
--- a/Resources/Maps/Shuttles/emergency_exo.yml
+++ b/Resources/Maps/Shuttles/emergency_exo.yml
@@ -4,7 +4,7 @@ meta:
   engineVersion: 289.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/23/2026 06:47:09
+  time: 09/11/2026 16:53:43
   entityCount: 1017
 maps: []
 grids:
@@ -20,6 +20,9 @@ tilemap:
   2: Space
   5: FloorDark
   7: FloorDarkMini
+  12: FloorExoCornerNE
+  13: FloorExoCornerNW
+  14: FloorExoCornerSE
   8: FloorExoCornerSW
   9: FloorExoHull
   10: FloorExoTechmaint
@@ -43,27 +46,27 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: AAAAAAAAAAAAAAAAAAABAAAAAAAACAAAAAAAAgkAAAAAAAMJAAAAAAADCQAAAAAAAwkAAAAAAAMJAAAAAAADCQAAAAAAAwkAAAAAAAMKAAAAAAAACQAAAAAAAwkAAAAAAAMIAAAAAAAACAAAAAAAAgAAAAAAAAAAAAAAAAAAAQAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAACwAAAAAAAAsAAAAAAgABAAAAAAAAAQAAAAAAAAgAAAAAAAIJAAAAAAADCQAAAAAAAwgAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAALAAAAAAAACwAAAAAAAAgAAAAAAAIJAAAAAAADCQAAAAAAAwEAAAAAAAAIAAAAAAAACAAAAAAAAgkAAAAAAAMJAAAAAAADAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAACCQAAAAAAAwkAAAAAAAMIAAAAAAAACwAAAAAAAAsAAAAAAgABAAAAAAAAAQAAAAAAAAkAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAAAwkAAAAAAAMJAAAAAAADCAAAAAAAAAsAAAAAAgALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAEAAQAAAAAAAAsAAAAAAgAJAAAAAAAACwAAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALAAAAAAAACwAAAAABAAsAAAAAAAALAAAAAAAACwAAAAABAAEAAAAAAAALAAAAAAEACQAAAAAAAAsAAAAAAAALAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAACwAAAAABAAEAAAAAAAABAAAAAAAACwAAAAABAAEAAAAAAAABAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAMAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAKAAAAAAAACgAAAAAAAAsAAAAAAgALAAAAAAIAAQAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAADAAAAAAAAAwAAAAAAAAsAAAAAAgAKAAAAAAAACwAAAAAAAAsAAAAAAgALAAAAAAAACwAAAAABAAEAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAACgAAAAAAAAsAAAAAAgALAAAAAAIACgAAAAAAAAoAAAAAAAABAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAMAAAAAAAADAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAADAAAAAAAAAwAAAAAAAAEAAAAAAAAEAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAABAAAAAAAADAAAAAAAAAkAAAAAAAMJAAAAAAADCQAAAAAAAwkAAAAAAAMJAAAAAAADCQAAAAAAAwkAAAAAAAMKAAAAAAAACQAAAAAAAwkAAAAAAAMNAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAACQAAAAAAAAkAAAAAAAABAAAAAAAAAQAAAAAAAA4AAAAAAAAJAAAAAAADCQAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAALAAAAAAIACwAAAAAAAAwAAAAAAAAJAAAAAAADCQAAAAAAAwEAAAAAAAALAAAAAAAACQAAAAAAAAkAAAAAAAMJAAAAAAADAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAACQAAAAAAAwkAAAAAAAMIAAAAAAAACwAAAAABAAsAAAAAAgABAAAAAAAAAQAAAAAAAAkAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAAAwkAAAAAAAMJAAAAAAADCAAAAAAAAAsAAAAAAQALAAAAAAIACwAAAAACAAsAAAAAAQALAAAAAAAAAQAAAAAAAAsAAAAAAQAJAAAAAAAACwAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALAAAAAAIACwAAAAACAAsAAAAAAgALAAAAAAIACwAAAAAAAAEAAAAAAAALAAAAAAIACQAAAAAAAAsAAAAAAgALAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAACwAAAAAAAAEAAAAAAAABAAAAAAAACwAAAAAAAAEAAAAAAAABAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAMAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAKAAAAAAAACgAAAAAAAAsAAAAAAgALAAAAAAAAAQAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAADAAAAAAAAAwAAAAAAAAsAAAAAAAAKAAAAAAAACwAAAAACAAsAAAAAAAALAAAAAAAACwAAAAACAAEAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAACgAAAAAAAAsAAAAAAQALAAAAAAIACgAAAAAAAAoAAAAAAAABAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAMAAAAAAAADAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAADAAAAAAAAAwAAAAAAAAEAAAAAAAAEAAAAAAIAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
         -1,0:
           ind: -1,0
-          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAABAAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAABAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
         0,-1:
           ind: 0,-1
-          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABAAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAQAAAAAAgAEAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAFAAAAAAAAAQAAAAAAAAQAAAAAAQABAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAQAAAAAAAAQAAAAAAQAEAAAAAAAABAAAAAAAAAEAAAAAAAAGAAAAAAAAAQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAsAAAAAAQALAAAAAAAACwAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAAACgAAAAAAAAEAAAAAAAABAAAAAAAACgAAAAAAAAsAAAAAAgALAAAAAAEACwAAAAAAAAsAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAAAAAgAAAAAAAIIAAAAAAADAQAAAAAAAAsAAAAAAgALAAAAAAIACwAAAAABAAsAAAAAAAALAAAAAAIACwAAAAACAAUAAAAAAAAFAAAAAAAABwAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAAIAAAAAAABCQAAAAAAAAEAAAAAAAALAAAAAAEACwAAAAACAAsAAAAAAgALAAAAAAEACwAAAAABAAsAAAAAAgAFAAAAAAAABQAAAAAAAAcAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAAACQAAAAAAAwgAAAAAAAABAAAAAAAAAQAAAAAAAAsAAAAAAQALAAAAAAEACwAAAAAAAAsAAAAAAQALAAAAAAIABQAAAAAAAAUAAAAAAAABAAAAAAAAAQAAAAAAAAUAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAALAAAAAAEAAQAAAAAAAAkAAAAAAAMKAAAAAAAACQAAAAAAAwgAAAAAAAALAAAAAAIACwAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAQkAAAAAAAMJAAAAAAADCQAAAAAAAwkAAAAAAAMIAAAAAAACCgAAAAAAAAgAAAAAAAMIAAAAAAACCQAAAAAAAwkAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAACwAAAAAAAAsAAAAAAQALAAAAAAEACQAAAAAAAAEAAAAAAAAJAAAAAAAACQAAAAAAAAgAAAAAAAIIAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAsAAAAAAgALAAAAAAEACwAAAAAAAAgAAAAAAAAKAAAAAAAACAAAAAAAAQgAAAAAAAAIAAAAAAACCAAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABAAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAQAAAAAAAAEAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAFAAAAAAAAAQAAAAAAAAQAAAAAAAABAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAQAAAAAAAAQAAAAAAgAEAAAAAAEABAAAAAABAAEAAAAAAAAGAAAAAAAAAQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAsAAAAAAAALAAAAAAIACwAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAAACgAAAAAAAAEAAAAAAAABAAAAAAAACgAAAAAAAAsAAAAAAgALAAAAAAEACwAAAAABAAsAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAAAAAsAAAAAAAAIAAAAAAADAQAAAAAAAAsAAAAAAQALAAAAAAEACwAAAAABAAsAAAAAAQALAAAAAAIACwAAAAABAAUAAAAAAAAFAAAAAAAABwAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAAMAAAAAAAACQAAAAAAAAEAAAAAAAALAAAAAAAACwAAAAABAAsAAAAAAgALAAAAAAIACwAAAAACAAsAAAAAAQAFAAAAAAAABQAAAAAAAAcAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAAACQAAAAAAAwgAAAAAAAABAAAAAAAAAQAAAAAAAAsAAAAAAAALAAAAAAEACwAAAAABAAsAAAAAAAALAAAAAAIABQAAAAAAAAUAAAAAAAABAAAAAAAAAQAAAAAAAAUAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAJAAAAAAAAAQAAAAAAAAkAAAAAAAMKAAAAAAAACQAAAAAAAwkAAAAAAAALAAAAAAIACwAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAAkAAAAAAAMJAAAAAAADCQAAAAAAAwkAAAAAAAMIAAAAAAACCgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAAAAwsAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAACwAAAAABAAsAAAAAAgALAAAAAAEACQAAAAAAAAEAAAAAAAAJAAAAAAAACQAAAAAAAAgAAAAAAAILAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAsAAAAAAAALAAAAAAEACwAAAAACAA0AAAAAAAAKAAAAAAAADAAAAAAAAAgAAAAAAAALAAAAAAIACwAAAAABAA==
           version: 7
         -1,-1:
           ind: -1,-1
-          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABAAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABAAAAAACAAQAAAAAAgABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAAAQAAAAAAAAYAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABAAAAAABAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABAAAAAABAAQAAAAAAQABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAAAQAAAAAAAAYAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAA==
           version: 7
         1,-1:
           ind: 1,-1
-          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAQAAAAAAgACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAsAAAAAAgABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAALAAAAAAEAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACwAAAAACAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgAAAAAAAMBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAJAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAQAAAAAAgACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAsAAAAAAQABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAALAAAAAAIAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACwAAAAACAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAsAAAAAAQABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAALAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACwAAAAABAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
         1,0:
           ind: 1,0
-          tiles: CAAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAoAAAAAAAAKAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABAAAAAACAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAABAAAAAACAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: CQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAoAAAAAAAAKAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAJAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAABAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
     - type: Broadphase
     - type: Physics
diff --git a/Resources/Maps/Shuttles/emergency_sushi.yml b/Resources/Maps/Shuttles/emergency_sushi.yml
index d8cdffa2a2..0c52680dc3 100644
--- a/Resources/Maps/Shuttles/emergency_sushi.yml
+++ b/Resources/Maps/Shuttles/emergency_sushi.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Grid
-  engineVersion: 289.0.0
+  engineVersion: 289.0.3
   forkId: ""
   forkVersion: ""
-  time: 08/23/2026 14:55:13
-  entityCount: 1415
+  time: 09/15/2026 18:19:55
+  entityCount: 1411
 maps: []
 grids:
 - 1
@@ -66,7 +66,7 @@ entities:
           version: 7
         -1,1:
           ind: -1,1
-          tiles: AAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABgAAAAAAAAYAAAAAAAAEAAAAAAAACgAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAYAAAAAAAAGAAAAAAAABAAAAAAAAAoAAAAAAAALAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          tiles: AAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABgAAAAAAAAYAAAAAAAAEAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAYAAAAAAAAGAAAAAAAABAAAAAAAAAsAAAAAAAALAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
           version: 7
         -2,1:
           ind: -2,1
@@ -86,11 +86,11 @@ entities:
           version: 7
         -2,-1:
           ind: -2,-1
-          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAA==
           version: 7
         -2,0:
           ind: -2,0
-          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
           version: 7
     - type: Broadphase
     - type: Physics
@@ -166,7 +166,7 @@ entities:
           -4,-1:
             0: 26239
           -5,-1:
-            1: 2048
+            1: 34816
           -4,-5:
             0: 61166
           -4,0:
@@ -203,7 +203,7 @@ entities:
           -4,1:
             0: 26231
           -5,1:
-            1: 2048
+            1: 34816
           -4,2:
             0: 65398
           -5,2:
@@ -400,11 +400,6 @@ entities:
       parent: 1
       rot: -1.5707963267948966 rad
       pos: -7.5,-16.5
-  - uid: 21
-    components:
-    - type: Transform
-      parent: 1
-      pos: -2.5,-12.5
   - uid: 22
     components:
     - type: Transform
@@ -441,6 +436,12 @@ entities:
       parent: 1
       rot: -1.5707963267948966 rad
       pos: -3.5,1.5
+  - uid: 330
+    components:
+    - type: Transform
+      parent: 1
+      rot: 3.141592653589793 rad
+      pos: -6.5,-19.5
 - proto: Ashtray
   entities:
   - uid: 28
@@ -896,11 +897,6 @@ entities:
     - type: Transform
       parent: 1
       pos: -12.5,8.5
-  - uid: 114
-    components:
-    - type: Transform
-      parent: 1
-      pos: -2.5,-12.5
   - uid: 115
     components:
     - type: Transform
@@ -1653,6 +1649,11 @@ entities:
       pos: -0.5,18.5
 - proto: CableHV
   entities:
+  - uid: 21
+    components:
+    - type: Transform
+      parent: 1
+      pos: -3.5,-14.5
   - uid: 265
     components:
     - type: Transform
@@ -1698,11 +1699,6 @@ entities:
     - type: Transform
       parent: 1
       pos: -4.5,-14.5
-  - uid: 274
-    components:
-    - type: Transform
-      parent: 1
-      pos: -3.5,-14.5
   - uid: 275
     components:
     - type: Transform
@@ -1970,46 +1966,11 @@ entities:
     - type: Transform
       parent: 1
       pos: -4.5,-18.5
-  - uid: 328
-    components:
-    - type: Transform
-      parent: 1
-      pos: -4.5,-17.5
-  - uid: 329
-    components:
-    - type: Transform
-      parent: 1
-      pos: -4.5,-16.5
-  - uid: 330
-    components:
-    - type: Transform
-      parent: 1
-      pos: -4.5,-15.5
-  - uid: 331
-    components:
-    - type: Transform
-      parent: 1
-      pos: -4.5,-13.5
   - uid: 332
     components:
     - type: Transform
       parent: 1
-      pos: -4.5,-14.5
-  - uid: 333
-    components:
-    - type: Transform
-      parent: 1
-      pos: -3.5,-13.5
-  - uid: 334
-    components:
-    - type: Transform
-      parent: 1
-      pos: -2.5,-13.5
-  - uid: 335
-    components:
-    - type: Transform
-      parent: 1
-      pos: -2.5,-12.5
+      pos: -6.5,-19.5
   - uid: 336
     components:
     - type: Transform
@@ -5598,13 +5559,6 @@ entities:
       pos: -14.5,2.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 828
-    components:
-    - type: Transform
-      parent: 1
-      pos: -14.5,3.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 829
     components:
     - type: Transform
@@ -5810,6 +5764,14 @@ entities:
       color: '#0055CCFF'
 - proto: GasPipeTJunction
   entities:
+  - uid: 274
+    components:
+    - type: Transform
+      parent: 1
+      rot: -1.5707963267948966 rad
+      pos: -14.5,3.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 858
     components:
     - type: Transform
@@ -5931,6 +5893,14 @@ entities:
       color: '#0055CCFF'
 - proto: GasVentPump
   entities:
+  - uid: 329
+    components:
+    - type: Transform
+      parent: 1
+      rot: 1.5707963267948966 rad
+      pos: -15.5,3.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 873
     components:
     - type: Transform
@@ -6291,11 +6261,6 @@ entities:
     - type: Transform
       parent: 1
       pos: -15.5,-13.5
-  - uid: 935
-    components:
-    - type: Transform
-      parent: 1
-      pos: -15.5,-12.5
   - uid: 936
     components:
     - type: Transform
@@ -6466,11 +6431,11 @@ entities:
       pos: -9.5,2.5
 - proto: LockerEvacRepairFilled
   entities:
-  - uid: 966
+  - uid: 996
     components:
     - type: Transform
       parent: 1
-      pos: -2.5,-18.5
+      pos: -2.5,-16.5
 - proto: LockerMedicineFilled
   entities:
   - uid: 967
@@ -6593,6 +6558,12 @@ entities:
       pos: -1.345274,18.11729
 - proto: PlasmaReinforcedWindowDirectional
   entities:
+  - uid: 1049
+    components:
+    - type: Transform
+      parent: 1
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-14.5
   - uid: 1408
     components:
     - type: Transform
@@ -6605,6 +6576,14 @@ entities:
       parent: 1
       rot: 1.5707963267948966 rad
       pos: -2.5,-15.5
+- proto: PlasmaReinforcedWindowDirectionalCorner
+  entities:
+  - uid: 998
+    components:
+    - type: Transform
+      parent: 1
+      rot: 3.141592653589793 rad
+      pos: -2.5,-16.5
 - proto: PlasticFlapsAirtightClear
   entities:
   - uid: 722
@@ -6683,6 +6662,22 @@ entities:
       pos: -8.5,-6.5
 - proto: Poweredlight
   entities:
+  - uid: 114
+    components:
+    - type: Transform
+      parent: 1
+      pos: -2.5,-13.5
+  - uid: 331
+    components:
+    - type: Transform
+      parent: 1
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-12.5
+  - uid: 334
+    components:
+    - type: Transform
+      parent: 1
+      pos: -8.5,7.5
   - uid: 525
     components:
     - type: Transform
@@ -6711,24 +6706,12 @@ entities:
       parent: 1
       rot: 3.141592653589793 rad
       pos: -15.5,-5.5
-  - uid: 996
-    components:
-    - type: Transform
-      parent: 1
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-14.5
   - uid: 997
     components:
     - type: Transform
       parent: 1
       rot: -1.5707963267948966 rad
       pos: -0.5,-4.5
-  - uid: 998
-    components:
-    - type: Transform
-      parent: 1
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-12.5
   - uid: 999
     components:
     - type: Transform
@@ -6865,11 +6848,6 @@ entities:
       parent: 1
       rot: 3.141592653589793 rad
       pos: -4.5,-18.5
-  - uid: 1049
-    components:
-    - type: Transform
-      parent: 1
-      pos: -7.5,7.5
   - uid: 1228
     components:
     - type: Transform
@@ -6994,8 +6972,27 @@ entities:
     - type: Transform
       parent: 1
       pos: -1.5,-11.5
+- proto: ReinforcedPlasmaWindow
+  entities:
+  - uid: 828
+    components:
+    - type: Transform
+      parent: 1
+      rot: 3.141592653589793 rad
+      pos: -1.5,-14.5
+  - uid: 966
+    components:
+    - type: Transform
+      parent: 1
+      rot: 3.141592653589793 rad
+      pos: -0.5,-14.5
 - proto: Screen
   entities:
+  - uid: 333
+    components:
+    - type: Transform
+      parent: 1
+      pos: -7.5,8.5
   - uid: 712
     components:
     - type: Transform
@@ -7038,11 +7035,6 @@ entities:
       parent: 1
       rot: 3.141592653589793 rad
       pos: -8.5,-1.5
-  - uid: 1050
-    components:
-    - type: Transform
-      parent: 1
-      pos: -8.5,8.5
   - uid: 1051
     components:
     - type: Transform
@@ -7133,11 +7125,6 @@ entities:
     - type: Transform
       parent: 1
       pos: -5.5,22.5
-  - uid: 1067
-    components:
-    - type: Transform
-      parent: 1
-      pos: -1.5,-14.5
   - uid: 1068
     components:
     - type: Transform
@@ -7208,11 +7195,6 @@ entities:
     - type: Transform
       parent: 1
       pos: -10.5,-20.5
-  - uid: 1082
-    components:
-    - type: Transform
-      parent: 1
-      pos: -0.5,-14.5
   - uid: 1083
     components:
     - type: Transform
@@ -7318,11 +7300,6 @@ entities:
     - type: Transform
       parent: 1
       pos: -15.5,-13.5
-  - uid: 1104
-    components:
-    - type: Transform
-      parent: 1
-      pos: -15.5,-12.5
   - uid: 1105
     components:
     - type: Transform
@@ -7400,12 +7377,12 @@ entities:
       pos: -13.5,2.5
 - proto: SignAtmos
   entities:
-  - uid: 1119
+  - uid: 935
     components:
     - type: Transform
       parent: 1
       rot: 3.141592653589793 rad
-      pos: -0.5,-14.5
+      pos: 0.5,-14.5
 - proto: SignBridge
   entities:
   - uid: 1120
@@ -7654,6 +7631,11 @@ entities:
       pos: -10.5,2.5
 - proto: TableReinforced
   entities:
+  - uid: 335
+    components:
+    - type: Transform
+      parent: 1
+      pos: -2.5,-18.5
   - uid: 1160
     components:
     - type: Transform
@@ -7684,11 +7666,6 @@ entities:
     - type: Transform
       parent: 1
       pos: -12.5,-3.5
-  - uid: 1167
-    components:
-    - type: Transform
-      parent: 1
-      pos: -2.5,-16.5
   - uid: 1168
     components:
     - type: Transform
@@ -7956,11 +7933,11 @@ entities:
       pos: -3.5,-21.5
 - proto: ToolboxElectricalFilled
   entities:
-  - uid: 1217
+  - uid: 1067
     components:
     - type: Transform
       parent: 1
-      pos: -2.5180264,-16.460123
+      pos: -2.5758772,-18.479002
 - proto: TwoWayLever
   entities:
   - uid: 1218
@@ -8821,6 +8798,11 @@ entities:
     - type: Transform
       parent: 1
       pos: 0.5,8.5
+  - uid: 328
+    components:
+    - type: Transform
+      parent: 1
+      pos: -15.5,-12.5
   - uid: 896
     components:
     - type: Transform
@@ -9775,4 +9757,18 @@ entities:
       parent: 1
       rot: 3.141592653589793 rad
       pos: -8.5,12.5
+- proto: WindowReinforcedDirectionalCorner
+  entities:
+  - uid: 1021
+    components:
+    - type: Transform
+      parent: 1
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-16.5
+  - uid: 1050
+    components:
+    - type: Transform
+      parent: 1
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-16.5
 ...
diff --git a/Resources/Maps/Shuttles/emergency_tram.yml b/Resources/Maps/Shuttles/emergency_tram.yml
new file mode 100644
index 0000000000..86136cbb0c
--- /dev/null
+++ b/Resources/Maps/Shuttles/emergency_tram.yml
@@ -0,0 +1,8534 @@
+meta:
+  format: 7
+  category: Grid
+  engineVersion: 289.0.3
+  forkId: ""
+  forkVersion: ""
+  time: 09/15/2026 20:15:06
+  entityCount: 1266
+maps: []
+grids:
+- 2
+orphans:
+- 2
+nullspace:
+- 380
+- 381
+- 382
+- 383
+- 384
+tilemap:
+  1: Space
+  9: FloorBar
+  5: FloorConcreteMono
+  10: FloorDark
+  19: FloorDarkHerringbone
+  14: FloorDarkMono
+  20: FloorDarkPavement
+  17: FloorDarkPlastic
+  22: FloorKitchen
+  21: FloorMowedAstroGrass
+  4: FloorShuttleBlack
+  3: FloorSteel
+  7: FloorSteelMono
+  18: FloorTechMaint2
+  6: FloorTechMaintDark
+  8: FloorWhite
+  13: FloorWhiteMini
+  12: FloorWhiteMono
+  16: FloorWhitePavementVertical
+  15: FloorWhitePlastic
+  11: FloorWood
+  2: Lattice
+  0: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 2
+    components:
+    - type: MetaData
+      name: Tram Evac
+    - type: Transform
+      parent: invalid
+      pos: -0.59375,0.0785262
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: CgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAYAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAYAAAAAAAACAAAAAAEAAgAAAAABAAAAAAAAAAAGAAAAAAAACgAAAAAAAA4AAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAQAAAAAAAAIAAAAAAgAAAAAAAAAABgAAAAAAAAoAAAAAAAAOAAAAAAAACgAAAAAAAAYAAAAAAAAAAAAAAAAACwAAAAAAAAsAAAAAAAATAAAAAAAAEwAAAAAAAA4AAAAAAAAAAAAAAAAACgAAAAAAAAEAAAAAAAACAAAAAAEAAAAAAAAAAAYAAAAAAAAKAAAAAAAADgAAAAAAAAoAAAAAAAAGAAAAAAAAAAAAAAAAAAsAAAAAAAALAAAAAAAAEwAAAAAAABMAAAAAAAAOAAAAAAAAAAAAAAAAAAoAAAAAAAABAAAAAAAAAgAAAAACAAAAAAAAAAAGAAAAAAAACgAAAAAAAA4AAAAAAAAKAAAAAAAABgAAAAAAAAAAAAAAAAALAAAAAAAACwAAAAAAABMAAAAAAAATAAAAAAAAFAAAAAAAAAYAAAAAAAAKAAAAAAAAAQAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAsAAAAAAAATAAAAAAAAEwAAAAAAAA4AAAAAAAAAAAAAAAAACgAAAAAAAAEAAAAAAAACAAAAAAEAAAAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAgAAAAABAAAAAAAAAAAKAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACgAAAAAAAAAAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAABAAIAAAAAAAACAAAAAAIAAgAAAAABAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAEAAgAAAAAAAAIAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          version: 7
+        0,-1:
+          ind: 0,-1
+          tiles: AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAABIAAAAAAAABAAAAAAAAAgAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAAAAAAAAAAAQAAAAAAAAIAAAAAAgAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAASAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAEAAAAAAAACAAAAAAEAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAAEgAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAsAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAMAAAAAAAAOAAAAAAAADgAAAAAAABUAAAAAAAAOAAAAAAAADgAAAAAAAAMAAAAAAAALAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAEQAAAAAAABEAAAAAAAAVAAAAAAAAEQAAAAAAABEAAAAAAAADAAAAAAAACwAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAGAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAwAAAAAAAA4AAAAAAAAOAAAAAAAAFQAAAAAAAA4AAAAAAAAOAAAAAAAAAwAAAAAAAAsAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABgAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAMAAAAAAAARAAAAAAAADgAAAAAAABUAAAAAAAAOAAAAAAAAEQAAAAAAAAMAAAAAAAALAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAoAAAAAAAADAAAAAAAAEQAAAAAAAA4AAAAAAAAVAAAAAAAADgAAAAAAABEAAAAAAAADAAAAAAAACwAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAAKAAAAAAAAAwAAAAAAAA4AAAAAAAAOAAAAAAAAFQAAAAAAAA4AAAAAAAAOAAAAAAAAAwAAAAAAAAsAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAYAAAAAAAAGAAAAAAAAAAAAAAAAAAMAAAAAAAARAAAAAAAAEQAAAAAAABUAAAAAAAARAAAAAAAAEQAAAAAAAAMAAAAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAADAAAAAAAADgAAAAAAAA4AAAAAAAAVAAAAAAAADgAAAAAAAA4AAAAAAAADAAAAAAAACwAAAAAAAA==
+          version: 7
+        1,0:
+          ind: 1,0
+          tiles: FgAAAAAAABYAAAAAAAAWAAAAAAAACgAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAACAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACgAAAAAAAAoAAAAAAAAAAAAAAAAAAgAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAACAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACgAAAAAAAAoAAAAAAAAAAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAACAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAQACAAAAAAAAAgAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          version: 7
+        1,-1:
+          ind: 1,-1
+          tiles: EAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAIAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACgAAAAAAAAoAAAAAAAAAAAAAAAAAAgAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAIAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACgAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAJAAAAAAAACQAAAAAAAAoAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAACQAAAAAAAAkAAAAAAAAKAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAkAAAAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAJAAAAAAAACQAAAAAAAAAAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAAFgAAAAAAAAkAAAAAAAAAAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAABYAAAAAAAAWAAAAAAAAAAAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAWAAAAAAAAFgAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAAFgAAAAAAABYAAAAAAAAKAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAABYAAAAAAAAWAAAAAAAACgAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          version: 7
+        0,-2:
+          ind: 0,-2
+          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAEAAgAAAAACAAEAAAAAAAABAAAAAAAAAgAAAAACAAEAAAAAAAABAAAAAAAAAgAAAAABAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAIAAgAAAAABAAIAAAAAAQACAAAAAAEAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAABAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAIAAgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAACAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAABAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAABAAAAAAAAAgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAoAAAAAAAAKAAAAAAAAAQAAAAAAAAIAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAACgAAAAAAAAEAAAAAAAACAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAABAAAAAAAAAgAAAAAAAAAAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAgAAAAACAAAAAAAAAAAAAAAAAAAACgAAAAAAAAAAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAABgAAAAAAAAMAAAAAAAADAAAAAAAABgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAA==
+          version: 7
+        1,-2:
+          ind: 1,-2
+          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAACAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAIAAAAAAQACAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAACAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACgAAAAAAAAoAAAAAAAAAAAAAAAAAAgAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAIAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          version: 7
+        -1,0:
+          ind: -1,0
+          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          version: 7
+        -1,-1:
+          ind: -1,-1
+          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAEgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAASAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAASAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAA==
+          version: 7
+    - type: Broadphase
+    - type: Physics
+      fixedRotation: False
+      bodyType: Dynamic
+      bodyStatus: InAir
+    - type: Fixtures
+      fixtures: {}
+    - type: ChunkContainer
+      chunkEntities:
+      - 380
+      - 381
+      - 382
+      - 383
+      - 384
+    - type: OccluderTree
+    - type: TileHistory
+      chunkHistory: {}
+    - type: SpreaderGrid
+    - type: Shuttle
+      dampingModifier: 0.25
+    - type: ImplicitRoof
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: GridAtmosphere
+      version: 2
+      data:
+        uniqueMixes:
+        - temperature: 293.15
+          volume: 2500
+          moles:
+            Oxygen: 21.824879
+            Nitrogen: 82.10312
+        - volume: 2500
+          moles: {}
+          immutable: True
+        - temperature: 293.14975
+          volume: 2500
+          moles:
+            Oxygen: 21.824879
+            Nitrogen: 82.10312
+        - temperature: 293.1495
+          volume: 2500
+          moles:
+            Oxygen: 21.824879
+            Nitrogen: 82.10312
+        - temperature: 293.15
+          volume: 2500
+          moles:
+            Oxygen: 6666.982
+        - temperature: 293.15
+          volume: 2500
+          moles:
+            Nitrogen: 6666.982
+        tiles:
+          0,0:
+            0: 34831
+            1: 8960
+          -1,0:
+            0: 8
+          0,1:
+            1: 8738
+            0: 32904
+          0,2:
+            1: 3106
+            0: 8
+          0,-1:
+            0: 20462
+          1,0:
+            0: 63359
+          1,1:
+            0: 62975
+          1,2:
+            0: 15
+            1: 3840
+          1,-1:
+            0: 26350
+          2,0:
+            0: 57599
+          2,-1:
+            0: 65535
+          2,1:
+            0: 61166
+          2,2:
+            0: 238
+            1: 57344
+          3,0:
+            0: 47551
+          3,1:
+            0: 15355
+          3,2:
+            0: 11
+            1: 3584
+          3,-1:
+            0: 65535
+          4,0:
+            0: 12303
+            2: 768
+            1: 34816
+          4,1:
+            3: 1
+            0: 4400
+            2: 514
+            1: 34952
+          4,2:
+            0: 7
+            1: 1800
+          0,-4:
+            1: 8721
+            0: 34830
+          0,-5:
+            1: 4642
+            0: 34952
+          0,-3:
+            0: 30472
+            1: 2
+          -1,-3:
+            0: 2048
+          0,-2:
+            0: 61159
+          -1,-2:
+            0: 8
+            1: 34816
+          -1,-1:
+            1: 8
+            0: 2048
+          1,-4:
+            0: 65294
+          1,-3:
+            0: 65295
+          1,-2:
+            0: 30478
+          1,-5:
+            0: 61439
+          2,-4:
+            0: 65229
+          2,-3:
+            0: 65486
+          2,-2:
+            0: 65535
+          2,-5:
+            0: 64984
+          3,-4:
+            0: 30704
+          3,-3:
+            0: 65295
+          3,-2:
+            0: 65535
+          3,-5:
+            0: 32492
+          4,-4:
+            0: 12343
+            1: 34816
+          4,-3:
+            0: 65283
+            1: 8
+          4,-2:
+            0: 30591
+          4,-1:
+            0: 63351
+            2: 2048
+          5,-4:
+            1: 17
+          5,-2:
+            1: 4352
+          5,-1:
+            1: 1
+          5,-5:
+            1: 4096
+          0,-6:
+            1: 8904
+            0: 32768
+          0,-7:
+            1: 32768
+          1,-6:
+            0: 61440
+            4: 34
+            1: 2560
+            5: 136
+          1,-7:
+            1: 3776
+          2,-7:
+            1: 2880
+          2,-6:
+            0: 52846
+            3: 8192
+          3,-7:
+            1: 3936
+          3,-6:
+            0: 55759
+          4,-6:
+            0: 12289
+            1: 34914
+          4,-5:
+            0: 819
+            1: 2184
+          4,-7:
+            1: 8192
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: ExplosionAirtightGrid
+    - type: RadiationGridResistance
+    - type: GridSplitNode
+- proto: AirAlarm
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 8.5,-10.5
+    - type: DeviceList
+      devices:
+      - 511
+      - 475
+      - 525
+      - 522
+  - uid: 37
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-14.5
+    - type: DeviceList
+      devices:
+      - 457
+  - uid: 631
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-15.5
+    - type: DeviceList
+      devices:
+      - 518
+  - uid: 2175
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 14.5,3.5
+    - type: DeviceList
+      devices:
+      - 607
+  - uid: 2482
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-14.5
+    - type: DeviceList
+      devices:
+      - 449
+  - uid: 2484
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 8.5,7.5
+    - type: DeviceList
+      devices:
+      - 500
+  - uid: 2492
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-6.5
+    - type: DeviceList
+      devices:
+      - 461
+      - 471
+      - 462
+  - uid: 2493
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-10.5
+    - type: DeviceList
+      devices:
+      - 502
+  - uid: 2494
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 2.5,3.5
+    - type: DeviceList
+      devices:
+      - 509
+      - 476
+- proto: Airlock
+  entities:
+  - uid: 36
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-11.5
+  - uid: 81
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-14.5
+- proto: AirlockCargo
+  entities:
+  - uid: 17
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-16.5
+- proto: AirlockCommandGlassLocked
+  entities:
+  - uid: 542
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,2.5
+- proto: AirlockCommandLocked
+  entities:
+  - uid: 52
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 14.5,5.5
+- proto: AirlockEngineeringLocked
+  entities:
+  - uid: 53
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-16.5
+- proto: AirlockExternal
+  entities:
+  - uid: 74
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,7.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        346:
+        - - DoorStatus
+          - DoorBolt
+  - uid: 82
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-23.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        58:
+        - - DoorStatus
+          - DoorBolt
+  - uid: 1908
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-16.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        75:
+        - - DoorStatus
+          - DoorBolt
+  - uid: 1914
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-21.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        58:
+        - - DoorStatus
+          - DoorBolt
+- proto: AirlockExternalGlassShuttleEmergencyLocked
+  entities:
+  - uid: 62
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-7.5
+  - uid: 63
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-9.5
+  - uid: 66
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-1.5
+  - uid: 67
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,0.5
+- proto: AirlockExternalLocked
+  entities:
+  - uid: 58
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-23.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1914:
+        - - DoorStatus
+          - DoorBolt
+        82:
+        - - DoorStatus
+          - DoorBolt
+  - uid: 75
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-15.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1908:
+        - - DoorStatus
+          - DoorBolt
+  - uid: 346
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 18.5,8.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        74:
+        - - DoorStatus
+          - DoorBolt
+- proto: AirlockGlass
+  entities:
+  - uid: 121
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-4.5
+  - uid: 127
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-5.5
+  - uid: 255
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-3.5
+  - uid: 410
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-2.5
+- proto: AirlockHatchMaintenance
+  entities:
+  - uid: 137
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,-19.5
+- proto: AirlockMaintGlass
+  entities:
+  - uid: 161
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,1.5
+- proto: AirlockMedicalGlassLocked
+  entities:
+  - uid: 152
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-12.5
+- proto: AirlockSecurityLocked
+  entities:
+  - uid: 377
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 7.5,0.5
+  - uid: 385
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-0.5
+- proto: APCBasic
+  entities:
+  - uid: 1770
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-16.5
+  - uid: 1942
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-10.5
+  - uid: 1946
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 14.5,4.5
+  - uid: 1990
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-5.5
+  - uid: 2006
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,2.5
+  - uid: 2007
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-2.5
+  - uid: 2235
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-20.5
+  - uid: 2247
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-10.5
+  - uid: 2323
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-14.5
+- proto: Ashtray
+  entities:
+  - uid: 1814
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.285147,5.648949
+- proto: AtmosDeviceFanDirectional
+  entities:
+  - uid: 2183
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-1.5
+  - uid: 2214
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-7.5
+  - uid: 2322
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-9.5
+  - uid: 2350
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,0.5
+- proto: AtmosFixNitrogenMarker
+  entities:
+  - uid: 73
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-22.5
+  - uid: 404
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-23.5
+- proto: AtmosFixOxygenMarker
+  entities:
+  - uid: 109
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-22.5
+  - uid: 405
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-23.5
+- proto: BarricadeBlock
+  entities:
+  - uid: 559
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 11.5,-19.5
+  - uid: 560
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-23.5
+- proto: BarSignWiggleRoom
+  entities:
+  - uid: 286
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-4.5
+- proto: Beaker
+  entities:
+  - uid: 2548
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.359383,-0.039783478
+  - uid: 2549
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.598967,0.095727265
+- proto: Bed
+  entities:
+  - uid: 162
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-11.5
+- proto: BedsheetMedical
+  entities:
+  - uid: 12
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 4.5,-13.5
+  - uid: 291
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 5.5,-13.5
+  - uid: 299
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,-13.5
+  - uid: 326
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 7.5,-13.5
+- proto: BedsheetSpawner
+  entities:
+  - uid: 2420
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-11.5
+- proto: BoardGameSpawner100
+  entities:
+  - uid: 2193
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-9.5
+- proto: BookshelfFilled
+  entities:
+  - uid: 1683
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-7.5
+- proto: BoozeDispenser
+  entities:
+  - uid: 315
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-8.5
+- proto: BoxBodyBag
+  entities:
+  - uid: 2346
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.412546,-11.3211975
+- proto: BoxFolderBase
+  entities:
+  - uid: 2311
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.6707004,-4.3352723
+- proto: BoxFolderRedThreePapers
+  entities:
+  - uid: 1778
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.607375,-1.5397091
+- proto: CableApcExtension
+  entities:
+  - uid: 19
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,3.5
+  - uid: 38
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,0.5
+  - uid: 46
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-10.5
+  - uid: 49
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-11.5
+  - uid: 55
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-12.5
+  - uid: 68
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-12.5
+  - uid: 83
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-12.5
+  - uid: 85
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-12.5
+  - uid: 88
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-21.5
+  - uid: 105
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-23.5
+  - uid: 172
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-15.5
+  - uid: 224
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,10.5
+  - uid: 239
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,10.5
+  - uid: 244
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,10.5
+  - uid: 253
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,10.5
+  - uid: 272
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,10.5
+  - uid: 284
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-18.5
+  - uid: 288
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,9.5
+  - uid: 289
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,9.5
+  - uid: 318
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-15.5
+  - uid: 334
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,8.5
+  - uid: 338
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,9.5
+  - uid: 339
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,0.5
+  - uid: 340
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,0.5
+  - uid: 341
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,9.5
+  - uid: 358
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,0.5
+  - uid: 566
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-0.5
+  - uid: 1680
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-11.5
+  - uid: 1693
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-14.5
+  - uid: 1697
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-12.5
+  - uid: 1822
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,7.5
+  - uid: 1825
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-3.5
+  - uid: 1943
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-5.5
+  - uid: 1945
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-5.5
+  - uid: 1974
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,8.5
+  - uid: 1975
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,6.5
+  - uid: 1976
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,6.5
+  - uid: 1977
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,8.5
+  - uid: 1978
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-3.5
+  - uid: 1987
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-16.5
+  - uid: 2011
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,7.5
+  - uid: 2012
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,6.5
+  - uid: 2016
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-17.5
+  - uid: 2017
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-17.5
+  - uid: 2018
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-17.5
+  - uid: 2019
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-17.5
+  - uid: 2020
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-17.5
+  - uid: 2021
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-17.5
+  - uid: 2022
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-18.5
+  - uid: 2023
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-19.5
+  - uid: 2024
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-20.5
+  - uid: 2026
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-11.5
+  - uid: 2027
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-12.5
+  - uid: 2028
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-13.5
+  - uid: 2029
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-11.5
+  - uid: 2030
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-11.5
+  - uid: 2031
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-11.5
+  - uid: 2032
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-11.5
+  - uid: 2033
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-14.5
+  - uid: 2034
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-14.5
+  - uid: 2035
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-14.5
+  - uid: 2036
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-14.5
+  - uid: 2037
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-14.5
+  - uid: 2038
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,-12.5
+  - uid: 2039
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-12.5
+  - uid: 2046
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-13.5
+  - uid: 2047
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-14.5
+  - uid: 2048
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-15.5
+  - uid: 2049
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-16.5
+  - uid: 2050
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,-16.5
+  - uid: 2051
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,-17.5
+  - uid: 2052
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,-18.5
+  - uid: 2053
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-5.5
+  - uid: 2054
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-5.5
+  - uid: 2055
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-6.5
+  - uid: 2056
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-7.5
+  - uid: 2057
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-8.5
+  - uid: 2058
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-8.5
+  - uid: 2059
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,-8.5
+  - uid: 2060
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-8.5
+  - uid: 2061
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-8.5
+  - uid: 2062
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-8.5
+  - uid: 2063
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-8.5
+  - uid: 2064
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-9.5
+  - uid: 2065
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-9.5
+  - uid: 2066
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-9.5
+  - uid: 2067
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-9.5
+  - uid: 2068
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-9.5
+  - uid: 2069
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-8.5
+  - uid: 2070
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-7.5
+  - uid: 2071
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-6.5
+  - uid: 2072
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-5.5
+  - uid: 2073
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-4.5
+  - uid: 2074
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-3.5
+  - uid: 2075
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-2.5
+  - uid: 2076
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-1.5
+  - uid: 2077
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-0.5
+  - uid: 2078
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,0.5
+  - uid: 2079
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-4.5
+  - uid: 2080
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-3.5
+  - uid: 2081
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-2.5
+  - uid: 2082
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-1.5
+  - uid: 2083
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-0.5
+  - uid: 2084
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,0.5
+  - uid: 2085
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,0.5
+  - uid: 2086
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,0.5
+  - uid: 2087
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,0.5
+  - uid: 2088
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,0.5
+  - uid: 2089
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,0.5
+  - uid: 2090
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,0.5
+  - uid: 2091
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-0.5
+  - uid: 2092
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-1.5
+  - uid: 2093
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-2.5
+  - uid: 2094
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-3.5
+  - uid: 2095
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-4.5
+  - uid: 2096
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-5.5
+  - uid: 2097
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-6.5
+  - uid: 2098
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-7.5
+  - uid: 2101
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,2.5
+  - uid: 2102
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,2.5
+  - uid: 2103
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,2.5
+  - uid: 2104
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,1.5
+  - uid: 2105
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,0.5
+  - uid: 2106
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-2.5
+  - uid: 2109
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-4.5
+  - uid: 2110
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-5.5
+  - uid: 2111
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-2.5
+  - uid: 2112
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-2.5
+  - uid: 2113
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-2.5
+  - uid: 2120
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-6.5
+  - uid: 2121
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-7.5
+  - uid: 2122
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-8.5
+  - uid: 2123
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-9.5
+  - uid: 2124
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,3.5
+  - uid: 2129
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,4.5
+  - uid: 2130
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,4.5
+  - uid: 2131
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,4.5
+  - uid: 2132
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,4.5
+  - uid: 2133
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,4.5
+  - uid: 2134
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,4.5
+  - uid: 2135
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,5.5
+  - uid: 2136
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,6.5
+  - uid: 2137
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,7.5
+  - uid: 2138
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,8.5
+  - uid: 2139
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,7.5
+  - uid: 2140
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,7.5
+  - uid: 2142
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,4.5
+  - uid: 2144
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,5.5
+  - uid: 2145
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,6.5
+  - uid: 2146
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,7.5
+  - uid: 2147
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,8.5
+  - uid: 2148
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,8.5
+  - uid: 2149
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,8.5
+  - uid: 2159
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,7.5
+  - uid: 2160
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,7.5
+  - uid: 2209
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-16.5
+  - uid: 2248
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-12.5
+  - uid: 2312
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-4.5
+  - uid: 2313
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-5.5
+  - uid: 2314
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-6.5
+  - uid: 2324
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-16.5
+  - uid: 2325
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-16.5
+  - uid: 2326
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-17.5
+  - uid: 2327
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-18.5
+  - uid: 2328
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-18.5
+  - uid: 2329
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-18.5
+  - uid: 2445
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-15.5
+  - uid: 2460
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,5.5
+  - uid: 2461
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,6.5
+  - uid: 2462
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,7.5
+  - uid: 2463
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,8.5
+  - uid: 2468
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-10.5
+  - uid: 2480
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-20.5
+  - uid: 2481
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-20.5
+  - uid: 2499
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,3.5
+  - uid: 2502
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,3.5
+  - uid: 2503
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,3.5
+  - uid: 2504
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,5.5
+  - uid: 2505
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,3.5
+  - uid: 2506
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-19.5
+  - uid: 2507
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-20.5
+  - uid: 2509
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-22.5
+  - uid: 2510
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-23.5
+  - uid: 2511
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-23.5
+  - uid: 2512
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-23.5
+  - uid: 2513
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-15.5
+  - uid: 2519
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-21.5
+  - uid: 2520
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-22.5
+  - uid: 2521
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-23.5
+  - uid: 2523
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-16.5
+  - uid: 2524
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-15.5
+  - uid: 2525
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-14.5
+  - uid: 2533
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,6.5
+  - uid: 2534
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,4.5
+  - uid: 2535
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,8.5
+  - uid: 2564
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-16.5
+- proto: CableHV
+  entities:
+  - uid: 179
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-20.5
+  - uid: 191
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-8.5
+  - uid: 192
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-8.5
+  - uid: 344
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-19.5
+  - uid: 348
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,7.5
+  - uid: 460
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,0.5
+  - uid: 473
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,0.5
+  - uid: 477
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-7.5
+  - uid: 478
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-5.5
+  - uid: 501
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-4.5
+  - uid: 503
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-2.5
+  - uid: 504
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-1.5
+  - uid: 505
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-0.5
+  - uid: 512
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-3.5
+  - uid: 520
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-6.5
+  - uid: 521
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,0.5
+  - uid: 534
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-19.5
+  - uid: 537
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-20.5
+  - uid: 574
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,8.5
+  - uid: 575
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,8.5
+  - uid: 1816
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,4.5
+  - uid: 1848
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-18.5
+  - uid: 1850
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-20.5
+  - uid: 1858
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-19.5
+  - uid: 1859
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-19.5
+  - uid: 1860
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-19.5
+  - uid: 1861
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-18.5
+  - uid: 1862
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-17.5
+  - uid: 1863
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-16.5
+  - uid: 1864
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-18.5
+  - uid: 1866
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-16.5
+  - uid: 1867
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-16.5
+  - uid: 1868
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-16.5
+  - uid: 1869
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-15.5
+  - uid: 1870
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-14.5
+  - uid: 1871
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-13.5
+  - uid: 1872
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-12.5
+  - uid: 1873
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-11.5
+  - uid: 1874
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-10.5
+  - uid: 1875
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-9.5
+  - uid: 1876
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-8.5
+  - uid: 1886
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,0.5
+  - uid: 1887
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,0.5
+  - uid: 1888
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,1.5
+  - uid: 1889
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,2.5
+  - uid: 1890
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,5.5
+  - uid: 1891
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,3.5
+  - uid: 1894
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,6.5
+  - uid: 1895
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,6.5
+  - uid: 2428
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-18.5
+  - uid: 2538
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-20.5
+- proto: CableMV
+  entities:
+  - uid: 363
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-3.5
+  - uid: 364
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-4.5
+  - uid: 498
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-2.5
+  - uid: 516
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-2.5
+  - uid: 517
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-2.5
+  - uid: 526
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-2.5
+  - uid: 1944
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,1.5
+  - uid: 1947
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-18.5
+  - uid: 1948
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-17.5
+  - uid: 1950
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-16.5
+  - uid: 1951
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-16.5
+  - uid: 1952
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-16.5
+  - uid: 1953
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-15.5
+  - uid: 1955
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-13.5
+  - uid: 1956
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-12.5
+  - uid: 1957
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-12.5
+  - uid: 1958
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-12.5
+  - uid: 1959
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-12.5
+  - uid: 1960
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-12.5
+  - uid: 1961
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-12.5
+  - uid: 1962
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-12.5
+  - uid: 1963
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-12.5
+  - uid: 1964
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-11.5
+  - uid: 1965
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-10.5
+  - uid: 1966
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,-12.5
+  - uid: 1967
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-12.5
+  - uid: 1968
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-11.5
+  - uid: 1970
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-11.5
+  - uid: 1971
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-10.5
+  - uid: 1972
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-9.5
+  - uid: 1973
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-8.5
+  - uid: 1979
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-14.5
+  - uid: 1989
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,6.5
+  - uid: 1991
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,6.5
+  - uid: 1992
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,5.5
+  - uid: 1993
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,4.5
+  - uid: 1994
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,4.5
+  - uid: 1995
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,4.5
+  - uid: 1996
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,3.5
+  - uid: 1997
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,2.5
+  - uid: 1998
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,1.5
+  - uid: 1999
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,0.5
+  - uid: 2000
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,0.5
+  - uid: 2001
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,0.5
+  - uid: 2002
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,0.5
+  - uid: 2003
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,0.5
+  - uid: 2004
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,0.5
+  - uid: 2005
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,0.5
+  - uid: 2008
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,-16.5
+  - uid: 2010
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-2.5
+  - uid: 2013
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-5.5
+  - uid: 2014
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-5.5
+  - uid: 2099
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,2.5
+  - uid: 2100
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,2.5
+  - uid: 2107
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-15.5
+  - uid: 2108
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-14.5
+  - uid: 2125
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-6.5
+  - uid: 2431
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-7.5
+  - uid: 2434
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-8.5
+  - uid: 2466
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-11.5
+  - uid: 2467
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-10.5
+  - uid: 2476
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-18.5
+  - uid: 2477
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-19.5
+  - uid: 2478
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-20.5
+  - uid: 2479
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-20.5
+  - uid: 2526
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-16.5
+  - uid: 2527
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-16.5
+  - uid: 2528
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-16.5
+  - uid: 2529
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-16.5
+  - uid: 2532
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-8.5
+- proto: CableTerminal
+  entities:
+  - uid: 589
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-20.5
+- proto: Carpet
+  entities:
+  - uid: 271
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-6.5
+  - uid: 2409
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-7.5
+  - uid: 2410
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-4.5
+  - uid: 2411
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-5.5
+  - uid: 2412
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-2.5
+  - uid: 2413
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-3.5
+  - uid: 2414
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-1.5
+  - uid: 2415
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-0.5
+  - uid: 2416
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-8.5
+- proto: CarpetBlue
+  entities:
+  - uid: 2393
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 9.5,6.5
+  - uid: 2394
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 9.5,5.5
+  - uid: 2395
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 9.5,4.5
+  - uid: 2396
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 10.5,6.5
+  - uid: 2397
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 10.5,5.5
+  - uid: 2398
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 10.5,4.5
+- proto: CarpetGreen
+  entities:
+  - uid: 47
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-7.5
+  - uid: 93
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-8.5
+  - uid: 155
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-8.5
+  - uid: 259
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-9.5
+  - uid: 2184
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-9.5
+  - uid: 2273
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-9.5
+  - uid: 2276
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-8.5
+  - uid: 2496
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-7.5
+- proto: Catwalk
+  entities:
+  - uid: 84
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-22.5
+  - uid: 110
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-18.5
+  - uid: 112
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-20.5
+  - uid: 114
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-18.5
+  - uid: 129
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-20.5
+  - uid: 134
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 1.5,-17.5
+  - uid: 157
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,8.5
+  - uid: 207
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-20.5
+  - uid: 209
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 1.5,-19.5
+  - uid: 210
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 1.5,-18.5
+  - uid: 211
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-19.5
+  - uid: 294
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 19.5,-17.5
+  - uid: 295
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 19.5,-18.5
+  - uid: 296
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 19.5,-19.5
+  - uid: 378
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-21.5
+  - uid: 402
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-23.5
+  - uid: 411
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-23.5
+  - uid: 415
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-23.5
+  - uid: 427
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-21.5
+  - uid: 428
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-20.5
+  - uid: 535
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-20.5
+  - uid: 1745
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-15.5
+  - uid: 1794
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-15.5
+  - uid: 1893
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-19.5
+  - uid: 1897
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-19.5
+  - uid: 1898
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-19.5
+  - uid: 1900
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-19.5
+  - uid: 1903
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-19.5
+  - uid: 1905
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-18.5
+  - uid: 1906
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-19.5
+  - uid: 2150
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,8.5
+  - uid: 2319
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-23.5
+  - uid: 2320
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-23.5
+  - uid: 2387
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-18.5
+  - uid: 2399
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-18.5
+  - uid: 2400
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-19.5
+  - uid: 2421
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,-25.5
+  - uid: 2422
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,-26.5
+  - uid: 2423
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 7.5,-25.5
+  - uid: 2424
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 7.5,-26.5
+  - uid: 2425
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 8.5,-25.5
+  - uid: 2427
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 9.5,-25.5
+  - uid: 2429
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 11.5,-25.5
+  - uid: 2430
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 12.5,-25.5
+  - uid: 2432
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 13.5,-25.5
+  - uid: 2433
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 13.5,-26.5
+  - uid: 2435
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 14.5,-26.5
+  - uid: 2436
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 14.5,-25.5
+  - uid: 2442
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 1.5,4.5
+  - uid: 2449
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 1.5,3.5
+  - uid: 2450
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 1.5,2.5
+  - uid: 2451
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 3.5,10.5
+  - uid: 2452
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 4.5,10.5
+  - uid: 2453
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 5.5,10.5
+  - uid: 2454
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 15.5,10.5
+  - uid: 2455
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 16.5,10.5
+  - uid: 2456
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 17.5,10.5
+  - uid: 2457
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 19.5,4.5
+  - uid: 2458
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 19.5,3.5
+  - uid: 2459
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 19.5,2.5
+  - uid: 2541
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-16.5
+  - uid: 2542
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-16.5
+- proto: Chair
+  entities:
+  - uid: 168
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-20.5
+  - uid: 327
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-16.5
+  - uid: 328
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-15.5
+  - uid: 329
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-15.5
+  - uid: 330
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-16.5
+  - uid: 573
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,8.5
+  - uid: 1681
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,8.5
+  - uid: 2354
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,8.5
+- proto: ChairOfficeDark
+  entities:
+  - uid: 261
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-0.5
+- proto: ChairOfficeLight
+  entities:
+  - uid: 215
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 12.564465,8.5310335
+  - uid: 442
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 10.50368,8.58155
+- proto: ChairPilotSeat
+  entities:
+  - uid: 28
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-1.5
+  - uid: 231
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-2.5
+  - uid: 351
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-5.5
+  - uid: 352
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 9.5,-2.5
+  - uid: 353
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 13.5,-2.5
+  - uid: 354
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 12.5,-2.5
+  - uid: 355
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-4.5
+  - uid: 357
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-0.5
+  - uid: 361
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 10.5,-2.5
+  - uid: 365
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 9.5,-7.5
+  - uid: 366
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-5.5
+  - uid: 370
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 10.5,-7.5
+  - uid: 372
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-5.5
+  - uid: 373
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-3.5
+  - uid: 374
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-0.5
+  - uid: 387
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-0.5
+  - uid: 396
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 13.5,-7.5
+  - uid: 401
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 3.5,3.5
+  - uid: 417
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-0.5
+  - uid: 418
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-3.5
+  - uid: 430
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-4.5
+  - uid: 433
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-5.5
+  - uid: 434
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 16.5,-20.5
+  - uid: 435
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 12.5,-7.5
+  - uid: 437
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 3.5,5.5
+  - uid: 438
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 3.5,4.5
+  - uid: 538
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,5.5
+  - uid: 549
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,3.5
+  - uid: 550
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,4.5
+  - uid: 569
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-19.5
+  - uid: 570
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-20.5
+  - uid: 2497
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-8.5
+  - uid: 2498
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-9.5
+- proto: ChairWood
+  entities:
+  - uid: 50
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 10.489152,4.5210633
+  - uid: 91
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 9.520402,4.5419116
+  - uid: 540
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,6.5
+  - uid: 2263
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 1.5,-5.5
+  - uid: 2308
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-3.5
+  - uid: 2351
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.490741,6.408763
+- proto: ChunkEntity
+  entities:
+  - uid: 380
+    components:
+    - type: ChunkEntity
+      root: 2
+      chunk: 0,-1
+    - type: DecalChunk
+      maxDecalId: 80
+      decals:
+        version: 1
+        nodes:
+        - node:
+            id: BotLeftGreyscale
+            color: '#FFFFFFFF'
+          decals:
+            75: 5,-3
+            76: 5,-4
+            77: 5,-5
+        - node:
+            id: BrickLineOverlayW
+            color: '#52B4E996'
+          decals:
+            21: 9,-12
+            26: 9,-13
+            27: 9,-14
+        - node:
+            id: BrickLineOverlayW
+            color: '#EFB34196'
+          decals:
+            28: 10,-16
+        - node:
+            id: BrickTileWhiteInnerNe
+            color: '#DE3A3A96'
+          decals:
+            36: 0,-2
+        - node:
+            id: BrickTileWhiteInnerNw
+            color: '#DE3A3A96'
+          decals:
+            32: 8,-2
+        - node:
+            id: BrickTileWhiteInnerSe
+            color: '#A4610696'
+          decals:
+            30: 11,-16
+        - node:
+            id: BrickTileWhiteInnerSw
+            color: '#EFB34196'
+          decals:
+            29: 10,-15
+        - node:
+            id: BrickTileWhiteLineE
+            color: '#52B4E996'
+          decals:
+            17: 7,-12
+            18: 7,-13
+            19: 7,-14
+        - node:
+            id: BrickTileWhiteLineE
+            color: '#DE3A3A96'
+          decals:
+            13: 6,-1
+        - node:
+            id: BrickTileWhiteLineE
+            color: '#EFB34196'
+          decals:
+            20: 8,-16
+        - node:
+            id: BrickTileWhiteLineN
+            color: '#639137FF'
+          decals:
+            9: 9,-1
+            10: 10,-1
+            11: 12,-1
+            12: 13,-1
+            45: 9,-6
+            46: 10,-6
+            47: 12,-6
+            48: 13,-6
+        - node:
+            id: BrickTileWhiteLineN
+            color: '#DE3A3A96'
+          decals:
+            33: 2,-2
+            34: 3,-2
+            35: 1,-2
+        - node:
+            id: BrickTileWhiteLineS
+            color: '#639137FF'
+          decals:
+            37: 9,-3
+            38: 10,-3
+            39: 12,-3
+            40: 13,-3
+            41: 12,-8
+            42: 13,-8
+            43: 10,-8
+            44: 9,-8
+        - node:
+            id: BrickTileWhiteLineW
+            color: '#52B4E996'
+          decals:
+            14: 3,-12
+            15: 3,-13
+            16: 3,-14
+        - node:
+            id: BrickTileWhiteLineW
+            color: '#DE3A3A96'
+          decals:
+            31: 8,-1
+        - node:
+            id: BushCTwo
+            color: '#FFFFFFFF'
+          decals:
+            4: 11,-2
+        - node:
+            id: Busha3
+            color: '#FFFFFFFF'
+          decals:
+            7: 11,-5
+        - node:
+            id: Bushd2
+            color: '#FFFFFFFF'
+          decals:
+            8: 11,-7
+        - node:
+            id: Bushi1
+            color: '#FFFFFFFF'
+          decals:
+            5: 11,-4
+            6: 11,-8
+        - node:
+            id: Bushk1
+            color: '#FFFFFFFF'
+          decals:
+            0: 11,-1
+        - node:
+            id: Bushk2
+            color: '#FFFFFFFF'
+          decals:
+            1: 11,-3
+        - node:
+            id: Bushk3
+            color: '#FFFFFFFF'
+          decals:
+            3: 11,-6
+        - node:
+            id: ConcreteTrimLineE
+            color: '#9FED5896'
+          decals:
+            22: 14,-12
+            23: 14,-13
+            24: 14,-14
+            25: 14,-15
+        - node:
+            id: LoadingAreaGreyscale
+            color: '#FFFFFFFF'
+            angle: 1.5707963267948966 rad
+          decals:
+            78: 3,-5
+            79: 3,-6
+        - node:
+            id: StandClear
+            color: '#FFFFFFFF'
+            angle: 1.5707963267948966 rad
+          decals:
+            80: 9,-13
+        - node:
+            id: StandClearGreyscale
+            color: '#FFFFFFFF'
+          decals:
+            72: 0,-8
+            73: 0,-2
+            74: 0,-10
+        - node:
+            id: WarnCornerSmallGreyscaleNE
+            color: '#FFFFFFFF'
+          decals:
+            49: 8,-9
+        - node:
+            id: WarnCornerSmallGreyscaleNW
+            color: '#FFFFFFFF'
+          decals:
+            50: 14,-9
+        - node:
+            id: WarnCornerSmallNE
+            color: '#FFFFFFFF'
+          decals:
+            2: 3,-7
+        - node:
+            id: WarnLineGreyscaleE
+            color: '#FFFFFFFF'
+          decals:
+            51: 8,-8
+            52: 8,-7
+            53: 8,-6
+            54: 8,-5
+            55: 8,-4
+            56: 8,-3
+            57: 8,-2
+            58: 8,-1
+        - node:
+            id: WarnLineGreyscaleN
+            color: '#FFFFFFFF'
+          decals:
+            67: 13,-9
+            68: 12,-9
+            69: 11,-9
+            70: 10,-9
+            71: 9,-9
+        - node:
+            id: WarnLineGreyscaleW
+            color: '#FFFFFFFF'
+          decals:
+            59: 14,-8
+            60: 14,-7
+            61: 14,-6
+            62: 14,-5
+            63: 14,-4
+            64: 14,-3
+            65: 14,-2
+            66: 14,-1
+  - uid: 381
+    components:
+    - type: ChunkEntity
+      root: 2
+      chunk: 0,-2
+    - type: DecalChunk
+      maxDecalId: 38
+      decals:
+        version: 1
+        nodes:
+        - node:
+            id: Bot
+            color: '#FFFFFFFF'
+          decals:
+            34: 10,-19
+            35: 10,-18
+        - node:
+            id: BrickLineOverlayW
+            color: '#EFB34196'
+          decals:
+            19: 3,-18
+            20: 3,-19
+            27: 3,-20
+            28: 3,-21
+            29: 10,-17
+            30: 10,-18
+        - node:
+            id: BrickTileWhiteInnerNe
+            color: '#A4610696'
+          decals:
+            33: 11,-18
+        - node:
+            id: BrickTileWhiteInnerNw
+            color: '#EFB34196'
+          decals:
+            31: 10,-19
+        - node:
+            id: BrickTileWhiteLineE
+            color: '#A4610696'
+          decals:
+            32: 11,-17
+        - node:
+            id: BrickTileWhiteLineE
+            color: '#EFB34196'
+          decals:
+            16: 8,-17
+            17: 8,-18
+            18: 8,-19
+        - node:
+            id: ConcreteTrimCornerSw
+            color: '#EFB34196'
+          decals:
+            26: 13,-19
+        - node:
+            id: ConcreteTrimInnerSw
+            color: '#EFB34196'
+          decals:
+            23: 14,-19
+        - node:
+            id: ConcreteTrimLineW
+            color: '#EFB34196'
+          decals:
+            21: 13,-17
+            22: 13,-18
+            24: 14,-20
+            25: 14,-21
+        - node:
+            id: Dirt
+            color: '#FFFFFFFF'
+            cleanable: True
+          decals:
+            3: 11,-22
+            4: 12,-22
+            5: 12,-21
+            6: 11,-21
+            7: 10,-21
+            8: 9,-21
+            9: 9,-22
+            10: 10,-22
+            11: 10,-23
+            12: 9,-23
+            13: 9,-24
+            14: 10,-24
+            15: 11,-24
+        - node:
+            id: Remains
+            color: '#FFFFFFFF'
+          decals:
+            38: 12,-21
+        - node:
+            id: WarnCornerSmallSE
+            color: '#FFFFFFFF'
+          decals:
+            37: 4,-18
+        - node:
+            id: WarnLineN
+            color: '#FFFFFFFF'
+          decals:
+            0: 5,-18
+            1: 6,-18
+            2: 7,-18
+            36: 8,-18
+  - uid: 382
+    components:
+    - type: ChunkEntity
+      root: 2
+      chunk: 1,-2
+    - type: DecalChunk
+      maxDecalId: 12
+      decals:
+        version: 1
+        nodes:
+        - node:
+            id: Bot
+            color: '#FFFFFFFF'
+          decals:
+            0: 16,-20
+            1: 16,-19
+            2: 16,-18
+            3: 17,-18
+            4: 17,-19
+            5: 17,-20
+            10: 17,-18
+            11: 17,-19
+            12: 17,-20
+        - node:
+            id: ConcreteTrimLineE
+            color: '#EFB34196'
+          decals:
+            6: 17,-18
+            7: 17,-19
+            8: 17,-20
+            9: 17,-21
+  - uid: 383
+    components:
+    - type: ChunkEntity
+      root: 2
+      chunk: 1,0
+    - type: DecalChunk
+      maxDecalId: 8
+      decals:
+        version: 1
+        nodes:
+        - node:
+            id: Box
+            color: '#FFFFFFFF'
+          decals:
+            0: 16,2
+            1: 17,2
+            2: 17,4
+            3: 16,4
+            4: 17,6
+        - node:
+            id: BrickTileWhiteInnerNw
+            color: '#334E6DC8'
+          decals:
+            5: 16,5
+        - node:
+            id: BrickTileWhiteLineE
+            color: '#334E6DC8'
+          decals:
+            7: 17,3
+            8: 17,5
+        - node:
+            id: BrickTileWhiteLineW
+            color: '#334E6DC8'
+          decals:
+            6: 16,6
+  - uid: 384
+    components:
+    - type: ChunkEntity
+      root: 2
+    - type: DecalChunk
+      maxDecalId: 59
+      decals:
+        version: 1
+        nodes:
+        - node:
+            id: Bot
+            color: '#FFFFFFFF'
+          decals:
+            51: 13,6
+            55: 15,6
+        - node:
+            id: BotGreyscale
+            color: '#FFFFFFFF'
+          decals:
+            46: 4,8
+            47: 5,8
+            48: 6,8
+            52: 13,4
+            53: 13,3
+        - node:
+            id: BrickLineOverlayE
+            color: '#334E6DC8'
+          decals:
+            0: 13,6
+            1: 13,5
+            2: 13,4
+            3: 13,3
+            4: 13,7
+            5: 13,8
+        - node:
+            id: BrickLineOverlayN
+            color: '#334E6DC8'
+          decals:
+            6: 13,1
+            7: 12,1
+            19: 11,1
+        - node:
+            id: BrickLineOverlayW
+            color: '#334E6DC8'
+          decals:
+            8: 9,7
+            9: 9,8
+            10: 9,9
+        - node:
+            id: BrickLineOverlayW
+            color: '#DE3A3A96'
+          decals:
+            18: 3,2
+        - node:
+            id: BrickTileWhiteCornerNw
+            color: '#334E6DC8'
+          decals:
+            59: 15,5
+        - node:
+            id: BrickTileWhiteCornerSe
+            color: '#DE3A3A96'
+          decals:
+            12: 7,3
+        - node:
+            id: BrickTileWhiteInnerSe
+            color: '#DE3A3A96'
+          decals:
+            11: 6,3
+        - node:
+            id: BrickTileWhiteLineE
+            color: '#DE3A3A96'
+          decals:
+            13: 6,2
+            14: 7,4
+            15: 7,5
+            16: 6,1
+            17: 6,0
+            49: 7,8
+            50: 7,7
+        - node:
+            id: BrickTileWhiteLineW
+            color: '#334E6DC8'
+          decals:
+            56: 15,2
+            57: 15,3
+            58: 15,4
+        - node:
+            id: BrickTileWhiteLineW
+            color: '#DE3A3A96'
+          decals:
+            20: 3,7
+            21: 3,8
+            22: 3,6
+            23: 3,5
+            24: 3,4
+            25: 3,3
+            27: 8,0
+            28: 8,1
+        - node:
+            id: DeliveryGreyscale
+            color: '#FFFFFFFF'
+            angle: 1.5707963267948966 rad
+          decals:
+            37: 4,6
+            38: 6,6
+        - node:
+            id: LoadingAreaGreyscale
+            color: '#FFFFFFFF'
+            angle: 1.5707963267948966 rad
+          decals:
+            54: 0,0
+        - node:
+            id: MiniTileInnerOverlayNE
+            color: '#334E6DC8'
+          decals:
+            26: 10,1
+        - node:
+            id: WarnCornerSmallGreyscaleSE
+            color: '#FFFFFFFF'
+          decals:
+            44: 8,0
+        - node:
+            id: WarnCornerSmallGreyscaleSW
+            color: '#FFFFFFFF'
+          decals:
+            45: 14,0
+        - node:
+            id: WarnLineGreyscaleN
+            color: '#DE3A3A96'
+          decals:
+            29: 0,0
+            30: 3,0
+            31: 2,0
+            32: 1,0
+        - node:
+            id: WarnLineGreyscaleS
+            color: '#DE3A3A96'
+          decals:
+            33: 0,0
+            34: 1,0
+            35: 2,0
+            36: 3,0
+        - node:
+            id: WarnLineGreyscaleS
+            color: '#FFFFFFFF'
+          decals:
+            39: 9,0
+            40: 10,0
+            41: 11,0
+            42: 12,0
+            43: 13,0
+- proto: ClosetEmergencyFilledRandom
+  entities:
+  - uid: 398
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-7.5
+  - uid: 408
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,1.5
+  - uid: 629
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-11.5
+  - uid: 1811
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,3.5
+  - uid: 1852
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-17.5
+  - uid: 2348
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,8.5
+- proto: ClosetEmergencyN2FilledRandom
+  entities:
+  - uid: 440
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-13.5
+  - uid: 441
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-18.5
+- proto: ClosetFireFilled
+  entities:
+  - uid: 1815
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,4.5
+- proto: ClosetMaintenance
+  entities:
+  - uid: 586
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-20.5
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          ents:
+          - 587
+          showEnts: False
+          occludes: True
+        paper_label: !type:ContainerSlot
+          ent: null
+          showEnts: False
+          occludes: True
+- proto: ClosetWallEmergencyFilledRandom
+  entities:
+  - uid: 87
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-14.5
+  - uid: 632
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-22.5
+- proto: ClothingBeltUtilityEngineering
+  entities:
+  - uid: 420
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5201616,-20.43535
+- proto: ClothingHeadHatCone
+  entities:
+  - uid: 379
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.535453,-22.47224
+  - uid: 448
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.504203,-23.456615
+  - uid: 583
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.347953,-23.65974
+  - uid: 584
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.269828,-21.206615
+  - uid: 585
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.676078,-21.581615
+- proto: Cobweb1
+  entities:
+  - uid: 2201
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-20.5
+- proto: Cobweb2
+  entities:
+  - uid: 2318
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-20.5
+- proto: ComfyChair
+  entities:
+  - uid: 182
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-12.5
+  - uid: 201
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-8.5
+  - uid: 1684
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-8.5
+  - uid: 1688
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-9.5
+  - uid: 1795
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 13.5,-13.5
+- proto: ComputerAtmosMonitoring
+  entities:
+  - uid: 177
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,9.5
+- proto: ComputerEmergencyShuttle
+  entities:
+  - uid: 213
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,9.5
+- proto: ComputerPowerMonitoring
+  entities:
+  - uid: 170
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 13.5,8.5
+- proto: ComputerRadar
+  entities:
+  - uid: 212
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,9.5
+- proto: CrateEmptySpawner
+  entities:
+  - uid: 635
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-18.5
+- proto: CrateFilledSpawner
+  entities:
+  - uid: 367
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-17.5
+  - uid: 443
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-18.5
+  - uid: 568
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-17.5
+- proto: CrateServiceCooking
+  entities:
+  - uid: 2254
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,-1.5
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          ents:
+          - 130
+          showEnts: False
+          occludes: True
+        paper_label: !type:ContainerSlot
+          ent: null
+          showEnts: False
+          occludes: True
+- proto: CrowbarRed
+  entities:
+  - uid: 551
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.578987,8.446652
+- proto: DresserFilled
+  entities:
+  - uid: 270
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-12.5
+- proto: DrinkGlass
+  entities:
+  - uid: 1812
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.670948,5.8049846
+  - uid: 1813
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.835011,5.5000854
+- proto: DrinkNTCahorsBottleFull
+  entities:
+  - uid: 246
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.396809,5.780712
+- proto: DrinkShotGlass
+  entities:
+  - uid: 368
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.592595,-15.972469
+  - uid: 371
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.7037063,-16.18543
+  - uid: 571
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.305558,-15.972469
+  - uid: 572
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.4120398,-16.19932
+- proto: DrinkWhiskeyBottleFull
+  entities:
+  - uid: 376
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.379632,-15.32895
+- proto: EmergencyLight
+  entities:
+  - uid: 219
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,4.5
+  - uid: 297
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 17.5,-15.5
+  - uid: 1907
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-11.5
+  - uid: 2179
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 13.5,-14.5
+  - uid: 2180
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-0.5
+  - uid: 2182
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 14.5,-9.5
+  - uid: 2185
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 13.5,3.5
+  - uid: 2189
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,-9.5
+  - uid: 2265
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 13.5,1.5
+  - uid: 2370
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 17.5,-12.5
+  - uid: 2371
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-15.5
+  - uid: 2374
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-17.5
+  - uid: 2375
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-6.5
+  - uid: 2376
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-3.5
+- proto: FireAlarm
+  entities:
+  - uid: 233
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 2.5,4.5
+    - type: DeviceList
+      devices:
+      - 386
+      - 350
+  - uid: 1689
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 8.5,6.5
+    - type: DeviceList
+      devices:
+      - 2339
+      - 2340
+  - uid: 2483
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 14.5,2.5
+    - type: DeviceList
+      devices:
+      - 2223
+      - 2340
+  - uid: 2487
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 15.5,-10.5
+    - type: DeviceList
+      devices:
+      - 1925
+      - 263
+      - 386
+      - 2223
+      - 2339
+  - uid: 2488
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-10.5
+    - type: DeviceList
+      devices:
+      - 2345
+      - 2344
+      - 2343
+      - 2342
+      - 1925
+      - 263
+      - 2336
+  - uid: 2489
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-15.5
+    - type: DeviceList
+      devices:
+      - 2345
+  - uid: 2490
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,-14.5
+    - type: DeviceList
+      devices:
+      - 2336
+  - uid: 2491
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-2.5
+- proto: FirelockGlass
+  entities:
+  - uid: 263
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-10.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 2487
+  - uid: 350
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-0.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 233
+  - uid: 386
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 7.5,0.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 233
+      - 2487
+  - uid: 1925
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,-10.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 2487
+  - uid: 2223
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,1.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 2487
+  - uid: 2336
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-12.5
+  - uid: 2339
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,2.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 2487
+  - uid: 2340
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 14.5,5.5
+  - uid: 2342
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-11.5
+  - uid: 2343
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-14.5
+  - uid: 2344
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-16.5
+  - uid: 2345
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-16.5
+- proto: FloorDrain
+  entities:
+  - uid: 304
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-14.5
+    - type: Fixtures
+      fixtures: {}
+- proto: FoodMealMilkape
+  entities:
+  - uid: 130
+    components:
+    - type: Transform
+      parent: 2254
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 2254
+- proto: FoodPoppy
+  entities:
+  - uid: 2220
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.43617,8.72581
+- proto: GasMixerFlipped
+  entities:
+  - uid: 2229
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-20.5
+    - type: GasMixer
+      targetPressure: 300
+      inletTwoConcentration: 0.23000002
+      inletOneConcentration: 0.77
+      enabled: True
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+- proto: GasPassiveVent
+  entities:
+  - uid: 60
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 5.5,-22.5
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 65
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 7.5,-22.5
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 416
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 17.5,-23.5
+- proto: GasPipeBend
+  entities:
+  - uid: 324
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,-17.5
+  - uid: 331
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-21.5
+  - uid: 342
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-16.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 399
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-21.5
+  - uid: 413
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 9.5,-23.5
+  - uid: 459
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 14.5,-17.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 486
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-16.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 514
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,-12.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 603
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,7.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 612
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 12.5,5.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 622
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-11.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 623
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-14.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 2228
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-20.5
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+- proto: GasPipeFourway
+  entities:
+  - uid: 458
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-12.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPipeStraight
+  entities:
+  - uid: 147
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-23.5
+  - uid: 151
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-23.5
+  - uid: 163
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-22.5
+  - uid: 189
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-21.5
+  - uid: 222
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-7.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 223
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-4.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 280
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 11.5,-19.5
+  - uid: 333
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-17.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 345
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-4.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 392
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-21.5
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 393
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-21.5
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 400
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 11.5,-20.5
+  - uid: 403
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-23.5
+  - uid: 419
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-23.5
+  - uid: 422
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-23.5
+  - uid: 423
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-23.5
+  - uid: 425
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-23.5
+  - uid: 450
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-5.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 452
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-1.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 453
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-0.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 454
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-3.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 456
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-3.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 463
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-6.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 464
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-5.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 465
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-4.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 466
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-2.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 467
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-1.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 468
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-0.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 469
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-2.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 479
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-6.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 480
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-7.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 481
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-8.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 482
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-8.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 484
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-13.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 488
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-12.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 497
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-16.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 507
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-7.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 508
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-3.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 510
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-12.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 513
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 10.5,-9.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 519
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-4.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 523
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-15.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 524
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-3.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 527
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-16.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 529
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 10.5,-10.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 530
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-16.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 531
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-16.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 532
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-12.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 533
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-6.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 588
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-5.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 590
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-4.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 591
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-4.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 593
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,-2.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 594
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,-1.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 595
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,-0.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 596
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,0.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 597
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,1.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 599
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,3.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 600
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,4.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 601
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,5.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 602
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,6.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 608
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 10.5,0.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 609
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,0.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 610
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 12.5,1.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 611
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 12.5,2.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 613
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 13.5,5.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 614
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 14.5,5.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 615
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 15.5,5.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 616
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,4.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 617
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-11.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 618
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-11.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 619
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-11.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 620
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-11.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 621
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-11.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 624
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-14.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 625
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-14.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 626
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-14.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 627
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-14.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 628
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-14.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 2151
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-19.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 2230
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-20.5
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 2232
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-18.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPipeTJunction
+  entities:
+  - uid: 335
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 8.5,-16.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 414
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-18.5
+  - uid: 451
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 13.5,-8.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 455
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-4.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 470
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-3.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 472
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-4.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 483
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-8.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 485
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-14.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 487
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 10.5,-16.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 499
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,0.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 515
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-11.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 528
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 9.5,-8.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 592
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-3.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 598
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 6.5,2.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 604
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 12.5,3.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 605
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,0.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 606
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 12.5,0.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPort
+  entities:
+  - uid: 273
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-17.5
+  - uid: 409
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-18.5
+- proto: GasVentPump
+  entities:
+  - uid: 449
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-15.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 2482
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 457
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-12.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 37
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 461
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-2.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 2492
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 462
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,-5.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 2492
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 471
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 1.5,-8.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 2492
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 474
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 16.5,-12.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 475
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-8.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 11
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 476
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 5.5,7.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 2494
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 500
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 11.5,3.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 2484
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 502
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-11.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 2493
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 506
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 16.5,-15.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 509
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 5.5,2.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 2494
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 511
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-8.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 11
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 518
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-17.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 631
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 522
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 14.5,0.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 11
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 525
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 8.5,0.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 11
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 607
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 16.5,5.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 2175
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GeneratorBasic15kW
+  entities:
+  - uid: 388
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-18.5
+  - uid: 389
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-20.5
+  - uid: 546
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-19.5
+- proto: GeneratorWallmountAPU
+  entities:
+  - uid: 190
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-19.5
+  - uid: 2373
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-18.5
+  - uid: 2537
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-20.5
+- proto: GlowstickPurple
+  entities:
+  - uid: 2181
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.451935,-12.3447
+- proto: GlowstickRed
+  entities:
+  - uid: 2557
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.484217,-12.50692
+- proto: GlowstickYellow
+  entities:
+  - uid: 2558
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.7238,-12.50692
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 545
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-19.5
+- proto: Grille
+  entities:
+  - uid: 9
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-10.5
+  - uid: 45
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,-9.5
+  - uid: 48
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,9.5
+  - uid: 99
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,0.5
+  - uid: 196
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,-1.5
+  - uid: 256
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,-3.5
+  - uid: 274
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,-0.5
+  - uid: 287
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,-8.5
+  - uid: 302
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,-7.5
+  - uid: 307
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-11.5
+  - uid: 308
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-12.5
+  - uid: 309
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-13.5
+  - uid: 362
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-18.5
+  - uid: 539
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-11.5
+  - uid: 543
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-17.5
+  - uid: 547
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-19.5
+  - uid: 553
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,2.5
+  - uid: 564
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-0.5
+  - uid: 1784
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,9.5
+  - uid: 1785
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,10.5
+  - uid: 1786
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,10.5
+  - uid: 1787
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,10.5
+  - uid: 1788
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,10.5
+  - uid: 1789
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,10.5
+  - uid: 1792
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,-4.5
+  - uid: 1793
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,-5.5
+  - uid: 2040
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,6.5
+  - uid: 2127
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,9.5
+  - uid: 2406
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-10.5
+  - uid: 2443
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,8.5
+  - uid: 2444
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,7.5
+  - uid: 2508
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,6.5
+  - uid: 2531
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,6.5
+  - uid: 2550
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-21.5
+  - uid: 2551
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-22.5
+  - uid: 2552
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-23.5
+- proto: Gyroscope
+  entities:
+  - uid: 343
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-18.5
+- proto: HoloprojectorSecurity
+  entities:
+  - uid: 2361
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.4612856,4.5328703
+- proto: JetInjector
+  entities:
+  - uid: 1847
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.624418,-11.362892
+- proto: KitchenKnife
+  entities:
+  - uid: 1902
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.566994,-0.3685841
+- proto: KitchenMicrowave
+  entities:
+  - uid: 135
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,0.5
+- proto: KnifePlastic
+  entities:
+  - uid: 446
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.0471975511965976 rad
+      pos: 12.613578,-20.956615
+- proto: LockerEvacRepairFilled
+  entities:
+  - uid: 431
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-20.5
+- proto: LockerEvidence
+  entities:
+  - uid: 406
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,5.5
+- proto: LockerMedicineFilled
+  entities:
+  - uid: 1924
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-11.5
+- proto: MedicalBed
+  entities:
+  - uid: 1742
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-13.5
+  - uid: 1920
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-13.5
+  - uid: 2174
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-13.5
+  - uid: 2203
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-13.5
+- proto: MedkitAdvancedFilled
+  entities:
+  - uid: 2407
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.6729627,-11.415012
+- proto: MedkitBruteFilled
+  entities:
+  - uid: 34
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.4265013,-11.289926
+- proto: MirrorModern
+  entities:
+  - uid: 319
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-13.5
+  - uid: 321
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-13.5
+- proto: NitrogenCanister
+  entities:
+  - uid: 108
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-23.5
+- proto: OxygenCanister
+  entities:
+  - uid: 390
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-23.5
+- proto: PaintingCafeTerraceAtNight
+  entities:
+  - uid: 183
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 18.5,-10.5
+- proto: PaintingEmpty
+  entities:
+  - uid: 2418
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 8.5,3.5
+- proto: PaintingSadClown
+  entities:
+  - uid: 2157
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-19.5
+- proto: PaintingSleepingGypsy
+  entities:
+  - uid: 634
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-12.5
+- proto: PaintingTheKiss
+  entities:
+  - uid: 1922
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-6.5
+- proto: PaintingTheSonOfMan
+  entities:
+  - uid: 2419
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 8.5,5.5
+- proto: Paper
+  entities:
+  - uid: 587
+    components:
+    - type: MetaData
+      name: Crazy Ramblings
+    - type: Transform
+      parent: 586
+    - type: Paper
+      content: >-
+        Crazy?
+
+        I was crazy once.
+
+        They locked me in a room.
+
+        A shuttle room.
+
+        A shuttle room with cones.
+
+        And cones make me crazy.
+
+        Crazy?
+
+        I was crazy once.
+
+        They locked me in a room.
+
+        A shuttle room.
+
+        A shuttle room with cones.
+
+        And cones make me crazy.
+
+        Crazy?
+
+        I was crazy once.
+
+        They locked me in a room.
+
+        A shuttle room.
+
+        A shuttle room with cones.
+
+        And cones make me crazy.
+
+        Crazy?
+
+        I was crazy on--
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 586
+  - uid: 1776
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.503208,-1.4667416
+    - type: Paper
+      content: >+
+        [head=2] TRANSPORT AUTHORITY PENALTY NOTICE [/head]
+
+        DOCUMENT NO: NT-2526-91743
+
+        TIME: 00:02
+
+        OPERATOR / LINE: Tram station
+
+
+        [head=3]
+
+        1. PASSENGER DETAILS[/head]
+
+        •	Full Name: ___________________
+
+        •	Date of Birth: ___________________
+
+        •	Address: ___________________
+
+        •	ID Verified By: ___________________
+
+        [head=3]
+
+        2. OFFENSE DETAILS[/head]
+
+        •	Reason for Issue: Passenger was unable to present a valid ticket or validated transit pass upon inspection.
+
+        •	Location/Stop: Boarded at Command, inspected en route to Evacuation.
+
+        [head=3]
+
+        3. FEE AMOUNT[/head]
+
+        •	Standard Fare Penalty:  $1,000.00 (One Thousand Spesos).
+
+        (Note: Fees may vary by jurisdiction; train and metro fines are typically  $750, while bus violations are $1,000).
+
+
+        [head=3]
+
+        4. LEGAL & PAYMENT INFORMATION[/head]
+
+        Please be advised that you must be in possession of a valid ticket prior to boarding Nanotrasen property transit. Traveling without a valid fare is a violation of the Transport Companies Act.
+
+        •	Payment Deadline: Payment must be received within 30 days of the date of issue.
+
+        •	How to Pay: Payments can be settled via your personal data assistant. Please reference Document No: NT-2526-91743.
+
+        •	Consequences of Non-Payment: Failure to pay within the deadline will result in an initial reminder fee of $250.00. Unpaid balances will be forwarded directly to the Nanotrasen debt collection agency, which may incur severe interest penalties and legal enforcement.
+
+        [head=3]
+
+        5. RIGHT TO APPEAL[/head]
+
+        If you believe this fee was issued in error, you have the right to file a dispute. Appeals must be submitted through our customer service portal within 14 days of issue. Providing false identity information is a security matter.
+
+        Inspector Signature: ___________________
+
+        Passenger Signature: ___________________
+
+  - uid: 1780
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.669875,-1.5501328
+    - type: Paper
+      content: >+
+        [head=2] TRANSPORT AUTHORITY PENALTY NOTICE [/head]
+
+        DOCUMENT NO: NT-2526-91743
+
+        TIME: 00:02
+
+        OPERATOR / LINE: Tram station
+
+
+        [head=3]
+
+        1. PASSENGER DETAILS[/head]
+
+        •	Full Name: ___________________
+
+        •	Date of Birth: ___________________
+
+        •	Address: ___________________
+
+        •	ID Verified By: ___________________
+
+        [head=3]
+
+        2. OFFENSE DETAILS[/head]
+
+        •	Reason for Issue: Passenger was unable to present a valid ticket or validated transit pass upon inspection.
+
+        •	Location/Stop: Boarded at Command, inspected en route to Evacuation.
+
+        [head=3]
+
+        3. FEE AMOUNT[/head]
+
+        •	Standard Fare Penalty:  $1,000.00 (One Thousand Spesos).
+
+        (Note: Fees may vary by jurisdiction; train and metro fines are typically  $750, while bus violations are $1,000).
+
+
+        [head=3]
+
+        4. LEGAL & PAYMENT INFORMATION[/head]
+
+        Please be advised that you must be in possession of a valid ticket prior to boarding Nanotrasen property transit. Traveling without a valid fare is a violation of the Transport Companies Act.
+
+        •	Payment Deadline: Payment must be received within 30 days of the date of issue.
+
+        •	How to Pay: Payments can be settled via your personal data assistant. Please reference Document No: NT-2526-91743.
+
+        •	Consequences of Non-Payment: Failure to pay within the deadline will result in an initial reminder fee of $250.00. Unpaid balances will be forwarded directly to the Nanotrasen debt collection agency, which may incur severe interest penalties and legal enforcement.
+
+        [head=3]
+
+        5. RIGHT TO APPEAL[/head]
+
+        If you believe this fee was issued in error, you have the right to file a dispute. Appeals must be submitted through our customer service portal within 14 days of issue. Providing false identity information is a security matter.
+
+        Inspector Signature: ___________________
+
+        Passenger Signature: ___________________
+
+- proto: Pen
+  entities:
+  - uid: 277
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.0989494,-1.4632909
+  - uid: 2310
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.399867,-4.522903
+- proto: PlasmaReinforcedWindowDirectional
+  entities:
+  - uid: 59
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-21.5
+  - uid: 391
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-21.5
+- proto: PlasmaWindowDirectional
+  entities:
+  - uid: 1841
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 7.5,-21.5
+  - uid: 1842
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 5.5,-21.5
+- proto: PortableScrubber
+  entities:
+  - uid: 205
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-17.5
+  - uid: 242
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-18.5
+- proto: PosterLegitDoNotQuestion
+  entities:
+  - uid: 2382
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,-6.5
+- proto: PottedPlantRandom
+  entities:
+  - uid: 445
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,7.5
+  - uid: 580
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,7.5
+  - uid: 1823
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-6.5
+  - uid: 1824
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-3.5
+- proto: PoweredDimSmallLight
+  entities:
+  - uid: 198
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-15.5
+  - uid: 541
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 1.5,6.5
+  - uid: 1909
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-14.5
+  - uid: 1910
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-15.5
+  - uid: 2206
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-22.5
+  - uid: 2347
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 15.5,8.5
+  - uid: 2426
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-26.5
+  - uid: 2563
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 15.5,-23.5
+- proto: Poweredlight
+  entities:
+  - uid: 278
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-11.5
+  - uid: 317
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 16.5,-15.5
+  - uid: 322
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 19.5,-9.5
+  - uid: 323
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-4.5
+  - uid: 325
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-7.5
+  - uid: 349
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,0.5
+  - uid: 581
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 10.5,3.5
+  - uid: 1834
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-19.5
+  - uid: 2158
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 13.5,7.5
+  - uid: 2162
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 15.5,4.5
+  - uid: 2164
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,1.5
+  - uid: 2165
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-1.5
+  - uid: 2166
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-4.5
+  - uid: 2171
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 17.5,4.5
+  - uid: 2172
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 16.5,-12.5
+  - uid: 2177
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-1.5
+  - uid: 2178
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-15.5
+  - uid: 2186
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 0.5,-9.5
+  - uid: 2188
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,0.5
+  - uid: 2197
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 3.5,5.5
+  - uid: 2233
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 13.5,-9.5
+  - uid: 2237
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-3.5
+  - uid: 2238
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-13.5
+  - uid: 2245
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-13.5
+  - uid: 2349
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 19.5,7.5
+  - uid: 2358
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-0.5
+  - uid: 2369
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,0.5
+  - uid: 2372
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-8.5
+  - uid: 2464
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-12.5
+  - uid: 2465
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-18.5
+  - uid: 2485
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 9.5,8.5
+  - uid: 2486
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,7.5
+  - uid: 2500
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-7.5
+- proto: PoweredSmallLight
+  entities:
+  - uid: 567
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 17.5,-20.5
+  - uid: 2309
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-17.5
+- proto: PoweredWarmSmallLight
+  entities:
+  - uid: 394
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-20.5
+- proto: Rack
+  entities:
+  - uid: 421
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-22.5
+  - uid: 2334
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-22.5
+- proto: Railing
+  entities:
+  - uid: 407
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-20.5
+  - uid: 412
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-19.5
+  - uid: 578
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,7.5
+  - uid: 1917
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-18.5
+- proto: RailingCorner
+  entities:
+  - uid: 577
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,7.5
+  - uid: 579
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 13.5,7.5
+- proto: RandomArcade
+  entities:
+  - uid: 1855
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 14.5,-13.5
+- proto: RandomDrinkGlass
+  entities:
+  - uid: 1695
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-0.5
+  - uid: 1704
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-6.5
+  - uid: 1901
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-3.5
+- proto: RandomDrinkSoda
+  entities:
+  - uid: 2556
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-9.5
+- proto: RandomFoodMeal
+  entities:
+  - uid: 369
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-4.5
+  - uid: 494
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-7.5
+  - uid: 582
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-1.5
+- proto: RandomVendingDrinks
+  entities:
+  - uid: 1818
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,1.5
+- proto: RandomVendingSnacks
+  entities:
+  - uid: 1819
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,1.5
+- proto: ShuttleWindow
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,-3.5
+  - uid: 5
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,-4.5
+  - uid: 6
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,-5.5
+  - uid: 31
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,2.5
+  - uid: 33
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,10.5
+  - uid: 41
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,9.5
+  - uid: 89
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,10.5
+  - uid: 97
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,6.5
+  - uid: 102
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,10.5
+  - uid: 103
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,10.5
+  - uid: 106
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,10.5
+  - uid: 107
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,9.5
+  - uid: 133
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-11.5
+  - uid: 148
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-12.5
+  - uid: 232
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,0.5
+  - uid: 250
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,-1.5
+  - uid: 257
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,-0.5
+  - uid: 266
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-23.5
+  - uid: 290
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-13.5
+  - uid: 300
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,-9.5
+  - uid: 301
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,-7.5
+  - uid: 303
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,-8.5
+  - uid: 552
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-11.5
+  - uid: 554
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-0.5
+  - uid: 556
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-19.5
+  - uid: 557
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-18.5
+  - uid: 558
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-17.5
+  - uid: 1756
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,9.5
+  - uid: 1837
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-22.5
+  - uid: 1838
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-21.5
+  - uid: 2222
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-10.5
+  - uid: 2255
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,6.5
+  - uid: 2264
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-10.5
+  - uid: 2379
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,6.5
+  - uid: 2446
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,8.5
+  - uid: 2447
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,7.5
+- proto: SignalButton
+  entities:
+  - uid: 2363
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-15.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        81:
+        - - Pressed
+          - DoorBolt
+  - uid: 2364
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-12.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        36:
+        - - Pressed
+          - DoorBolt
+- proto: SignAtmos
+  entities:
+  - uid: 2353
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,-21.5
+- proto: SignBar
+  entities:
+  - uid: 22
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-6.5
+- proto: SignCargo
+  entities:
+  - uid: 544
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-15.5
+- proto: SignEngineering
+  entities:
+  - uid: 630
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-17.5
+- proto: SignEVA
+  entities:
+  - uid: 2357
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,1.5
+- proto: SignGravity
+  entities:
+  - uid: 2388
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 4.5,-21.5
+- proto: SignKitchen
+  entities:
+  - uid: 283
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-2.5
+- proto: SignMedical
+  entities:
+  - uid: 264
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-11.5
+- proto: SignNosmoking
+  entities:
+  - uid: 2553
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-16.5
+- proto: SignRestroom
+  entities:
+  - uid: 2154
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-13.5
+- proto: SignSecurity
+  entities:
+  - uid: 2213
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 7.5,1.5
+- proto: SignShipDock
+  entities:
+  - uid: 14
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-10.5
+  - uid: 56
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 2.5,9.5
+  - uid: 265
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-6.5
+  - uid: 275
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-2.5
+  - uid: 276
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,1.5
+  - uid: 316
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-14.5
+  - uid: 2153
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 18.5,9.5
+- proto: Sink
+  entities:
+  - uid: 285
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-14.5
+  - uid: 320
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-14.5
+- proto: SMESBasic
+  entities:
+  - uid: 347
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-20.5
+- proto: SodaDispenser
+  entities:
+  - uid: 298
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-7.5
+- proto: SpiderWeb
+  entities:
+  - uid: 548
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-23.5
+- proto: StairDark
+  entities:
+  - uid: 444
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,7.5
+  - uid: 576
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,7.5
+- proto: StasisBed
+  entities:
+  - uid: 260
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-11.5
+- proto: StoolBar
+  entities:
+  - uid: 39
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-6.5
+  - uid: 40
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-0.5
+  - uid: 90
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-1.5
+  - uid: 248
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-3.5
+  - uid: 252
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-7.5
+  - uid: 254
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-4.5
+  - uid: 1849
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-12.5
+- proto: SubstationBasic
+  entities:
+  - uid: 140
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,6.5
+  - uid: 1865
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-18.5
+- proto: SuitStorageEVA
+  entities:
+  - uid: 216
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,6.5
+  - uid: 217
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,2.5
+  - uid: 218
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,4.5
+  - uid: 2377
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,2.5
+  - uid: 2378
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,4.5
+- proto: Syringe
+  entities:
+  - uid: 2408
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.110463,-11.373317
+- proto: Table
+  entities:
+  - uid: 43
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,0.5
+  - uid: 150
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,-0.5
+  - uid: 336
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-15.5
+  - uid: 337
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-16.5
+  - uid: 633
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-20.5
+  - uid: 1791
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-11.5
+  - uid: 1844
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-11.5
+  - uid: 2155
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-11.5
+  - uid: 2385
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-20.5
+  - uid: 2448
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,8.5
+- proto: TableReinforced
+  entities:
+  - uid: 30
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-1.5
+  - uid: 160
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-1.5
+  - uid: 356
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,3.5
+  - uid: 360
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,4.5
+- proto: TableWood
+  entities:
+  - uid: 57
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,5.5
+  - uid: 80
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-1.5
+  - uid: 92
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,5.5
+  - uid: 141
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-8.5
+  - uid: 143
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-6.5
+  - uid: 144
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-5.5
+  - uid: 145
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-7.5
+  - uid: 146
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-4.5
+  - uid: 156
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-9.5
+  - uid: 167
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-0.5
+  - uid: 180
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,-8.5
+  - uid: 197
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-2.5
+  - uid: 241
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,-7.5
+  - uid: 1687
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-9.5
+  - uid: 2200
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-12.5
+  - uid: 2208
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-3.5
+  - uid: 2269
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-4.5
+- proto: Thruster
+  entities:
+  - uid: 77
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 8.5,-25.5
+  - uid: 86
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 9.5,-25.5
+  - uid: 193
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,10.5
+  - uid: 195
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,10.5
+  - uid: 199
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-18.5
+  - uid: 292
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-18.5
+  - uid: 293
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-19.5
+  - uid: 310
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-17.5
+  - uid: 311
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-17.5
+  - uid: 312
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-19.5
+  - uid: 1685
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 12.5,-25.5
+  - uid: 1753
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 11.5,-25.5
+  - uid: 1758
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 1.5,2.5
+  - uid: 1759
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 19.5,2.5
+  - uid: 1762
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,10.5
+  - uid: 1764
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,10.5
+  - uid: 1765
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,10.5
+  - uid: 1767
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,10.5
+  - uid: 1801
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 19.5,3.5
+  - uid: 2128
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 1.5,3.5
+  - uid: 2330
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 1.5,4.5
+  - uid: 2390
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 19.5,4.5
+- proto: ThrusterLarge
+  entities:
+  - uid: 1701
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 14.5,-26.5
+  - uid: 1752
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 7.5,-26.5
+- proto: ToiletDirtyWaterFilled
+  entities:
+  - uid: 169
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-15.5
+- proto: ToolboxElectricalFilled
+  entities:
+  - uid: 2386
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.491707,-20.389145
+- proto: ToolboxEmergencyFilled
+  entities:
+  - uid: 447
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.432401,-22.235931
+  - uid: 2383
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.604276,-22.485931
+- proto: UtilityKnife
+  entities:
+  - uid: 131
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.539446,-19.47791
+- proto: VendingMachineBooze
+  entities:
+  - uid: 171
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,-9.5
+  - uid: 221
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,3.5
+- proto: VendingMachineCigs
+  entities:
+  - uid: 424
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-7.5
+  - uid: 1782
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,3.5
+- proto: VendingMachineMedical
+  entities:
+  - uid: 1923
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-13.5
+- proto: VendingMachineSec
+  entities:
+  - uid: 439
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,2.5
+- proto: VendingMachineTankDispenserEVA
+  entities:
+  - uid: 1817
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,6.5
+- proto: WallShuttle
+  entities:
+  - uid: 3
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,-6.5
+  - uid: 7
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,-2.5
+  - uid: 8
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,1.5
+  - uid: 10
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,2.5
+  - uid: 13
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,-10.5
+  - uid: 15
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-10.5
+  - uid: 16
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,1.5
+  - uid: 18
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,1.5
+  - uid: 20
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,9.5
+  - uid: 21
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-0.5
+  - uid: 23
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-10.5
+  - uid: 24
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-10.5
+  - uid: 25
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-6.5
+  - uid: 26
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-6.5
+  - uid: 27
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-6.5
+  - uid: 29
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-1.5
+  - uid: 32
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-10.5
+  - uid: 35
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-6.5
+  - uid: 42
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,8.5
+  - uid: 44
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-10.5
+  - uid: 51
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-16.5
+  - uid: 54
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-10.5
+  - uid: 61
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-3.5
+  - uid: 64
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-2.5
+  - uid: 69
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,3.5
+  - uid: 70
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,2.5
+  - uid: 71
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,1.5
+  - uid: 72
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,-2.5
+  - uid: 76
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,2.5
+  - uid: 78
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,9.5
+  - uid: 79
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,9.5
+  - uid: 94
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-0.5
+  - uid: 95
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-14.5
+  - uid: 96
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,9.5
+  - uid: 98
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,2.5
+  - uid: 100
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,-3.5
+  - uid: 101
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,7.5
+  - uid: 104
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,1.5
+  - uid: 111
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,9.5
+  - uid: 113
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,9.5
+  - uid: 115
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,9.5
+  - uid: 116
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,7.5
+  - uid: 117
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,7.5
+  - uid: 118
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,6.5
+  - uid: 119
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,9.5
+  - uid: 120
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,9.5
+  - uid: 122
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,7.5
+  - uid: 123
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,6.5
+  - uid: 124
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,5.5
+  - uid: 125
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,4.5
+  - uid: 126
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,3.5
+  - uid: 128
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,4.5
+  - uid: 132
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-4.5
+  - uid: 136
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-10.5
+  - uid: 138
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-0.5
+  - uid: 139
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-10.5
+  - uid: 142
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-10.5
+  - uid: 149
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-1.5
+  - uid: 153
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-13.5
+  - uid: 154
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-10.5
+  - uid: 158
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,8.5
+  - uid: 159
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-5.5
+  - uid: 164
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,1.5
+  - uid: 165
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,1.5
+  - uid: 166
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,1.5
+  - uid: 173
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-12.5
+  - uid: 174
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,-6.5
+  - uid: 175
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,-2.5
+  - uid: 176
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-14.5
+  - uid: 178
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-16.5
+  - uid: 181
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-17.5
+  - uid: 184
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,-10.5
+  - uid: 185
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,-10.5
+  - uid: 186
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-14.5
+  - uid: 187
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-14.5
+  - uid: 188
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-14.5
+  - uid: 202
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,2.5
+  - uid: 203
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,-4.5
+  - uid: 225
+    components:
+    - type: Transform
+      parent: 2
+      pos: -0.5,-10.5
+  - uid: 226
+    components:
+    - type: Transform
+      parent: 2
+      pos: -0.5,-8.5
+  - uid: 227
+    components:
+    - type: Transform
+      parent: 2
+      pos: -0.5,-6.5
+  - uid: 228
+    components:
+    - type: Transform
+      parent: 2
+      pos: -0.5,-2.5
+  - uid: 229
+    components:
+    - type: Transform
+      parent: 2
+      pos: -0.5,-0.5
+  - uid: 230
+    components:
+    - type: Transform
+      parent: 2
+      pos: -0.5,1.5
+  - uid: 234
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,2.5
+  - uid: 235
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,3.5
+  - uid: 236
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,4.5
+  - uid: 237
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,5.5
+  - uid: 238
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,6.5
+  - uid: 240
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-9.5
+  - uid: 243
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,2.5
+  - uid: 245
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,2.5
+  - uid: 247
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-19.5
+  - uid: 249
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-19.5
+  - uid: 251
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-14.5
+  - uid: 258
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-10.5
+  - uid: 262
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-7.5
+  - uid: 267
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-10.5
+  - uid: 268
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-10.5
+  - uid: 269
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-13.5
+  - uid: 279
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,-5.5
+  - uid: 281
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,-6.5
+  - uid: 305
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,-15.5
+  - uid: 306
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,-14.5
+  - uid: 313
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,-16.5
+  - uid: 555
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-22.5
+  - uid: 562
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,-22.5
+  - uid: 565
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,-0.5
+  - uid: 1678
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-16.5
+  - uid: 1679
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-13.5
+  - uid: 1682
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-8.5
+  - uid: 1686
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-20.5
+  - uid: 1691
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-14.5
+  - uid: 1692
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-14.5
+  - uid: 1696
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-19.5
+  - uid: 1699
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-15.5
+  - uid: 1703
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-21.5
+  - uid: 1705
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-16.5
+  - uid: 1707
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-19.5
+  - uid: 1708
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-19.5
+  - uid: 1713
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-20.5
+  - uid: 1714
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-21.5
+  - uid: 1715
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-20.5
+  - uid: 1716
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-21.5
+  - uid: 1717
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-22.5
+  - uid: 1718
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-23.5
+  - uid: 1719
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-24.5
+  - uid: 1720
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-24.5
+  - uid: 1721
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-24.5
+  - uid: 1722
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,-24.5
+  - uid: 1723
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-24.5
+  - uid: 1724
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-24.5
+  - uid: 1725
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-24.5
+  - uid: 1726
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-24.5
+  - uid: 1727
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-24.5
+  - uid: 1728
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-16.5
+  - uid: 1729
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-22.5
+  - uid: 1730
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-21.5
+  - uid: 1731
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-21.5
+  - uid: 1732
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-24.5
+  - uid: 1733
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-24.5
+  - uid: 1734
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-24.5
+  - uid: 1735
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-24.5
+  - uid: 1736
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-21.5
+  - uid: 1737
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-21.5
+  - uid: 1738
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-22.5
+  - uid: 1739
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-23.5
+  - uid: 1740
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-21.5
+  - uid: 1741
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-20.5
+  - uid: 1748
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-15.5
+  - uid: 1749
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-15.5
+  - uid: 1751
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-13.5
+  - uid: 1755
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,4.5
+  - uid: 1781
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,3.5
+  - uid: 1798
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-16.5
+  - uid: 1799
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-18.5
+  - uid: 1800
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-19.5
+  - uid: 1826
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-14.5
+  - uid: 1827
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-15.5
+  - uid: 1828
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-17.5
+  - uid: 1829
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,-18.5
+  - uid: 1832
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-15.5
+  - uid: 1833
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-21.5
+  - uid: 1836
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-12.5
+  - uid: 1915
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-16.5
+  - uid: 1919
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-14.5
+  - uid: 1933
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-18.5
+  - uid: 1935
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,1.5
+  - uid: 1936
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-17.5
+  - uid: 1941
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,-22.5
+  - uid: 2041
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,9.5
+  - uid: 2043
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,7.5
+  - uid: 2044
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,9.5
+  - uid: 2204
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-25.5
+  - uid: 2236
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-7.5
+  - uid: 2258
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,6.5
+  - uid: 2260
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-10.5
+  - uid: 2365
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,1.5
+  - uid: 2366
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,1.5
+  - uid: 2389
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,5.5
+  - uid: 2402
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-11.5
+  - uid: 2403
+    components:
+    - type: Transform
+      parent: 2
+      pos: 8.5,-13.5
+  - uid: 2540
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-15.5
+- proto: WallShuttleDiagonal
+  entities:
+  - uid: 282
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-20.5
+  - uid: 314
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 19.5,-20.5
+  - uid: 1750
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 18.5,10.5
+  - uid: 1754
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,10.5
+  - uid: 1771
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,5.5
+  - uid: 2141
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 19.5,5.5
+  - uid: 2335
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,10.5
+  - uid: 2360
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 6.5,10.5
+  - uid: 2437
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 15.5,-25.5
+  - uid: 2438
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-25.5
+- proto: WardrobePrison
+  entities:
+  - uid: 397
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,8.5
+  - uid: 561
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,8.5
+- proto: WaterCooler
+  entities:
+  - uid: 2210
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,-13.5
+- proto: WeaponCapacitorRecharger
+  entities:
+  - uid: 536
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,3.5
+- proto: WindoorBarLocked
+  entities:
+  - uid: 563
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-9.5
+  - uid: 2221
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 16.5,0.5
+- proto: WindoorSecurityLocked
+  entities:
+  - uid: 1
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 5.5,-1.5
+  - uid: 332
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,7.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        426:
+        - - DoorStatus
+          - Close
+  - uid: 395
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 4.5,5.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        429:
+        - - DoorStatus
+          - Close
+  - uid: 426
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,5.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        332:
+        - - DoorStatus
+          - Close
+  - uid: 429
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,7.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        395:
+        - - DoorStatus
+          - Close
+- proto: WindowReinforcedDirectional
+  entities:
+  - uid: 194
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-7.5
+  - uid: 200
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,-7.5
+  - uid: 204
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-0.5
+  - uid: 206
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-2.5
+  - uid: 208
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-7.5
+  - uid: 214
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-6.5
+  - uid: 220
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-4.5
+  - uid: 359
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-0.5
+  - uid: 375
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-4.5
+  - uid: 432
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-1.5
+  - uid: 436
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-2.5
+  - uid: 489
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-3.5
+  - uid: 490
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-5.5
+  - uid: 491
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-3.5
+  - uid: 492
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-5.5
+  - uid: 493
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-1.5
+  - uid: 495
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 11.5,-0.5
+  - uid: 496
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-6.5
+  - uid: 1744
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 4.5,-18.5
+  - uid: 1777
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 6.5,-1.5
+  - uid: 2546
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 3.5,-18.5
+...
diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index a425639e35..5f6b855892 100644
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -4,8 +4,8 @@ meta:
   engineVersion: 289.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/23/2026 14:45:10
-  entityCount: 25862
+  time: 09/10/2026 21:27:00
+  entityCount: 25873
 maps:
 - 943
 grids:
@@ -13,19 +13,8 @@ grids:
 - 7536
 orphans: []
 nullspace:
-- 24127
-- 24128
-- 24129
-- 24130
-- 24131
-- 24132
-- 24133
-- 24134
-- 24135
-- 24136
-- 24138
-- 24142
-- 24271
+- 13184
+- 13760
 - 24275
 - 24276
 - 24283
@@ -82,6 +71,17 @@ nullspace:
 - 24534
 - 24535
 - 24536
+- 24537
+- 24646
+- 24647
+- 24648
+- 24649
+- 24650
+- 24651
+- 24652
+- 24653
+- 24654
+- 24655
 tilemap:
   0: Space
   1: FloorArcadeBlue
@@ -162,11 +162,11 @@ entities:
           version: 7
         0,0:
           ind: 0,0
-          tiles: HwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAEAfQAAAAAAAH0AAAAAAAB+AAAAAAAAPAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAAB9AAAAAAAAfgAAAAAAADwAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAAAAAAAAAAH0AAAAAAAAvAAAAAAAADAAAAAAAAAwAAAAABQAMAAAAAAUALwAAAAAAAH4AAAAAAAA8AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB9AAAAAAEAAAAAAAAAAH0AAAAAAgAvAAAAAAAADAAAAAAEAAwAAAAAAAAMAAAAAAMADAAAAAAAAAwAAAAAAgAvAAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAABAAAAAAAAAAB9AAAAAAIALwAAAAAAAAwAAAAABQAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAMALwAAAAAAADwAAAAAAAB9AAAAAAIAfQAAAAACAH0AAAAAAgB9AAAAAAIAfQAAAAABAAAAAAAAAAAAAAAAAAAAfQAAAAAAAC8AAAAAAAAfAAAAAAAADAAAAAABAAwAAAAAAwAMAAAAAAMAHwAAAAAAAC8AAAAAAAA8AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAEAfQAAAAABAH4AAAAAAAB+AAAAAAAALwAAAAAAAC8AAAAAAABOAAAAAAAALwAAAAAAAC8AAAAAAAB+AAAAAAAATQAAAAAAAH0AAAAAAQB9AAAAAAIAfQAAAAABAH0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAATQAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAE0AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAABNAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAE0AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAAA==
+          tiles: HwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAEAfQAAAAAAAH0AAAAAAAB+AAAAAAAAPAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAAB9AAAAAAAAfgAAAAAAADwAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAAAAAAAAAAH0AAAAAAAAvAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAALwAAAAAAAH4AAAAAAAA8AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB9AAAAAAEAAAAAAAAAAH0AAAAAAgAvAAAAAAAADQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAA0AAAAAAAAvAAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAABAAAAAAAAAAB9AAAAAAIALwAAAAAAAA0AAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAANAAAAAAAALwAAAAAAADwAAAAAAAB9AAAAAAIAfQAAAAACAH0AAAAAAgB9AAAAAAIAfQAAAAABAAAAAAAAAAAAAAAAAAAAfQAAAAAAAC8AAAAAAAAfAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAHwAAAAAAAC8AAAAAAAA8AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAEAfQAAAAABAH4AAAAAAAB+AAAAAAAALwAAAAAAAC8AAAAAAABOAAAAAAAALwAAAAAAAC8AAAAAAAB+AAAAAAAATQAAAAAAAH0AAAAAAQB9AAAAAAIAfQAAAAABAH0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAE0AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAAA==
           version: 7
         -1,0:
           ind: -1,0
-          tiles: fgAAAAAAAH4AAAAAAAB9AAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAIAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAABsAAAAAAAAbAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAAAfAAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAIAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAAHwAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAA4AAAAAAEAOAAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAB8AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAACAH0AAAAAAgB9AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAQB9AAAAAAIAfQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAATQAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAA8AAAAAAAAPAAAAAAAAE0AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAABNAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAE0AAAAAAABNAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAB+AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAfAAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAegAAAAAAAHoAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAPAAAAAAAAA==
+          tiles: fgAAAAAAAH4AAAAAAAB9AAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAIAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAABsAAAAAAAAbAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAAAfAAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAIAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAAHwAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAA4AAAAAAEAOAAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAB8AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAACAH0AAAAAAgB9AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAQB9AAAAAAIAfQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAE0AAAAAAABNAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAB+AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAfAAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAegAAAAAAAHoAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAPAAAAAAAAA==
           version: 7
         0,-2:
           ind: 0,-2
@@ -198,7 +198,7 @@ entities:
           version: 7
         -2,-2:
           ind: -2,-2
-          tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAHoAAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAFsAAAAABAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAB6AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABbAAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAegAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB6AAAAAAAAfgAAAAAAAH0AAAAAAQB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAHoAAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAEAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB8AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAE0AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAABNAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAAwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAMAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAGwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAADAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAABsAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAABsAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAAwAAAAABAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAbAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAA==
+          tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAHoAAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAFsAAAAABAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAB6AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABbAAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAegAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB6AAAAAAAAfgAAAAAAAH0AAAAAAQB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAHoAAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAEAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB8AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAATQAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAE0AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAABNAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAA0AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAANAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAGwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAADQAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAABsAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAABsAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAA0AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAbAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAA==
           version: 7
         -2,-1:
           ind: -2,-1
@@ -218,11 +218,11 @@ entities:
           version: 7
         -3,-2:
           ind: -3,-2
-          tiles: PAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAACAH0AAAAAAQB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAAB+AAAAAAAAHwAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAEAAAAAAAABAAAAAAAAAfgAAAAAAAA==
+          tiles: PAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAACAH0AAAAAAQB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAAB+AAAAAAAAHwAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAEAAAAAAAABAAAAAAAAAfgAAAAAAAA==
           version: 7
         -3,-1:
           ind: -3,-1
-          tiles: fgAAAAAAAHwAAAAAAAB8AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAfAAAAAAAAHwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAABsAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAfAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAfAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAbAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAE0AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAABsAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAoAAAAAAAAKAAAAAAAAB8AAAAAAABNAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAbAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAA==
+          tiles: fgAAAAAAAHwAAAAAAAB8AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAfAAAAAAAAHwAAAAAAAB+AAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAABsAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAfAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAfAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAbAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAE0AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAABsAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAoAAAAAAAAKAAAAAAAAB8AAAAAAABNAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAbAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAA==
           version: 7
         2,-3:
           ind: 2,-3
@@ -314,7 +314,7 @@ entities:
           version: 7
         0,-5:
           ind: 0,-5
-          tiles: fgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfQAAAAAAAH0AAAAAAgB9AAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAQB9AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAAABAANAAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAAMADQAAAAABADwAAAAAAAA8AAAAAAAAPAAAAAAAAA8AAAAAAQB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAAAAEAA0AAAAABAA8AAAAAAAAPAAAAAAAADwAAAAAAAAPAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAAABAANAAAAAAMAPAAAAAAAADwAAAAAAAA8AAAAAAAADwAAAAAEAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAAIADQAAAAABADwAAAAAAAA8AAAAAAAAPAAAAAAAAA8AAAAAAQB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAAAAEAA0AAAAAAgA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: fgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfQAAAAAAAH0AAAAAAgB9AAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAQB9AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAAABAANAAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAAMADQAAAAABADwAAAAAAAA8AAAAAAAAPAAAAAAAAA0AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAAAAEAA0AAAAABAA8AAAAAAAAPAAAAAAAADwAAAAAAAANAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAAABAANAAAAAAMAPAAAAAAAADwAAAAAAAA8AAAAAAAADQAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAAIADQAAAAABADwAAAAAAAA8AAAAAAAAPAAAAAAAAA0AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAAAAEAA0AAAAAAgA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -3,-3:
           ind: -3,-3
@@ -338,7 +338,7 @@ entities:
           version: 7
         -1,-5:
           ind: -1,-5
-          tiles: fQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAABAH0AAAAAAgB9AAAAAAEAfgAAAAAAADwAAAAAAAA8AAAAAAAAfQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAAH0AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAEAAAAAAAAAAAAAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAgAAAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH0AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAIAAAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB9AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH0AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAAA0AAAAABQB9AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAA8AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAANAAAAAAUAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAAPAAAAAAIAPAAAAAAAADwAAAAAAAA8AAAAAAAADQAAAAAFAH0AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAADwAAAAADADwAAAAAAAA8AAAAAAAAPAAAAAAAAA0AAAAAAwB9AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAA8AAAAAAgA8AAAAAAAAPAAAAAAAADwAAAAAAAANAAAAAAUAfQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAADQAAAAACAA==
+          tiles: fQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAABAH0AAAAAAgB9AAAAAAEAfgAAAAAAADwAAAAAAAA8AAAAAAAAfQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAAH0AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAEAAAAAAAAAAAAAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAgAAAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH0AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAIAAAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB9AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH0AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAAA0AAAAABQB9AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAA0AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAANAAAAAAUAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAANAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAADQAAAAAFAH0AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAADQAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAA0AAAAAAwB9AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAA0AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAANAAAAAAUAfQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAADQAAAAACAA==
           version: 7
         1,1:
           ind: 1,1
@@ -346,7 +346,7 @@ entities:
           version: 7
         2,1:
           ind: 2,1
-          tiles: fgAAAAAAAH4AAAAAAAAmAAAAAAAAJgAAAAAAACYAAAAAAAAmAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB+AAAAAAAAPAAAAAAAAGwAAAAAAAB+AAAAAAAAJgAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAACYAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAgB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAE0AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAABNAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAATQAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB9AAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: fgAAAAAAAH4AAAAAAAAmAAAAAAAAJgAAAAAAACYAAAAAAAAmAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB+AAAAAAAAPAAAAAAAAGwAAAAAAAB+AAAAAAAAJgAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAACYAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAE0AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAABNAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAATQAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB9AAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         4,-2:
           ind: 4,-2
@@ -362,11 +362,11 @@ entities:
           version: 7
         2,0:
           ind: 2,0
-          tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAfAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB+AAAAAAAAfgAAAAAAAA==
+          tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAE0AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAABNAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAATQAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAfAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB+AAAAAAAAfgAAAAAAAA==
           version: 7
         3,1:
           ind: 3,1
-          tiles: PAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfQAAAAACAH0AAAAAAQB9AAAAAAEAfQAAAAABAH0AAAAAAgB9AAAAAAEAfQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH0AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAkAAAAAAAAJAAAAAAMACQAAAAADAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAQAAAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAEAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAgB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAIAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH0AAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: PAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfQAAAAACAH0AAAAAAQB9AAAAAAEAfQAAAAABAH0AAAAAAgB9AAAAAAEAfQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH0AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAQAAAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAEAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAgB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAIAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH0AAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -3,1:
           ind: -3,1
@@ -3326,19 +3326,8 @@ entities:
       chunkHistory: {}
     - type: ChunkContainer
       chunkEntities:
-      - 24127
-      - 24128
-      - 24129
-      - 24130
-      - 24131
-      - 24132
-      - 24133
-      - 24134
-      - 24135
-      - 24136
-      - 24138
-      - 24142
-      - 24271
+      - 13184
+      - 13760
       - 24275
       - 24276
       - 24283
@@ -3393,6 +3382,17 @@ entities:
       - 24532
       - 24533
       - 24534
+      - 24535
+      - 24536
+      - 24537
+      - 24646
+      - 24647
+      - 24648
+      - 24649
+      - 24650
+      - 24651
+      - 24652
+      - 24653
     - type: GridSplitNode
   - uid: 943
     components:
@@ -3532,8 +3532,8 @@ entities:
       chunkHistory: {}
     - type: ChunkContainer
       chunkEntities:
-      - 24535
-      - 24536
+      - 24654
+      - 24655
     - type: GridSplitNode
 - proto: AcousticGuitarInstrument
   entities:
@@ -5770,6 +5770,19 @@ entities:
       pos: -24.5,-34.5
 - proto: AirlockExternalGlassCargoLocked
   entities:
+  - uid: 8251
+    components:
+    - type: Transform
+      parent: 60
+      rot: 1.5707963267948966 rad
+      pos: 57.5,14.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        6768:
+        - - DoorStatus
+          - Close
   - uid: 8358
     components:
     - type: Transform
@@ -5800,18 +5813,19 @@ entities:
         19006:
         - - DoorStatus
           - DoorBolt
-  - uid: 13183
-    components:
-    - type: Transform
-      parent: 60
-      rot: 1.5707963267948966 rad
-      pos: 57.5,14.5
-  - uid: 13184
+  - uid: 13181
     components:
     - type: Transform
       parent: 60
       rot: 1.5707963267948966 rad
       pos: 57.5,12.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        5477:
+        - - DoorStatus
+          - Close
 - proto: AirlockExternalGlassEngineeringLocked
   entities:
   - uid: 3334
@@ -6259,6 +6273,34 @@ entities:
       parent: 60
       rot: -1.5707963267948966 rad
       pos: -5.5,-63.5
+- proto: AirlockExternalGlassShuttleCargo
+  entities:
+  - uid: 5477
+    components:
+    - type: Transform
+      parent: 60
+      rot: 1.5707963267948966 rad
+      pos: 59.5,12.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        13181:
+        - - DoorStatus
+          - Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 6768
+    components:
+    - type: Transform
+      parent: 60
+      rot: 1.5707963267948966 rad
+      pos: 59.5,14.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        8251:
+        - - DoorStatus
+          - Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: AirlockExternalGlassShuttleEmergencyLocked
   entities:
   - uid: 6372
@@ -6417,18 +6459,6 @@ entities:
       parent: 60
       rot: 1.5707963267948966 rad
       pos: 58.5,39.5
-  - uid: 13181
-    components:
-    - type: Transform
-      parent: 60
-      rot: 1.5707963267948966 rad
-      pos: 59.5,12.5
-  - uid: 13182
-    components:
-    - type: Transform
-      parent: 60
-      rot: 1.5707963267948966 rad
-      pos: 59.5,14.5
 - proto: AirlockExternalGlassShuttleSyndicateLocked
   entities:
   - uid: 8108
@@ -9139,13 +9169,6 @@ entities:
     - type: Transform
       parent: 60
       pos: 47.5,22.5
-- proto: AsimovCircuitBoard
-  entities:
-  - uid: 19807
-    components:
-    - type: Transform
-      parent: 60
-      pos: -112.765816,8.588821
 - proto: AtmosDeviceFanDirectional
   entities:
   - uid: 280
@@ -9225,12 +9248,6 @@ entities:
       parent: 60
       rot: 1.5707963267948966 rad
       pos: 6.5,-70.5
-  - uid: 5477
-    components:
-    - type: Transform
-      parent: 60
-      rot: 1.5707963267948966 rad
-      pos: 59.5,14.5
   - uid: 5779
     components:
     - type: Transform
@@ -9243,12 +9260,6 @@ entities:
       parent: 7536
       rot: 3.141592653589793 rad
       pos: -11.5,-0.5
-  - uid: 6768
-    components:
-    - type: Transform
-      parent: 60
-      rot: 1.5707963267948966 rad
-      pos: 59.5,12.5
   - uid: 7581
     components:
     - type: Transform
@@ -12098,11 +12109,6 @@ entities:
     - type: Transform
       parent: 60
       pos: -6.5,-17.5
-  - uid: 13760
-    components:
-    - type: Transform
-      parent: 60
-      pos: 47.5,16.5
   - uid: 14632
     components:
     - type: Transform
@@ -12748,6 +12754,12 @@ entities:
       pos: -35.5,-34.5
     - type: SpamEmitSound
       enabled: False
+  - uid: 24127
+    components:
+    - type: Transform
+      parent: 60
+      rot: 1.5707963267948966 rad
+      pos: -19.5,-20.5
   - uid: 25282
     components:
     - type: Transform
@@ -13160,6 +13172,13 @@ entities:
     - type: Transform
       parent: 60
       pos: -58.50381,1.496242
+- proto: BoxFolderYellowThreePapers
+  entities:
+  - uid: 24136
+    components:
+    - type: Transform
+      parent: 60
+      pos: 40.549213,9.608847
 - proto: BoxLatexGloves
   entities:
   - uid: 261
@@ -46849,6 +46868,13 @@ entities:
     - type: Transform
       parent: 60
       pos: 51.5,6.5
+- proto: CargoTelepad
+  entities:
+  - uid: 24129
+    components:
+    - type: Transform
+      parent: 60
+      pos: 50.5,8.5
 - proto: Carpet
   entities:
   - uid: 309
@@ -54669,18 +54695,6 @@ entities:
       parent: 60
       rot: 1.5707963267948966 rad
       pos: 29.5,-5.5
-  - uid: 20080
-    components:
-    - type: Transform
-      parent: 60
-      rot: -1.5707963267948966 rad
-      pos: 41.5,10.5
-  - uid: 20081
-    components:
-    - type: Transform
-      parent: 60
-      rot: -1.5707963267948966 rad
-      pos: 41.5,11.5
   - uid: 21025
     components:
     - type: Transform
@@ -55825,7 +55839,7 @@ entities:
       pos: 34.480053,51.56334
 - proto: ChunkEntity
   entities:
-  - uid: 24127
+  - uid: 13184
     components:
     - type: ChunkEntity
       root: 60
@@ -56018,7 +56032,7 @@ entities:
             cleanable: True
           decals:
             6488: -8.215054,-20.979568
-  - uid: 24128
+  - uid: 13760
     components:
     - type: ChunkEntity
       root: 60
@@ -56241,7 +56255,7 @@ entities:
             3697: 13,-27
             3698: 14,-27
             3699: 15,-27
-  - uid: 24129
+  - uid: 24275
     components:
     - type: ChunkEntity
       root: 60
@@ -56388,7 +56402,7 @@ entities:
             color: '#A46106FF'
           decals:
             3499: 26,-41
-  - uid: 24130
+  - uid: 24276
     components:
     - type: ChunkEntity
       root: 60
@@ -56806,7 +56820,7 @@ entities:
             cleanable: True
           decals:
             2899: 35,-29
-  - uid: 24131
+  - uid: 24283
     components:
     - type: ChunkEntity
       root: 60
@@ -56970,7 +56984,7 @@ entities:
             3181: 40.159973,-45.371067
             3182: 39.909973,-44.996067
             3183: 40.191223,-44.621067
-  - uid: 24132
+  - uid: 24284
     components:
     - type: ChunkEntity
       root: 60
@@ -57087,7 +57101,7 @@ entities:
             cleanable: True
           decals:
             609: 19,-8
-  - uid: 24133
+  - uid: 24286
     components:
     - type: ChunkEntity
       root: 60
@@ -57304,7 +57318,7 @@ entities:
             cleanable: True
           decals:
             2401: 32.02958,-5.0098457
-  - uid: 24134
+  - uid: 24294
     components:
     - type: ChunkEntity
       root: 60
@@ -57694,7 +57708,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             811: -42,8
-  - uid: 24135
+  - uid: 24299
     components:
     - type: ChunkEntity
       root: 60
@@ -57974,7 +57988,7 @@ entities:
             5363: -11,14
             5364: -10,14
             5365: -9,14
-  - uid: 24136
+  - uid: 24310
     components:
     - type: ChunkEntity
       root: 60
@@ -58274,7 +58288,7 @@ entities:
             571: 24,15
             572: 23,15
             573: 22,15
-  - uid: 24138
+  - uid: 24333
     components:
     - type: ChunkEntity
       root: 60
@@ -58522,7 +58536,7 @@ entities:
           decals:
             3650: 13,20
             3651: 12,20
-  - uid: 24142
+  - uid: 24334
     components:
     - type: ChunkEntity
       root: 60
@@ -58862,7 +58876,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1762: 15,6
-  - uid: 24271
+  - uid: 24337
     components:
     - type: ChunkEntity
       root: 60
@@ -59043,7 +59057,7 @@ entities:
             cleanable: True
           decals:
             2698: 9.979055,-45.00161
-  - uid: 24275
+  - uid: 24350
     components:
     - type: ChunkEntity
       root: 60
@@ -59198,7 +59212,7 @@ entities:
             3703: 19,-27
             3704: 20,-27
             3705: 21,-27
-  - uid: 24276
+  - uid: 24352
     components:
     - type: ChunkEntity
       root: 60
@@ -59320,7 +59334,7 @@ entities:
             cleanable: True
           decals:
             2617: -10.991777,-32.08159
-  - uid: 24283
+  - uid: 24353
     components:
     - type: ChunkEntity
       root: 60
@@ -59378,7 +59392,7 @@ entities:
             cleanable: True
           decals:
             138: -45,-35
-  - uid: 24284
+  - uid: 24365
     components:
     - type: ChunkEntity
       root: 60
@@ -59423,7 +59437,7 @@ entities:
             cleanable: True
           decals:
             2415: -49,-31
-  - uid: 24286
+  - uid: 24428
     components:
     - type: ChunkEntity
       root: 60
@@ -59733,7 +59747,7 @@ entities:
           decals:
             2046: -47,-16
             2047: -46,-16
-  - uid: 24294
+  - uid: 24429
     components:
     - type: ChunkEntity
       root: 60
@@ -59896,7 +59910,7 @@ entities:
             cleanable: True
           decals:
             2505: -45.397133,-31.934364
-  - uid: 24299
+  - uid: 24430
     components:
     - type: ChunkEntity
       root: 60
@@ -60198,7 +60212,7 @@ entities:
             776: -23,19
             777: -23,20
             778: -23,21
-  - uid: 24310
+  - uid: 24431
     components:
     - type: ChunkEntity
       root: 60
@@ -60565,7 +60579,7 @@ entities:
             5360: -7,16
             5361: -7,17
             5362: -7,18
-  - uid: 24333
+  - uid: 24432
     components:
     - type: ChunkEntity
       root: 60
@@ -60663,7 +60677,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2995: -41,25
-  - uid: 24334
+  - uid: 24433
     components:
     - type: ChunkEntity
       root: 60
@@ -60739,7 +60753,7 @@ entities:
             color: '#3EB38896'
           decals:
             3959: -62.042515,28.021345
-  - uid: 24337
+  - uid: 24436
     components:
     - type: ChunkEntity
       root: 60
@@ -60856,7 +60870,7 @@ entities:
             2474: 51.849873,-9.726813
             2475: 52.084248,-9.383063
             2476: 51.849873,-9.070563
-  - uid: 24350
+  - uid: 24439
     components:
     - type: ChunkEntity
       root: 60
@@ -61070,7 +61084,7 @@ entities:
             angle: 1.5707963267948966 rad
           decals:
             565: 56,10
-  - uid: 24352
+  - uid: 24440
     components:
     - type: ChunkEntity
       root: 60
@@ -61103,7 +61117,6 @@ entities:
             3111: 47,2
             3115: 46,2
             3116: 40,2
-            3132: 41,8
             3133: 40,9
             3134: 39,8
             3135: 41,13
@@ -61117,8 +61130,13 @@ entities:
             color: '#FFFFFFFF'
             angle: -1.5707963267948966 rad
           decals:
-            4129: 41,7
+            8: 41,7
             4130: 43,5
+        - node:
+            id: Arrows
+            color: '#FFFFFFFF'
+          decals:
+            9: 41,11
         - node:
             id: Arrows
             color: '#FFFFFFFF'
@@ -61129,6 +61147,8 @@ entities:
             id: Bot
             color: '#FFFFFFFF'
           decals:
+            4: 41,10
+            5: 41,9
             2321: 47,14
             2366: 36,4
             2893: 45,10
@@ -61165,6 +61185,7 @@ entities:
             id: Delivery
             color: '#FFFFFFFF'
           decals:
+            6: 41,8
             3061: 38,1
             4141: 40,5
             4575: 46,0
@@ -61233,10 +61254,10 @@ entities:
             id: HalfTileOverlayGreyscale90
             color: '#A4610696'
           decals:
-            531: 41,7
-            532: 41,8
-            533: 41,9
-            534: 41,10
+            0: 41,7
+            1: 41,8
+            2: 41,9
+            3: 41,10
             544: 46,6
             545: 46,7
             546: 46,8
@@ -61277,7 +61298,7 @@ entities:
             id: QuarterTileOverlayGreyscale180
             color: '#A4610696'
           decals:
-            625: 41,11
+            7: 41,11
             638: 34,7
             639: 33,7
             640: 32,7
@@ -61349,7 +61370,7 @@ entities:
             2886: 43,12
             2887: 44,12
             2888: 45,12
-  - uid: 24353
+  - uid: 24441
     components:
     - type: ChunkEntity
       root: 60
@@ -61540,7 +61561,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3584: -15,-52
-  - uid: 24365
+  - uid: 24443
     components:
     - type: ChunkEntity
       root: 60
@@ -61582,7 +61603,7 @@ entities:
             1051: -20,-56
             1052: -20,-55
             1053: -20,-54
-  - uid: 24428
+  - uid: 24445
     components:
     - type: ChunkEntity
       root: 60
@@ -61727,7 +61748,7 @@ entities:
             3542: 5,-56
             3543: 5,-55
             3544: 5,-54
-  - uid: 24429
+  - uid: 24446
     components:
     - type: ChunkEntity
       root: 60
@@ -61933,7 +61954,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1048: -1,-78
-  - uid: 24430
+  - uid: 24447
     components:
     - type: ChunkEntity
       root: 60
@@ -62122,7 +62143,7 @@ entities:
           decals:
             1046: 0,-78
             1047: 1,-78
-  - uid: 24431
+  - uid: 24448
     components:
     - type: ChunkEntity
       root: 60
@@ -62314,7 +62335,7 @@ entities:
             4245: 19,23
             4246: 19,24
             4292: 19,25
-  - uid: 24432
+  - uid: 24450
     components:
     - type: ChunkEntity
       root: 60
@@ -62593,7 +62614,7 @@ entities:
             cleanable: True
           decals:
             2471: 36.93115,20.930944
-  - uid: 24433
+  - uid: 24512
     components:
     - type: ChunkEntity
       root: 60
@@ -62811,7 +62832,7 @@ entities:
             4251: 53,27
             4252: 54,27
             4253: 55,27
-  - uid: 24436
+  - uid: 24513
     components:
     - type: ChunkEntity
       root: 60
@@ -62995,7 +63016,7 @@ entities:
             435: -11,36
             436: -12,36
             437: -13,36
-  - uid: 24439
+  - uid: 24514
     components:
     - type: ChunkEntity
       root: 60
@@ -63083,7 +63104,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2: 48,-33
-  - uid: 24440
+  - uid: 24515
     components:
     - type: ChunkEntity
       root: 60
@@ -63130,7 +63151,7 @@ entities:
             cleanable: True
           decals:
             2504: -51.97618,-34.20235
-  - uid: 24441
+  - uid: 24516
     components:
     - type: ChunkEntity
       root: 60
@@ -63228,7 +63249,7 @@ entities:
             4399: 36,41
             4400: 36,42
             4401: 36,43
-  - uid: 24443
+  - uid: 24517
     components:
     - type: ChunkEntity
       root: 60
@@ -63329,7 +63350,7 @@ entities:
             4390: 56,41
             4391: 56,42
             4392: 56,43
-  - uid: 24445
+  - uid: 24518
     components:
     - type: ChunkEntity
       root: 60
@@ -63369,7 +63390,7 @@ entities:
           decals:
             4473: 56,49
             4474: 56,50
-  - uid: 24446
+  - uid: 24519
     components:
     - type: ChunkEntity
       root: 60
@@ -63574,7 +63595,7 @@ entities:
             1536: -58,2
             1537: -59,2
             1538: -60,2
-  - uid: 24447
+  - uid: 24520
     components:
     - type: ChunkEntity
       root: 60
@@ -63596,7 +63617,7 @@ entities:
             3287: -40,40
             3288: -40,42
             3289: -40,44
-  - uid: 24448
+  - uid: 24521
     components:
     - type: ChunkEntity
       root: 60
@@ -63759,7 +63780,7 @@ entities:
             445: -21,36
             446: -22,36
             447: -23,36
-  - uid: 24450
+  - uid: 24522
     components:
     - type: ChunkEntity
       root: 60
@@ -63980,7 +64001,7 @@ entities:
           decals:
             7200: -31,-9
             7201: -31,-8
-  - uid: 24512
+  - uid: 24523
     components:
     - type: ChunkEntity
       root: 60
@@ -64029,7 +64050,7 @@ entities:
             745: -62,40
             746: -63,40
             747: -64,40
-  - uid: 24513
+  - uid: 24524
     components:
     - type: ChunkEntity
       root: 60
@@ -64180,7 +64201,7 @@ entities:
             5490: 6,42
             5512: 0,42
             5513: 1,42
-  - uid: 24514
+  - uid: 24525
     components:
     - type: ChunkEntity
       root: 60
@@ -64425,7 +64446,7 @@ entities:
             825: -26,-28
             826: -27,-28
             2024: -23,-28
-  - uid: 24515
+  - uid: 24526
     components:
     - type: ChunkEntity
       root: 60
@@ -64446,7 +64467,7 @@ entities:
             color: '#8800FFFF'
           decals:
             5632: 7,49
-  - uid: 24516
+  - uid: 24527
     components:
     - type: ChunkEntity
       root: 60
@@ -64485,7 +64506,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             7244: -16,49
-  - uid: 24517
+  - uid: 24528
     components:
     - type: ChunkEntity
       root: 60
@@ -64642,7 +64663,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             794: -6,-5
-  - uid: 24518
+  - uid: 24529
     components:
     - type: ChunkEntity
       root: 60
@@ -64732,7 +64753,7 @@ entities:
           decals:
             3878: -112,30
             3879: -111,30
-  - uid: 24519
+  - uid: 24530
     components:
     - type: ChunkEntity
       root: 60
@@ -64800,7 +64821,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3877: -113,30
-  - uid: 24520
+  - uid: 24531
     components:
     - type: ChunkEntity
       root: 60
@@ -64941,7 +64962,7 @@ entities:
             cleanable: True
           decals:
             3875: -62.06539,-6.96041
-  - uid: 24521
+  - uid: 24532
     components:
     - type: ChunkEntity
       root: 60
@@ -65069,7 +65090,7 @@ entities:
             2340: 3,-8
             2341: 3,-7
             2342: 3,-6
-  - uid: 24522
+  - uid: 24533
     components:
     - type: ChunkEntity
       root: 60
@@ -65237,7 +65258,7 @@ entities:
             angle: 3.141592653589793 rad
           decals:
             3: 48,-32
-  - uid: 24523
+  - uid: 24534
     components:
     - type: ChunkEntity
       root: 60
@@ -65338,7 +65359,7 @@ entities:
             angle: -1.5707963267948966 rad
           decals:
             624: -72,19
-  - uid: 24524
+  - uid: 24535
     components:
     - type: ChunkEntity
       root: 60
@@ -65548,7 +65569,7 @@ entities:
             cleanable: True
           decals:
             5823: -21,5
-  - uid: 24525
+  - uid: 24536
     components:
     - type: ChunkEntity
       root: 60
@@ -65588,7 +65609,7 @@ entities:
             735: -119,15
             736: -120,15
             737: -121,15
-  - uid: 24526
+  - uid: 24537
     components:
     - type: ChunkEntity
       root: 60
@@ -65619,7 +65640,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2958: -109,13
-  - uid: 24527
+  - uid: 24646
     components:
     - type: ChunkEntity
       root: 60
@@ -65668,7 +65689,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             5727: -95,17
-  - uid: 24528
+  - uid: 24647
     components:
     - type: ChunkEntity
       root: 60
@@ -65703,7 +65724,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             7243: -17,49
-  - uid: 24529
+  - uid: 24648
     components:
     - type: ChunkEntity
       root: 60
@@ -65730,7 +65751,7 @@ entities:
             53: 17,-51
             54: 17,-51
             2771: 22,-49
-  - uid: 24530
+  - uid: 24649
     components:
     - type: ChunkEntity
       root: 60
@@ -65764,7 +65785,7 @@ entities:
             color: '#D4D4D428'
           decals:
             1656: -30,-36
-  - uid: 24531
+  - uid: 24650
     components:
     - type: ChunkEntity
       root: 60
@@ -65790,7 +65811,7 @@ entities:
             cleanable: True
           decals:
             1665: 32,-54
-  - uid: 24532
+  - uid: 24651
     components:
     - type: ChunkEntity
       root: 60
@@ -65827,7 +65848,7 @@ entities:
             cleanable: True
           decals:
             2759: -64,51
-  - uid: 24533
+  - uid: 24652
     components:
     - type: ChunkEntity
       root: 60
@@ -65861,7 +65882,7 @@ entities:
           decals:
             4465: 36,49
             4466: 36,50
-  - uid: 24534
+  - uid: 24653
     components:
     - type: ChunkEntity
       root: 60
@@ -65883,7 +65904,7 @@ entities:
             cleanable: True
           decals:
             2692: -66.02228,7.9843655
-  - uid: 24535
+  - uid: 24654
     components:
     - type: ChunkEntity
       root: 7536
@@ -65935,7 +65956,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3: -1,-3
-  - uid: 24536
+  - uid: 24655
     components:
     - type: ChunkEntity
       root: 7536
@@ -68843,11 +68864,27 @@ entities:
       pos: 50.5,14.5
 - proto: ComputerCargoOrders
   entities:
+  - uid: 12009
+    components:
+    - type: Transform
+      parent: 60
+      rot: 1.5707963267948966 rad
+      pos: 40.5,8.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        24129:
+        - - OrderSender
+          - OrderReceiver
   - uid: 18899
     components:
     - type: Transform
       parent: 60
       pos: 43.5,10.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        24129:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersEngineering
   entities:
   - uid: 1921
@@ -68855,6 +68892,11 @@ entities:
     - type: Transform
       parent: 60
       pos: -1.5,21.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        24129:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersMedical
   entities:
   - uid: 22116
@@ -68863,6 +68905,11 @@ entities:
       parent: 60
       rot: 1.5707963267948966 rad
       pos: 47.5,-10.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        24129:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersScience
   entities:
   - uid: 7070
@@ -68871,6 +68918,11 @@ entities:
       parent: 60
       rot: 1.5707963267948966 rad
       pos: -45.5,-9.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        24129:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersSecurity
   entities:
   - uid: 1643
@@ -68879,6 +68931,11 @@ entities:
       parent: 60
       rot: 1.5707963267948966 rad
       pos: -27.5,-4.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        24129:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersService
   entities:
   - uid: 9591
@@ -68886,6 +68943,16 @@ entities:
     - type: Transform
       parent: 60
       pos: 21.5,-26.5
+  - uid: 24138
+    components:
+    - type: Transform
+      parent: 60
+      pos: 9.5,-39.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        24129:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerComms
   entities:
   - uid: 18508
@@ -70302,6 +70369,13 @@ entities:
     - type: SingletonDeviceNetServer
       available: False
       active: False
+- proto: CrewsimovCircuitBoard
+  entities:
+  - uid: 19807
+    components:
+    - type: Transform
+      parent: 60
+      pos: -112.765816,8.588821
 - proto: Crowbar
   entities:
   - uid: 23156
@@ -111011,11 +111085,6 @@ entities:
     - type: Transform
       parent: 60
       pos: 44.5,17.5
-  - uid: 13110
-    components:
-    - type: Transform
-      parent: 60
-      pos: 42.5,10.5
   - uid: 13111
     components:
     - type: Transform
@@ -113496,6 +113565,11 @@ entities:
     - type: Transform
       parent: 60
       pos: 20.5,-3.5
+  - uid: 20081
+    components:
+    - type: Transform
+      parent: 60
+      pos: 42.5,10.5
   - uid: 20099
     components:
     - type: Transform
@@ -119093,6 +119167,13 @@ entities:
     - type: Transform
       parent: 60
       pos: -26.668507,-6.333041
+- proto: MailCart
+  entities:
+  - uid: 24142
+    components:
+    - type: Transform
+      parent: 60
+      pos: 52.5,6.5
 - proto: MaintenanceFluffSpawner
   entities:
   - uid: 1463
@@ -119316,6 +119397,13 @@ entities:
     - type: Transform
       parent: 60
       pos: 51.428207,-36.33008
+- proto: Mattress
+  entities:
+  - uid: 13182
+    components:
+    - type: Transform
+      parent: 60
+      pos: 47.5,16.5
 - proto: MechEquipmentGrabberSmall
   entities:
   - uid: 25380
@@ -127420,11 +127508,6 @@ entities:
     - type: Transform
       parent: 60
       pos: 10.5,11.5
-  - uid: 8251
-    components:
-    - type: Transform
-      parent: 60
-      pos: -31.5,-4.5
   - uid: 11241
     components:
     - type: Transform
@@ -128256,11 +128339,6 @@ entities:
     - type: Transform
       parent: 60
       pos: -69.5,-17.5
-  - uid: 2657
-    components:
-    - type: Transform
-      parent: 60
-      pos: 36.5,-22.5
   - uid: 2663
     components:
     - type: Transform
@@ -128311,11 +128389,6 @@ entities:
     - type: Transform
       parent: 60
       pos: 32.5,-41.5
-  - uid: 2767
-    components:
-    - type: Transform
-      parent: 60
-      pos: 36.5,-24.5
   - uid: 2975
     components:
     - type: Transform
@@ -130041,11 +130114,6 @@ entities:
     - type: Transform
       parent: 60
       pos: 56.5,46.5
-  - uid: 12009
-    components:
-    - type: Transform
-      parent: 60
-      pos: 42.5,10.5
   - uid: 12011
     components:
     - type: Transform
@@ -131696,6 +131764,11 @@ entities:
     - type: Transform
       parent: 60
       pos: -16.5,26.5
+  - uid: 20080
+    components:
+    - type: Transform
+      parent: 60
+      pos: 42.5,10.5
   - uid: 20512
     components:
     - type: Transform
@@ -135523,6 +135596,13 @@ entities:
     - type: Transform
       parent: 60
       pos: -7.5,10.5
+- proto: SignMail
+  entities:
+  - uid: 24271
+    components:
+    - type: Transform
+      parent: 60
+      pos: 51.5,5.5
 - proto: SignMaterials
   entities:
   - uid: 7203
@@ -139564,6 +139644,12 @@ entities:
       parent: 60
       rot: 3.141592653589793 rad
       pos: -45.5,-8.5
+  - uid: 24128
+    components:
+    - type: Transform
+      parent: 60
+      rot: -1.5707963267948966 rad
+      pos: -18.5,-20.5
   - uid: 25283
     components:
     - type: Transform
@@ -142780,6 +142866,12 @@ entities:
     - type: Transform
       parent: 60
       pos: 44.5,13.5
+  - uid: 13110
+    components:
+    - type: Transform
+      parent: 60
+      rot: 1.5707963267948966 rad
+      pos: 40.5,9.5
   - uid: 13146
     components:
     - type: Transform
@@ -143206,6 +143298,12 @@ entities:
     - type: Transform
       parent: 60
       pos: -41.5,-6.5
+  - uid: 24130
+    components:
+    - type: Transform
+      parent: 60
+      rot: 1.5707963267948966 rad
+      pos: 40.5,10.5
   - uid: 24231
     components:
     - type: Transform
@@ -161240,6 +161338,12 @@ entities:
     - type: Transform
       parent: 7536
       pos: 13.5,-1.5
+  - uid: 13183
+    components:
+    - type: Transform
+      parent: 60
+      rot: 1.5707963267948966 rad
+      pos: -34.5,-8.5
   - uid: 18572
     components:
     - type: Transform
@@ -162129,6 +162233,16 @@ entities:
     - type: Transform
       parent: 60
       pos: 15.5,-25.5
+  - uid: 2657
+    components:
+    - type: Transform
+      parent: 60
+      pos: 36.5,-22.5
+  - uid: 2767
+    components:
+    - type: Transform
+      parent: 60
+      pos: 36.5,-24.5
   - uid: 3347
     components:
     - type: Transform
@@ -164810,6 +164924,35 @@ entities:
       parent: 60
       rot: 3.141592653589793 rad
       pos: -103.5,11.5
+  - uid: 24131
+    components:
+    - type: Transform
+      parent: 60
+      pos: 40.5,8.5
+  - uid: 24132
+    components:
+    - type: Transform
+      parent: 60
+      rot: -1.5707963267948966 rad
+      pos: 40.5,8.5
+  - uid: 24133
+    components:
+    - type: Transform
+      parent: 60
+      rot: -1.5707963267948966 rad
+      pos: 40.5,9.5
+  - uid: 24134
+    components:
+    - type: Transform
+      parent: 60
+      rot: -1.5707963267948966 rad
+      pos: 40.5,10.5
+  - uid: 24135
+    components:
+    - type: Transform
+      parent: 60
+      rot: 3.141592653589793 rad
+      pos: 40.5,10.5
   - uid: 24660
     components:
     - type: Transform
diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml
index d35b1e5a42..b1adfc94b1 100644
--- a/Resources/Maps/box.yml
+++ b/Resources/Maps/box.yml
@@ -4,8 +4,8 @@ meta:
   engineVersion: 289.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/22/2026 17:50:29
-  entityCount: 28909
+  time: 09/10/2026 21:42:45
+  entityCount: 28908
 maps:
 - 780
 grids:
@@ -13,6 +13,7 @@ grids:
 - 11906
 orphans: []
 nullspace:
+- 20699
 - 28831
 - 28832
 - 28833
@@ -91,7 +92,6 @@ nullspace:
 - 28906
 - 28907
 - 28908
-- 28909
 tilemap:
   0: Space
   41: FloorArcadeBlue
@@ -260,7 +260,7 @@ entities:
           version: 7
         2,0:
           ind: 2,0
-          tiles: PgAAAAAAAD4AAAAAAAB5AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAeQAAAAAAAAkAAAAAAQAJAAAAAAEACQAAAAACADoAAAAAAAA6AAAAAAAAOgAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAeQAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAHkAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAaAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAeQAAAAAAAAEAAAAABAABAAAAAAQAAQAAAAADAAEAAAAAAgABAAAAAAEAAQAAAAADAHkAAAAAAABoAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAHkAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAgABAAAAAAMAAQAAAAAAAAEAAAAAAgB5AAAAAAAAaAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAQAAAAACAAEAAAAABAABAAAAAAQAAQAAAAAAAAEAAAAAAgABAAAAAAQAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAeQAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAADAAEAAAAAAgABAAAAAAIAAQAAAAADADoAAAAAAAA6AAAAAAAAOgAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAGgAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAABAAAAAAIAAQAAAAAEAAEAAAAABAABAAAAAAQAAQAAAAAEAAEAAAAAAgB5AAAAAAAAOgAAAAAAADoAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAABoAAAAAAAAAQAAAAACAAEAAAAABAABAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAEAeQAAAAAAADoAAAAAAAA6AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAACAAEAAAAAAAABAAAAAAQAAQAAAAAEADoAAAAAAAA6AAAAAAAAOgAAAAAAAHkAAAAAAAAAAAAAAAAAeAAAAAABAAAAAAAAAAB5AAAAAAAAaAAAAAAAAHkAAAAAAAABAAAAAAQAAQAAAAAAAAEAAAAABAABAAAAAAMAAQAAAAADAAEAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAHgAAAAAAgAAAAAAAAAAeQAAAAAAAGgAAAAAAAB5AAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAIAAQAAAAACAAEAAAAABAABAAAAAAIAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAEAAAAAAAAAAHkAAAAAAABoAAAAAAAAeQAAAAAAAA==
+          tiles: PgAAAAAAAD4AAAAAAAB5AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAeQAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAeQAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAHkAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAaAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAeQAAAAAAAAEAAAAABAABAAAAAAQAAQAAAAADAAEAAAAAAgABAAAAAAEAAQAAAAADAHkAAAAAAABoAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAHkAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAgABAAAAAAMAAQAAAAAAAAEAAAAAAgB5AAAAAAAAaAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAQAAAAACAAEAAAAABAABAAAAAAQAAQAAAAAAAAEAAAAAAgABAAAAAAQAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAeQAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAADAAEAAAAAAgABAAAAAAIAAQAAAAADADoAAAAAAAA6AAAAAAAAOgAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAGgAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAABAAAAAAIAAQAAAAAEAAEAAAAABAABAAAAAAQAAQAAAAAEAAEAAAAAAgB5AAAAAAAAOgAAAAAAADoAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAABoAAAAAAAAAQAAAAACAAEAAAAABAABAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAEAeQAAAAAAADoAAAAAAAA6AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAACAAEAAAAAAAABAAAAAAQAAQAAAAAEADoAAAAAAAA6AAAAAAAAOgAAAAAAAHkAAAAAAAAAAAAAAAAAeAAAAAABAAAAAAAAAAB5AAAAAAAAaAAAAAAAAHkAAAAAAAABAAAAAAQAAQAAAAAAAAEAAAAABAABAAAAAAMAAQAAAAADAAEAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAHgAAAAAAgAAAAAAAAAAeQAAAAAAAGgAAAAAAAB5AAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAIAAQAAAAACAAEAAAAABAABAAAAAAIAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAEAAAAAAAAAAHkAAAAAAABoAAAAAAAAeQAAAAAAAA==
           version: 7
         -2,1:
           ind: -2,1
@@ -320,7 +320,7 @@ entities:
           version: 7
         2,-1:
           ind: 2,-1
-          tiles: eQAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAAHkAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAAHkAAAAAAAB5AAAAAAAAOgAAAAAAADoAAAAAAAB5AAAAAAAAOgAAAAAAADoAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAeQAAAAAAAHkAAAAAAAA6AAAAAAAAHQAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAeQAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAAB0AAAAAAAAdAAAAAAAAOgAAAAAAAHkAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAHkAAAAAAAAdAAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAB2AAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAB5AAAAAAAAHQAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAeQAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAOgAAAAAAAB0AAAAAAAA6AAAAAAAAOgAAAAAAAB0AAAAAAAAdAAAAAAAAOgAAAAAAAB0AAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAADoAAAAAAAAdAAAAAAAAOgAAAAAAADoAAAAAAAAdAAAAAAAAHQAAAAAAADoAAAAAAAB5AAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAA6AAAAAAAAHQAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAPgAAAAAAAD4AAAAAAAB5AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAAAkAAAAAAAAJAAAAAAQACQAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAAA==
+          tiles: eQAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAAHkAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAAHkAAAAAAAB5AAAAAAAAOgAAAAAAADoAAAAAAAB5AAAAAAAAOgAAAAAAADoAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAeQAAAAAAAHkAAAAAAAA6AAAAAAAAHQAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAeQAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAAB0AAAAAAAAdAAAAAAAAOgAAAAAAAHkAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAHkAAAAAAAAdAAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAB2AAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAB5AAAAAAAAHQAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAeQAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAOgAAAAAAAB0AAAAAAAA6AAAAAAAAOgAAAAAAAB0AAAAAAAAdAAAAAAAAOgAAAAAAAB0AAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAADoAAAAAAAAdAAAAAAAAOgAAAAAAADoAAAAAAAAdAAAAAAAAHQAAAAAAADoAAAAAAAB5AAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAA6AAAAAAAAHQAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAPgAAAAAAAD4AAAAAAAB5AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAAA==
           version: 7
         3,1:
           ind: 3,1
@@ -3427,6 +3427,7 @@ entities:
       chunkHistory: {}
     - type: ChunkContainer
       chunkEntities:
+      - 20699
       - 28831
       - 28832
       - 28833
@@ -3505,7 +3506,7 @@ entities:
       - 28906
       - 28907
       - 28908
-      - 28909
+    - type: GridSplitNode
   - uid: 11906
     components:
     - type: MetaData
@@ -3561,6 +3562,7 @@ entities:
       chunkHistory: {}
     - type: ChunkContainer
       chunkEntities: []
+    - type: GridSplitNode
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 19976
@@ -6624,12 +6626,26 @@ entities:
       parent: 8364
       rot: 1.5707963267948966 rad
       pos: -42.5,-28.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        17677:
+        - - DoorStatus
+          - Close
   - uid: 18233
     components:
     - type: Transform
       parent: 8364
       rot: 1.5707963267948966 rad
       pos: -42.5,-30.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        18039:
+        - - DoorStatus
+          - Close
 - proto: AirlockExternalGlassEngineeringLocked
   entities:
   - uid: 3707
@@ -6909,6 +6925,34 @@ entities:
     - type: Transform
       parent: 8364
       pos: -77.5,7.5
+- proto: AirlockExternalGlassShuttleCargo
+  entities:
+  - uid: 17677
+    components:
+    - type: Transform
+      parent: 8364
+      rot: -1.5707963267948966 rad
+      pos: -44.5,-28.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        18040:
+        - - DoorStatus
+          - Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 18039
+    components:
+    - type: Transform
+      parent: 8364
+      rot: -1.5707963267948966 rad
+      pos: -44.5,-30.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        18233:
+        - - DoorStatus
+          - Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: AirlockExternalGlassShuttleEmergencyLocked
   entities:
   - uid: 682
@@ -6955,20 +6999,6 @@ entities:
       parent: 8364
       rot: -1.5707963267948966 rad
       pos: -67.5,-9.5
-- proto: AirlockExternalGlassShuttleLocked
-  entities:
-  - uid: 18302
-    components:
-    - type: Transform
-      parent: 8364
-      rot: -1.5707963267948966 rad
-      pos: -44.5,-28.5
-  - uid: 18325
-    components:
-    - type: Transform
-      parent: 8364
-      rot: -1.5707963267948966 rad
-      pos: -44.5,-30.5
 - proto: AirlockExternalLocked
   entities:
   - uid: 610
@@ -11022,13 +11052,6 @@ entities:
     - type: Transform
       parent: 8364
       pos: -36.5,20.5
-- proto: AsimovCircuitBoard
-  entities:
-  - uid: 27912
-    components:
-    - type: Transform
-      parent: 8364
-      pos: -3.6,-23.45
 - proto: AsteroidRock
   entities:
   - uid: 2042
@@ -11223,18 +11246,6 @@ entities:
       parent: 8364
       rot: 3.141592653589793 rad
       pos: -66.5,21.5
-  - uid: 18039
-    components:
-    - type: Transform
-      parent: 8364
-      rot: -1.5707963267948966 rad
-      pos: -44.5,-30.5
-  - uid: 20699
-    components:
-    - type: Transform
-      parent: 8364
-      rot: -1.5707963267948966 rad
-      pos: -44.5,-28.5
   - uid: 20800
     components:
     - type: Transform
@@ -54778,6 +54789,13 @@ entities:
     - type: Transform
       parent: 8364
       pos: -22.5,-19.5
+- proto: CargoTelepad
+  entities:
+  - uid: 18325
+    components:
+    - type: Transform
+      parent: 8364
+      pos: -38.5,-21.5
 - proto: Carpet
   entities:
   - uid: 4508
@@ -62569,7 +62587,7 @@ entities:
       pos: 57.5,15.5
 - proto: ChunkEntity
   entities:
-  - uid: 28831
+  - uid: 20699
     components:
     - type: ChunkEntity
       root: 8364
@@ -62734,7 +62752,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2437: 31,-35
-  - uid: 28832
+  - uid: 28831
     components:
     - type: ChunkEntity
       root: 8364
@@ -63098,7 +63116,7 @@ entities:
             color: '#52B4E996'
           decals:
             2421: 37,-35
-  - uid: 28833
+  - uid: 28832
     components:
     - type: ChunkEntity
       root: 8364
@@ -63450,7 +63468,7 @@ entities:
             3179: -32,-29
             3180: -31,-29
             3185: -32,-25
-  - uid: 28834
+  - uid: 28833
     components:
     - type: ChunkEntity
       root: 8364
@@ -63702,7 +63720,7 @@ entities:
             color: '#A4610696'
           decals:
             2323: -27,-16
-  - uid: 28835
+  - uid: 28834
     components:
     - type: ChunkEntity
       root: 8364
@@ -64019,7 +64037,7 @@ entities:
             6299: 13,-72
             6300: 14,-72
             6301: 15,-72
-  - uid: 28836
+  - uid: 28835
     components:
     - type: ChunkEntity
       root: 8364
@@ -64200,7 +64218,7 @@ entities:
             color: '#D381C996'
           decals:
             1461: 66,-51
-  - uid: 28837
+  - uid: 28836
     components:
     - type: ChunkEntity
       root: 8364
@@ -64451,7 +64469,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2474: 8,-49
-  - uid: 28838
+  - uid: 28837
     components:
     - type: ChunkEntity
       root: 8364
@@ -64712,7 +64730,7 @@ entities:
             721: 75,-47
             722: 76,-47
             723: 77,-47
-  - uid: 28839
+  - uid: 28838
     components:
     - type: ChunkEntity
       root: 8364
@@ -65016,7 +65034,7 @@ entities:
             6582: -8,29
             6583: -9,29
             6584: -10,29
-  - uid: 28840
+  - uid: 28839
     components:
     - type: ChunkEntity
       root: 8364
@@ -65435,7 +65453,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2959: 10,-36
-  - uid: 28841
+  - uid: 28840
     components:
     - type: ChunkEntity
       root: 8364
@@ -65501,7 +65519,7 @@ entities:
             color: '#FED83DFF'
           decals:
             69: 87,-58
-  - uid: 28842
+  - uid: 28841
     components:
     - type: ChunkEntity
       root: 8364
@@ -65699,7 +65717,7 @@ entities:
           decals:
             6429: -17,24
             6430: -17,23
-  - uid: 28843
+  - uid: 28842
     components:
     - type: ChunkEntity
       root: 8364
@@ -65802,7 +65820,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3638: 57,-52
-  - uid: 28844
+  - uid: 28843
     components:
     - type: ChunkEntity
       root: 8364
@@ -65899,7 +65917,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1017: -33,3
-  - uid: 28845
+  - uid: 28844
     components:
     - type: ChunkEntity
       root: 8364
@@ -66235,7 +66253,7 @@ entities:
             3498: -8,-24
             3499: -8,-23
             3500: -8,-22
-  - uid: 28846
+  - uid: 28845
     components:
     - type: ChunkEntity
       root: 8364
@@ -66568,7 +66586,7 @@ entities:
             1656: 54,-21
             1657: 53,-21
             1658: 52,-21
-  - uid: 28847
+  - uid: 28846
     components:
     - type: ChunkEntity
       root: 8364
@@ -66686,7 +66704,7 @@ entities:
             color: '#DE3A3A96'
           decals:
             986: 82,-2
-  - uid: 28848
+  - uid: 28847
     components:
     - type: ChunkEntity
       root: 8364
@@ -66865,7 +66883,7 @@ entities:
             1642: 55,-38
             1643: 56,-38
             1644: 57,-38
-  - uid: 28849
+  - uid: 28848
     components:
     - type: ChunkEntity
       root: 8364
@@ -66989,7 +67007,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2286: -79,9
-  - uid: 28850
+  - uid: 28849
     components:
     - type: ChunkEntity
       root: 8364
@@ -67149,7 +67167,7 @@ entities:
             2295: -78,-4
             2296: -79,-4
             2297: -77,-4
-  - uid: 28851
+  - uid: 28850
     components:
     - type: ChunkEntity
       root: 8364
@@ -67449,7 +67467,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3508: -12,-63
-  - uid: 28852
+  - uid: 28851
     components:
     - type: ChunkEntity
       root: 8364
@@ -67759,7 +67777,7 @@ entities:
           decals:
             757: 41,-52
             758: 39,-52
-  - uid: 28853
+  - uid: 28852
     components:
     - type: ChunkEntity
       root: 8364
@@ -67995,7 +68013,7 @@ entities:
             3188: -34,-28
             3189: -34,-27
             3190: -34,-26
-  - uid: 28854
+  - uid: 28853
     components:
     - type: ChunkEntity
       root: 8364
@@ -68147,7 +68165,7 @@ entities:
             2391: -30,-37
             2392: -30,-36
             2393: -30,-39
-  - uid: 28855
+  - uid: 28854
     components:
     - type: ChunkEntity
       root: 8364
@@ -68374,7 +68392,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             6958: 11,47
-  - uid: 28856
+  - uid: 28855
     components:
     - type: ChunkEntity
       root: 8364
@@ -68776,7 +68794,7 @@ entities:
             6448: -9,42
             7548: -10,46
             7616: -10,42
-  - uid: 28857
+  - uid: 28856
     components:
     - type: ChunkEntity
       root: 8364
@@ -68921,7 +68939,7 @@ entities:
             6960: 11,49
             6961: 11,50
             6962: 11,51
-  - uid: 28858
+  - uid: 28857
     components:
     - type: ChunkEntity
       root: 8364
@@ -69083,7 +69101,7 @@ entities:
             6502: -10,52
             6503: -10,53
             6513: -6,55
-  - uid: 28859
+  - uid: 28858
     components:
     - type: ChunkEntity
       root: 8364
@@ -69105,7 +69123,7 @@ entities:
           decals:
             6350: -9,-91
             6357: -9,-83
-  - uid: 28860
+  - uid: 28859
     components:
     - type: ChunkEntity
       root: 8364
@@ -69131,7 +69149,7 @@ entities:
           decals:
             6289: 12,-81
             6307: 12,-82
-  - uid: 28861
+  - uid: 28860
     components:
     - type: ChunkEntity
       root: 8364
@@ -69383,7 +69401,7 @@ entities:
             1240: 7,-13
             1241: 6,-13
             1242: 5,-13
-  - uid: 28862
+  - uid: 28861
     components:
     - type: ChunkEntity
       root: 8364
@@ -69689,7 +69707,7 @@ entities:
             color: '#334E6DC8'
           decals:
             2061: -1,-9
-  - uid: 28863
+  - uid: 28862
     components:
     - type: ChunkEntity
       root: 8364
@@ -69869,7 +69887,7 @@ entities:
             6060: 17,-78
             6061: 18,-78
             6062: 19,-78
-  - uid: 28864
+  - uid: 28863
     components:
     - type: ChunkEntity
       root: 8364
@@ -70095,7 +70113,7 @@ entities:
             5971: -26,-70
             5972: -25,-70
             5973: -24,-70
-  - uid: 28865
+  - uid: 28864
     components:
     - type: ChunkEntity
       root: 8364
@@ -70418,7 +70436,7 @@ entities:
             3401: 10,-27
             3402: 8,-27
             3403: 7,-27
-  - uid: 28866
+  - uid: 28865
     components:
     - type: ChunkEntity
       root: 8364
@@ -70703,7 +70721,7 @@ entities:
             2602: -1,-79
             2603: -2,-79
             2604: -3,-79
-  - uid: 28867
+  - uid: 28866
     components:
     - type: ChunkEntity
       root: 8364
@@ -70882,7 +70900,7 @@ entities:
             cleanable: True
           decals:
             7386: -18,33
-  - uid: 28868
+  - uid: 28867
     components:
     - type: ChunkEntity
       root: 8364
@@ -71134,7 +71152,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2825: 32,-1
-  - uid: 28869
+  - uid: 28868
     components:
     - type: ChunkEntity
       root: 8364
@@ -71226,7 +71244,7 @@ entities:
             3644: 32.88275,8.297449
             3645: 32.88275,9.188074
             3646: 32.88275,10.078699
-  - uid: 28870
+  - uid: 28869
     components:
     - type: ChunkEntity
       root: 8364
@@ -71388,7 +71406,7 @@ entities:
             1667: 53,-15
             1668: 52,-15
             1675: 58,-15
-  - uid: 28871
+  - uid: 28870
     components:
     - type: ChunkEntity
       root: 8364
@@ -71629,7 +71647,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1534: -12,6
-  - uid: 28872
+  - uid: 28871
     components:
     - type: ChunkEntity
       root: 8364
@@ -71969,7 +71987,7 @@ entities:
             1612: 21,-18
             1613: 21,-19
             1614: 21,-20
-  - uid: 28873
+  - uid: 28872
     components:
     - type: ChunkEntity
       root: 8364
@@ -72184,7 +72202,7 @@ entities:
             1154: 78,-26
             1155: 79,-26
             1173: 71,-22
-  - uid: 28874
+  - uid: 28873
     components:
     - type: ChunkEntity
       root: 8364
@@ -72255,7 +72273,7 @@ entities:
             cleanable: True
           decals:
             4969: 60,1
-  - uid: 28875
+  - uid: 28874
     components:
     - type: ChunkEntity
       root: 8364
@@ -72567,7 +72585,7 @@ entities:
             1268: 46,-20
             1269: 46,-19
             1270: 46,-18
-  - uid: 28876
+  - uid: 28875
     components:
     - type: ChunkEntity
       root: 8364
@@ -72635,7 +72653,7 @@ entities:
             1156: 80,-26
             1157: 82,-26
             1158: 81,-26
-  - uid: 28877
+  - uid: 28876
     components:
     - type: ChunkEntity
       root: 8364
@@ -72806,7 +72824,7 @@ entities:
             6658: 5,31
             6659: 5,30
             6660: 5,29
-  - uid: 28878
+  - uid: 28877
     components:
     - type: ChunkEntity
       root: 8364
@@ -72927,7 +72945,7 @@ entities:
           decals:
             6262: 8,1
             6263: 9,1
-  - uid: 28879
+  - uid: 28878
     components:
     - type: ChunkEntity
       root: 8364
@@ -73005,7 +73023,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             7636: 25,-84
-  - uid: 28880
+  - uid: 28879
     components:
     - type: ChunkEntity
       root: 8364
@@ -73254,7 +73272,7 @@ entities:
             418: -38,-13
             419: -38,-12
             3703: -38,-11
-  - uid: 28881
+  - uid: 28880
     components:
     - type: ChunkEntity
       root: 8364
@@ -73397,7 +73415,7 @@ entities:
             2201: 16,-10
             2202: 16,-12
             2203: 16,-13
-  - uid: 28882
+  - uid: 28881
     components:
     - type: ChunkEntity
       root: 8364
@@ -73499,7 +73517,7 @@ entities:
           decals:
             2489: -1,-33
             2490: -2,-33
-  - uid: 28883
+  - uid: 28882
     components:
     - type: ChunkEntity
       root: 8364
@@ -73711,7 +73729,7 @@ entities:
             2395: 75,-15
             2396: 75,-14
             2397: 75,-13
-  - uid: 28884
+  - uid: 28883
     components:
     - type: ChunkEntity
       root: 8364
@@ -73848,7 +73866,7 @@ entities:
             color: '#FED83DFF'
           decals:
             83: -62,15
-  - uid: 28885
+  - uid: 28884
     components:
     - type: ChunkEntity
       root: 8364
@@ -73942,7 +73960,7 @@ entities:
             2012: -54,-6
             2013: -54,-5
             2014: -54,-4
-  - uid: 28886
+  - uid: 28885
     components:
     - type: ChunkEntity
       root: 8364
@@ -73997,7 +74015,7 @@ entities:
           decals:
             1018: -32,3
             1019: -31,3
-  - uid: 28887
+  - uid: 28886
     components:
     - type: ChunkEntity
       root: 8364
@@ -74100,7 +74118,7 @@ entities:
             2779: 27,14
             2788: 17,12
             2789: 16,12
-  - uid: 28888
+  - uid: 28887
     components:
     - type: ChunkEntity
       root: 8364
@@ -74168,7 +74186,7 @@ entities:
             cleanable: True
           decals:
             5945: 35,-67
-  - uid: 28889
+  - uid: 28888
     components:
     - type: ChunkEntity
       root: 8364
@@ -74233,7 +74251,7 @@ entities:
             color: '#FED83DFF'
           decals:
             77: -62,-22
-  - uid: 28890
+  - uid: 28889
     components:
     - type: ChunkEntity
       root: 8364
@@ -74282,7 +74300,7 @@ entities:
             4949: 70,3
             4950: 69,3
             4951: 68,1
-  - uid: 28891
+  - uid: 28890
     components:
     - type: ChunkEntity
       root: 8364
@@ -74310,7 +74328,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             5980: 62,-71
-  - uid: 28892
+  - uid: 28891
     components:
     - type: ChunkEntity
       root: 8364
@@ -74336,7 +74354,7 @@ entities:
             5464: 70,-67
             5465: 68,-67
             5471: 74,-65
-  - uid: 28893
+  - uid: 28892
     components:
     - type: ChunkEntity
       root: 8364
@@ -74358,7 +74376,7 @@ entities:
             color: '#FED83DFF'
           decals:
             70: 81,-67
-  - uid: 28894
+  - uid: 28893
     components:
     - type: ChunkEntity
       root: 8364
@@ -74397,7 +74415,7 @@ entities:
             color: '#FED83DFF'
           decals:
             68: 87,-39
-  - uid: 28895
+  - uid: 28894
     components:
     - type: ChunkEntity
       root: 8364
@@ -74420,7 +74438,7 @@ entities:
             5597: 55,19
             5598: 58,19
             5599: 57,16
-  - uid: 28896
+  - uid: 28895
     components:
     - type: ChunkEntity
       root: 8364
@@ -74445,7 +74463,7 @@ entities:
             5607: 65,21
             5608: 65,22
             5609: 65,23
-  - uid: 28897
+  - uid: 28896
     components:
     - type: ChunkEntity
       root: 8364
@@ -74531,7 +74549,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3518: 25,18
-  - uid: 28898
+  - uid: 28897
     components:
     - type: ChunkEntity
       root: 8364
@@ -74558,7 +74576,7 @@ entities:
             color: '#FED83DFF'
           decals:
             84: -50,24
-  - uid: 28899
+  - uid: 28898
     components:
     - type: ChunkEntity
       root: 8364
@@ -74584,7 +74602,7 @@ entities:
             5722: -38,21
             5723: -34,20
             5724: -35,19
-  - uid: 28900
+  - uid: 28899
     components:
     - type: ChunkEntity
       root: 8364
@@ -74610,7 +74628,7 @@ entities:
           decals:
             7422: 17,48
             7423: 16,50
-  - uid: 28901
+  - uid: 28900
     components:
     - type: ChunkEntity
       root: 8364
@@ -74627,7 +74645,7 @@ entities:
             cleanable: True
           decals:
             7261: 16,32
-  - uid: 28902
+  - uid: 28901
     components:
     - type: ChunkEntity
       root: 8364
@@ -74665,7 +74683,7 @@ entities:
             5863: -23,-59
             5864: -25,-59
             5865: -27,-59
-  - uid: 28903
+  - uid: 28902
     components:
     - type: ChunkEntity
       root: 8364
@@ -74690,7 +74708,7 @@ entities:
           decals:
             5842: -33,-65
             5843: -33,-65
-  - uid: 28904
+  - uid: 28903
     components:
     - type: ChunkEntity
       root: 8364
@@ -74723,7 +74741,7 @@ entities:
             5926: 16,-56
             5928: 18,-56
             5929: 20,-52
-  - uid: 28905
+  - uid: 28904
     components:
     - type: ChunkEntity
       root: 8364
@@ -74767,7 +74785,7 @@ entities:
             73: -43,-49
             74: -43,-50
             75: -43,-51
-  - uid: 28906
+  - uid: 28905
     components:
     - type: ChunkEntity
       root: 8364
@@ -74782,7 +74800,7 @@ entities:
             color: '#FED83DFF'
           decals:
             64: 47,21
-  - uid: 28907
+  - uid: 28906
     components:
     - type: ChunkEntity
       root: 8364
@@ -74797,7 +74815,7 @@ entities:
             color: '#FED83DFF'
           decals:
             82: -67,19
-  - uid: 28908
+  - uid: 28907
     components:
     - type: ChunkEntity
       root: 8364
@@ -74821,7 +74839,7 @@ entities:
             1011: -74,-17
             1012: -72,-17
             1013: -71,-17
-  - uid: 28909
+  - uid: 28908
     components:
     - type: ChunkEntity
       root: 8364
@@ -78857,16 +78875,31 @@ entities:
       parent: 8364
       rot: 3.141592653589793 rad
       pos: -24.5,-23.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        18325:
+        - - OrderSender
+          - OrderReceiver
   - uid: 14971
     components:
     - type: Transform
       parent: 8364
       pos: -32.5,-24.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        18325:
+        - - OrderSender
+          - OrderReceiver
   - uid: 17667
     components:
     - type: Transform
       parent: 8364
       pos: -22.5,-21.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        18325:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersEngineering
   entities:
   - uid: 20632
@@ -78874,6 +78907,11 @@ entities:
     - type: Transform
       parent: 8364
       pos: -1.5,-66.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        18325:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersMedical
   entities:
   - uid: 5493
@@ -78882,6 +78920,11 @@ entities:
       parent: 8364
       rot: -1.5707963267948966 rad
       pos: 46.5,-25.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        18325:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersScience
   entities:
   - uid: 28356
@@ -78890,6 +78933,11 @@ entities:
       parent: 8364
       rot: 1.5707963267948966 rad
       pos: 69.5,-25.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        18325:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersSecurity
   entities:
   - uid: 8556
@@ -78898,6 +78946,11 @@ entities:
       parent: 8364
       rot: -1.5707963267948966 rad
       pos: 5.5,47.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        18325:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersService
   entities:
   - uid: 5773
@@ -78906,6 +78959,11 @@ entities:
       parent: 8364
       rot: -1.5707963267948966 rad
       pos: 31.5,-10.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        18325:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerComms
   entities:
   - uid: 1073
@@ -80509,6 +80567,13 @@ entities:
     - type: SingletonDeviceNetServer
       available: False
       active: False
+- proto: CrewsimovCircuitBoard
+  entities:
+  - uid: 27912
+    components:
+    - type: Transform
+      parent: 8364
+      pos: -3.6,-23.45
 - proto: Crowbar
   entities:
   - uid: 5342
@@ -137116,6 +137181,14 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: MailCart
+  entities:
+  - uid: 18302
+    components:
+    - type: Transform
+      parent: 8364
+      rot: 1.5707963267948966 rad
+      pos: -22.5,-17.5
 - proto: MailingUnit
   entities:
   - uid: 8179
@@ -155307,6 +155380,12 @@ entities:
       parent: 8364
       rot: -1.5707963267948966 rad
       pos: -45.5,-11.5
+  - uid: 16331
+    components:
+    - type: Transform
+      parent: 8364
+      rot: 1.5707963267948966 rad
+      pos: 18.5,-17.5
   - uid: 19232
     components:
     - type: Transform
@@ -155355,12 +155434,6 @@ entities:
     - type: Transform
       parent: 8364
       pos: -36.5,-54.5
-  - uid: 16331
-    components:
-    - type: Transform
-      parent: 8364
-      rot: 1.5707963267948966 rad
-      pos: 18.5,-17.5
   - uid: 20883
     components:
     - type: Transform
@@ -165628,11 +165701,6 @@ entities:
     - type: Transform
       parent: 8364
       pos: -2.5,43.5
-  - uid: 17677
-    components:
-    - type: Transform
-      parent: 8364
-      pos: -21.5,-31.5
 - proto: VendingMachineSeeds
   entities:
   - uid: 10713
diff --git a/Resources/Maps/centcomm.yml b/Resources/Maps/centcomm.yml
index cee4139c01..7a797c6e26 100644
--- a/Resources/Maps/centcomm.yml
+++ b/Resources/Maps/centcomm.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Grid
-  engineVersion: 288.0.1
+  engineVersion: 289.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/12/2026 19:15:03
-  entityCount: 9790
+  time: 09/10/2026 23:43:42
+  entityCount: 9833
 maps: []
 grids:
 - 1668
@@ -56,6 +56,7 @@ tilemap:
   14: FloorBar
   17: FloorBlueCircuit
   29: FloorDark
+  10: FloorDarkMarble
   38: FloorDarkPlastic
   4: FloorFreezer
   6: FloorGlass
@@ -66,6 +67,7 @@ tilemap:
   61: FloorLaundry
   62: FloorLino
   1: FloorMowedAstroGrass
+  20: FloorPlastic
   11: FloorRedCircuit
   77: FloorReinforced
   9: FloorReinforcedHardened
@@ -76,6 +78,7 @@ tilemap:
   13: FloorSteelLime
   104: FloorTechMaint2
   108: FloorWhite
+  21: FloorWhitePlastic
   118: FloorWood
   8: FloorWoodTile
   120: Lattice
@@ -93,47 +96,47 @@ entities:
       chunks:
         -1,-1:
           ind: -1,-1
-          tiles: eQAAAAAAAE0AAAAAAABNAAAAAAAAeQAAAAAAAE0AAAAAAABNAAAAAAAAeQAAAAAAAE0AAAAAAABNAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAACwAAAAAAAAsAAAAAAQAdAAAAAAAAEQAAAAABABEAAAAAAQAdAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAA2AAAAAAEANgAAAAAAAB0AAAAAAAARAAAAAAEAEQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAgABAAAAAAUAAQAAAAACAAEAAAAAAQABAAAAAAMAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAB0AAAAAAAB2AAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAAdAAAAAAAAdgAAAAAAAD4AAAAAAAA+AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAHYAAAAAAAA+AAAAAAAAPgAAAAAAAA==
+          tiles: eQAAAAAAAE0AAAAAAABNAAAAAAAAeQAAAAAAAE0AAAAAAABNAAAAAAAAeQAAAAAAAE0AAAAAAABNAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAoAAAAAAQACAAAAAAAAAgAAAAAAAAoAAAAABAAKAAAAAAAACgAAAAAAAAoAAAAAAwAKAAAAAAMACgAAAAAFAAoAAAAAAQAKAAAAAAIACgAAAAABAAoAAAAABAAKAAAAAAIACgAAAAADAAoAAAAABQAKAAAAAAQAAgAAAAAAAAIAAAAAAAAKAAAAAAUACgAAAAAEAAoAAAAAAwAKAAAAAAIACgAAAAAAAAoAAAAABAAKAAAAAAQACgAAAAAFAAoAAAAAAQAKAAAAAAQACgAAAAAEAAoAAAAABQAKAAAAAAMACgAAAAAAAAIAAAAAAAACAAAAAAAACgAAAAAEAAoAAAAABAAKAAAAAAQACgAAAAAEAAoAAAAAAwAKAAAAAAQACgAAAAAAAAoAAAAAAAAKAAAAAAMACgAAAAAEAAoAAAAAAwAKAAAAAAEACgAAAAAAAAoAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAKAAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAACgAAAAAFAAIAAAAAAAACAAAAAAAACwAAAAABAAsAAAAAAQAdAAAAAAAAEQAAAAAAABEAAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAHQAAAAAAAAoAAAAABQACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAAKAAAAAAMAAgAAAAAAAAIAAAAAAAA2AAAAAAAANgAAAAAAAB0AAAAAAAARAAAAAAAAEQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAKAAAAAAMACgAAAAACAAoAAAAAAgAKAAAAAAEACgAAAAAAAAoAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAACgAAAAAEAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAUAAQAAAAADAAEAAAAAAwABAAAAAAAAAQAAAAABAAEAAAAABAABAAAAAAIAeQAAAAAAAAoAAAAABQACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAKAAAAAAIAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAoAAAAAAwAKAAAAAAIACgAAAAAAAAoAAAAAAwAKAAAAAAUACgAAAAAAAAoAAAAAAAB5AAAAAAAACgAAAAABAAIAAAAAAAACAAAAAAAAeQAAAAAAAB0AAAAAAAB2AAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAAdAAAAAAAAdgAAAAAAAD4AAAAAAAA+AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAHYAAAAAAAA+AAAAAAAAPgAAAAAAAA==
           version: 7
         0,-1:
           ind: 0,-1
-          tiles: AgAAAAAAAB0AAAAAAAABAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAAdAAAAAAAAAQAAAAACAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAbAAAAAAAAGwAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAACAAAAAAAAHQAAAAAAAGwAAAAAAABsAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAAgAAAAAAAB0AAAAAAABsAAAAAAAAbAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAIAAAAAAAAdAAAAAAAAbAAAAAAAAGwAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAGwAAAAAAABsAAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAABsAAAAAAAAbAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAIAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAbAAAAAAAAGwAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAB2AAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAA+AAAAAAAAdgAAAAAAAB0AAAAAAABNAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAPgAAAAAAAHYAAAAAAAAdAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: AgAAAAAAAAoAAAAAAwABAAAAAAUAHQAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAAKAAAAAAAAAQAAAAACAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAACgAAAAAEAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAoAAAAABQB5AAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAbAAAAAAAAGwAAAAAAAACAAAAAAAAFAAAAAAAAAIAAAAAAAAKAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAACAAAAAAAAHQAAAAAAAGwAAAAAAABsAAAAAAAAFAAAAAAAAAIAAAAAAAACAAAAAAAACgAAAAADAB0AAAAAAAAdAAAAAAAAHQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAAgAAAAAAAB0AAAAAAABsAAAAAAAAbAAAAAAAAAIAAAAAAAAUAAAAAAAAAgAAAAAAAAoAAAAAAwAdAAAAAAAAHQAAAAAAAB0AAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAAAIAAAAAAAAdAAAAAAAAbAAAAAAAAGwAAAAAAAAUAAAAAAAAAgAAAAAAAAIAAAAAAAAKAAAAAAQAeQAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAGwAAAAAAABsAAAAAAAAAgAAAAAAABQAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAABsAAAAAAAAbAAAAAAAABQAAAAAAAACAAAAAAAAAgAAAAAAAAoAAAAAAgAKAAAAAAUACgAAAAAEAAoAAAAABAAKAAAAAAUACgAAAAADAHkAAAAAAAACAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAACAAAAAAAAFAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAoAAAAAAAB5AAAAAAAAAgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAKAAAAAAAAeQAAAAAAAAIAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAACgAAAAAAAHkAAAAAAAB5AAAAAAAAJgAAAAAAACYAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAB2AAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAoAAAAAAgB5AAAAAAAACgAAAAADAAoAAAAABQAKAAAAAAEACgAAAAAEAAoAAAAAAgAKAAAAAAIACgAAAAADAAoAAAAABAA+AAAAAAAAdgAAAAAAAB0AAAAAAABNAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAPgAAAAAAAHYAAAAAAAAdAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
         -1,0:
           ind: -1,0
-          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAQAAAAAFAAEAAAAAAgABAAAAAAEAAQAAAAAAAAEAAAAAAgABAAAAAAMAAQAAAAABAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAA+AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAPgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAAQAAAAAFAAEAAAAABQB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAD4AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAABAAAAAAEAHQAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAD4AAAAAAAB5AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAA+AAAAAAAAeQAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAABAAAAAAIAHQAAAAAAAAIAAAAAAAACAAAAAAAAPgAAAAAAAB0AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAaAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAAoAAAAAAQAKAAAAAAQACgAAAAAAAAoAAAAABAAKAAAAAAEACgAAAAADAAoAAAAABQB5AAAAAAAACgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAoAAAAABQACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAQAAAAACAAEAAAAABAABAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAADAHkAAAAAAAAKAAAAAAMAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAACgAAAAABAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAA+AAAAAAAAeQAAAAAAAAoAAAAAAwAKAAAAAAIACgAAAAAFAAoAAAAAAQAKAAAAAAMAeQAAAAAAAAoAAAAABQAKAAAAAAAACgAAAAAEAAoAAAAAAgAKAAAAAAUACgAAAAACAAIAAAAAAAACAAAAAAAAPgAAAAAAAAoAAAAAAwAKAAAAAAUACgAAAAACAAoAAAAAAwAKAAAAAAUACgAAAAABAHkAAAAAAAB5AAAAAAAAAQAAAAACAAEAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAD4AAAAAAAB5AAAAAAAACgAAAAACAAoAAAAAAQAKAAAAAAUACgAAAAACAAoAAAAABAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAKAAAAAAQAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAABAAAAAAEACgAAAAAFAAIAAAAAAAACAAAAAAAACgAAAAAAAHkAAAAAAAAKAAAAAAIACgAAAAADAAoAAAAABQB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAQAAAAAFAAoAAAAABQACAAAAAAAAAgAAAAAAAD4AAAAAAAB5AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAKAAAAAAAAAgAAAAAAAAIAAAAAAAA+AAAAAAAAeQAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAABAAAAAAAACgAAAAACAAIAAAAAAAACAAAAAAAAPgAAAAAAAB0AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAQAAAAABAAoAAAAAAAACAAAAAAAAAgAAAAAAAAoAAAAAAAB5AAAAAAAACgAAAAAFAAoAAAAAAAAKAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAaAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
         0,0:
           ind: 0,0
-          tiles: dgAAAAAAAHYAAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAAdAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAAdAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: dgAAAAAAAHYAAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAoAAAAAAQB5AAAAAAAACgAAAAABAAoAAAAAAgAKAAAAAAAACgAAAAACAAoAAAAAAAAKAAAAAAUACgAAAAACAAoAAAAAAgB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAAKAAAAAAQAeQAAAAAAAHkAAAAAAAAmAAAAAAAAJgAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACgAAAAADAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAACgAAAAABAAoAAAAABQAKAAAAAAMACgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAoAAAAAAQB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAoAAAAABQAKAAAAAAAACgAAAAABAAoAAAAABAACAAAAAAAACgAAAAAAAAoAAAAABQAKAAAAAAMACgAAAAAAAAoAAAAAAAAKAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAKAAAAAAAACgAAAAABAAoAAAAAAQAKAAAAAAUAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAACgAAAAAFAAoAAAAAAgAKAAAAAAMACgAAAAAFAAIAAAAAAAAKAAAAAAMAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAJgAAAAAAAAoAAAAAAgAKAAAAAAUACgAAAAADAAoAAAAAAgACAAAAAAAACgAAAAABAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAACYAAAAAAAAKAAAAAAMACgAAAAAFAAoAAAAABAAKAAAAAAAAAgAAAAAAAAoAAAAAAwB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAACgAAAAAFAAoAAAAABAAKAAAAAAMACgAAAAAEAAIAAAAAAAAKAAAAAAEAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAoAAAAABQAKAAAAAAIACgAAAAACAAoAAAAAAwACAAAAAAAACgAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAKAAAAAAMACgAAAAACAAoAAAAABQAKAAAAAAEAAgAAAAAAAAoAAAAAAQB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAACgAAAAACAAoAAAAAAwAKAAAAAAUACgAAAAAEAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAoAAAAAAQAKAAAAAAQACgAAAAAFAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
         1,-1:
           ind: 1,-1
-          tiles: HQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAeQAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAGwAAAAAAABsAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAABsAAAAAAAAAgAAAAAAAHkAAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: HQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAJgAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAB4AAAAAAEAeAAAAAACAHgAAAAAAQB5AAAAAAAACgAAAAAEAAoAAAAAAwAKAAAAAAEAAgAAAAAAABQAAAAAAAACAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAoAAAAABQAKAAAAAAUACgAAAAAFABQAAAAAAAACAAAAAAAAFAAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAeQAAAAAAAHgAAAAAAQB4AAAAAAAAeAAAAAABAHkAAAAAAAAKAAAAAAIACgAAAAADAAoAAAAAAwACAAAAAAAAFAAAAAAAAAIAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAACgAAAAAAAAoAAAAAAgAKAAAAAAUAFAAAAAAAAAIAAAAAAAAUAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAoAAAAABAAKAAAAAAAACgAAAAAEAAIAAAAAAAAUAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAKAAAAAAMACgAAAAAEAAoAAAAABQAUAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAoAAAAAAQB5AAAAAAAAAgAAAAAAABQAAAAAAAB5AAAAAAAACgAAAAADAAoAAAAAAQAKAAAAAAIACgAAAAAFAAoAAAAAAgAKAAAAAAMACgAAAAACAAoAAAAABAAKAAAAAAEACgAAAAAAAAoAAAAABAAKAAAAAAMACgAAAAAFAGwAAAAAAABsAAAAAAAAJgAAAAAAAAoAAAAABQACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAABsAAAAAAAAAgAAAAAAAHkAAAAAAAAKAAAAAAQAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAACgAAAAAEAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAoAAAAAAwAKAAAAAAAAeQAAAAAAAAoAAAAAAgACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
         1,0:
           ind: 1,0
-          tiles: AgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAQAAAAACAAEAAAAABAABAAAAAAIAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAEAAAAAAQABAAAAAAUAAQAAAAACAAEAAAAAAwABAAAAAAEAeQAAAAAAAAEAAAAABAABAAAAAAMAAQAAAAADAHkAAAAAAAABAAAAAAMAAQAAAAAEAAEAAAAABAAdAAAAAAAAHQAAAAAAAHkAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAQABAAAAAAEAAQAAAAACAHkAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAwB5AAAAAAAAAQAAAAAAAAEAAAAABQABAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAMAAAAABQADAAAAAAAAAwAAAAAEAAMAAAAABQADAAAAAAAAAwAAAAABAHkAAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAADAAAAAAYAAwAAAAAEAAMAAAAABgADAAAAAAQAAwAAAAAGAAMAAAAAAQB5AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAwAAAAAFAAMAAAAAAQADAAAAAAEAAwAAAAABAAMAAAAAAQADAAAAAAQAeQAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAHQAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAoAAAAAAQAKAAAAAAIAeQAAAAAAAAoAAAAAAQACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAKAAAAAAUAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACgAAAAAFAAoAAAAAAwB5AAAAAAAACgAAAAADAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAoAAAAAAwAKAAAAAAIACgAAAAABAAoAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAKAAAAAAIACgAAAAAFAHkAAAAAAAAKAAAAAAQACgAAAAACAAoAAAAABQAKAAAAAAUACgAAAAAEAAoAAAAAAgAKAAAAAAUACgAAAAACAAoAAAAAAQAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAABAAoAAAAAAgB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAIAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAoAAAAAAQAKAAAAAAUAeQAAAAAAAAEAAAAABQABAAAAAAEAAQAAAAAAAAEAAAAAAgABAAAAAAAAeQAAAAAAAAEAAAAAAQABAAAAAAUAAQAAAAAAAHkAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAwAKAAAAAAMACgAAAAADAHkAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAQABAAAAAAUAAQAAAAAEAHkAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAABAB5AAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAIACgAAAAACAAoAAAAAAwB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAoAAAAAAwAKAAAAAAUAAgAAAAAAAAMAAAAABAADAAAAAAUAAwAAAAADAAMAAAAAAwADAAAAAAYAAwAAAAACAHkAAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAAKAAAAAAUACgAAAAACAAIAAAAAAAADAAAAAAEAAwAAAAAAAAMAAAAAAgADAAAAAAQAAwAAAAAGAAMAAAAAAwB5AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAACgAAAAAAAAoAAAAABQACAAAAAAAAAwAAAAAFAAMAAAAAAAADAAAAAAMAAwAAAAACAAMAAAAAAwADAAAAAAIAeQAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAAoAAAAAAQB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAHQAAAAAAAA==
           version: 7
         2,0:
           ind: 2,0
-          tiles: AgAAAAAAAHkAAAAAAABNAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAdAAAAAAAATQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAHQAAAAAAAE0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAB0AAAAAAABNAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAdAAAAAAAATQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAHQAAAAAAAE0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAABQABAAAAAAQAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAQAAQAAAAADAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAAAAAA+AAAAAAAAHQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB2AAAAAAAAdgAAAAAAAB0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAAHYAAAAAAAAdAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AgAAAAAAAHkAAAAAAABNAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAKAAAAAAUATQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAACgAAAAADAE0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAoAAAAAAwBNAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAKAAAAAAIATQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAQACgAAAAADAE0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAABQABAAAAAAIAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAUAAQAAAAADAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAAAAAA+AAAAAAAAHQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB2AAAAAAAAdgAAAAAAAB0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAAHYAAAAAAAAdAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         2,-1:
           ind: 2,-1
-          tiles: HQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAB0AAAAAAABNAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAdAAAAAAAATQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAHQAAAAAAAE0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAB0AAAAAAABNAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAdAAAAAAAATQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAeQAAAAAAAE0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAHkAAAAAAABNAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: HQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAADAAoAAAAABQBNAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAKAAAAAAAATQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAACgAAAAAFAE0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAoAAAAAAABNAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAKAAAAAAUATQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAeQAAAAAAAE0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAHkAAAAAAABNAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         1,-2:
           ind: 1,-2
-          tiles: bAAAAAAAAGwAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAEAAAAAAAABAAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAABgAAAAAAAAYAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAABAAAAAAAAAQAAAAAAAB5AAAAAAAAdgAAAAAAAHYAAAAAAAAdAAAAAAAABgAAAAAAAAYAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAQAAAAAAAAEAAAAAAAAeQAAAAAAAHYAAAAAAAB2AAAAAAAAHQAAAAAAAAYAAAAAAAAGAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB2AAAAAAAAdgAAAAAAAB0AAAAAAAAGAAAAAAAABgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAYAAAAAAAAGAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAUAAAAAAAAFAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAFAAAAAAAABQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAdAAAAAAAABQAAAAAAAAUAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAdAAAAAAAAHQAAAAAAAA==
+          tiles: bAAAAAAAAGwAAAAAAAB5AAAAAAAAJgAAAAAAACYAAAAAAAAmAAAAAAAAJgAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAeQAAAAAAACYAAAAAAAAmAAAAAAAAJgAAAAAAACYAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAHkAAAAAAAAmAAAAAAAAJgAAAAAAACYAAAAAAAAmAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAEAAAAAAAABAAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAABgAAAAAAAAYAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAABAAAAAAAAAQAAAAAAAB5AAAAAAAAdgAAAAAAAHYAAAAAAAAdAAAAAAAABgAAAAAAAAYAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAQAAAAAAAAEAAAAAAAAeQAAAAAAAHYAAAAAAAB2AAAAAAAAHQAAAAAAAAYAAAAAAAAGAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB2AAAAAAAAdgAAAAAAAB0AAAAAAAAGAAAAAAAABgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAYAAAAAAAAGAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAUAAAAAAAAFAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAFAAAAAAAABQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAdAAAAAAAABQAAAAAAAAUAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAdAAAAAAAAHQAAAAAAAA==
           version: 7
         0,-2:
           ind: 0,-2
-          tiles: HQAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAAEAAAAAAAB5AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAgAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAABAAAAAAAAeQAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAIAAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAAQAAAAAEAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAgAAAAAAAB0AAAAAAAABAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAB5AAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAIAAAAAAAAdAAAAAAAAAQAAAAAAAB0AAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAAdAAAAAAAAeQAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAACAAAAAAAAHQAAAAAAAAEAAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAB5AAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAHQAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAgAAAAAAAB0AAAAAAAABAAAAAAQAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAB5AAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAA==
+          tiles: HQAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAAEAAAAABQB5AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAgAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAABAAAAAAEAeQAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAIAAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAAQAAAAADAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAACgAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAgAAAAAAAAoAAAAAAwABAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAB5AAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAIAAAAAAAAKAAAAAAMAAQAAAAABAB0AAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAAdAAAAAAAAeQAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAACAAAAAAAACgAAAAAEAAEAAAAAAgAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAB5AAAAAAAAAgAAAAAAAAoAAAAABAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAHQAAAAAAAAIAAAAAAAAKAAAAAAMAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAACAAAAAAAACgAAAAAEAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAgAAAAAAAAoAAAAAAQABAAAAAAMAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAB5AAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAA==
           version: 7
         -1,-2:
           ind: -1,-2
-          tiles: eQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAB0AAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAeQAAAAAAAAEAAAAAAgB5AAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAHkAAAAAAAABAAAAAAMAeQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAQAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAABAAdAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAHQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAPAAAAAAAADwAAAAAAAB5AAAAAAAANgAAAAABADYAAAAAAAB5AAAAAAAAEQAAAAABABEAAAAAAQB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAADwAAAAAAAA8AAAAAAAAeQAAAAAAADYAAAAAAAA2AAAAAAAAeQAAAAAAABEAAAAAAQARAAAAAAEAeQAAAAAAAHkAAAAAAABoAAAAAAAAeQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: eQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAB0AAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAeQAAAAAAAAEAAAAAAgB5AAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAHkAAAAAAAABAAAAAAQAeQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAQAAAAADAHkAAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAACgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAFAAoAAAAAAgACAAAAAAAAAgAAAAAAAAEAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgAKAAAAAAQAAgAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIACgAAAAABAAIAAAAAAAACAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAoAAAAABQACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAKAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAPAAAAAAAADwAAAAAAAB5AAAAAAAANgAAAAABADYAAAAAAAB5AAAAAAAAEQAAAAAAABEAAAAAAQB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAACgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAADwAAAAAAAA8AAAAAAAAeQAAAAAAADYAAAAAAQA2AAAAAAEAeQAAAAAAABEAAAAAAQARAAAAAAEAeQAAAAAAAHkAAAAAAABoAAAAAAAAeQAAAAAAAAoAAAAAAwACAAAAAAAAAgAAAAAAAA==
           version: 7
         2,-2:
           ind: 2,-2
@@ -141,7 +144,7 @@ entities:
           version: 7
         1,1:
           ind: 1,1
-          tiles: AgAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAHQAAAAAAAHkAAAAAAAA+AAAAAAAAPgAAAAAAAHkAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAB0AAAAAAAB5AAAAAAAAPgAAAAAAAD4AAAAAAAAdAAAAAAAAdgAAAAAAAHYAAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAdgAAAAAAAHYAAAAAAAB5AAAAAAAAeQAAAAAAAD4AAAAAAAA+AAAAAAAAHQAAAAAAAHYAAAAAAAB2AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAHYAAAAAAAB2AAAAAAAATQAAAAAAAHkAAAAAAAA+AAAAAAAAPgAAAAAAAB0AAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAE0AAAAAAAB5AAAAAAAAPgAAAAAAAD4AAAAAAAB5AAAAAAAAdgAAAAAAAHkAAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAeQAAAAAAAHYAAAAAAABNAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAB0AAAAAAAAdAAAAAAAATQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAE0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABNAAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAATQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAE0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAAAHkAAAAAAAB5AAAAAAAATQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAAKAAAAAAQAeQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAACgAAAAAFAHkAAAAAAAA+AAAAAAAAPgAAAAAAAHkAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAAoAAAAAAQB5AAAAAAAAPgAAAAAAAD4AAAAAAAAdAAAAAAAAdgAAAAAAAHYAAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAdgAAAAAAAHYAAAAAAAB5AAAAAAAAeQAAAAAAAD4AAAAAAAA+AAAAAAAAHQAAAAAAAHYAAAAAAAB2AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAHYAAAAAAAB2AAAAAAAATQAAAAAAAHkAAAAAAAA+AAAAAAAAPgAAAAAAAB0AAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAE0AAAAAAAB5AAAAAAAAPgAAAAAAAD4AAAAAAAB5AAAAAAAAdgAAAAAAAHkAAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAeQAAAAAAAHYAAAAAAABNAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAB0AAAAAAAAdAAAAAAAATQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAE0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABNAAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAATQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAE0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAAAHkAAAAAAAB5AAAAAAAATQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         2,1:
           ind: 2,1
@@ -149,11 +152,11 @@ entities:
           version: 7
         0,1:
           ind: 0,1
-          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAAdAAAAAAAATQAAAAAAAE0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAKAAAAAAQAeQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAACgAAAAADAAoAAAAABQAKAAAAAAMACgAAAAAAAAoAAAAAAwAKAAAAAAQAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAAoAAAAABAAKAAAAAAAACgAAAAAFAAoAAAAAAQAKAAAAAAQACgAAAAACAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAAKAAAAAAAACgAAAAADAAoAAAAABQAKAAAAAAQACgAAAAAFAAoAAAAAAgAKAAAAAAIACgAAAAACAAoAAAAAAwAKAAAAAAQACgAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAAoAAAAAAwAKAAAAAAMACgAAAAADAAoAAAAABQAKAAAAAAQAeQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAAdAAAAAAAATQAAAAAAAE0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAA==
           version: 7
         -1,1:
           ind: -1,1
-          tiles: aAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAGgAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAABoAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAANAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAaAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAAEAAAAABAACAAAAAAAAAgAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAAAQAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAADQAAAAAAAHkAAAAAAAACAAAAAAAAeQAAAAAAAA0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAB0AAAAAAAANAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAADQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAA0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAANAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAHgAAAAAAQB4AAAAAAIAeAAAAAABAHgAAAAAAQB4AAAAAAAAeAAAAAABAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAEAeAAAAAABAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: aAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAGgAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAABoAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAANAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAaAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAAEAAAAAAwACAAAAAAAAAgAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAAAQAAAAAAAAIAAAAAAAAKAAAAAAUAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAADQAAAAAAAHkAAAAAAAACAAAAAAAAeQAAAAAAAA0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAoAAAAAAwANAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAADQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAA0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAANAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAHgAAAAAAgB4AAAAAAEAeAAAAAACAHgAAAAAAAB4AAAAAAAAeAAAAAABAHgAAAAAAQB4AAAAAAAAeAAAAAACAHgAAAAAAgB4AAAAAAAAeAAAAAABAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
         1,2:
           ind: 1,2
@@ -165,43 +168,43 @@ entities:
           version: 7
         -2,0:
           ind: -2,0
-          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAdgAAAAAAAB0AAAAAAAB5AAAAAAAAAQAAAAAEAAEAAAAAAQABAAAAAAAAAQAAAAADAHkAAAAAAAAQAAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHYAAAAAAAAdAAAAAAAAeQAAAAAAAA8AAAAAAAAPAAAAAAEADwAAAAABAA8AAAAABQB5AAAAAAAAHQAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAA+AAAAAAAAPgAAAAAAAHkAAAAAAAB2AAAAAAAAHQAAAAAAAB0AAAAAAAADAAAAAAYAAwAAAAAFAAMAAAAAAAADAAAAAAQAHQAAAAAAAB0AAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAdgAAAAAAAB0AAAAAAAAdAAAAAAAAAwAAAAABAAMAAAAABgADAAAAAAIAAwAAAAADAB0AAAAAAAAdAAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAHYAAAAAAAAdAAAAAAAAeQAAAAAAAA8AAAAABQAPAAAAAAIADwAAAAACAA8AAAAAAgB5AAAAAAAAHQAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAdgAAAAAAAB0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHYAAAAAAAAdAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAHQAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAPgAAAAAAAD4AAAAAAAB2AAAAAAAAHQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAB0AAAAAAAB2AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAdgAAAAAAAD4AAAAAAAA+AAAAAAAAdgAAAAAAAB0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAdAAAAAAAAdgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAHYAAAAAAAA+AAAAAAAAPgAAAAAAAHYAAAAAAAAdAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB4AAAAAAEAeAAAAAACAHgAAAAAAQB4AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAGwAAAAAAABsAAAAAAAAeQAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAoAAAAABAAKAAAAAAUACgAAAAAEAAoAAAAABAAKAAAAAAAACgAAAAAAAAoAAAAABQAKAAAAAAQACgAAAAAEAAoAAAAABAAKAAAAAAQACgAAAAADAAoAAAAAAQAKAAAAAAUACgAAAAAEAAoAAAAABQB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAoAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAdgAAAAAAAAoAAAAAAAB5AAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAMAAQAAAAAEAHkAAAAAAAAQAAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAAoAAAAABQAKAAAAAAEACgAAAAADAHYAAAAAAAAKAAAAAAEAeQAAAAAAAA8AAAAABQAPAAAAAAEADwAAAAADAA8AAAAAAwB5AAAAAAAACgAAAAADAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAA+AAAAAAAAPgAAAAAAAHkAAAAAAAB2AAAAAAAACgAAAAACAAoAAAAABAADAAAAAAIAAwAAAAAAAAMAAAAABgADAAAAAAQACgAAAAABAAoAAAAABQB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAdgAAAAAAAAoAAAAAAwAKAAAAAAMAAwAAAAACAAMAAAAABAADAAAAAAAAAwAAAAACAAoAAAAAAQAKAAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAHYAAAAAAAAKAAAAAAAAeQAAAAAAAA8AAAAABQAPAAAAAAMADwAAAAAEAA8AAAAABAB5AAAAAAAACgAAAAACAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAACgAAAAABAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAKAAAAAAEAdgAAAAAAAAoAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAKAAAAAAMACgAAAAAEAAoAAAAAAQAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAMACgAAAAABAHYAAAAAAAAKAAAAAAEAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAACgAAAAAEAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAPgAAAAAAAD4AAAAAAAB2AAAAAAAACgAAAAABAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAoAAAAAAgB2AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAdgAAAAAAAD4AAAAAAAA+AAAAAAAAdgAAAAAAAAoAAAAAAgB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAKAAAAAAAAdgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAHYAAAAAAAA+AAAAAAAAPgAAAAAAAHYAAAAAAAAKAAAAAAEAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAACgAAAAADAAoAAAAAAQAKAAAAAAQACgAAAAAFAAoAAAAAAQAKAAAAAAUACgAAAAAFAAoAAAAABAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB4AAAAAAEAeAAAAAABAHgAAAAAAgB4AAAAAAEAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAEAAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAABAAAAAAAAAQAAAAAAAAeQAAAAAAAA==
           version: 7
         -2,-1:
           ind: -2,-1
-          tiles: TQAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAADwAAAAAFAA8AAAAABAAPAAAAAAEADwAAAAADAA8AAAAABAB2AAAAAAAADwAAAAACAA8AAAAABAAPAAAAAAIADwAAAAACAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAA8AAAAABAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAA8AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAPAAAAAAQAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHYAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAPAAAAAAMAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAADwAAAAADAHkAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB5AAAAAAAADwAAAAAEAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAA8AAAAAAgB5AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAeQAAAAAAAA8AAAAAAQB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAPAAAAAAEAeQAAAAAAAHYAAAAAAAB2AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAdgAAAAAAAHkAAAAAAAAPAAAAAAMAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAADwAAAAACAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAADwAAAAAEAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAA8AAAAAAwAPAAAAAAAAAwAAAAAAAAMAAAAABQADAAAAAAYAAwAAAAAEAAMAAAAAAQAPAAAAAAUADwAAAAABAA8AAAAABQAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: TQAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAHkAAAAAAABNAAAAAAAATQAAAAAAAAoAAAAAAwAKAAAAAAAACgAAAAAEAAoAAAAABQAKAAAAAAEACgAAAAADAAoAAAAAAgAKAAAAAAEACgAAAAABAAoAAAAABAAKAAAAAAAACgAAAAAEAAoAAAAAAAAKAAAAAAIACgAAAAADAAoAAAAABQAKAAAAAAEACgAAAAAAAAoAAAAABQAKAAAAAAUACgAAAAAFAAoAAAAABQAKAAAAAAMACgAAAAABAAoAAAAABQAKAAAAAAIACgAAAAAAAAoAAAAAAAAKAAAAAAUACgAAAAAAAAoAAAAAAAAKAAAAAAEACgAAAAABAAoAAAAABAAKAAAAAAAACgAAAAAAAAoAAAAAAQAKAAAAAAQACgAAAAACAAoAAAAABAAKAAAAAAMACgAAAAACAAoAAAAAAwAKAAAAAAUACgAAAAACAAoAAAAAAgAKAAAAAAAACgAAAAAFAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAADwAAAAADAA8AAAAAAgAPAAAAAAIADwAAAAACAA8AAAAABAB2AAAAAAAADwAAAAAAAA8AAAAABAAPAAAAAAIADwAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAA8AAAAABQB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAA8AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAPAAAAAAMAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHYAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAPAAAAAAUAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAADwAAAAAEAHkAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB5AAAAAAAADwAAAAABAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAA8AAAAABAB5AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAeQAAAAAAAA8AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAPAAAAAAIAeQAAAAAAAHYAAAAAAAB2AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAdgAAAAAAAHkAAAAAAAAPAAAAAAQAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAADwAAAAACAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAADwAAAAABAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAA8AAAAAAwAPAAAAAAAAAwAAAAAGAAMAAAAABAADAAAAAAQAAwAAAAAFAAMAAAAABAAPAAAAAAAADwAAAAAEAA8AAAAAAwAKAAAAAAEAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAoAAAAABAAKAAAAAAEACgAAAAAAAAoAAAAAAwAKAAAAAAUACgAAAAAEAAoAAAAAAQAKAAAAAAAACgAAAAAEAAoAAAAAAwAKAAAAAAUACgAAAAAEAAoAAAAAAgAKAAAAAAMACgAAAAADAAoAAAAAAgACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
         -2,1:
           ind: -2,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAGwAAAAAAABsAAAAAAAAeQAAAAAAAHgAAAAAAQB4AAAAAAIAeAAAAAACAHgAAAAAAAB4AAAAAAIAeAAAAAAAAHgAAAAAAgB4AAAAAAIAeAAAAAACAHgAAAAAAQB4AAAAAAEAeAAAAAACAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAeQAAAAAAAHgAAAAAAgB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAHkAAAAAAAB4AAAAAAEAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAB5AAAAAAAAeAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHgAAAAAAQB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHgAAAAAAAB4AAAAAAIAeAAAAAACAHgAAAAAAgB4AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeAAAAAACAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAeQAAAAAAAHgAAAAAAQB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAHkAAAAAAAB4AAAAAAIAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAB5AAAAAAAAeAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHgAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHgAAAAAAgB4AAAAAAEAeAAAAAAAAHgAAAAAAQB4AAAAAAEAeAAAAAACAHgAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB4AAAAAAEAeAAAAAABAHgAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAABAAAAAAAAAQAAAAAAAAeQAAAAAAAHgAAAAAAgB4AAAAAAAAeAAAAAABAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAgB4AAAAAAIAeAAAAAACAHgAAAAAAAB4AAAAAAAAeAAAAAACAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAeQAAAAAAAHgAAAAAAgB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAHkAAAAAAAB4AAAAAAEAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAB5AAAAAAAAeAAAAAACAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHgAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHgAAAAAAgB4AAAAAAAAeAAAAAABAHgAAAAAAgB4AAAAAAEAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAeQAAAAAAAHgAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAE0AAAAAAABNAAAAAAAATQAAAAAAAHkAAAAAAAB4AAAAAAEAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAABNAAAAAAAATQAAAAAAAE0AAAAAAAB5AAAAAAAAeAAAAAABAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHgAAAAAAQB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHgAAAAAAQB4AAAAAAEAeAAAAAABAHgAAAAAAAB4AAAAAAIAeAAAAAABAHgAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB4AAAAAAEAeAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -1,2:
           ind: -1,2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAEAAAAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAABAAAAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAEAAAAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAABAAAAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAQAAAAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -3,1:
           ind: -3,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAACAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAQB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAABAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAgB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAIAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAABAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAgB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAABAHgAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAABAHgAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAIAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAABAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAQB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAABAHgAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAEAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAQB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAACAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         0,-3:
           ind: 0,-3
-          tiles: HQAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAANgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAADYAAAAAAQACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAADgAAAAAAAB0AAAAAAAB2AAAAAAAAdgAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAdAAAAAAAAdgAAAAAAAHYAAAAAAAAdAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHYAAAAAAAB2AAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB2AAAAAAAAdgAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAgAAAAAAAA==
+          tiles: HQAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAANgAAAAABAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAADYAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAADgAAAAAAAB0AAAAAAAB2AAAAAAAAdgAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAdAAAAAAAAdgAAAAAAAHYAAAAAAAAdAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHYAAAAAAAB2AAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB2AAAAAAAAdgAAAAAAAB0AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAgAAAAAAAA==
           version: 7
         -1,-3:
           ind: -1,-3
-          tiles: HQAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAA2AAAAAAAANgAAAAABAAIAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAANgAAAAABADYAAAAAAAACAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAB0AAAAAAAAMAAAAAAAADAAAAAAAAB0AAAAAAAAOAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAAdAAAAAAAADAAAAAAAAAwAAAAAAAAdAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAAwAAAAAAAAMAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAB0AAAAAAAAMAAAAAAAADAAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAA==
+          tiles: HQAAAAAAAAIAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAA2AAAAAAAANgAAAAAAAAIAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAANgAAAAABADYAAAAAAQACAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAB0AAAAAAAAMAAAAAAAADAAAAAAAAB0AAAAAAAAOAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAAdAAAAAAAADAAAAAAAAAwAAAAAAAAdAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAHQAAAAAAAAwAAAAAAAAMAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAB0AAAAAAAAMAAAAAAAADAAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAA==
           version: 7
         -2,-2:
           ind: -2,-2
-          tiles: AQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAGwAAAAAAABsAAAAAAAAAgAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAABsAAAAAAAAbAAAAAAAAAIAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAbAAAAAAAAGwAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAeQAAAAAAABMAAAAAAAATAAAAAAAAeQAAAAAAAGwAAAAAAABsAAAAAAAAeQAAAAAAAAsAAAAAAQALAAAAAAEAeQAAAAAAAGwAAAAAAABsAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAATAAAAAAAAEwAAAAAAAHkAAAAAAABsAAAAAAAAbAAAAAAAAHkAAAAAAAALAAAAAAAACwAAAAAAAHkAAAAAAABsAAAAAAAAbAAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAA==
+          tiles: AQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAGwAAAAAAABsAAAAAAAAAgAAAAAAAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAABsAAAAAAAAbAAAAAAAAAIAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAbAAAAAAAAGwAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAeQAAAAAAABMAAAAAAAATAAAAAAAAeQAAAAAAAGwAAAAAAABsAAAAAAAAeQAAAAAAAAsAAAAAAAALAAAAAAEAeQAAAAAAAGwAAAAAAABsAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAATAAAAAAAAEwAAAAAAAHkAAAAAAABsAAAAAAAAbAAAAAAAAHkAAAAAAAALAAAAAAEACwAAAAABAHkAAAAAAABsAAAAAAAAbAAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAA==
           version: 7
         -2,-3:
           ind: -2,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAwAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAMAAAAAAwB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAwAAAAAGAHkAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAADAAAAAAQAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAwAAAAADAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAADAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAMAAAAAAwB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAADAAAAAAQAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAbAAAAAAAAGwAAAAAAAACAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAGwAAAAAAABsAAAAAAAAAgAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAwAAAAADAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAMAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAwAAAAABAHkAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAADAAAAAAUAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAwAAAAADAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAADAAAAAAUAeQAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAMAAAAAAQB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAADAAAAAAAAeQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAbAAAAAAAAGwAAAAAAAACAAAAAAAAAQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAGwAAAAAAABsAAAAAAAAAgAAAAAAAA==
           version: 7
         1,-3:
           ind: 1,-3
-          tiles: eQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAMAAAAABgB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAADAAAAAAMAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAMAAAAAAwB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAwAAAAABAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAMAAAAABQB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAwAAAAACAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAADAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAwAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: eQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAAMAAAAABgB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAADAAAAAAMAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAMAAAAABgB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAwAAAAAEAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAAMAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAwAAAAACAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAHkAAAAAAAADAAAAAAYAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAB5AAAAAAAAAwAAAAAEAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAHkAAAAAAAAmAAAAAAAAJgAAAAAAACYAAAAAAAAmAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAAB5AAAAAAAAJgAAAAAAACYAAAAAAAAmAAAAAAAAJgAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         1,-4:
           ind: 1,-4
@@ -221,27 +224,27 @@ entities:
           version: 7
         -3,0:
           ind: -3,0
-          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAdgAAAAAAAHkAAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAHkAAAAAAAAdAAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB5AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAB5AAAAAAAAHQAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAeQAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAeQAAAAAAAB0AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHkAAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAHkAAAAAAAAdAAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAHQAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAB0AAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAA2AAAAAAAACAAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAHQAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAB0AAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAoAAAAABQAKAAAAAAQACgAAAAABAAoAAAAABQAKAAAAAAUACgAAAAAFAAoAAAAAAAAKAAAAAAQACgAAAAADAAoAAAAAAQAKAAAAAAAACgAAAAAAAAoAAAAAAQAKAAAAAAAACgAAAAACAAoAAAAAAwB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAACgAAAAABAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAoAAAAAAQB5AAAAAAAAdgAAAAAAAHkAAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAHkAAAAAAAAKAAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB5AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAB5AAAAAAAACgAAAAABAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAeQAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAeQAAAAAAAAoAAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHkAAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAHkAAAAAAAAKAAAAAAMAPgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAACgAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAACgAAAAABAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAACgAAAAAFAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAoAAAAAAQB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAA2AAAAAAEACAAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAACgAAAAABAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAoAAAAABAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -3,-1:
           ind: -3,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAATQAAAAAAAE0AAAAAAAB5AAAAAAAATQAAAAAAAE0AAAAAAAB5AAAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAHkAAAAAAAAdAAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAASAAAAAAAAeQAAAAAAAB0AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAAdAAAAAAAAHQAAAAAAADYAAAAAAAA2AAAAAAEAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAEgAAAAAAAHkAAAAAAAAdAAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAABIAAAAAAAB5AAAAAAAAHQAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAASAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAATQAAAAAAAE0AAAAAAAB5AAAAAAAATQAAAAAAAE0AAAAAAAB5AAAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAoAAAAAAQAKAAAAAAAACgAAAAAEAAoAAAAAAQAKAAAAAAAACgAAAAACAAoAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAKAAAAAAMACgAAAAABAAoAAAAABQAKAAAAAAEACgAAAAABAAoAAAAAAAAKAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAACgAAAAABAAoAAAAABQAKAAAAAAAACgAAAAAFAAoAAAAABAAKAAAAAAEACgAAAAAEAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAHkAAAAAAAAdAAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAASAAAAAAAAeQAAAAAAAB0AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAAdAAAAAAAAHQAAAAAAADYAAAAAAQA2AAAAAAEAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAEgAAAAAAAHkAAAAAAAAdAAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAABIAAAAAAAB5AAAAAAAAHQAAAAAAAD4AAAAAAAA+AAAAAAAAPgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAASAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAoAAAAAAwB5AAAAAAAACgAAAAAEAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAoAAAAAAQAKAAAAAAMACgAAAAAEAAoAAAAAAwAKAAAAAAUACgAAAAACAAoAAAAABAAKAAAAAAIACgAAAAAFAAoAAAAAAwAKAAAAAAUACgAAAAAFAAoAAAAAAwAKAAAAAAQACgAAAAADAAoAAAAABAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
         -3,-2:
           ind: -3,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAQAAAAAAAAEAAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAEAAAAAAAABAAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAQAAAAAAAAEAAAAAAAAHkAAAAAAAAdAAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAEAAAAAAAABAAAAAAAAB5AAAAAAAAHQAAAAAAAB0AAAAAAAB5AAAAAAAAeQAAAAAAAA==
           version: 7
         -4,-1:
           ind: -4,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAKAAAAAAUAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAoAAAAAAAAKAAAAAAEACgAAAAACAAoAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
         -4,0:
           ind: -4,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAABoAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAoAAAAABAAKAAAAAAAACgAAAAAEAAoAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAoAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB2AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAdgAAAAAAAHYAAAAAAAB2AAAAAAAAdgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -3,-3:
           ind: -3,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
     - type: Broadphase
     - type: Physics
@@ -1135,6 +1138,11 @@ entities:
       pos: 16.5,1.5
 - proto: AdminHypo
   entities:
+  - uid: 143
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -23.716885,10.477397
   - uid: 797
     components:
     - type: Transform
@@ -1251,6 +1259,12 @@ entities:
       pos: 8.5,23.5
 - proto: AirlockCentralCommand
   entities:
+  - uid: 52
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 1.5707963267948966 rad
+      pos: -16.5,-4.5
   - uid: 1128
     components:
     - type: Transform
@@ -1422,6 +1436,18 @@ entities:
       pos: 17.5,-43.5
 - proto: AirlockCentralCommandGlassLocked
   entities:
+  - uid: 50
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-48.5
+  - uid: 51
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-48.5
   - uid: 2899
     components:
     - type: Transform
@@ -1432,16 +1458,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: -16.5,8.5
-  - uid: 4614
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 7.5,-48.5
-  - uid: 4624
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -8.5,-48.5
   - uid: 7283
     components:
     - type: Transform
@@ -1483,11 +1499,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: -20.5,2.5
-  - uid: 3368
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -16.5,-4.5
   - uid: 7183
     components:
     - type: MetaData
@@ -1564,6 +1575,18 @@ entities:
       pos: -13.5,-11.5
 - proto: AirlockExternal
   entities:
+  - uid: 54
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-48.5
+  - uid: 55
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -17.5,-48.5
   - uid: 330
     components:
     - type: Transform
@@ -1582,16 +1605,6 @@ entities:
       parent: 1668
       rot: -1.5707963267948966 rad
       pos: -52.5,0.5
-  - uid: 4615
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 16.5,-48.5
-  - uid: 4616
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -17.5,-48.5
 - proto: AirlockExternalEngineeringLocked
   entities:
   - uid: 4090
@@ -1601,6 +1614,12 @@ entities:
       pos: -21.5,18.5
 - proto: AirlockExternalGlass
   entities:
+  - uid: 57
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -40.5,-26.5
   - uid: 3660
     components:
     - type: Transform
@@ -1613,11 +1632,6 @@ entities:
       parent: 1668
       rot: 3.141592653589793 rad
       pos: 4.5,33.5
-  - uid: 7486
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -40.5,-26.5
 - proto: AirlockExternalGlassShuttleEmergencyLocked
   entities:
   - uid: 25
@@ -1777,14 +1791,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: -29.5,-28.5
-- proto: AirlockFreezer
-  entities:
-  - uid: 2798
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 3.141592653589793 rad
-      pos: -18.5,14.5
 - proto: AirlockFreezerLocked
   entities:
   - uid: 1068
@@ -2023,6 +2029,13 @@ entities:
     - type: Transform
       parent: 1668
       pos: -22.492147,-17.432499
+- proto: AnomalyScannerAdmin
+  entities:
+  - uid: 9749
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -23.3841,9.5656
 - proto: APCBasic
   entities:
   - uid: 2865
@@ -3238,11 +3251,91 @@ entities:
     - type: Transform
       parent: 1668
       pos: 33.5,3.5
+  - uid: 59
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-0.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 60
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-1.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 61
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-2.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 63
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 7.5,0.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 64
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 7.5,1.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 65
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-2.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 66
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-1.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 67
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-0.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 68
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 18.5,0.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
   - uid: 78
     components:
     - type: Transform
       parent: 1668
       pos: 33.5,1.5
+  - uid: 82
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 18.5,1.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
   - uid: 138
     components:
     - type: Transform
@@ -3273,6 +3366,38 @@ entities:
     - type: Transform
       parent: 1668
       pos: 33.5,-4.5
+  - uid: 210
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 18.5,4.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 211
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-5.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 308
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: 31.5,-14.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 309
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: 30.5,-14.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
   - uid: 314
     components:
     - type: Transform
@@ -3308,6 +3433,8 @@ entities:
     - type: Transform
       parent: 1668
       pos: 2.5,2.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
   - uid: 333
     components:
     - type: Transform
@@ -3323,56 +3450,38 @@ entities:
     - type: Transform
       parent: 1668
       pos: -1.5,2.5
-  - uid: 537
+  - uid: 517
     components:
     - type: Transform
       parent: 1668
-      pos: 17.5,-0.5
-  - uid: 538
+      rot: 3.141592653589793 rad
+      pos: 29.5,-14.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 518
     components:
     - type: Transform
       parent: 1668
-      pos: 17.5,0.5
-  - uid: 539
+      rot: 3.141592653589793 rad
+      pos: 30.5,-7.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 519
     components:
     - type: Transform
       parent: 1668
-      pos: 17.5,1.5
-  - uid: 540
+      rot: 3.141592653589793 rad
+      pos: 29.5,-7.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 520
     components:
     - type: Transform
       parent: 1668
-      pos: 17.5,-1.5
-  - uid: 541
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 17.5,-2.5
-  - uid: 542
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 8.5,1.5
-  - uid: 543
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 8.5,0.5
-  - uid: 544
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 8.5,-0.5
-  - uid: 545
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 8.5,-1.5
-  - uid: 546
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 8.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: 31.5,-7.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
   - uid: 559
     components:
     - type: Transform
@@ -3423,16 +3532,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: 12.5,-3.5
-  - uid: 609
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 18.5,4.5
-  - uid: 612
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 18.5,-5.5
   - uid: 729
     components:
     - type: Transform
@@ -3448,38 +3547,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: 20.5,-7.5
-  - uid: 1140
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 31.5,-8.5
-    - type: DeviceLinkSink
-      invokeCounter: 1
-  - uid: 1141
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 30.5,-8.5
-  - uid: 1142
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 29.5,-8.5
-  - uid: 1143
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 31.5,-13.5
-  - uid: 1144
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 30.5,-13.5
-  - uid: 1145
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 29.5,-13.5
   - uid: 2104
     components:
     - type: Transform
@@ -17518,6 +17585,13 @@ entities:
       parent: 1668
       rot: 1.5707963267948966 rad
       pos: -18.5,5.5
+- proto: CentCommFlippo
+  entities:
+  - uid: 162
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -15.502895,9.575231
 - proto: CentcomPDA
   entities:
   - uid: 22
@@ -18209,13 +18283,13 @@ entities:
       parent: 1668
       rot: -1.5707963267948966 rad
       pos: -34.5,12.5
-- proto: ChameleonProjector
+- proto: ChameleonControllerImplanter
   entities:
-  - uid: 6002
+  - uid: 131
     components:
     - type: Transform
       parent: 1668
-      pos: -12.443271,7.649471
+      pos: -12.430484,7.6615725
 - proto: CheapRollerBedSpawnFolded
   entities:
   - uid: 1386
@@ -18382,6 +18456,44 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2927: 0,-2
+        - node:
+            id: BrickTileSteelCornerNe
+            color: '#43990996'
+          decals:
+            5: 8,-3
+        - node:
+            id: BrickTileSteelCornerNw
+            color: '#43990996'
+          decals:
+            3: 6,-3
+            4: 1,-7
+        - node:
+            id: BrickTileSteelInnerNw
+            color: '#43990996'
+          decals:
+            13: 6,-7
+        - node:
+            id: BrickTileSteelLineN
+            color: '#43990996'
+          decals:
+            6: 5,-7
+            7: 4,-7
+            8: 3,-7
+            9: 2,-7
+        - node:
+            id: BrickTileSteelLineS
+            color: '#52B4E996'
+          decals:
+            0: 11,-3
+            1: 12,-3
+            2: 14,-3
+        - node:
+            id: BrickTileSteelLineW
+            color: '#43990996'
+          decals:
+            10: 6,-6
+            11: 6,-5
+            12: 6,-4
         - node:
             id: BrickTileWhiteCornerNe
             color: '#FA750096'
@@ -18556,18 +18668,6 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2219: 2,-15
-        - node:
-            id: HalfTileOverlayGreyscale180
-            color: '#52B4E996'
-          decals:
-            468: 11,-3
-            469: 12,-3
-            470: 14,-3
-        - node:
-            id: HalfTileOverlayGreyscale180
-            color: '#9FED5866'
-          decals:
-            500: 8,-3
         - node:
             id: HalfTileOverlayGreyscale270
             color: '#334E6DC8'
@@ -18582,8 +18682,7 @@ entities:
             id: QuarterTileOverlayGreyscale
             color: '#334E6DC8'
           decals:
-            1438: 0,-7
-            1473: 1,-7
+            14: 0,-7
         - node:
             id: QuarterTileOverlayGreyscale
             color: '#D4D4D428'
@@ -18597,23 +18696,6 @@ entities:
             356: 4,-3
             357: 4,-2
             358: 4,-1
-        - node:
-            id: QuarterTileOverlayGreyscale180
-            color: '#52B4E996'
-          decals:
-            807: 4,-7
-            808: 5,-7
-            809: 6,-7
-            810: 6,-6
-            811: 6,-5
-        - node:
-            id: QuarterTileOverlayGreyscale180
-            color: '#9FED5876'
-          decals:
-            451: 2,-7
-            452: 3,-7
-            458: 6,-4
-            459: 6,-3
         - node:
             id: QuarterTileOverlayGreyscale270
             color: '#334E6DC8'
@@ -19063,6 +19145,37 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1044: -11,5
+        - node:
+            id: BrickTileSteelCornerSe
+            color: '#43990996'
+          decals:
+            0: -8,1
+            1: -3,5
+        - node:
+            id: BrickTileSteelInnerNe
+            color: '#43990996'
+          decals:
+            8: -8,5
+        - node:
+            id: BrickTileSteelInnerSe
+            color: '#43990996'
+          decals:
+            10: -8,5
+        - node:
+            id: BrickTileSteelLineE
+            color: '#43990996'
+          decals:
+            5: -8,2
+            6: -8,3
+            7: -8,4
+        - node:
+            id: BrickTileSteelLineS
+            color: '#43990996'
+          decals:
+            2: -5,5
+            3: -6,5
+            4: -7,5
+            9: -4,5
         - node:
             id: BrickTileWhiteCornerNe
             color: '#EFD2415D'
@@ -19304,23 +19417,6 @@ entities:
             270: -4,1
             271: -3,1
             272: -2,1
-        - node:
-            id: QuarterTileOverlayGreyscale
-            color: '#9FED5876'
-          decals:
-            431: -4,5
-            432: -5,5
-            438: -8,2
-            439: -8,1
-        - node:
-            id: QuarterTileOverlayGreyscale
-            color: '#EFD2415D'
-          decals:
-            1210: -8,3
-            1211: -8,4
-            1212: -8,5
-            1213: -7,5
-            1214: -6,5
         - node:
             id: QuarterTileOverlayGreyscale
             color: '#EFD84150'
@@ -19337,7 +19433,6 @@ entities:
           decals:
             1429: -2,5
             1432: -1,4
-            1435: -3,5
         - node:
             id: QuarterTileOverlayGreyscale180
             color: '#D4D4D428'
@@ -20915,6 +21010,44 @@ entities:
             3349: 3,9
             3350: 3,10
             3351: 3,11
+        - node:
+            id: BrickTileSteelCornerSe
+            color: '#43990996'
+          decals:
+            3: 8,1
+        - node:
+            id: BrickTileSteelCornerSw
+            color: '#43990996'
+          decals:
+            4: 1,5
+            5: 6,1
+        - node:
+            id: BrickTileSteelInnerSw
+            color: '#43990996'
+          decals:
+            13: 6,5
+        - node:
+            id: BrickTileSteelLineN
+            color: '#DE3A3A96'
+          decals:
+            0: 11,1
+            1: 12,1
+            2: 14,1
+        - node:
+            id: BrickTileSteelLineS
+            color: '#43990996'
+          decals:
+            9: 5,5
+            10: 4,5
+            11: 3,5
+            12: 2,5
+        - node:
+            id: BrickTileSteelLineW
+            color: '#43990996'
+          decals:
+            6: 6,2
+            7: 6,3
+            8: 6,4
         - node:
             id: BrickTileWhiteCornerNe
             color: '#DE3A3A96'
@@ -21040,18 +21173,6 @@ entities:
             3361: 10,11
             3362: 10,10
             3363: 10,9
-        - node:
-            id: HalfTileOverlayGreyscale
-            color: '#9FED5866'
-          decals:
-            498: 8,1
-        - node:
-            id: HalfTileOverlayGreyscale
-            color: '#DE3A3A96'
-          decals:
-            464: 11,1
-            465: 12,1
-            466: 14,1
         - node:
             id: HalfTileOverlayGreyscale270
             color: '#334E6DC8'
@@ -21068,7 +21189,6 @@ entities:
             color: '#334E6DC8'
           decals:
             1430: 0,3
-            1434: 1,3
         - node:
             id: QuarterTileOverlayGreyscale180
             color: '#DE3A3A96'
@@ -21084,6 +21204,7 @@ entities:
             id: QuarterTileOverlayGreyscale270
             color: '#D4D4D428'
           decals:
+            14: 1,3
             368: 2,3
             369: 3,3
             370: 4,3
@@ -21110,23 +21231,10 @@ entities:
             261: 0,1
             262: 1,1
             263: 2,1
-        - node:
-            id: QuarterTileOverlayGreyscale90
-            color: '#9FED5876'
-          decals:
-            420: 6,1
-            421: 6,2
-            427: 2,5
-            428: 3,5
         - node:
             id: QuarterTileOverlayGreyscale90
             color: '#DE3A3A96'
           decals:
-            812: 6,3
-            813: 6,4
-            814: 6,5
-            815: 5,5
-            816: 4,5
             1502: 0,7
             1503: 0,8
             1504: 0,9
@@ -21200,16 +21308,16 @@ entities:
           decals:
             544: 20,-12
             545: 22,-12
+        - node:
+            id: BrickTileSteelLineS
+            color: '#52B4E996'
+          decals:
+            2: 16,-3
         - node:
             id: BrickTileWhiteCornerNw
             color: '#334E6DC8'
           decals:
             640: 19,-16
-        - node:
-            id: BrickTileWhiteInnerSe
-            color: '#334E6DC8'
-          decals:
-            662: 26,-16
         - node:
             id: BrickTileWhiteLineE
             color: '#43990947'
@@ -21222,8 +21330,8 @@ entities:
             id: BrickTileWhiteLineN
             color: '#334E6DC8'
           decals:
+            3: 26,-16
             629: 31,-16
-            633: 26,-16
             634: 25,-16
             635: 24,-16
             636: 23,-16
@@ -21313,16 +21421,6 @@ entities:
             513: 16,-9
             516: 17,-8
             517: 16,-7
-        - node:
-            id: HalfTileOverlayGreyscale180
-            color: '#52B4E996'
-          decals:
-            471: 16,-3
-        - node:
-            id: HalfTileOverlayGreyscale180
-            color: '#9FED5866'
-          decals:
-            501: 17,-3
         - node:
             id: HalfTileOverlayGreyscale270
             color: '#334E6DC8'
@@ -22489,6 +22587,11 @@ entities:
             966: 24,15
             967: 29,15
             968: 28,15
+        - node:
+            id: BrickTileSteelLineN
+            color: '#DE3A3A96'
+          decals:
+            0: 16,1
         - node:
             id: BrickTileWhiteCornerSe
             color: '#DE3A3A96'
@@ -22686,16 +22789,6 @@ entities:
             109: 19.107887,7.5067863
             110: 29.420387,7.0224113
             111: 30.092262,7.5849113
-        - node:
-            id: HalfTileOverlayGreyscale
-            color: '#9FED5866'
-          decals:
-            499: 17,1
-        - node:
-            id: HalfTileOverlayGreyscale
-            color: '#DE3A3A96'
-          decals:
-            467: 16,1
         - node:
             id: HalfTileOverlayGreyscale270
             color: '#334E6DC8'
@@ -23218,6 +23311,32 @@ entities:
           decals:
             2928: -2,-2
             2931: -1,-2
+        - node:
+            id: BrickTileSteelCornerNe
+            color: '#43990996'
+          decals:
+            0: -8,-3
+            1: -3,-7
+        - node:
+            id: BrickTileSteelInnerNe
+            color: '#43990996'
+          decals:
+            9: -8,-7
+        - node:
+            id: BrickTileSteelLineE
+            color: '#43990996'
+          decals:
+            6: -8,-6
+            7: -8,-5
+            8: -8,-4
+        - node:
+            id: BrickTileSteelLineN
+            color: '#43990996'
+          decals:
+            2: -4,-7
+            3: -5,-7
+            4: -6,-7
+            5: -7,-7
         - node:
             id: BrickTileWhiteLineE
             color: '#43990941'
@@ -23453,7 +23572,6 @@ entities:
           decals:
             1441: -2,-5
             1442: -1,-6
-            1445: -3,-5
         - node:
             id: QuarterTileOverlayGreyscale180
             color: '#43990996'
@@ -23465,19 +23583,6 @@ entities:
             2981: -14,-2
             2982: -15,-2
             2983: -16,-2
-        - node:
-            id: QuarterTileOverlayGreyscale270
-            color: '#9FED5876'
-          decals:
-            440: -8,-3
-            441: -8,-4
-            442: -8,-5
-            443: -8,-6
-            444: -8,-7
-            445: -7,-7
-            446: -6,-7
-            447: -5,-7
-            448: -4,-7
         - node:
             id: QuarterTileOverlayGreyscale90
             color: '#334E6DC8'
@@ -23487,6 +23592,7 @@ entities:
             id: QuarterTileOverlayGreyscale90
             color: '#D4D4D428'
           decals:
+            10: -3,-5
             341: -6,-1
             342: -6,-2
             343: -6,-3
@@ -23494,7 +23600,6 @@ entities:
             345: -6,-5
             346: -5,-5
             347: -4,-5
-            348: -3,-5
             349: -2,-5
         - node:
             id: WoodTrimThinCornerNw
@@ -24464,21 +24569,6 @@ entities:
     - type: ChunkEntity
       root: 1668
       chunk: -3,1
-    - type: DecalChunk
-      maxDecalId: 1479
-      decals:
-        version: 1
-        nodes:
-        - node:
-            id: b
-            color: '#FFFFFFFF'
-          decals:
-            1479: -34,26
-        - node:
-            id: largebrush
-            color: '#DE3A3A96'
-          decals:
-            1478: -34,26
 - proto: CigaretteSpent
   entities:
   - uid: 1188
@@ -24515,11 +24605,6 @@ entities:
       pos: -44.404884,-4.442357
 - proto: CigarGoldCase
   entities:
-  - uid: 2977
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -15.491083,9.742575
   - uid: 9161
     components:
     - type: Transform
@@ -24532,6 +24617,11 @@ entities:
     - type: Transform
       parent: 1668
       pos: -11.04193,7.539497
+  - uid: 9753
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 27.460176,-19.43678
 - proto: CircuitImprinter
   entities:
   - uid: 3271
@@ -25017,6 +25107,13 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: ClothingHandsKnuckleDustersStun
+  entities:
+  - uid: 9158
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 15.528798,4.6529226
 - proto: ClothingHeadHatCatEars
   entities:
   - uid: 9693
@@ -25348,15 +25445,13 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingOuterArmorCaptainCarapace
+- proto: ClothingOuterArmorCentcommCarapace
   entities:
-  - uid: 1101
+  - uid: 86
     components:
     - type: Transform
       parent: 1668
-      pos: -11.664687,7.5583878
-- proto: ClothingOuterArmorCentcommCarapace
-  entities:
+      pos: -11.696109,7.5990725
   - uid: 9685
     components:
     - type: Transform
@@ -25641,18 +25736,11 @@ entities:
       pos: -9.538566,5.4158797
 - proto: ClothingShoesChameleonNoSlips
   entities:
-  - uid: 3420
+  - uid: 145
     components:
     - type: Transform
       parent: 1668
-      pos: -13.522441,10.1285
-- proto: ClothingShoesLeather
-  entities:
-  - uid: 2992
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -19.521015,9.144212
+      pos: -19.520454,9.180522
 - proto: ClothingShoeSlippersDuck
   entities:
   - uid: 6213
@@ -26622,6 +26710,13 @@ entities:
     - type: Transform
       parent: 1668
       pos: -17.5,16.5
+- proto: d2Dice
+  entities:
+  - uid: 9751
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 26.5,-15.5
 - proto: d6Dice
   entities:
   - uid: 9168
@@ -26689,6 +26784,26 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+  - uid: 9733
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -19.505926,13.806881
+  - uid: 9734
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -19.505926,13.806881
+  - uid: 9735
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -19.505926,13.806881
+  - uid: 9736
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -19.505926,13.806881
 - proto: DeathsquadPDA
   entities:
   - uid: 2470
@@ -29925,13 +30040,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: FlippoEngravedLighter
-  entities:
-  - uid: 2841
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -15.490675,9.659155
 - proto: FloorDrain
   entities:
   - uid: 676
@@ -30324,6 +30432,26 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+  - uid: 9741
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -21.5091,13.775631
+  - uid: 9742
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -21.5091,13.775631
+  - uid: 9743
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -21.5091,13.775631
+  - uid: 9744
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -21.5091,13.775631
 - proto: GasFilter
   entities:
   - uid: 684
@@ -42367,6 +42495,13 @@ entities:
     - type: Transform
       parent: 1668
       pos: 8.767073,-23.469265
+- proto: GoldDoor
+  entities:
+  - uid: 58
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -18.5,14.5
 - proto: GoldenPlunger
   entities:
   - uid: 2802
@@ -44683,11 +44818,6 @@ entities:
       pos: -42.48301,-4.457982
 - proto: HighSecCentralCommandLocked
   entities:
-  - uid: 784
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 13.5,17.5
   - uid: 2212
     components:
     - type: Transform
@@ -44699,11 +44829,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: 13.5,21.5
-  - uid: 5998
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -14.5,6.5
   - uid: 6903
     components:
     - type: Transform
@@ -44712,16 +44837,6 @@ entities:
       pos: -14.5,6.5
 - proto: HighSecCommandLocked
   entities:
-  - uid: 1583
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -4.5,0.5
-  - uid: 1584
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 3.5,0.5
   - uid: 6905
     components:
     - type: Transform
@@ -44937,6 +45052,13 @@ entities:
     - type: Transform
       parent: 1668
       pos: -3.3831449,-0.61700773
+- proto: Jukebox
+  entities:
+  - uid: 9768
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 29.5,-15.5
 - proto: KillerTomatoSeeds
   entities:
   - uid: 1015
@@ -45870,6 +45992,11 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+  - uid: 9750
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -11.394649,5.5776577
 - proto: MagicDiceBag
   entities:
   - uid: 4765
@@ -46239,6 +46366,26 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+  - uid: 9745
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -21.5091,13.525631
+  - uid: 9746
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -21.5091,13.525631
+  - uid: 9747
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -21.5091,13.525631
+  - uid: 9748
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -21.5091,13.525631
 - proto: Mirror
   entities:
   - uid: 2789
@@ -46261,6 +46408,13 @@ entities:
     - type: Transform
       parent: 1668
       pos: -5.5,7.5
+- proto: NanotrasenFlippo
+  entities:
+  - uid: 9752
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 26.5,-23.5
 - proto: NitrogenCanister
   entities:
   - uid: 3493
@@ -46779,116 +46933,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: 20.5,32.5
-  - uid: 6048
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -7.5,-15.5
-  - uid: 6049
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -8.5,-15.5
-  - uid: 6050
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -11.5,-15.5
-  - uid: 6051
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -10.5,-15.5
-  - uid: 6052
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -13.5,-15.5
-  - uid: 6053
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -14.5,-15.5
-  - uid: 6054
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -16.5,-15.5
-  - uid: 6055
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -17.5,-15.5
-  - uid: 6077
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -20.5,-15.5
-  - uid: 6078
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -19.5,-15.5
-  - uid: 6080
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -22.5,-15.5
-  - uid: 6088
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -23.5,-15.5
-  - uid: 6089
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -25.5,-15.5
-  - uid: 6090
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -26.5,-15.5
-  - uid: 6643
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -28.5,-15.5
-  - uid: 6644
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -29.5,-15.5
-  - uid: 6645
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -31.5,-15.5
-  - uid: 6646
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -32.5,-15.5
-  - uid: 6647
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -34.5,-15.5
-  - uid: 6648
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -35.5,-15.5
-  - uid: 6649
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -38.5,-15.5
-  - uid: 6650
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -37.5,-15.5
 - proto: PlayerStationAiEmpty
   entities:
   - uid: 73
@@ -47067,6 +47111,27 @@ entities:
     - type: Transform
       parent: 1668
       pos: 17.5,34.5
+- proto: PosterContrabandExoAcid
+  entities:
+  - uid: 9756
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -15.5,-29.5
+- proto: PosterContrabandExoChomp
+  entities:
+  - uid: 9757
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -15.5,-31.5
+- proto: PosterContrabandExoRun
+  entities:
+  - uid: 9758
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -15.5,-33.5
 - proto: PosterContrabandHackingGuide
   entities:
   - uid: 9332
@@ -47103,6 +47168,13 @@ entities:
       parent: 1668
       rot: 1.5707963267948966 rad
       pos: 17.5,25.5
+- proto: PosterContrabandLamarr
+  entities:
+  - uid: 543
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 18.5,-30.5
 - proto: PosterContrabandMissingGloves
   entities:
   - uid: 9329
@@ -47139,6 +47211,14 @@ entities:
       parent: 1668
       rot: 1.5707963267948966 rad
       pos: 9.5,27.5
+- proto: PosterContrabandRouny
+  entities:
+  - uid: 174
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -18.5,-47.5
 - proto: PosterContrabandSmoke
   entities:
   - uid: 9309
@@ -47155,11 +47235,11 @@ entities:
       pos: -7.5,14.5
 - proto: PosterContrabandVoteWeh
   entities:
-  - uid: 308
+  - uid: 7487
     components:
     - type: Transform
       parent: 1668
-      pos: 29.5,6.5
+      pos: 35.5,-15.5
 - proto: PosterContrabandWaffleCorp
   entities:
   - uid: 9330
@@ -47176,11 +47256,19 @@ entities:
       pos: 18.5,-32.5
 - proto: PosterLegitAnatomyPoster
   entities:
-  - uid: 6188
+  - uid: 541
     components:
     - type: Transform
       parent: 1668
-      pos: 11.5,-12.5
+      pos: 11.5,-13.5
+- proto: PosterLegitBotanyFear
+  entities:
+  - uid: 9289
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-21.5
 - proto: PosterLegitCarpMount
   entities:
   - uid: 9313
@@ -47197,12 +47285,26 @@ entities:
       pos: 31.5,-22.5
 - proto: PosterLegitEnlist
   entities:
+  - uid: 542
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-28.5
   - uid: 2447
     components:
     - type: Transform
       parent: 1668
       rot: 1.5707963267948966 rad
       pos: 9.5,31.5
+- proto: PosterLegitFruitBowl
+  entities:
+  - uid: 171
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-34.5
 - proto: PosterLegitGetYourLEGS
   entities:
   - uid: 9333
@@ -47226,11 +47328,12 @@ entities:
       pos: 7.5,-28.5
 - proto: PosterLegitHighClassMartini
   entities:
-  - uid: 1327
+  - uid: 9694
     components:
     - type: Transform
       parent: 1668
-      pos: 18.5,-22.5
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-34.5
 - proto: PosterLegitIan
   entities:
   - uid: 9307
@@ -47298,16 +47401,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: 2.5,-7.5
-  - uid: 801
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 3.5,-3.5
-  - uid: 802
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -4.5,-3.5
   - uid: 1270
     components:
     - type: Transform
@@ -47528,11 +47621,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: -8.5,-37.5
-  - uid: 9328
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -0.5,-50.5
   - uid: 9336
     components:
     - type: Transform
@@ -47609,6 +47697,11 @@ entities:
     - type: Transform
       parent: 1668
       pos: -17.5,2.5
+  - uid: 9754
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -10.5,12.5
 - proto: PosterLegitReportCrimes
   entities:
   - uid: 9305
@@ -47688,11 +47781,11 @@ entities:
       pos: 11.5,6.5
 - proto: PosterLegitUeNo
   entities:
-  - uid: 309
+  - uid: 7102
     components:
     - type: Transform
       parent: 1668
-      pos: 23.5,6.5
+      pos: 28.5,-10.5
 - proto: PosterLegitVacation
   entities:
   - uid: 98
@@ -47959,6 +48052,26 @@ entities:
     - type: Transform
       parent: 1668
       pos: -30.5,9.5
+  - uid: 9726
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 17.5,-2.5
+  - uid: 9727
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 8.5,1.5
+  - uid: 9728
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 17.5,1.5
+  - uid: 9729
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 8.5,-2.5
 - proto: PottedPlant26
   entities:
   - uid: 9076
@@ -48098,18 +48211,6 @@ entities:
       parent: 1668
       rot: -1.5707963267948966 rad
       pos: 33.5,7.5
-  - uid: 128
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 3.141592653589793 rad
-      pos: 24.5,-6.5
-  - uid: 131
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 3.141592653589793 rad
-      pos: 20.5,-13.5
   - uid: 134
     components:
     - type: Transform
@@ -48127,16 +48228,6 @@ entities:
       parent: 1668
       rot: 3.141592653589793 rad
       pos: 0.5,-2.5
-  - uid: 210
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 23.5,5.5
-  - uid: 211
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 29.5,5.5
   - uid: 212
     components:
     - type: Transform
@@ -48149,42 +48240,12 @@ entities:
       parent: 1668
       rot: 1.5707963267948966 rad
       pos: 19.5,2.5
-  - uid: 517
-    components:
-    - type: Transform
-      parent: 1668
-      rot: -1.5707963267948966 rad
-      pos: 6.5,2.5
-  - uid: 518
-    components:
-    - type: Transform
-      parent: 1668
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-3.5
-  - uid: 519
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-3.5
-  - uid: 520
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: -7.5,2.5
-  - uid: 521
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 3.141592653589793 rad
-      pos: 2.5,-6.5
   - uid: 522
     components:
     - type: Transform
       parent: 1668
-      rot: 3.141592653589793 rad
-      pos: -3.5,-6.5
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-3.5
   - uid: 523
     components:
     - type: Transform
@@ -48195,6 +48256,29 @@ entities:
     - type: Transform
       parent: 1668
       pos: 2.5,5.5
+  - uid: 544
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: 19.5,-13.5
+  - uid: 547
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-3.5
+  - uid: 548
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: -11.5,-27.5
+  - uid: 612
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 24.5,5.5
   - uid: 619
     components:
     - type: Transform
@@ -48221,8 +48305,7 @@ entities:
     components:
     - type: Transform
       parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-7.5
+      pos: 28.5,5.5
   - uid: 747
     components:
     - type: Transform
@@ -48232,20 +48315,50 @@ entities:
     components:
     - type: Transform
       parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-8.5
+      rot: -1.5707963267948966 rad
+      pos: -5.5,2.5
   - uid: 751
     components:
     - type: Transform
       parent: 1668
       rot: -1.5707963267948966 rad
       pos: 10.5,-12.5
-  - uid: 1155
+  - uid: 801
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 1.5707963267948966 rad
+      pos: 4.5,2.5
+  - uid: 1140
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 1.5707963267948966 rad
+      pos: -1.5,20.5
+  - uid: 1141
     components:
     - type: Transform
       parent: 1668
       rot: 3.141592653589793 rad
-      pos: 28.5,-6.5
+      pos: 4.5,-6.5
+  - uid: 1142
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: -5.5,-6.5
+  - uid: 1143
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: 11.5,-6.5
+  - uid: 1144
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: 4.5,-12.5
   - uid: 1190
     components:
     - type: Transform
@@ -48257,12 +48370,29 @@ entities:
     - type: Transform
       parent: 1668
       pos: 17.5,-15.5
+  - uid: 1250
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: -1.5,-2.5
+  - uid: 1255
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: 3.5,14.5
+  - uid: 1294
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -17.5,16.5
   - uid: 1524
     components:
     - type: Transform
       parent: 1668
-      rot: -1.5707963267948966 rad
-      pos: 17.5,7.5
+      rot: 3.141592653589793 rad
+      pos: 3.5,18.5
   - uid: 1631
     components:
     - type: Transform
@@ -48300,7 +48430,8 @@ entities:
     components:
     - type: Transform
       parent: 1668
-      pos: 26.5,27.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,10.5
   - uid: 2101
     components:
     - type: Transform
@@ -48335,19 +48466,30 @@ entities:
     components:
     - type: Transform
       parent: 1668
-      pos: -2.5,1.5
+      pos: 3.5,-14.5
   - uid: 2124
     components:
     - type: Transform
       parent: 1668
-      rot: 3.141592653589793 rad
-      pos: 2.5,14.5
+      pos: 25.5,27.5
   - uid: 2439
     components:
     - type: Transform
       parent: 1668
       rot: -1.5707963267948966 rad
       pos: 16.5,19.5
+  - uid: 2445
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: 18.5,14.5
+  - uid: 2446
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: -1.5,-31.5
   - uid: 2612
     components:
     - type: Transform
@@ -48369,13 +48511,13 @@ entities:
     components:
     - type: Transform
       parent: 1668
-      rot: 3.141592653589793 rad
-      pos: -17.5,15.5
+      pos: 8.5,-29.5
   - uid: 2915
     components:
     - type: Transform
       parent: 1668
-      pos: 1.5,21.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,-31.5
   - uid: 2917
     components:
     - type: Transform
@@ -48409,13 +48551,7 @@ entities:
     components:
     - type: Transform
       parent: 1668
-      rot: -1.5707963267948966 rad
-      pos: 1.5,9.5
-  - uid: 3197
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 2.5,-14.5
+      pos: 0.5,-33.5
   - uid: 3306
     components:
     - type: Transform
@@ -48482,12 +48618,18 @@ entities:
     components:
     - type: Transform
       parent: 1668
-      pos: 9.5,16.5
+      pos: -9.5,-29.5
   - uid: 3910
     components:
     - type: Transform
       parent: 1668
-      pos: 17.5,16.5
+      pos: 14.5,-45.5
+  - uid: 4084
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: -4.5,-27.5
   - uid: 4115
     components:
     - type: Transform
@@ -48498,46 +48640,47 @@ entities:
     components:
     - type: Transform
       parent: 1668
-      pos: 3.5,-33.5
+      rot: 3.141592653589793 rad
+      pos: -19.5,-27.5
   - uid: 4272
     components:
     - type: Transform
       parent: 1668
-      pos: -4.5,-33.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-49.5
   - uid: 4273
     components:
     - type: Transform
       parent: 1668
-      rot: 3.141592653589793 rad
-      pos: -3.5,-31.5
+      pos: 27.5,27.5
   - uid: 4274
     components:
     - type: Transform
       parent: 1668
-      rot: 3.141592653589793 rad
-      pos: 2.5,-31.5
+      pos: -15.5,-45.5
   - uid: 4275
     components:
     - type: Transform
       parent: 1668
-      rot: 3.141592653589793 rad
-      pos: 7.5,-31.5
+      pos: -30.5,-4.5
   - uid: 4276
     components:
     - type: Transform
       parent: 1668
       rot: 3.141592653589793 rad
-      pos: -8.5,-31.5
+      pos: -27.5,-27.5
   - uid: 4313
     components:
     - type: Transform
       parent: 1668
-      pos: 2.5,-25.5
+      rot: 3.141592653589793 rad
+      pos: 11.5,14.5
   - uid: 4314
     components:
     - type: Transform
       parent: 1668
-      pos: -3.5,-25.5
+      rot: 3.141592653589793 rad
+      pos: -29.5,-2.5
   - uid: 4315
     components:
     - type: Transform
@@ -48547,13 +48690,14 @@ entities:
     components:
     - type: Transform
       parent: 1668
-      pos: -27.5,-25.5
+      rot: 3.141592653589793 rad
+      pos: -31.5,-10.5
   - uid: 4782
     components:
     - type: Transform
       parent: 1668
       rot: 3.141592653589793 rad
-      pos: -0.5,-49.5
+      pos: -35.5,-27.5
   - uid: 4783
     components:
     - type: Transform
@@ -48634,18 +48778,11 @@ entities:
       parent: 1668
       rot: -1.5707963267948966 rad
       pos: 19.5,-43.5
-  - uid: 4808
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 3.141592653589793 rad
-      pos: 16.5,-46.5
   - uid: 4809
     components:
     - type: Transform
       parent: 1668
-      rot: 3.141592653589793 rad
-      pos: -17.5,-46.5
+      pos: -15.5,27.5
   - uid: 4811
     components:
     - type: Transform
@@ -48684,16 +48821,6 @@ entities:
       parent: 1668
       rot: 3.141592653589793 rad
       pos: -11.5,-22.5
-  - uid: 5718
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -11.5,-25.5
-  - uid: 5719
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -19.5,-25.5
   - uid: 5875
     components:
     - type: Transform
@@ -48745,11 +48872,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: -16.5,1.5
-  - uid: 5912
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -24.5,1.5
   - uid: 5928
     components:
     - type: Transform
@@ -48799,19 +48921,14 @@ entities:
     components:
     - type: Transform
       parent: 1668
-      pos: -29.5,1.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,9.5
   - uid: 7101
     components:
     - type: Transform
       parent: 1668
       rot: -1.5707963267948966 rad
       pos: -28.5,-9.5
-  - uid: 7102
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: -33.5,-5.5
   - uid: 7103
     components:
     - type: Transform
@@ -48828,6 +48945,23 @@ entities:
       parent: 1668
       rot: 1.5707963267948966 rad
       pos: -38.5,11.5
+  - uid: 7375
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 33.5,5.5
+  - uid: 7376
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: 33.5,-6.5
+  - uid: 7379
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: 26.5,-9.5
   - uid: 7460
     components:
     - type: Transform
@@ -48861,11 +48995,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: -31.5,-30.5
-  - uid: 7487
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -35.5,-25.5
   - uid: 8778
     components:
     - type: Transform
@@ -48878,13 +49007,55 @@ entities:
       parent: 1668
       rot: 1.5707963267948966 rad
       pos: -2.5,-16.5
-- proto: PoweredlightBlue
-  entities:
-  - uid: 1249
+  - uid: 8819
     components:
     - type: Transform
       parent: 1668
-      pos: 24.5,-15.5
+      rot: 3.141592653589793 rad
+      pos: 3.5,-27.5
+  - uid: 9328
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: -24.5,-2.5
+  - uid: 9760
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: 14.5,-13.5
+  - uid: 9761
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: 23.5,-6.5
+  - uid: 9762
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: -16.5,-2.5
+  - uid: 9765
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 1.5707963267948966 rad
+      pos: -2.5,10.5
+  - uid: 9766
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 1.5707963267948966 rad
+      pos: 8.5,3.5
+- proto: PoweredlightBlue
+  entities:
+  - uid: 546
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 22.5,-15.5
   - uid: 1252
     components:
     - type: Transform
@@ -48910,18 +49081,18 @@ entities:
       pos: -20.5,-17.5
 - proto: PoweredlightCyan
   entities:
-  - uid: 1250
+  - uid: 4786
     components:
     - type: Transform
       parent: 1668
       rot: 3.141592653589793 rad
-      pos: 29.5,-27.5
-  - uid: 1255
+      pos: 22.5,-27.5
+  - uid: 4799
     components:
     - type: Transform
       parent: 1668
       rot: 3.141592653589793 rad
-      pos: 23.5,-27.5
+      pos: 30.5,-27.5
   - uid: 9133
     components:
     - type: Transform
@@ -48966,20 +49137,26 @@ entities:
       parent: 1668
       rot: 3.141592653589793 rad
       pos: -23.5,-17.5
-- proto: PoweredlightRed
+- proto: PoweredlightPink
   entities:
-  - uid: 2445
+  - uid: 9767
     components:
     - type: Transform
       parent: 1668
       rot: -1.5707963267948966 rad
-      pos: 16.5,32.5
-  - uid: 2446
+      pos: 30.5,-21.5
+- proto: PoweredlightRed
+  entities:
+  - uid: 802
     components:
     - type: Transform
       parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: 10.5,32.5
+      pos: 16.5,34.5
+  - uid: 4808
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 10.5,34.5
   - uid: 6079
     components:
     - type: Transform
@@ -49002,17 +49179,17 @@ entities:
       parent: 1668
       rot: 1.5707963267948966 rad
       pos: 34.5,-0.5
-  - uid: 547
+  - uid: 545
     components:
     - type: Transform
       parent: 1668
-      pos: 34.5,5.5
-  - uid: 548
+      pos: 16.5,-21.5
+  - uid: 594
     components:
     - type: Transform
       parent: 1668
       rot: 3.141592653589793 rad
-      pos: 34.5,-6.5
+      pos: -11.5,5.5
   - uid: 1092
     components:
     - type: Transform
@@ -49049,12 +49226,6 @@ entities:
       parent: 1668
       rot: 3.141592653589793 rad
       pos: -16.5,5.5
-  - uid: 2634
-    components:
-    - type: Transform
-      parent: 1668
-      rot: -1.5707963267948966 rad
-      pos: -9.5,6.5
   - uid: 2715
     components:
     - type: Transform
@@ -49083,6 +49254,12 @@ entities:
     - type: Transform
       parent: 1668
       pos: 19.5,-48.5
+  - uid: 3197
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: -10.5,-36.5
   - uid: 3359
     components:
     - type: Transform
@@ -49125,11 +49302,6 @@ entities:
       parent: 1668
       rot: 1.5707963267948966 rad
       pos: 21.5,26.5
-  - uid: 4084
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -16.5,27.5
   - uid: 4664
     components:
     - type: Transform
@@ -49142,12 +49314,6 @@ entities:
       parent: 1668
       rot: 1.5707963267948966 rad
       pos: 8.5,-45.5
-  - uid: 4786
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-36.5
   - uid: 4788
     components:
     - type: Transform
@@ -49159,17 +49325,17 @@ entities:
     - type: Transform
       parent: 1668
       pos: -15.5,-38.5
-  - uid: 4799
-    components:
-    - type: Transform
-      parent: 1668
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-36.5
   - uid: 5194
     components:
     - type: Transform
       parent: 1668
       pos: -20.5,-48.5
+  - uid: 5718
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: 9.5,-36.5
   - uid: 7184
     components:
     - type: Transform
@@ -49242,20 +49408,32 @@ entities:
       parent: 1668
       rot: 3.141592653589793 rad
       pos: -22.5,3.5
+  - uid: 9763
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: -18.5,3.5
+  - uid: 9764
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: -18.5,9.5
 - proto: PoweredWarmSmallLight
   entities:
+  - uid: 1145
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 1.5707963267948966 rad
+      pos: 29.5,-13.5
   - uid: 1280
     components:
     - type: Transform
       parent: 1668
       rot: 1.5707963267948966 rad
       pos: 32.5,-21.5
-  - uid: 1294
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-10.5
   - uid: 2100
     components:
     - type: Transform
@@ -49279,17 +49457,23 @@ entities:
       parent: 1668
       rot: -1.5707963267948966 rad
       pos: 8.5,21.5
+  - uid: 5719
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -7.5,-8.5
+  - uid: 5912
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 1.5707963267948966 rad
+      pos: 29.5,-8.5
   - uid: 6172
     components:
     - type: Transform
       parent: 1668
       rot: 3.141592653589793 rad
       pos: -22.5,-8.5
-  - uid: 8819
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -6.5,-8.5
   - uid: 9562
     components:
     - type: Transform
@@ -49495,6 +49679,26 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+  - uid: 9737
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -19.505926,13.572506
+  - uid: 9738
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -19.505926,13.572506
+  - uid: 9739
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -19.505926,13.572506
+  - uid: 9740
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -19.505926,13.572506
 - proto: Railing
   entities:
   - uid: 2075
@@ -49599,6 +49803,2216 @@ entities:
       parent: 1668
       rot: -1.5707963267948966 rad
       pos: -4.5,-10.5
+- proto: RegalWindow
+  entities:
+  - uid: 175
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-15.5
+  - uid: 176
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-15.5
+  - uid: 177
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-15.5
+  - uid: 179
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-15.5
+  - uid: 180
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-15.5
+  - uid: 181
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-15.5
+  - uid: 189
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-15.5
+  - uid: 192
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -17.5,-15.5
+  - uid: 328
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-15.5
+  - uid: 348
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -19.5,-15.5
+  - uid: 355
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -22.5,-15.5
+  - uid: 366
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -23.5,-15.5
+  - uid: 367
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -25.5,-15.5
+  - uid: 394
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -26.5,-15.5
+  - uid: 478
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -28.5,-15.5
+  - uid: 479
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -29.5,-15.5
+  - uid: 480
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -31.5,-15.5
+  - uid: 481
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -32.5,-15.5
+  - uid: 537
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -34.5,-15.5
+  - uid: 538
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-15.5
+  - uid: 539
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -38.5,-15.5
+  - uid: 540
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -37.5,-15.5
+  - uid: 595
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-3.5
+  - uid: 596
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-3.5
+  - uid: 712
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-2.5
+  - uid: 719
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-0.5
+  - uid: 720
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 3.5,1.5
+  - uid: 784
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 2.5,2.5
+  - uid: 925
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 0.5,2.5
+  - uid: 927
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -1.5,2.5
+  - uid: 928
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -0.5,2.5
+  - uid: 930
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -3.5,2.5
+  - uid: 931
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -4.5,1.5
+  - uid: 932
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-0.5
+  - uid: 933
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-1.5
+  - uid: 934
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-2.5
+  - uid: 1101
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-3.5
+  - uid: 1106
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-3.5
+  - uid: 1155
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 11.5,10.5
+  - uid: 1162
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 24.5,7.5
+  - uid: 1199
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-3.5
+  - uid: 1205
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 28.5,7.5
+  - uid: 1249
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-7.5
+  - uid: 1254
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -2.5,6.5
+  - uid: 1316
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-3.5
+  - uid: 1327
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 12.5,2.5
+  - uid: 1352
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-3.5
+  - uid: 1353
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 14.5,2.5
+  - uid: 1354
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -8.5,1.5
+  - uid: 1365
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-2.5
+  - uid: 1521
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 1.5,6.5
+  - uid: 1539
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 7.5,4.5
+  - uid: 1550
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-7.5
+  - uid: 1555
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-3.5
+  - uid: 1556
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 16.5,2.5
+  - uid: 1557
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-29.5
+  - uid: 1558
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 21.5,6.5
+  - uid: 1560
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 31.5,6.5
+  - uid: 1561
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 4.5,6.5
+  - uid: 1562
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 5.5,6.5
+  - uid: 1572
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 6.5,6.5
+  - uid: 1577
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-2.5
+  - uid: 1578
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 18.5,1.5
+  - uid: 1581
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-2.5
+  - uid: 1582
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 7.5,1.5
+  - uid: 1583
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-6.5
+  - uid: 1584
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-5.5
+  - uid: 1585
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-4.5
+  - uid: 1586
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-7.5
+  - uid: 1590
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-7.5
+  - uid: 1593
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 20.5,-7.5
+  - uid: 1605
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-7.5
+  - uid: 1608
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-7.5
+  - uid: 1609
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-9.5
+  - uid: 1685
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-11.5
+  - uid: 1731
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-12.5
+  - uid: 1733
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-14.5
+  - uid: 1749
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-14.5
+  - uid: 1769
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-14.5
+  - uid: 1770
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-26.5
+  - uid: 1771
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-16.5
+  - uid: 1862
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-28.5
+  - uid: 1863
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-28.5
+  - uid: 1912
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-21.5
+  - uid: 1913
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-22.5
+  - uid: 1917
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-28.5
+  - uid: 2137
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-28.5
+  - uid: 2139
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-28.5
+  - uid: 2140
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-20.5
+  - uid: 2143
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 2.5,7.5
+  - uid: 2295
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 2.5,8.5
+  - uid: 2296
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 22.5,9.5
+  - uid: 2298
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 2.5,11.5
+  - uid: 2322
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 2.5,12.5
+  - uid: 2323
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 23.5,9.5
+  - uid: 2343
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 19.5,9.5
+  - uid: 2353
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 21.5,9.5
+  - uid: 2354
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 20.5,9.5
+  - uid: 2355
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 20.5,13.5
+  - uid: 2356
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 22.5,13.5
+  - uid: 2357
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 6.5,13.5
+  - uid: 2440
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 4.5,13.5
+  - uid: 2456
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-32.5
+  - uid: 2457
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-30.5
+  - uid: 2458
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-31.5
+  - uid: 2459
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-33.5
+  - uid: 2460
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 7.5,10.5
+  - uid: 2461
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 10.5,13.5
+  - uid: 2462
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 11.5,12.5
+  - uid: 2634
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 17.5,13.5
+  - uid: 2703
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 15.5,13.5
+  - uid: 2704
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 7.5,9.5
+  - uid: 2705
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 7.5,12.5
+  - uid: 2706
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 11.5,11.5
+  - uid: 2707
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 35.5,10.5
+  - uid: 2708
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 35.5,12.5
+  - uid: 2709
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 35.5,11.5
+  - uid: 2710
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 22.5,23.5
+  - uid: 2711
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 30.5,23.5
+  - uid: 2712
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 32.5,23.5
+  - uid: 2713
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 33.5,17.5
+  - uid: 2714
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 32.5,19.5
+  - uid: 2731
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 11.5,17.5
+  - uid: 2753
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 10.5,17.5
+  - uid: 2754
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 15.5,17.5
+  - uid: 2755
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 16.5,17.5
+  - uid: 2756
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-45.5
+  - uid: 2757
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-45.5
+  - uid: 2758
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-45.5
+  - uid: 2759
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-36.5
+  - uid: 2760
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-36.5
+  - uid: 2761
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-30.5
+  - uid: 2762
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-36.5
+  - uid: 2763
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-36.5
+  - uid: 2779
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-36.5
+  - uid: 2780
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-36.5
+  - uid: 2781
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-36.5
+  - uid: 2782
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-36.5
+  - uid: 2798
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-36.5
+  - uid: 2813
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-36.5
+  - uid: 2815
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-36.5
+  - uid: 2816
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-36.5
+  - uid: 2825
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-36.5
+  - uid: 2841
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-36.5
+  - uid: 2897
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-36.5
+  - uid: 2898
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-3.5
+  - uid: 2911
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-3.5
+  - uid: 2977
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-3.5
+  - uid: 2981
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-3.5
+  - uid: 2988
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-3.5
+  - uid: 2992
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-3.5
+  - uid: 2998
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -9.5,2.5
+  - uid: 3000
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -10.5,2.5
+  - uid: 3002
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -11.5,2.5
+  - uid: 3004
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -13.5,2.5
+  - uid: 3182
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -14.5,2.5
+  - uid: 3184
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -15.5,2.5
+  - uid: 3234
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -19.5,16.5
+  - uid: 3266
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -19.5,15.5
+  - uid: 3286
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -24.5,9.5
+  - uid: 3293
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -24.5,10.5
+  - uid: 3295
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -24.5,12.5
+  - uid: 3297
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -24.5,13.5
+  - uid: 3366
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -20.5,8.5
+  - uid: 3368
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -22.5,8.5
+  - uid: 3369
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-34.5
+  - uid: 3370
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -0.5,22.5
+  - uid: 3372
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 4.5,17.5
+  - uid: 3373
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 2.5,17.5
+  - uid: 3374
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -4.5,13.5
+  - uid: 3376
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -6.5,13.5
+  - uid: 3377
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 4.5,22.5
+  - uid: 3378
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-4.5
+  - uid: 3380
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -8.5,3.5
+  - uid: 3382
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 7.5,7.5
+  - uid: 3392
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -12.5,23.5
+  - uid: 3393
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -4.5,23.5
+  - uid: 3394
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -6.5,23.5
+  - uid: 3399
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -10.5,23.5
+  - uid: 3408
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -25.5,28.5
+  - uid: 3410
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -26.5,27.5
+  - uid: 3415
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -26.5,22.5
+  - uid: 3420
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -26.5,20.5
+  - uid: 3425
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -26.5,21.5
+  - uid: 3440
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -26.5,25.5
+  - uid: 3602
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -26.5,23.5
+  - uid: 3603
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -26.5,24.5
+  - uid: 3604
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -28.5,20.5
+  - uid: 3605
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -24.5,28.5
+  - uid: 3606
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -26.5,26.5
+  - uid: 3667
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -28.5,26.5
+  - uid: 3997
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -28.5,27.5
+  - uid: 4001
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -28.5,25.5
+  - uid: 4058
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -28.5,21.5
+  - uid: 4066
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -23.5,18.5
+  - uid: 4076
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -24.5,18.5
+  - uid: 4102
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -25.5,18.5
+  - uid: 4104
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -28.5,19.5
+  - uid: 4106
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -26.5,19.5
+  - uid: 4108
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 33.5,9.5
+  - uid: 4109
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 32.5,9.5
+  - uid: 4110
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 31.5,9.5
+  - uid: 4111
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 30.5,9.5
+  - uid: 4112
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 29.5,9.5
+  - uid: 4113
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -6.5,17.5
+  - uid: 4114
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -2.5,13.5
+  - uid: 4126
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 1.5,13.5
+  - uid: 4127
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-29.5
+  - uid: 4128
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-45.5
+  - uid: 4129
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-28.5
+  - uid: 4130
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -24.5,30.5
+  - uid: 4131
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -24.5,29.5
+  - uid: 4132
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -24.5,31.5
+  - uid: 4133
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -23.5,31.5
+  - uid: 4134
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -22.5,31.5
+  - uid: 4135
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -21.5,31.5
+  - uid: 4136
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -20.5,31.5
+  - uid: 4137
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -19.5,31.5
+  - uid: 4138
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -19.5,30.5
+  - uid: 4139
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -19.5,29.5
+  - uid: 4140
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-29.5
+  - uid: 4142
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-30.5
+  - uid: 4153
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-31.5
+  - uid: 4300
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-31.5
+  - uid: 4307
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-30.5
+  - uid: 4345
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-29.5
+  - uid: 4346
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-29.5
+  - uid: 4347
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-30.5
+  - uid: 4348
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-31.5
+  - uid: 4349
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-31.5
+  - uid: 4358
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-30.5
+  - uid: 4359
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-29.5
+  - uid: 4361
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-30.5
+  - uid: 4366
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-29.5
+  - uid: 4367
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-31.5
+  - uid: 4373
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-28.5
+  - uid: 4375
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-31.5
+  - uid: 4392
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-24.5
+  - uid: 4398
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-24.5
+  - uid: 4401
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-45.5
+  - uid: 4402
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-45.5
+  - uid: 4403
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-45.5
+  - uid: 4404
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-45.5
+  - uid: 4405
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-45.5
+  - uid: 4455
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-45.5
+  - uid: 4456
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-45.5
+  - uid: 4457
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-50.5
+  - uid: 4468
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-50.5
+  - uid: 4472
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-45.5
+  - uid: 4473
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-50.5
+  - uid: 4480
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-50.5
+  - uid: 4496
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-45.5
+  - uid: 4497
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-45.5
+  - uid: 4498
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-45.5
+  - uid: 4509
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-50.5
+  - uid: 4510
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-50.5
+  - uid: 4514
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-50.5
+  - uid: 4515
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-50.5
+  - uid: 4519
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-49.5
+  - uid: 4520
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-49.5
+  - uid: 4579
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-49.5
+  - uid: 4580
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-45.5
+  - uid: 4581
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-42.5
+  - uid: 4582
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-44.5
+  - uid: 4583
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-46.5
+  - uid: 4584
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-49.5
+  - uid: 4585
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-49.5
+  - uid: 4586
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-49.5
+  - uid: 4614
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -19.5,-45.5
+  - uid: 4615
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -19.5,-46.5
+  - uid: 4616
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -19.5,-40.5
+  - uid: 4624
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -19.5,-41.5
+  - uid: 4680
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -19.5,-35.5
+  - uid: 4682
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -19.5,-36.5
+  - uid: 4689
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-39.5
+  - uid: 4690
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-37.5
+  - uid: 4691
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-36.5
+  - uid: 4692
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-35.5
+  - uid: 4693
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-44.5
+  - uid: 4694
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-42.5
+  - uid: 4700
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-39.5
+  - uid: 4701
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-37.5
+  - uid: 4702
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-38.5
+  - uid: 4703
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-41.5
+  - uid: 4795
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-39.5
+  - uid: 4796
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-40.5
+  - uid: 5321
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-42.5
+  - uid: 5386
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-43.5
+  - uid: 5391
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-43.5
+  - uid: 5397
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-42.5
+  - uid: 5554
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-41.5
+  - uid: 5555
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-40.5
+  - uid: 5556
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-39.5
+  - uid: 5557
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-38.5
+  - uid: 5558
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 30.5,6.5
+  - uid: 5559
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 22.5,6.5
+  - uid: 5560
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 20.5,6.5
+  - uid: 5561
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 32.5,6.5
+  - uid: 5615
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-24.5
+  - uid: 5616
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-24.5
+  - uid: 5617
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-24.5
+  - uid: 5618
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-24.5
+  - uid: 5625
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-24.5
+  - uid: 5626
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-24.5
+  - uid: 5627
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-24.5
+  - uid: 5628
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -18.5,-24.5
+  - uid: 5913
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-28.5
+  - uid: 5914
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -22.5,-28.5
+  - uid: 5915
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -24.5,-28.5
+  - uid: 5916
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -26.5,-28.5
+  - uid: 5998
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -26.5,-24.5
+  - uid: 6002
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -24.5,-24.5
+  - uid: 6014
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -22.5,-24.5
+  - uid: 6015
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-24.5
+  - uid: 6016
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -24.5,4.5
+  - uid: 6017
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -29.5,7.5
+  - uid: 6048
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -29.5,4.5
+  - uid: 6049
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -24.5,7.5
+  - uid: 6050
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -25.5,2.5
+  - uid: 6051
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -27.5,2.5
+  - uid: 6052
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -28.5,2.5
+  - uid: 6053
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -26.5,2.5
+  - uid: 6054
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -29.5,9.5
+  - uid: 6055
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -29.5,10.5
+  - uid: 6077
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -29.5,12.5
+  - uid: 6078
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -29.5,13.5
+  - uid: 6080
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -52.5,1.5
+  - uid: 6088
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -48.5,-8.5
+  - uid: 6089
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -50.5,-8.5
+  - uid: 6090
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -49.5,-8.5
+  - uid: 6188
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -44.5,2.5
+  - uid: 6643
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -42.5,2.5
+  - uid: 6644
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -50.5,-3.5
+  - uid: 6645
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -48.5,-3.5
+  - uid: 6646
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -43.5,7.5
+  - uid: 6647
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -42.5,7.5
+  - uid: 6648
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -44.5,7.5
+  - uid: 6649
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -49.5,7.5
+  - uid: 6650
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -48.5,7.5
+  - uid: 6918
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -50.5,7.5
+  - uid: 6919
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -55.5,-2.5
+  - uid: 6932
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -52.5,-2.5
+  - uid: 6933
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -55.5,1.5
+  - uid: 6934
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -50.5,2.5
+  - uid: 6935
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -48.5,2.5
+  - uid: 6936
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -31.5,8.5
+  - uid: 6954
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -33.5,8.5
+  - uid: 7108
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -28.5,-28.5
+  - uid: 7109
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -30.5,-28.5
+  - uid: 7110
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -28.5,-24.5
+  - uid: 7120
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -30.5,-24.5
+  - uid: 7121
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -32.5,-28.5
+  - uid: 7123
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -34.5,-28.5
+  - uid: 7124
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -36.5,-28.5
+  - uid: 7133
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -38.5,-28.5
+  - uid: 7134
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -38.5,-24.5
+  - uid: 7135
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -36.5,-24.5
+  - uid: 7143
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -34.5,-24.5
+  - uid: 7144
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -32.5,-24.5
+  - uid: 7145
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -25.5,8.5
+  - uid: 7152
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -26.5,8.5
+  - uid: 7154
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -27.5,8.5
+  - uid: 7161
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -28.5,8.5
+  - uid: 7239
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-34.5
+  - uid: 7241
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-34.5
+  - uid: 7323
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-28.5
+  - uid: 7324
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: -36.5,-3.5
+  - uid: 7374
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-28.5
 - proto: RegenerativeMesh
   entities:
   - uid: 6854
@@ -49651,625 +52065,6 @@ entities:
       pos: 16.5,21.5
 - proto: ReinforcedWindow
   entities:
-  - uid: 50
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 1.5,-3.5
-  - uid: 51
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 2.5,-3.5
-  - uid: 52
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 3.5,-2.5
-  - uid: 54
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 3.5,-0.5
-  - uid: 55
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 3.5,1.5
-  - uid: 57
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 2.5,2.5
-  - uid: 58
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 0.5,2.5
-  - uid: 59
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -1.5,2.5
-  - uid: 60
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -0.5,2.5
-  - uid: 61
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -3.5,2.5
-  - uid: 63
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -4.5,1.5
-  - uid: 64
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -4.5,-0.5
-  - uid: 65
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -4.5,-1.5
-  - uid: 66
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -4.5,-2.5
-  - uid: 67
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -3.5,-3.5
-  - uid: 68
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -2.5,-3.5
-  - uid: 82
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 11.5,10.5
-  - uid: 86
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 24.5,7.5
-  - uid: 143
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -0.5,-3.5
-  - uid: 145
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 28.5,7.5
-  - uid: 162
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 1.5,-7.5
-  - uid: 169
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -2.5,6.5
-  - uid: 170
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 16.5,-3.5
-  - uid: 171
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 12.5,2.5
-  - uid: 174
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 14.5,-3.5
-  - uid: 175
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 14.5,2.5
-  - uid: 176
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -8.5,1.5
-  - uid: 177
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -8.5,-2.5
-  - uid: 179
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 1.5,6.5
-  - uid: 180
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 7.5,4.5
-  - uid: 181
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -2.5,-7.5
-  - uid: 189
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 12.5,-3.5
-  - uid: 192
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 16.5,2.5
-  - uid: 328
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 23.5,-29.5
-  - uid: 348
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 21.5,6.5
-  - uid: 355
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 31.5,6.5
-  - uid: 366
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 4.5,6.5
-  - uid: 367
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 5.5,6.5
-  - uid: 394
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 6.5,6.5
-  - uid: 478
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 18.5,-2.5
-  - uid: 479
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 18.5,1.5
-  - uid: 480
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 7.5,-2.5
-  - uid: 481
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 7.5,1.5
-  - uid: 594
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 7.5,-6.5
-  - uid: 595
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 7.5,-5.5
-  - uid: 596
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 7.5,-4.5
-  - uid: 712
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 22.5,-7.5
-  - uid: 719
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 21.5,-7.5
-  - uid: 720
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 20.5,-7.5
-  - uid: 925
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 27.5,-7.5
-  - uid: 927
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 25.5,-7.5
-  - uid: 928
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 24.5,-9.5
-  - uid: 930
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 24.5,-11.5
-  - uid: 931
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 24.5,-12.5
-  - uid: 932
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 27.5,-14.5
-  - uid: 933
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 26.5,-14.5
-  - uid: 934
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 25.5,-14.5
-  - uid: 1106
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 35.5,-26.5
-  - uid: 1162
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 35.5,-16.5
-  - uid: 1199
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 27.5,-28.5
-  - uid: 1205
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 25.5,-28.5
-  - uid: 1254
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 35.5,-21.5
-  - uid: 1316
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 35.5,-22.5
-  - uid: 1352
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 33.5,-28.5
-  - uid: 1353
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 32.5,-28.5
-  - uid: 1354
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 31.5,-28.5
-  - uid: 1365
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 35.5,-20.5
-  - uid: 1521
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 2.5,7.5
-  - uid: 1539
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 2.5,8.5
-  - uid: 1550
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 22.5,9.5
-  - uid: 1555
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 2.5,11.5
-  - uid: 1556
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 2.5,12.5
-  - uid: 1557
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 23.5,9.5
-  - uid: 1558
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 19.5,9.5
-  - uid: 1560
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 21.5,9.5
-  - uid: 1561
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 20.5,9.5
-  - uid: 1562
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 20.5,13.5
-  - uid: 1572
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 22.5,13.5
-  - uid: 1577
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 6.5,13.5
-  - uid: 1578
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 4.5,13.5
-  - uid: 1581
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 23.5,-32.5
-  - uid: 1582
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 23.5,-30.5
-  - uid: 1585
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 23.5,-31.5
-  - uid: 1586
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 23.5,-33.5
-  - uid: 1590
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: 7.5,10.5
-  - uid: 1593
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 3.141592653589793 rad
-      pos: 10.5,13.5
-  - uid: 1605
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 11.5,12.5
-  - uid: 1608
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 17.5,13.5
-  - uid: 1609
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 15.5,13.5
-  - uid: 1685
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: 7.5,9.5
-  - uid: 1733
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: 7.5,12.5
-  - uid: 1749
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 11.5,11.5
-  - uid: 1769
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 35.5,10.5
-  - uid: 1770
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 35.5,12.5
-  - uid: 1771
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 35.5,11.5
-  - uid: 1862
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 22.5,23.5
-  - uid: 1863
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 30.5,23.5
-  - uid: 1912
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 32.5,23.5
-  - uid: 1913
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 33.5,17.5
-  - uid: 1917
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 32.5,19.5
-  - uid: 2137
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 11.5,17.5
-  - uid: 2139
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 10.5,17.5
-  - uid: 2140
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 15.5,17.5
-  - uid: 2143
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 16.5,17.5
-  - uid: 2295
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -3.5,-45.5
-  - uid: 2296
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -1.5,-45.5
-  - uid: 2298
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -4.5,-45.5
-  - uid: 2322
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -6.5,-36.5
-  - uid: 2323
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -7.5,-36.5
-  - uid: 2343
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -6.5,-30.5
-  - uid: 2353
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 6.5,-36.5
-  - uid: 2354
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 5.5,-36.5
-  - uid: 2355
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 4.5,-36.5
-  - uid: 2356
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 3.5,-36.5
-  - uid: 2357
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 2.5,-36.5
-  - uid: 2440
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 1.5,-36.5
-  - uid: 2456
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 0.5,-36.5
-  - uid: 2457
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -0.5,-36.5
-  - uid: 2458
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -1.5,-36.5
-  - uid: 2459
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -2.5,-36.5
-  - uid: 2460
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -3.5,-36.5
-  - uid: 2461
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -4.5,-36.5
-  - uid: 2462
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -5.5,-36.5
   - uid: 2531
     components:
     - type: Transform
@@ -50285,304 +52080,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: 6.5,36.5
-  - uid: 2703
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -13.5,-3.5
-  - uid: 2704
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -14.5,-3.5
-  - uid: 2705
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -15.5,-3.5
-  - uid: 2706
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -11.5,-3.5
-  - uid: 2707
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -10.5,-3.5
-  - uid: 2708
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -9.5,-3.5
-  - uid: 2709
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -9.5,2.5
-  - uid: 2710
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -10.5,2.5
-  - uid: 2711
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -11.5,2.5
-  - uid: 2712
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -13.5,2.5
-  - uid: 2713
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -14.5,2.5
-  - uid: 2714
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -15.5,2.5
-  - uid: 2754
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -19.5,16.5
-  - uid: 2755
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -19.5,15.5
-  - uid: 2779
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -24.5,9.5
-  - uid: 2780
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -24.5,10.5
-  - uid: 2781
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -24.5,12.5
-  - uid: 2782
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -24.5,13.5
-  - uid: 2897
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -20.5,8.5
-  - uid: 2898
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -22.5,8.5
-  - uid: 2981
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 23.5,-34.5
-  - uid: 2988
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -0.5,22.5
-  - uid: 2998
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 3.141592653589793 rad
-      pos: 4.5,17.5
-  - uid: 3000
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 3.141592653589793 rad
-      pos: 2.5,17.5
-  - uid: 3002
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -4.5,13.5
-  - uid: 3004
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -6.5,13.5
-  - uid: 3182
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 4.5,22.5
-  - uid: 3184
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -8.5,-4.5
-  - uid: 3234
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -8.5,3.5
-  - uid: 3266
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: 7.5,7.5
-  - uid: 3286
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -12.5,23.5
-  - uid: 3293
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -4.5,23.5
-  - uid: 3295
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -6.5,23.5
-  - uid: 3297
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -10.5,23.5
-  - uid: 3366
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -25.5,28.5
-  - uid: 3369
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -26.5,27.5
-  - uid: 3370
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -26.5,22.5
-  - uid: 3372
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -26.5,20.5
-  - uid: 3373
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -26.5,21.5
-  - uid: 3374
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -26.5,25.5
-  - uid: 3376
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -26.5,23.5
-  - uid: 3377
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -26.5,24.5
-  - uid: 3378
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -28.5,20.5
-  - uid: 3380
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -24.5,28.5
-  - uid: 3382
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -26.5,26.5
-  - uid: 3392
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -28.5,26.5
-  - uid: 3393
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -28.5,27.5
-  - uid: 3394
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -28.5,25.5
-  - uid: 3399
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -28.5,21.5
-  - uid: 3408
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -23.5,18.5
-  - uid: 3410
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -24.5,18.5
-  - uid: 3415
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -25.5,18.5
-  - uid: 3425
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -28.5,19.5
-  - uid: 3440
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -26.5,19.5
-  - uid: 3602
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 33.5,9.5
-  - uid: 3603
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 32.5,9.5
-  - uid: 3604
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 31.5,9.5
-  - uid: 3605
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 30.5,9.5
-  - uid: 3606
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 29.5,9.5
   - uid: 3615
     components:
     - type: Transform
@@ -50618,11 +52115,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: -0.5,33.5
-  - uid: 3667
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -6.5,17.5
   - uid: 3882
     components:
     - type: Transform
@@ -50633,303 +52125,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: -3.5,30.5
-  - uid: 3997
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 3.141592653589793 rad
-      pos: -2.5,13.5
-  - uid: 4001
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 3.141592653589793 rad
-      pos: 1.5,13.5
-  - uid: 4058
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -6.5,-29.5
-  - uid: 4066
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 1.5,-45.5
-  - uid: 4076
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -5.5,-28.5
-  - uid: 4102
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -24.5,30.5
-  - uid: 4104
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -24.5,29.5
-  - uid: 4106
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -24.5,31.5
-  - uid: 4108
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -23.5,31.5
-  - uid: 4109
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -22.5,31.5
-  - uid: 4110
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -21.5,31.5
-  - uid: 4111
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -20.5,31.5
-  - uid: 4112
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -19.5,31.5
-  - uid: 4113
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -19.5,30.5
-  - uid: 4114
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -19.5,29.5
-  - uid: 4126
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 1.5,-29.5
-  - uid: 4127
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 1.5,-30.5
-  - uid: 4128
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 1.5,-31.5
-  - uid: 4129
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 3.5,-31.5
-  - uid: 4130
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 3.5,-30.5
-  - uid: 4131
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 3.5,-29.5
-  - uid: 4132
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -2.5,-29.5
-  - uid: 4133
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -2.5,-30.5
-  - uid: 4134
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -2.5,-31.5
-  - uid: 4135
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -4.5,-31.5
-  - uid: 4136
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -4.5,-30.5
-  - uid: 4137
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -4.5,-29.5
-  - uid: 4138
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 5.5,-30.5
-  - uid: 4139
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 5.5,-29.5
-  - uid: 4140
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -6.5,-31.5
-  - uid: 4142
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 4.5,-28.5
-  - uid: 4153
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 5.5,-31.5
-  - uid: 4300
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 1.5,-24.5
-  - uid: 4307
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -2.5,-24.5
-  - uid: 4345
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 0.5,-45.5
-  - uid: 4346
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 2.5,-45.5
-  - uid: 4347
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -0.5,-45.5
-  - uid: 4348
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 3.5,-45.5
-  - uid: 4349
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 4.5,-45.5
-  - uid: 4358
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -7.5,-45.5
-  - uid: 4359
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -6.5,-45.5
-  - uid: 4361
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 3.5,-50.5
-  - uid: 4366
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 1.5,-50.5
-  - uid: 4367
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -5.5,-45.5
-  - uid: 4373
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 4.5,-50.5
-  - uid: 4375
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 0.5,-50.5
-  - uid: 4392
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 5.5,-45.5
-  - uid: 4398
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 6.5,-45.5
-  - uid: 4401
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -2.5,-45.5
-  - uid: 4402
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -1.5,-50.5
-  - uid: 4403
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -2.5,-50.5
-  - uid: 4404
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -4.5,-50.5
-  - uid: 4405
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -5.5,-50.5
-  - uid: 4455
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 10.5,-49.5
-  - uid: 4456
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 9.5,-49.5
-  - uid: 4457
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 11.5,-49.5
-  - uid: 4468
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 18.5,-45.5
-  - uid: 4472
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 19.5,-42.5
-  - uid: 4473
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 19.5,-44.5
   - uid: 4477
     components:
     - type: Transform
@@ -50940,439 +52135,11 @@ entities:
     - type: Transform
       parent: 1668
       pos: 18.5,-40.5
-  - uid: 4480
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 18.5,-46.5
-  - uid: 4496
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -11.5,-49.5
-  - uid: 4497
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -10.5,-49.5
-  - uid: 4498
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -12.5,-49.5
-  - uid: 4509
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -19.5,-45.5
-  - uid: 4510
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -19.5,-46.5
-  - uid: 4514
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -19.5,-40.5
-  - uid: 4515
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -19.5,-41.5
-  - uid: 4519
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -19.5,-35.5
-  - uid: 4520
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -19.5,-36.5
-  - uid: 4579
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 19.5,-39.5
-  - uid: 4580
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 19.5,-37.5
-  - uid: 4581
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 18.5,-36.5
-  - uid: 4582
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 18.5,-35.5
-  - uid: 4583
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -20.5,-44.5
-  - uid: 4584
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -20.5,-42.5
-  - uid: 4585
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -20.5,-39.5
-  - uid: 4586
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -20.5,-37.5
-  - uid: 4680
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -14.5,-38.5
-  - uid: 4682
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -14.5,-41.5
-  - uid: 4689
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -14.5,-39.5
-  - uid: 4690
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -14.5,-40.5
-  - uid: 4691
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -14.5,-42.5
-  - uid: 4692
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -14.5,-43.5
-  - uid: 4693
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 13.5,-43.5
-  - uid: 4694
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 13.5,-42.5
-  - uid: 4700
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 13.5,-41.5
-  - uid: 4701
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 13.5,-40.5
-  - uid: 4702
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 13.5,-39.5
-  - uid: 4703
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 13.5,-38.5
-  - uid: 5321
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 30.5,6.5
-  - uid: 5386
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 22.5,6.5
-  - uid: 5391
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 20.5,6.5
-  - uid: 5397
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 32.5,6.5
-  - uid: 5554
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -4.5,-24.5
-  - uid: 5555
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -6.5,-24.5
-  - uid: 5556
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -8.5,-24.5
-  - uid: 5557
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -10.5,-24.5
-  - uid: 5558
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -12.5,-24.5
-  - uid: 5559
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -14.5,-24.5
-  - uid: 5560
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -16.5,-24.5
-  - uid: 5561
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -18.5,-24.5
-  - uid: 5615
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -20.5,-28.5
-  - uid: 5616
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -22.5,-28.5
-  - uid: 5617
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -24.5,-28.5
-  - uid: 5618
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -26.5,-28.5
-  - uid: 5625
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -26.5,-24.5
-  - uid: 5626
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -24.5,-24.5
-  - uid: 5627
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -22.5,-24.5
-  - uid: 5628
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -20.5,-24.5
   - uid: 5666
     components:
     - type: Transform
       parent: 1668
       pos: -40.5,-24.5
-  - uid: 5913
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -24.5,4.5
-  - uid: 5914
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -29.5,7.5
-  - uid: 5915
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -29.5,4.5
-  - uid: 5916
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -24.5,7.5
-  - uid: 6014
-    components:
-    - type: Transform
-      parent: 1668
-      rot: -1.5707963267948966 rad
-      pos: -25.5,2.5
-  - uid: 6015
-    components:
-    - type: Transform
-      parent: 1668
-      rot: -1.5707963267948966 rad
-      pos: -27.5,2.5
-  - uid: 6016
-    components:
-    - type: Transform
-      parent: 1668
-      rot: -1.5707963267948966 rad
-      pos: -28.5,2.5
-  - uid: 6017
-    components:
-    - type: Transform
-      parent: 1668
-      rot: -1.5707963267948966 rad
-      pos: -26.5,2.5
-  - uid: 6933
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -29.5,9.5
-  - uid: 6934
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -29.5,10.5
-  - uid: 6935
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -29.5,12.5
-  - uid: 6936
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -29.5,13.5
-  - uid: 6954
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -52.5,1.5
-  - uid: 7108
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: -48.5,-8.5
-  - uid: 7109
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: -50.5,-8.5
-  - uid: 7110
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: -49.5,-8.5
-  - uid: 7120
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -44.5,2.5
-  - uid: 7121
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -42.5,2.5
-  - uid: 7123
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -50.5,-3.5
-  - uid: 7124
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -48.5,-3.5
-  - uid: 7133
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: -43.5,7.5
-  - uid: 7134
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: -42.5,7.5
-  - uid: 7135
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: -44.5,7.5
-  - uid: 7143
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: -49.5,7.5
-  - uid: 7144
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: -48.5,7.5
-  - uid: 7145
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: -50.5,7.5
-  - uid: 7152
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -55.5,-2.5
-  - uid: 7154
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -52.5,-2.5
-  - uid: 7161
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -55.5,1.5
-  - uid: 7239
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -50.5,2.5
-  - uid: 7241
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -48.5,2.5
-  - uid: 7323
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -31.5,8.5
-  - uid: 7324
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -33.5,8.5
   - uid: 7359
     components:
     - type: Transform
@@ -51408,111 +52175,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: -40.5,-28.5
-  - uid: 7374
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -28.5,-28.5
-  - uid: 7375
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -30.5,-28.5
-  - uid: 7376
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -28.5,-24.5
-  - uid: 7377
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -30.5,-24.5
-  - uid: 7378
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -32.5,-28.5
-  - uid: 7379
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -34.5,-28.5
-  - uid: 7380
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -36.5,-28.5
-  - uid: 7381
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -38.5,-28.5
-  - uid: 7382
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -38.5,-24.5
-  - uid: 7383
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -36.5,-24.5
-  - uid: 7384
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -34.5,-24.5
-  - uid: 7385
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -32.5,-24.5
-  - uid: 8759
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -25.5,8.5
-  - uid: 8760
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -26.5,8.5
-  - uid: 8761
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -27.5,8.5
-  - uid: 8762
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -28.5,8.5
-  - uid: 9110
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 22.5,-34.5
-  - uid: 9111
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 21.5,-34.5
-  - uid: 9122
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 21.5,-28.5
-  - uid: 9289
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -36.5,-3.5
-  - uid: 9694
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 26.5,-28.5
 - proto: RitualDagger
   entities:
   - uid: 6114
@@ -51569,6 +52231,16 @@ entities:
       pos: -35.37574,11.823141
 - proto: Screen
   entities:
+  - uid: 521
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 23.5,6.5
+  - uid: 609
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 29.5,6.5
   - uid: 6906
     components:
     - type: Transform
@@ -51629,16 +52301,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: 26.5,13.5
-  - uid: 6918
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 33.5,-7.5
-  - uid: 6919
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 33.5,6.5
   - uid: 6920
     components:
     - type: Transform
@@ -51699,16 +52361,16 @@ entities:
     - type: Transform
       parent: 1668
       pos: 4.5,-7.5
-  - uid: 6932
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -14.5,11.5
   - uid: 7332
     components:
     - type: Transform
       parent: 1668
       pos: -34.5,2.5
+  - uid: 7377
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -14.5,13.5
   - uid: 7488
     components:
     - type: Transform
@@ -52037,31 +52699,41 @@ entities:
       pos: 13.5,4.5
     - type: DeviceLinkSource
       linkedPorts:
-        542:
+        64:
         - - On
           - Open
         - - Off
           - Close
-        543:
+        - - Status
+          - Toggle
+        63:
         - - On
           - Open
         - - Off
           - Close
-        544:
+        - - Status
+          - Toggle
+        59:
         - - On
           - Open
         - - Off
           - Close
-        545:
+        - - Status
+          - Toggle
+        60:
         - - On
           - Open
         - - Off
           - Close
-        546:
+        - - Status
+          - Toggle
+        61:
         - - On
           - Open
         - - Off
           - Close
+        - - Status
+          - Toggle
   - uid: 603
     components:
     - type: MetaData
@@ -52071,31 +52743,41 @@ entities:
       pos: 15.5,4.5
     - type: DeviceLinkSource
       linkedPorts:
-        539:
+        82:
         - - On
           - Open
         - - Off
           - Close
-        538:
+        - - Status
+          - Toggle
+        68:
         - - On
           - Open
         - - Off
           - Close
-        537:
+        - - Status
+          - Toggle
+        67:
         - - On
           - Open
         - - Off
           - Close
-        540:
+        - - Status
+          - Toggle
+        66:
         - - On
           - Open
         - - Off
           - Close
-        541:
+        - - Status
+          - Toggle
+        65:
         - - On
           - Open
         - - Off
           - Close
+        - - Status
+          - Toggle
   - uid: 9388
     components:
     - type: MetaData
@@ -52193,29 +52875,21 @@ entities:
           - Open
         - - Off
           - Close
-        - - Status
-          - Toggle
         4755:
         - - On
           - Open
         - - Off
           - Close
-        - - Status
-          - Toggle
         7172:
         - - On
           - Open
         - - Off
           - Close
-        - - Status
-          - Toggle
         4754:
         - - On
           - Open
         - - Off
           - Close
-        - - Status
-          - Toggle
         314:
         - - On
           - Open
@@ -52246,29 +52920,21 @@ entities:
           - Open
         - - Off
           - Close
-        - - Status
-          - Toggle
         4757:
         - - On
           - Open
         - - Off
           - Close
-        - - Status
-          - Toggle
         6673:
         - - On
           - Open
         - - Off
           - Close
-        - - Status
-          - Toggle
         6674:
         - - On
           - Open
         - - Off
           - Close
-        - - Status
-          - Toggle
         326:
         - - On
           - Open
@@ -52400,11 +53066,13 @@ entities:
       pos: 18.5,-4.5
     - type: DeviceLinkSource
       linkedPorts:
-        612:
+        211:
         - - On
           - Open
         - - Off
           - Close
+        - - Status
+          - Toggle
   - uid: 611
     components:
     - type: MetaData
@@ -52415,11 +53083,13 @@ entities:
       pos: 18.5,3.5
     - type: DeviceLinkSource
       linkedPorts:
-        609:
+        210:
         - - On
           - Open
         - - Off
           - Close
+        - - Status
+          - Toggle
   - uid: 728
     components:
     - type: MetaData
@@ -52452,21 +53122,27 @@ entities:
       pos: 32.5,-9.5
     - type: DeviceLinkSource
       linkedPorts:
-        1142:
+        519:
         - - On
           - Open
         - - Off
           - Close
-        1141:
+        - - Status
+          - Toggle
+        518:
         - - On
           - Open
         - - Off
           - Close
-        1140:
+        - - Status
+          - Toggle
+        520:
         - - On
           - Open
         - - Off
           - Close
+        - - Status
+          - Toggle
   - uid: 1131
     components:
     - type: Transform
@@ -52475,21 +53151,27 @@ entities:
       pos: 32.5,-12.5
     - type: DeviceLinkSource
       linkedPorts:
-        1143:
+        309:
         - - On
           - Open
         - - Off
           - Close
-        1144:
+        - - Status
+          - Toggle
+        517:
         - - On
           - Open
         - - Off
           - Close
-        1145:
+        - - Status
+          - Toggle
+        308:
         - - On
           - Open
         - - Off
           - Close
+        - - Status
+          - Toggle
   - uid: 1630
     components:
     - type: MetaData
@@ -53546,7 +54228,7 @@ entities:
     - type: Transform
       parent: 1668
       pos: -11.5,26.5
-- proto: StatueBananiumClown
+- proto: StatueOrnateClown
   entities:
   - uid: 9616
     components:
@@ -53663,7 +54345,7 @@ entities:
     - type: Transform
       parent: 1668
       rot: 3.141592653589793 rad
-      pos: -7.029807,-10.078645
+      pos: -7.5,-10.5
 - proto: StoolBar
   entities:
   - uid: 748
@@ -53956,9 +54638,9 @@ entities:
     - type: Transform
       parent: 1668
       pos: -15.5,24.5
-- proto: SuitStorageEVA
+- proto: SuitStorageNTSRA
   entities:
-  - uid: 2911
+  - uid: 7378
     components:
     - type: Transform
       parent: 1668
@@ -55206,6 +55888,11 @@ entities:
       pos: -15.5,-2.5
 - proto: TableCarpet
   entities:
+  - uid: 128
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -15.5,9.5
   - uid: 1527
     components:
     - type: Transform
@@ -55276,6 +55963,21 @@ entities:
     - type: Transform
       parent: 1668
       pos: -19.5,-8.5
+  - uid: 7380
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -11.5,13.5
+  - uid: 7381
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -13.5,13.5
+  - uid: 7382
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -12.5,13.5
   - uid: 8692
     components:
     - type: Transform
@@ -55348,6 +56050,11 @@ entities:
       pos: -28.5,-17.5
 - proto: TableFancyGreen
   entities:
+  - uid: 170
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -21.5,13.5
   - uid: 6066
     components:
     - type: Transform
@@ -55374,6 +56081,16 @@ entities:
     - type: Transform
       parent: 1668
       pos: -38.5,-17.5
+  - uid: 7383
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -13.5,9.5
+  - uid: 9732
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -19.5,13.5
 - proto: TableFancyOrange
   entities:
   - uid: 9523
@@ -56781,11 +57498,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: 27.5,11.5
-  - uid: 2731
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -15.5,9.5
   - uid: 2806
     components:
     - type: Transform
@@ -56806,26 +57518,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: -16.5,11.5
-  - uid: 2813
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -11.5,13.5
-  - uid: 2815
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -12.5,13.5
-  - uid: 2816
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -13.5,13.5
-  - uid: 2825
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -13.5,9.5
   - uid: 2843
     components:
     - type: Transform
@@ -57246,6 +57938,27 @@ entities:
     - type: Transform
       parent: 1668
       pos: -30.5,-8.5
+- proto: ToolDebug
+  entities:
+  - uid: 9759
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -23.356466,10.38205
+    - type: Tool
+      useSound: !type:SoundPathSpecifier
+        path: /Audio/Items/jaws_pry.ogg
+        params:
+          volume: 0
+          variation: null
+          rolloffFactor: 1
+          referenceDistance: 1
+          playOffsetSeconds: 0
+          pitch: 1
+          maxDistance: 15
+          loop: False
+      qualities:
+      - Prying
 - proto: TowelColorCentcom
   entities:
   - uid: 2850
@@ -57515,7 +58228,7 @@ entities:
     - type: Transform
       parent: 1668
       pos: -38.5,12.5
-- proto: UraniumWindoorSecureCentralCommandLocked
+- proto: UraniumWindoorCentralCommandLocked
   entities:
   - uid: 9603
     components:
@@ -57780,7 +58493,7 @@ entities:
       pos: -39.5,1.5
 - proto: VendingMachineSciDrobe
   entities:
-  - uid: 9158
+  - uid: 7384
     components:
     - type: Transform
       parent: 1668
@@ -57851,6 +58564,11 @@ entities:
     - type: Transform
       parent: 1668
       pos: -41.5,1.5
+  - uid: 9755
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 24.5,-15.5
 - proto: VendingMachineTankDispenserEVA
   entities:
   - uid: 9195
@@ -57879,6 +58597,53 @@ entities:
     - type: Transform
       parent: 1668
       pos: -4.5,10.5
+- proto: WallGold
+  entities:
+  - uid: 7385
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -19.5,14.5
+  - uid: 7486
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -19.5,17.5
+  - uid: 8759
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -18.5,17.5
+  - uid: 8760
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -17.5,17.5
+  - uid: 8761
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -16.5,17.5
+  - uid: 8762
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -16.5,16.5
+  - uid: 9110
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -16.5,15.5
+  - uid: 9111
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -16.5,14.5
+  - uid: 9122
+    components:
+    - type: Transform
+      parent: 1668
+      pos: -17.5,14.5
 - proto: WallMarble
   entities:
   - uid: 4
@@ -59971,51 +60736,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: -20.5,14.5
-  - uid: 2753
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -19.5,14.5
-  - uid: 2756
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -19.5,17.5
-  - uid: 2757
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -18.5,17.5
-  - uid: 2758
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -17.5,17.5
-  - uid: 2759
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -16.5,17.5
-  - uid: 2760
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -16.5,16.5
-  - uid: 2761
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -16.5,15.5
-  - uid: 2762
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -16.5,14.5
-  - uid: 2763
-    components:
-    - type: Transform
-      parent: 1668
-      pos: -17.5,14.5
   - uid: 2764
     components:
     - type: Transform
@@ -64198,6 +64918,23 @@ entities:
     - type: Transform
       parent: 1668
       pos: -38.44605,13.4853525
+- proto: WeaponTaserSuper
+  entities:
+  - uid: 169
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 10.526081,30.762127
+  - uid: 9730
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 10.526081,30.559002
+  - uid: 9731
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 10.541706,30.402752
 - proto: WeaponTetherGun
   entities:
   - uid: 4117
@@ -64363,84 +65100,7 @@ entities:
       parent: 1668
       rot: 3.141592653589793 rad
       pos: 33.5,23.5
-- proto: WindoorCargoLocked
-  entities:
-  - uid: 49
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 3.141592653589793 rad
-      pos: 3.5,22.5
-  - uid: 2989
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 3.141592653589793 rad
-      pos: 2.5,22.5
-- proto: WindoorHydroponicsLocked
-  entities:
-  - uid: 969
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-19.5
-  - uid: 970
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-18.5
-  - uid: 971
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-17.5
-  - uid: 981
-    components:
-    - type: Transform
-      parent: 1668
-      pos: 9.5,-13.5
-- proto: WindoorKitchenLocked
-  entities:
-  - uid: 1096
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: 11.5,-19.5
-  - uid: 1097
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: 11.5,-18.5
-  - uid: 1098
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 1.5707963267948966 rad
-      pos: 11.5,-17.5
-  - uid: 1176
-    components:
-    - type: Transform
-      parent: 1668
-      rot: -1.5707963267948966 rad
-      pos: 18.5,-19.5
-  - uid: 1177
-    components:
-    - type: Transform
-      parent: 1668
-      rot: -1.5707963267948966 rad
-      pos: 18.5,-18.5
-  - uid: 1178
-    components:
-    - type: Transform
-      parent: 1668
-      rot: -1.5707963267948966 rad
-      pos: 18.5,-17.5
-- proto: WindoorSecureBrigLocked
+- proto: WindoorBrigLocked
   entities:
   - uid: 1864
     components:
@@ -64479,15 +65139,27 @@ entities:
     - type: Transform
       parent: 1668
       pos: 26.5,25.5
-- proto: WindoorSecureCargoLocked
+- proto: WindoorCargoLocked
   entities:
+  - uid: 49
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: 3.5,22.5
+  - uid: 2989
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 3.141592653589793 rad
+      pos: 2.5,22.5
   - uid: 3885
     components:
     - type: Transform
       parent: 1668
       rot: -1.5707963267948966 rad
       pos: -3.5,31.5
-- proto: WindoorSecureCentralCommandLocked
+- proto: WindoorCentralCommandLocked
   entities:
   - uid: 2903
     components:
@@ -64559,7 +65231,7 @@ entities:
     - type: Transform
       parent: 1668
       pos: -38.5,5.5
-- proto: WindoorSecureChemistryLocked
+- proto: WindoorChemistryLocked
   entities:
   - uid: 666
     components:
@@ -64597,7 +65269,7 @@ entities:
       parent: 1668
       rot: 3.141592653589793 rad
       pos: 9.5,-13.5
-- proto: WindoorSecureCommandLocked
+- proto: WindoorCommandLocked
   entities:
   - uid: 96
     components:
@@ -64627,7 +65299,7 @@ entities:
       parent: 1668
       rot: 3.141592653589793 rad
       pos: -31.5,-10.5
-- proto: WindoorSecureEngineeringLocked
+- proto: WindoorEngineeringLocked
   entities:
   - uid: 3030
     components:
@@ -64641,7 +65313,70 @@ entities:
       parent: 1668
       rot: 3.141592653589793 rad
       pos: -4.5,17.5
-- proto: WindoorSecureMedicalLocked
+- proto: WindoorHydroponicsLocked
+  entities:
+  - uid: 969
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-19.5
+  - uid: 970
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-18.5
+  - uid: 971
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-17.5
+  - uid: 981
+    components:
+    - type: Transform
+      parent: 1668
+      pos: 9.5,-13.5
+- proto: WindoorKitchenLocked
+  entities:
+  - uid: 1096
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-19.5
+  - uid: 1097
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-18.5
+  - uid: 1098
+    components:
+    - type: Transform
+      parent: 1668
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-17.5
+  - uid: 1176
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-19.5
+  - uid: 1177
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-18.5
+  - uid: 1178
+    components:
+    - type: Transform
+      parent: 1668
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-17.5
+- proto: WindoorMedicalLocked
   entities:
   - uid: 550
     components:
@@ -64653,7 +65388,7 @@ entities:
     - type: Transform
       parent: 1668
       pos: 15.5,-3.5
-- proto: WindoorSecureSecurityLocked
+- proto: WindoorSecurityLocked
   entities:
   - uid: 409
     components:
@@ -64915,12 +65650,6 @@ entities:
     - type: Transform
       parent: 1668
       pos: 14.5,13.5
-  - uid: 1731
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 3.141592653589793 rad
-      pos: 5.5,12.5
   - uid: 1848
     components:
     - type: Transform
@@ -65217,18 +65946,6 @@ entities:
       parent: 1668
       rot: -1.5707963267948966 rad
       pos: -3.5,-20.5
-  - uid: 4795
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 3.141592653589793 rad
-      pos: -11.5,-38.5
-  - uid: 4796
-    components:
-    - type: Transform
-      parent: 1668
-      rot: 3.141592653589793 rad
-      pos: 10.5,-38.5
   - uid: 5510
     components:
     - type: Transform
diff --git a/Resources/Maps/elkridge.yml b/Resources/Maps/elkridge.yml
index ca580dc881..fbccec0cc9 100644
--- a/Resources/Maps/elkridge.yml
+++ b/Resources/Maps/elkridge.yml
@@ -4,8 +4,8 @@ meta:
   engineVersion: 289.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/23/2026 14:45:58
-  entityCount: 18753
+  time: 09/10/2026 21:51:29
+  entityCount: 18752
 maps:
 - 1
 grids:
@@ -17,6 +17,7 @@ nullspace:
 - 16520
 - 16545
 - 16579
+- 16911
 - 17458
 - 18048
 - 18107
@@ -61,7 +62,6 @@ nullspace:
 - 18750
 - 18751
 - 18752
-- 18753
 tilemap:
   0: Space
   44: FloorArcadeBlue
@@ -2171,6 +2171,7 @@ entities:
       - 16520
       - 16545
       - 16579
+      - 16911
       - 17458
       - 18048
       - 18107
@@ -2215,7 +2216,6 @@ entities:
       - 18750
       - 18751
       - 18752
-      - 18753
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 15607
@@ -4740,7 +4740,7 @@ entities:
       pos: -15.5,-9.5
     - type: Door
       state: Opening
-      secondsUntilStateChange: -6525.6064
+      secondsUntilStateChange: -7192.4497
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -4838,11 +4838,25 @@ entities:
     - type: Transform
       parent: 2
       pos: 7.5,40.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        6505:
+        - - DoorStatus
+          - DoorBolt
   - uid: 6503
     components:
     - type: Transform
       parent: 2
       pos: 9.5,40.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        6504:
+        - - DoorStatus
+          - DoorBolt
   - uid: 7670
     components:
     - type: Transform
@@ -5080,6 +5094,34 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -10.5,46.5
+- proto: AirlockExternalGlassShuttleCargo
+  entities:
+  - uid: 6504
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 9.5,42.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        6503:
+        - - DoorStatus
+          - DoorBolt
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 6505
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 7.5,42.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        6502:
+        - - DoorStatus
+          - DoorBolt
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: AirlockExternalGlassShuttleEmergencyLocked
   entities:
   - uid: 3591
@@ -5440,20 +5482,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 7.5,22.5
-- proto: AirlockGlassShuttle
-  entities:
-  - uid: 6504
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 7.5,42.5
-  - uid: 6505
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 9.5,42.5
 - proto: AirlockHeadOfPersonnelLocked
   entities:
   - uid: 10830
@@ -5554,7 +5582,7 @@ entities:
       pos: 16.5,24.5
     - type: Door
       state: Opening
-      secondsUntilStateChange: -6302.0063
+      secondsUntilStateChange: -6968.8496
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -5742,7 +5770,7 @@ entities:
       pos: 4.5,-15.5
     - type: Door
       state: Opening
-      secondsUntilStateChange: -1236.4108
+      secondsUntilStateChange: -1903.254
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -5817,7 +5845,7 @@ entities:
       pos: 9.5,-11.5
     - type: Door
       state: Opening
-      secondsUntilStateChange: -2220.8098
+      secondsUntilStateChange: -2887.653
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -8458,13 +8486,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 33.491795,61.631714
-- proto: AsimovCircuitBoard
-  entities:
-  - uid: 5102
-    components:
-    - type: Transform
-      parent: 2
-      pos: -42.6537,16.70864
 - proto: AtmosDeviceFanDirectional
   entities:
   - uid: 247
@@ -8562,18 +8583,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -54.5,-8.5
-  - uid: 10896
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 7.5,42.5
-  - uid: 10897
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 9.5,42.5
   - uid: 15145
     components:
     - type: Transform
@@ -13163,11 +13172,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 7.524176,9.531988
-  - uid: 16911
-    components:
-    - type: Transform
-      parent: 2
-      pos: 11.396216,25.5396
 - proto: Biogenerator
   entities:
   - uid: 9690
@@ -13486,12 +13490,12 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 11.9063835,25.245644
+      pos: 11.894741,23.706411
   - uid: 16986
     components:
     - type: Transform
       parent: 2
-      pos: 11.4845085,25.167519
+      pos: 11.665574,23.43558
 - proto: BoxDarts
   entities:
   - uid: 18242
@@ -36664,6 +36668,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 15.5,25.5
+- proto: CargoTelepad
+  entities:
+  - uid: 10897
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,36.5
 - proto: Carpet
   entities:
   - uid: 1583
@@ -45139,7 +45150,7 @@ entities:
             cleanable: True
           decals:
             3560: -16,-14
-  - uid: 17458
+  - uid: 16911
     components:
     - type: ChunkEntity
       root: 2
@@ -45340,7 +45351,7 @@ entities:
             cleanable: True
           decals:
             12003: 26,-29
-  - uid: 18048
+  - uid: 17458
     components:
     - type: ChunkEntity
       root: 2
@@ -45736,7 +45747,7 @@ entities:
           decals:
             3594: 24,-13
             3600: 30,-4
-  - uid: 18107
+  - uid: 18048
     components:
     - type: ChunkEntity
       root: 2
@@ -45871,7 +45882,7 @@ entities:
             angle: 1.5707963267948966 rad
           decals:
             11297: 30,-46
-  - uid: 18630
+  - uid: 18107
     components:
     - type: ChunkEntity
       root: 2
@@ -46155,7 +46166,7 @@ entities:
           decals:
             3502: 37,-1
             3503: 36,-15
-  - uid: 18646
+  - uid: 18630
     components:
     - type: ChunkEntity
       root: 2
@@ -46372,7 +46383,7 @@ entities:
             12588: 53,-25
             12589: 54,-25
             12599: 51,-24
-  - uid: 18714
+  - uid: 18646
     components:
     - type: ChunkEntity
       root: 2
@@ -46396,6 +46407,12 @@ entities:
             5517: 11,21
             5518: 11,19
             5519: 10,19
+        - node:
+            id: BotGreyscale
+            color: '#FFFFFFFF'
+            angle: -1.5707963267948966 rad
+          decals:
+            0: 11,25
         - node:
             id: BrickTileSteelCornerNe
             color: '#A4610696'
@@ -46924,7 +46941,7 @@ entities:
             cleanable: True
           decals:
             6483: 4,21
-  - uid: 18715
+  - uid: 18714
     components:
     - type: ChunkEntity
       root: 2
@@ -47182,7 +47199,7 @@ entities:
           decals:
             14309: 22.270153,41.347107
             14310: 21.863903,40.956482
-  - uid: 18716
+  - uid: 18715
     components:
     - type: ChunkEntity
       root: 2
@@ -47544,7 +47561,7 @@ entities:
             cleanable: True
           decals:
             14067: -2,-33
-  - uid: 18717
+  - uid: 18716
     components:
     - type: ChunkEntity
       root: 2
@@ -47730,7 +47747,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             14524: 2,-38
-  - uid: 18718
+  - uid: 18717
     components:
     - type: ChunkEntity
       root: 2
@@ -48257,7 +48274,7 @@ entities:
           decals:
             3558: -25,-6
             6692: -21,-8
-  - uid: 18719
+  - uid: 18718
     components:
     - type: ChunkEntity
       root: 2
@@ -48728,7 +48745,7 @@ entities:
           decals:
             3540: 34,13
             3601: 42,14
-  - uid: 18720
+  - uid: 18719
     components:
     - type: ChunkEntity
       root: 2
@@ -49289,7 +49306,7 @@ entities:
             12098: -15,17
             12099: -14,17
             12757: -9,17
-  - uid: 18721
+  - uid: 18720
     components:
     - type: ChunkEntity
       root: 2
@@ -49767,7 +49784,7 @@ entities:
             cleanable: True
           decals:
             3588: -26,-29
-  - uid: 18722
+  - uid: 18721
     components:
     - type: ChunkEntity
       root: 2
@@ -50129,7 +50146,7 @@ entities:
             cleanable: True
           decals:
             12349: -28,11
-  - uid: 18723
+  - uid: 18722
     components:
     - type: ChunkEntity
       root: 2
@@ -50214,7 +50231,7 @@ entities:
             cleanable: True
           decals:
             13437: -39,15
-  - uid: 18724
+  - uid: 18723
     components:
     - type: ChunkEntity
       root: 2
@@ -50342,7 +50359,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             14811: 58,-1
-  - uid: 18725
+  - uid: 18724
     components:
     - type: ChunkEntity
       root: 2
@@ -50802,7 +50819,7 @@ entities:
             3423: 4,8
             3550: 4,3
             3551: 6,5
-  - uid: 18726
+  - uid: 18725
     components:
     - type: ChunkEntity
       root: 2
@@ -51236,7 +51253,7 @@ entities:
             cleanable: True
           decals:
             14070: 1,-16
-  - uid: 18727
+  - uid: 18726
     components:
     - type: ChunkEntity
       root: 2
@@ -51637,7 +51654,7 @@ entities:
             3562: -34,-12
             3563: -37,-10
             3564: -40,-13
-  - uid: 18728
+  - uid: 18727
     components:
     - type: ChunkEntity
       root: 2
@@ -51922,7 +51939,7 @@ entities:
           decals:
             3520: 32,23
             3523: 45,19
-  - uid: 18729
+  - uid: 18728
     components:
     - type: ChunkEntity
       root: 2
@@ -52337,7 +52354,7 @@ entities:
             cleanable: True
           decals:
             13216: -29,28
-  - uid: 18730
+  - uid: 18729
     components:
     - type: ChunkEntity
       root: 2
@@ -52468,7 +52485,7 @@ entities:
             cleanable: True
           decals:
             13219: -32,32
-  - uid: 18731
+  - uid: 18730
     components:
     - type: ChunkEntity
       root: 2
@@ -52974,7 +52991,7 @@ entities:
             cleanable: True
           decals:
             3571: -18,-44
-  - uid: 18732
+  - uid: 18731
     components:
     - type: ChunkEntity
       root: 2
@@ -53258,7 +53275,7 @@ entities:
             cleanable: True
           decals:
             13209: -34,30
-  - uid: 18733
+  - uid: 18732
     components:
     - type: ChunkEntity
       root: 2
@@ -53552,7 +53569,7 @@ entities:
             cleanable: True
           decals:
             6315: -42,-37
-  - uid: 18734
+  - uid: 18733
     components:
     - type: ChunkEntity
       root: 2
@@ -53842,7 +53859,7 @@ entities:
             cleanable: True
           decals:
             3491: 5,-25
-  - uid: 18735
+  - uid: 18734
     components:
     - type: ChunkEntity
       root: 2
@@ -53980,7 +53997,7 @@ entities:
             cleanable: True
           decals:
             3469: -56,-12
-  - uid: 18736
+  - uid: 18735
     components:
     - type: ChunkEntity
       root: 2
@@ -54500,7 +54517,7 @@ entities:
             angle: 2.5656340004316642 rad
           decals:
             14326: 21.051403,30.893982
-  - uid: 18737
+  - uid: 18736
     components:
     - type: ChunkEntity
       root: 2
@@ -55140,7 +55157,7 @@ entities:
             cleanable: True
           decals:
             3543: 25,4
-  - uid: 18738
+  - uid: 18737
     components:
     - type: ChunkEntity
       root: 2
@@ -55182,7 +55199,7 @@ entities:
             cleanable: True
           decals:
             13208: -33,34
-  - uid: 18739
+  - uid: 18738
     components:
     - type: ChunkEntity
       root: 2
@@ -55396,7 +55413,7 @@ entities:
           decals:
             6353: -11.556236,57.953625
             6354: -10.5999,57.645977
-  - uid: 18740
+  - uid: 18739
     components:
     - type: ChunkEntity
       root: 2
@@ -55763,7 +55780,7 @@ entities:
             angle: 2.251474735072685 rad
           decals:
             10208: -37.270893,-19.01579
-  - uid: 18741
+  - uid: 18740
     components:
     - type: ChunkEntity
       root: 2
@@ -56002,7 +56019,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             14668: -1,39
-  - uid: 18742
+  - uid: 18741
     components:
     - type: ChunkEntity
       root: 2
@@ -56134,7 +56151,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             14810: 49,3
-  - uid: 18743
+  - uid: 18742
     components:
     - type: ChunkEntity
       root: 2
@@ -56216,7 +56233,7 @@ entities:
             color: '#D4D4D496'
           decals:
             10833: -19,55
-  - uid: 18744
+  - uid: 18743
     components:
     - type: ChunkEntity
       root: 2
@@ -56286,7 +56303,7 @@ entities:
           decals:
             3580: -69,-32
             3581: -68,-32
-  - uid: 18745
+  - uid: 18744
     components:
     - type: ChunkEntity
       root: 2
@@ -56424,7 +56441,7 @@ entities:
             angle: 1.5707963267948966 rad
           decals:
             11298: 32,-45
-  - uid: 18746
+  - uid: 18745
     components:
     - type: ChunkEntity
       root: 2
@@ -56459,7 +56476,7 @@ entities:
           decals:
             10738: 50,33
             10739: 52,33
-  - uid: 18747
+  - uid: 18746
     components:
     - type: ChunkEntity
       root: 2
@@ -56577,7 +56594,7 @@ entities:
             10987: -61,-28
             10988: -55,-28
             10989: -53,-28
-  - uid: 18748
+  - uid: 18747
     components:
     - type: ChunkEntity
       root: 2
@@ -56615,7 +56632,7 @@ entities:
             10986: -61,-34
             10990: -53,-34
             10991: -55,-34
-  - uid: 18749
+  - uid: 18748
     components:
     - type: ChunkEntity
       root: 2
@@ -56656,7 +56673,7 @@ entities:
             10729: 48,23
             10731: 50,17
             10734: 48,27
-  - uid: 18750
+  - uid: 18749
     components:
     - type: ChunkEntity
       root: 2
@@ -56678,7 +56695,7 @@ entities:
             cleanable: True
           decals:
             12727: 50,-33
-  - uid: 18751
+  - uid: 18750
     components:
     - type: ChunkEntity
       root: 2
@@ -56762,7 +56779,7 @@ entities:
             13007: -36,-54
             13008: -35,-54
             13009: -34,-54
-  - uid: 18752
+  - uid: 18751
     components:
     - type: ChunkEntity
       root: 2
@@ -56840,7 +56857,7 @@ entities:
           decals:
             13357: -27,-51
             13358: -23,-51
-  - uid: 18753
+  - uid: 18752
     components:
     - type: ChunkEntity
       root: 2
@@ -58855,11 +58872,21 @@ entities:
     - type: Transform
       parent: 2
       pos: 10.5,30.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        10897:
+        - - OrderSender
+          - OrderReceiver
   - uid: 4247
     components:
     - type: Transform
       parent: 2
       pos: 8.5,30.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        10897:
+        - - OrderSender
+          - OrderReceiver
   - uid: 4637
     components:
     - type: Transform
@@ -58873,6 +58900,11 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 26.5,-14.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        10897:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersMedical
   entities:
   - uid: 9592
@@ -58881,6 +58913,11 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 37.5,17.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        10897:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersScience
   entities:
   - uid: 5526
@@ -58888,6 +58925,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -19.5,21.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        10897:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersSecurity
   entities:
   - uid: 13009
@@ -58896,6 +58938,11 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -2.5,-23.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        10897:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersService
   entities:
   - uid: 11732
@@ -60006,6 +60053,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 27.5,-1.5
+- proto: CrewsimovCircuitBoard
+  entities:
+  - uid: 5102
+    components:
+    - type: Transform
+      parent: 2
+      pos: -42.6537,16.70864
 - proto: CrowbarOrange
   entities:
   - uid: 16048
@@ -66221,13 +66275,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -3.4372268,-43.335434
-- proto: DrinkWaterJug
-  entities:
-  - uid: 15217
-    components:
-    - type: Transform
-      parent: 2
-      pos: -31.180569,-11.36548
 - proto: DrinkWhiskeyBottleFull
   entities:
   - uid: 4913
@@ -94791,6 +94838,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 28.622116,-32.039066
+- proto: JugWater
+  entities:
+  - uid: 15217
+    components:
+    - type: Transform
+      parent: 2
+      pos: -31.180569,-11.36548
 - proto: KitchenElectricGrill
   entities:
   - uid: 1431
@@ -96273,6 +96327,13 @@ entities:
     - type: Transform
       parent: 2
       pos: -18.5,15.5
+- proto: MailCart
+  entities:
+  - uid: 10896
+    components:
+    - type: Transform
+      parent: 2
+      pos: 11.5,25.5
 - proto: MailingUnit
   entities:
   - uid: 11816
diff --git a/Resources/Maps/exo.yml b/Resources/Maps/exo.yml
index d20a956d00..5c115be5ef 100644
--- a/Resources/Maps/exo.yml
+++ b/Resources/Maps/exo.yml
@@ -1,71 +1,72 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 288.1.0
+  engineVersion: 289.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/14/2026 12:21:06
-  entityCount: 20270
+  time: 09/12/2026 12:40:31
+  entityCount: 20127
 maps:
 - 1
 grids:
 - 2
 orphans: []
 nullspace:
-- 7297
-- 20218
-- 20219
-- 20220
-- 20221
-- 20222
-- 20223
-- 20224
-- 20225
-- 20226
-- 20227
-- 20228
-- 20229
-- 20230
-- 20231
-- 20232
-- 20233
-- 20234
-- 20235
-- 20236
-- 20237
-- 20238
-- 20239
-- 20240
-- 20241
-- 20242
-- 20243
-- 20244
-- 20245
-- 20246
-- 20247
-- 20248
-- 20249
-- 20250
-- 20251
-- 20252
-- 20253
-- 20254
-- 20255
-- 20256
-- 20257
-- 20258
-- 20259
-- 20260
-- 20261
-- 20262
-- 20263
-- 20264
-- 20265
-- 20266
-- 20267
-- 20268
-- 20269
-- 20270
+- 17429
+- 17430
+- 17524
+- 17525
+- 17526
+- 17527
+- 17528
+- 17529
+- 17557
+- 17561
+- 17562
+- 17563
+- 17567
+- 17568
+- 17569
+- 17570
+- 17571
+- 17614
+- 17617
+- 17637
+- 17648
+- 17682
+- 17693
+- 17694
+- 17716
+- 17730
+- 17732
+- 17784
+- 17794
+- 17795
+- 17842
+- 17873
+- 17874
+- 17875
+- 17876
+- 17916
+- 17918
+- 17988
+- 18010
+- 18012
+- 18101
+- 18102
+- 18109
+- 18149
+- 18150
+- 18216
+- 18217
+- 18219
+- 18249
+- 18251
+- 18266
+- 18303
+- 18319
+- 18320
+- 18324
 tilemap:
   0: Space
   29: FloorArcadeBlue
@@ -111,6 +112,7 @@ tilemap:
   48: FloorSteelPavement
   49: FloorSteelPavementVertical
   111: FloorTechMaint2
+  5: FloorTechMaint3
   30: FloorTechMaintDark
   25: FloorWhite
   42: FloorWhiteMono
@@ -150,215 +152,215 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAIAAAAAAAAAAIEAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAAAXAAAAAAEAgQAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAACAIEAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAgQAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAXAAAAAAIAAAAAAAAAAIEAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAACAIEAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAFgAAAAAAABYAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABYAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABYAAAAAAAAWAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAABAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAgQAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAEAgQAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAFgAAAAAAABYAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABYAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABYAAAAAAAAWAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAACAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAACAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         0,-1:
           ind: 0,-1
-          tiles: JQAAAAAAACUAAAAAAAAlAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAACBAAAAAAAAKwAAAAAAACsAAAAAAACBAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADgQAAAAAAABgAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: JQAAAAAAACUAAAAAAAAlAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAACBAAAAAAAAKwAAAAAAACsAAAAAAACBAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -1,-1:
           ind: -1,-1
-          tiles: gQAAAAAAAAQAAAAAAQAEAAAAAAEABAAAAAABAIEAAAAAAAAkAAAAAAAAJAAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAACUAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAEYAAAAAAIALQAAAAAAATUAAAAAAAAlAAAAAAAARAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAEQAAAAAAAAlAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAGAAAAAACACUAAAAAAAAtAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAACBAAAAAAAAJQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAARgAAAAAAAAtAAAAAAABLgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAAQAAAAAAAAEAAAAAAEABAAAAAABAIEAAAAAAABEAAAAAAAARAAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAACUAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAEYAAAAAAIALQAAAAAAATUAAAAAAAAlAAAAAAAARAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAEQAAAAAAAAlAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAGAAAAAAAACUAAAAAAAAtAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAACBAAAAAAAAJQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAARgAAAAAAAAtAAAAAAABLgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQCBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAFwAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -1,-2:
           ind: -1,-2
-          tiles: GAAAAAABAIEAAAAAAAAYAAAAAAIAGAAAAAABAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAADYAAAAAAAAtAAAAAAAAJQAAAAAAABgAAAAAAgCBAAAAAAAAGAAAAAAAABgAAAAAAQACAAAAAAAAAgAAAAAAADcAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAADcAAAAAAAAuAAAAAAAALQAAAAAAAAEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAIEAAAAAAAAgAAAAAAAALgAAAAAAAi0AAAAAAAMuAAAAAAADIAAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAQCBAAAAAAAAIAAAAAAAAC0AAAAAAAAEAAAAAAAALQAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAC0AAAAAAAAZAAAAAAAAGQAAAAAAABkAAAAAAAAZAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAAIAAAAAAAACAAAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAtAAAAAAAAHgAAAAAAABkAAAAAAAAZAAAAAAAAGQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAALQAAAAAAAB4AAAAAAAAZAAAAAAAAGQAAAAAAABkAAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAARAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAEQAAAAAAAAtAAAAAAAAGAAAAAABAB4AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAAA1AAAAAAAALQAAAAAAADYAAAAAAAAuAAAAAAAALgAAAAAAABgAAAAAAAA2AAAAAAAALgAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAB4AAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAA3AAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAALgAAAAAAAhgAAAAAAAA2AAAAAAAALQAAAAAAABgAAAAAAgAgAAAAAAAAIAAAAAAAACAAAAAAAAAeAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAYAAAAAAIAGAAAAAABAB4AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAGAAAAAAAABgAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAACQAAAAAAACBAAAAAAAAgQAAAAAAACQAAAAAAAAkAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAADcAAAAAAAAtAAAAAAADgQAAAAAAAAQAAAAAAQAEAAAAAAEABAAAAAABAIEAAAAAAAAkAAAAAAAAJAAAAAAAAC8AAAAAAAAkAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAAA==
+          tiles: GAAAAAAAAIEAAAAAAAAYAAAAAAEAGAAAAAABADcAAAAAAAAtAAAAAAAANQAAAAAAABgAAAAAAQA2AAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAADYAAAAAAAAtAAAAAAAAJQAAAAAAABgAAAAAAQCBAAAAAAAAGAAAAAABABgAAAAAAgAYAAAAAAIANgAAAAAAAC0AAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAADcAAAAAAAAuAAAAAAAALQAAAAAAAAEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAYAAAAAAEAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAkAAAAAAAAJAAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAIEAAAAAAAAeAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAJAAAAAAAACQAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAgAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABgAAAAAAQAYAAAAAAEAgQAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAYAAAAAAIAGAAAAAAAABgAAAAAAQAuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAIEAAAAAAAAeAAAAAAAAIAAAAAAAADYAAAAAAAA1AAAAAAAAGAAAAAACABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAZAAAAAAAAGQAAAAAAABkAAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAtAAAAAAAALQAAAAAAABgAAAAAAABEAAAAAAAAgQAAAAAAAEQAAAAAAACBAAAAAAAAGQAAAAAAABkAAAAAAAAZAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAARAAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAANgAAAAAAAC0AAAAAAAA1AAAAAAAAIAAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAADUAAAAAAAA3AAAAAAAALQAAAAAAAC4AAAAAAAAtAAAAAAAAGAAAAAAAADYAAAAAAAAvAAAAAAAAIAAAAAAAAC0AAAAAAAAEAAAAAAEALQAAAAAAAEQAAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAA3AAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAALgAAAAAAAjYAAAAAAAAuAAAAAAAALwAAAAAAACAAAAAAAAA3AAAAAAAALQAAAAAAAC4AAAAAAAAgAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAAALQAAAAAAAy0AAAAAAAMuAAAAAAAAGAAAAAABAIEAAAAAAABEAAAAAAAAJAAAAAAAACQAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAGAAAAAABABgAAAAAAQCBAAAAAAAAgQAAAAAAACQAAAAAAAAkAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAACQAAAAAAAAkAAAAAAAAgQAAAAAAACUAAAAAAAAkAAAAAAAAJAAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAADcAAAAAAAAtAAAAAAADgQAAAAAAAAQAAAAAAQAEAAAAAAAABAAAAAAAAIEAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAAA==
           version: 7
         0,-2:
           ind: 0,-2
-          tiles: KwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAADYAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAG8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABgAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAAVAAAAAAIAFQAAAAABABUAAAAAAgACAAAAAAAAAgAAAAAAAAIAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAFQAAAAAAABUAAAAAAAAVAAAAAAMAAgAAAAAAAAIAAAAAAAACAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAABUAAAAAAwAVAAAAAAAAFQAAAAAAAAIAAAAAAAAyAAAAAAAAMgAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAAAJQAAAAAAACUAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAJQAAAAAAAIEAAAAAAABEAAAAAAAARAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAG8AAAAAAACBAAAAAAAAAgAAAAAAAA==
+          tiles: KwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAADYAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAG8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABgAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAAVAAAAAAAAFQAAAAADABUAAAAAAQACAAAAAAAAAgAAAAAAAAIAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAFQAAAAACABUAAAAAAAAVAAAAAAIAAgAAAAAAAAIAAAAAAAACAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAABUAAAAAAgAVAAAAAAAAFQAAAAADAAIAAAAAAAAyAAAAAAAAMgAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAAAJQAAAAAAACUAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAJQAAAAAAAIEAAAAAAABEAAAAAAAARAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAG8AAAAAAACBAAAAAAAAAgAAAAAAAA==
           version: 7
         1,-1:
           ind: 1,-1
-          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAACkAAAAAAAApAAAAAAAAKQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANgAAAAAAAC4AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAlAAAAAAAAJQAAAAAAADcAAAAAAAAtAAAAAAADNQAAAAAAAIEAAAAAAAApAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAArAAAAAAAAJQAAAAAAAC0AAAAAAACBAAAAAAAAKQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAgQAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAACkAAAAAAAApAAAAAAAAKQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANgAAAAAAAC4AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAlAAAAAAAAJQAAAAAAADcAAAAAAAAtAAAAAAADNQAAAAAAAIEAAAAAAAApAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAArAAAAAAAAJQAAAAAAAC0AAAAAAACBAAAAAAAAKQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAgQAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         1,-2:
           ind: 1,-2
-          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAC0AAAAAAAAlAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAKQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAA3AAAAAAAALQAAAAAAAy4AAAAAAACBAAAAAAAAKQAAAAAAACkAAAAAAAApAAAAAAAAJQAAAAAAACUAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAgAYAAAAAAEAgQAAAAAAACkAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAQAYAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAACAIEAAAAAAAApAAAAAAAAGAAAAAABABgAAAAAAAAYAAAAAAIAGAAAAAABAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAGAAAAAACABgAAAAAAgCBAAAAAAAAKQAAAAAAABgAAAAAAgAYAAAAAAEAGAAAAAAAABgAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANgAAAAAAAC0AAAAAAAM1AAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAAAKQAAAAAAACUAAAAAAAAlAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABYAAAAAAACBAAAAAAAAgQAAAAAAADcAAAAAAAAtAAAAAAADLQAAAAAAAzUAAAAAAACBAAAAAAAAKQAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAGAAAAAABADYAAAAAAAAuAAAAAAABHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAC0AAAAAAAMCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHgAAAAAAADYAAAAAAAAuAAAAAAAAJQAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB4AAAAAAAAtAAAAAAADNQAAAAAAAAEAAAAAAAA2AAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANwAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAQACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAKQAAAAAAACkAAAAAAAApAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAGAAAAAACACkAAAAAAAApAAAAAAAAKQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAABgAAAAAAAApAAAAAAAAKQAAAAAAACkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAKQAAAAAAACkAAAAAAAApAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAgAYAAAAAAEAgQAAAAAAAIEAAAAAAAApAAAAAAAAKQAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAC0AAAAAAAAlAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAA3AAAAAAAALQAAAAAAAy4AAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAQAYAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAEAGAAAAAABAIEAAAAAAAAeAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAAAABgAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANgAAAAAAAC0AAAAAAAM1AAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABYAAAAAAACBAAAAAAAAgQAAAAAAADcAAAAAAAAtAAAAAAADLQAAAAAAAzUAAAAAAACBAAAAAAAAKQAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAGAAAAAAAADYAAAAAAAAuAAAAAAABHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAC0AAAAAAAMCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAHgAAAAAAADYAAAAAAAAuAAAAAAAAJQAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAB4AAAAAAAAtAAAAAAADNQAAAAAAAAEAAAAAAAA2AAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANwAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAQACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAKQAAAAAAACkAAAAAAAApAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAGAAAAAACACkAAAAAAAApAAAAAAAAKQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAABgAAAAAAAApAAAAAAAAKQAAAAAAACkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAKQAAAAAAACkAAAAAAAApAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAIAgQAAAAAAAIEAAAAAAAApAAAAAAAAKQAAAAAAAA==
           version: 7
         0,-3:
           ind: 0,-3
-          tiles: IAAAAAAAAAMAAAAAAQADAAAAAAIAgQAAAAAAAC0AAAAAAAAtAAAAAAAAIAAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAADAAAAAAIAAwAAAAADAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEANgAAAAAAAC0AAAAAAAMCAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANgAAAAAAAC4AAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAGAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAACAIEAAAAAAAAtAAAAAAAALQAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAAAYAAAAAAEAGAAAAAACABgAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAIAGAAAAAABABgAAAAAAQAYAAAAAAIAGAAAAAACABgAAAAAAQAYAAAAAAIAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAAAGAAAAAAAABcAAAAAAgAAAAAAAAAAgQAAAAAAAC0AAAAAAAAlAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAABgAAAAAAQCBAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANwAAAAAAADUAAAAAAAAYAAAAAAEAgQAAAAAAABcAAAAAAQCBAAAAAAAAGAAAAAABABgAAAAAAQAYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQA3AAAAAAAALQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAAQAAAAAAADcAAAAAAAAYAAAAAAIALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACUAAAAAAAArAAAAAAAAGAAAAAACACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAADYAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: IAAAAAAAAAMAAAAAAQADAAAAAAIAgQAAAAAAAC0AAAAAAAAtAAAAAAAAIAAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAADAAAAAAIAAwAAAAAFAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIANgAAAAAAAC0AAAAAAAMCAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANgAAAAAAAC4AAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAGAAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAAAGAAAAAAAABgAAAAAAgAtAAAAAAAALQAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAACABgAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAGAAAAAAAABgAAAAAAgAYAAAAAAEAGAAAAAAAABgAAAAAAgAYAAAAAAEAGAAAAAAAABgAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAACABcAAAAAAQAAAAAAAAAAgQAAAAAAAC0AAAAAAAAlAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAABgAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANwAAAAAAADUAAAAAAAAYAAAAAAIAgQAAAAAAABcAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAQAYAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAA3AAAAAAAALQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAAQAAAAAAADcAAAAAAAAYAAAAAAEALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACUAAAAAAAArAAAAAAAAGAAAAAACACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAADYAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAQAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
         1,-3:
           ind: 1,-3
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAYAAAAAAEALQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAQCBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAM1AAAAAAAAGAAAAAABAIEAAAAAAAAYAAAAAAIAGAAAAAACABgAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAEANwAAAAAAADUAAAAAAACBAAAAAAAAIAAAAAAAAAEAAAAAAAAgAAAAAAAAgQAAAAAAAG8AAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAtAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAABgAAAAAAgBvAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAABgAAAAAAgAYAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAAAYAAAAAAIAbwAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAJAAAAAAAABAAAAAABAAkAAAAAAAAYAAAAAAIAGAAAAAABAC0AAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAG8AAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAGAAAAAAAABgAAAAAAAAtAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAABvAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAABgAAAAAAQAYAAAAAAAAGAAAAAAAABgAAAAAAgAYAAAAAAIALQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAbwAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAQAYAAAAAAEANgAAAAAAAC4AAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAG8AAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAYAAAAAAIAgQAAAAAAABgAAAAAAgAYAAAAAAIAGAAAAAAAAIEAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAG8AAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAIALgAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAGAAAAAAAACsAAAAAAAAlAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAA1AAAAAAAAAQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAYAAAAAAIALQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAQCBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAM1AAAAAAAAGAAAAAABAIEAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAQCBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAAAYAAAAAAEAGAAAAAACABgAAAAAAAAYAAAAAAEANwAAAAAAADUAAAAAAACBAAAAAAAAIAAAAAAAAAEAAAAAAAAgAAAAAAAAgQAAAAAAAG8AAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAIAGAAAAAACABgAAAAAAgAtAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAABgAAAAAAgBvAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAABgAAAAAAgAYAAAAAAEALQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAAAYAAAAAAAAbwAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAJAAAAAAAABAAAAAABAAkAAAAAAAAYAAAAAAAAGAAAAAACAC0AAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAG8AAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAGAAAAAABABgAAAAAAgAtAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAABvAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAABgAAAAAAgAYAAAAAAIAGAAAAAACABgAAAAAAAAYAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAbwAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAYAAAAAAAAGAAAAAABABgAAAAAAgAYAAAAAAIANgAAAAAAAC4AAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAG8AAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAYAAAAAAIAgQAAAAAAABgAAAAAAQAYAAAAAAIAGAAAAAAAAIEAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAG8AAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAEALgAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAGAAAAAAAACsAAAAAAAAlAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAA1AAAAAAAAAQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -1,-3:
           ind: -1,-3
-          tiles: gQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAAAeAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAAAYAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAAAGAAAAAABAC8AAAAAAAAYAAAAAAIALwAAAAAAABgAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAABAC8AAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAQCBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAALwAAAAAAABgAAAAAAQAYAAAAAAEAGAAAAAACABgAAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAgCBAAAAAAAAFwAAAAABAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAAA2AAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAYAAAAAAEAGAAAAAAAABgAAAAAAgAYAAAAAAIAgQAAAAAAABcAAAAAAgAYAAAAAAAALQAAAAAAACUAAAAAAAArAAAAAAAAJQAAAAAAADYAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAgAYAAAAAAIAGAAAAAACACAAAAAAAACBAAAAAAAAGAAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAGAAAAAAAABgAAAAAAQAYAAAAAAIAGAAAAAACABgAAAAAAAA3AAAAAAAALQAAAAAAAC0AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAALQAAAAAABxgAAAAAAgCBAAAAAAAAgQAAAAAAAC0AAAAAAAA3AAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAADcAAAAAAAAtAAAAAAADGAAAAAACAIEAAAAAAAA3AAAAAAAALQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAAAYAAAAAAIAJQAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAALQAAAAAAAAEAAAAAAAAYAAAAAAEAgQAAAAAAABgAAAAAAgAYAAAAAAEAGAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAC0AAAAAAAABAAAAAAAAGAAAAAACAIEAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAAAtAAAAAAAAAQAAAAAAAA==
+          tiles: gQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAAAeAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAAAYAAAAAAEALQAAAAAAAAEAAAAAAAAtAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAIAGAAAAAABAC8AAAAAAAAYAAAAAAIALwAAAAAAABgAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAACAC8AAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAAAYAAAAAAEAGAAAAAABABgAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAALwAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAABABgAAAAAAgCBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAABABgAAAAAAgCBAAAAAAAAFwAAAAACAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAAA2AAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAQAYAAAAAAEAGAAAAAAAABgAAAAAAgAYAAAAAAEAgQAAAAAAABcAAAAAAgAYAAAAAAAALQAAAAAAACUAAAAAAAArAAAAAAAAJQAAAAAAADYAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAQAYAAAAAAAAGAAAAAACACAAAAAAAACBAAAAAAAAGAAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAGAAAAAABABgAAAAAAQAYAAAAAAIAGAAAAAABABgAAAAAAQA3AAAAAAAALQAAAAAAAC0AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAALQAAAAAABxgAAAAAAgCBAAAAAAAAgQAAAAAAAC0AAAAAAAA3AAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAADcAAAAAAAAtAAAAAAADGAAAAAACAIEAAAAAAAA3AAAAAAAALQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAAAYAAAAAAAAJQAAAAAAABgAAAAAAgCBAAAAAAAAGAAAAAAAAC0AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAALQAAAAAAAAEAAAAAAAAYAAAAAAEAgQAAAAAAABgAAAAAAAA3AAAAAAAANQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAC0AAAAAAAABAAAAAAAAGAAAAAACAIEAAAAAAAAYAAAAAAIAGAAAAAAAAC0AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAAAtAAAAAAAAAQAAAAAAAA==
           version: 7
         -2,-2:
           ind: -2,-2
-          tiles: gQAAAAAAAIEAAAAAAAAtAAAAAAAAJQAAAAAAAC0AAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAgAYAAAAAAEAAAAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAYAAAAAAEAGAAAAAABAIEAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAEAgQAAAAAAABgAAAAAAQAYAAAAAAIAGAAAAAABABgAAAAAAgAYAAAAAAAAGAAAAAAAAB4AAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAEAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAeAAAAAAAAGAAAAAABABgAAAAAAQAYAAAAAAEAgQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAHgAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAAAAIEAAAAAAAAvAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAACAAAAAAAAAgAAAAAAAANgAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAzUAAAAAAAAgAAAAAAAANQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAIAAAAAAAADcAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAIAAAAAAAAC0AAAAAAAAYAAAAAAIALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAuAAAAAAAAGAAAAAABAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAAAtAAAAAAAARAAAAAAAAC0AAAAAAAAYAAAAAAIALQAAAAAAAAEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAADYAAAAAAAAtAAAAAAADLgAAAAAAADcAAAAAAAAuAAAAAAAAGAAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAABgAAAAAAgAtAAAAAAAAGAAAAAABABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAABABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAgCBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAgAYAAAAAAIAgQAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAAEQAAAAAAAAYAAAAAAAAGAAAAAABAC0AAAAAAAABAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAEAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAABEAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAIAGAAAAAABAIEAAAAAAAAEAAAAAAEAGAAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAACAA==
+          tiles: gQAAAAAAAIEAAAAAAAAtAAAAAAAAJQAAAAAAAC0AAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAAAYAAAAAAEAAAAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAYAAAAAAEAGAAAAAABAIEAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAQAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAgAYAAAAAAEAGAAAAAAAAB4AAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAIAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAQAYAAAAAAEAGAAAAAACABgAAAAAAAAeAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAIAgQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAgAYAAAAAAEAHgAAAAAAABgAAAAAAQAYAAAAAAAAGAAAAAABAIEAAAAAAAAvAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAACAAAAAAAAAgAAAAAAAANgAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAzUAAAAAAAAgAAAAAAAANQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAIAAAAAAAADcAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAIAAAAAAAAC0AAAAAAAAYAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAuAAAAAAAAGAAAAAABAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAAAtAAAAAAAARAAAAAAAAC0AAAAAAAAYAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAADYAAAAAAAAtAAAAAAADLgAAAAAAADcAAAAAAAAuAAAAAAAAGAAAAAACAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAABgAAAAAAQAtAAAAAAAAGAAAAAABABgAAAAAAgAYAAAAAAEAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAgCBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAAAYAAAAAAEAgQAAAAAAABgAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAYAAAAAAIAGAAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAgAYAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAgQAAAAAAADcAAAAAAAAuAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAEAGAAAAAACAIEAAAAAAAAEAAAAAAAAGAAAAAACAIEAAAAAAAAYAAAAAAEAGAAAAAACAA==
           version: 7
         -2,-1:
           ind: -2,-1
-          tiles: HgAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAABAIEAAAAAAABEAAAAAAAARAAAAAAAAB4AAAAAAAAeAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAANgAAAAAAAC4AAAAAAAABAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAlAAAAAAAAJQAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAJQAAAAAAADYAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACAIEAAAAAAAAYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAACABcAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAgAXAAAAAAEAFwAAAAAAABcAAAAAAQAYAAAAAAEAgQAAAAAAABgAAAAAAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: HgAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAGAAAAAACAIEAAAAAAABEAAAAAAAARAAAAAAAAB4AAAAAAAAeAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAANgAAAAAAAC4AAAAAAAABAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAlAAAAAAAAJQAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAJQAAAAAAADYAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAQAYAAAAAAAAgQAAAAAAABgAAAAAAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAQAAAAAAAAAAFwAAAAAAABcAAAAAAQAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -2,-3:
           ind: -2,-3
-          tiles: gQAAAAAAAIEAAAAAAAAtAAAAAAACAQAAAAAAABgAAAAAAgAtAAAAAAACgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAgEAAAAAAAAYAAAAAAEALQAAAAAAAoEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAIBAAAAAAAAGAAAAAACAC0AAAAAAAKBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAACAQAAAAAAABgAAAAAAAAtAAAAAAACgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAgEAAAAAAAAYAAAAAAIALQAAAAAAAoEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAgCBAAAAAAAAHgAAAAAAAC0AAAAAAAIBAAAAAAAAGAAAAAAAAC0AAAAAAAIYAAAAAAEAGAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABAIEAAAAAAAAYAAAAAAIAHgAAAAAAAB4AAAAAAAAtAAAAAAACAQAAAAAAADYAAAAAAAAuAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAEAGAAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAIALQAAAAAAAS0AAAAAAAEtAAAAAAABGAAAAAAAABgAAAAAAgAYAAAAAAIAGAAAAAACABgAAAAAAgAYAAAAAAAAGAAAAAABAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAQAYAAAAAAEALQAAAAAAAS0AAAAAAAEYAAAAAAEALQAAAAAAAS0AAAAAAAEYAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAgCBAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAIAGAAAAAAAABgAAAAAAgAtAAAAAAABLQAAAAAAAS0AAAAAAAEYAAAAAAIAGAAAAAABABgAAAAAAQAYAAAAAAEAGAAAAAACABgAAAAAAgAYAAAAAAEAGAAAAAAAABgAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAgAYAAAAAAIAGAAAAAACABgAAAAAAQAYAAAAAAIAGAAAAAABABgAAAAAAQAYAAAAAAIAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAEAGAAAAAAAABgAAAAAAQAYAAAAAAIAGAAAAAACABgAAAAAAAAeAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAEAGAAAAAACABgAAAAAAAAYAAAAAAEAGAAAAAAAABgAAAAAAgAYAAAAAAIAGAAAAAABABgAAAAAAQAYAAAAAAEAGAAAAAACABgAAAAAAQAYAAAAAAEAHgAAAAAAABgAAAAAAAAYAAAAAAEAGAAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAABABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAEAGAAAAAACABgAAAAAAgAYAAAAAAIAGAAAAAACAB4AAAAAAAAYAAAAAAEAGAAAAAABABgAAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAACABgAAAAAAAAAAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABgAAAAAAAAYAAAAAAIAgQAAAAAAAIEAAAAAAAA2AAAAAAAALQAAAAAAATUAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAEAAAAAAAAAAIEAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAAYAAAAAAEAGAAAAAACAA==
+          tiles: gQAAAAAAAIEAAAAAAAAtAAAAAAACAQAAAAAAABgAAAAAAQAtAAAAAAACgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAgEAAAAAAAAYAAAAAAEALQAAAAAAAoEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAIBAAAAAAAAGAAAAAAAAC0AAAAAAAKBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAACAQAAAAAAABgAAAAAAQAtAAAAAAACgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAgEAAAAAAAAYAAAAAAAALQAAAAAAAoEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAYAAAAAAIAgQAAAAAAABgAAAAAAACBAAAAAAAAHgAAAAAAAC0AAAAAAAIBAAAAAAAAGAAAAAABAC0AAAAAAAIYAAAAAAIAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAEAHgAAAAAAAB4AAAAAAAAtAAAAAAACAQAAAAAAADYAAAAAAAAuAAAAAAAAgQAAAAAAABgAAAAAAQCBAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAIAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAABAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAEALQAAAAAAAS0AAAAAAAEtAAAAAAABGAAAAAACABgAAAAAAQAYAAAAAAEAGAAAAAAAABgAAAAAAgAYAAAAAAEAGAAAAAACAIEAAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAgAYAAAAAAIALQAAAAAAAS0AAAAAAAEYAAAAAAIALQAAAAAAAS0AAAAAAAEYAAAAAAAAGAAAAAACABgAAAAAAgAYAAAAAAIAGAAAAAAAABgAAAAAAQCBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAEAGAAAAAABABgAAAAAAAAtAAAAAAABLQAAAAAAAS0AAAAAAAEYAAAAAAIAGAAAAAACABgAAAAAAgAYAAAAAAEAGAAAAAAAABgAAAAAAAAYAAAAAAIAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAEAGAAAAAABABgAAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAIAGAAAAAABABgAAAAAAQAYAAAAAAAAGAAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAQAeAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAEAGAAAAAACABgAAAAAAgAYAAAAAAIAGAAAAAABABgAAAAAAQAYAAAAAAAAGAAAAAACABgAAAAAAgAYAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAIAHgAAAAAAABgAAAAAAgAYAAAAAAEAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAEAgQAAAAAAABgAAAAAAQAYAAAAAAEAGAAAAAACABgAAAAAAgAYAAAAAAAAGAAAAAACAB4AAAAAAAAYAAAAAAIAGAAAAAAAABgAAAAAAQAYAAAAAAAAGAAAAAACABgAAAAAAgAYAAAAAAEAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAQAAAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABgAAAAAAAAYAAAAAAEAgQAAAAAAAIEAAAAAAAA2AAAAAAAALQAAAAAAATUAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAEAAAAAAAAAAIEAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAAYAAAAAAAAGAAAAAABAA==
           version: 7
         0,-4:
           ind: 0,-4
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAABAAAAAAAAAQAAAAAAAIEAAAAAAAAYAAAAAAIAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAQAAAAAAAAEAAAAAAACBAAAAAAAAGAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAABkAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAABvAAAAAAAAbwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAABvAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAbwAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAANgAAAAAAAC0AAAAAAAMtAAAAAAADGAAAAAABAC4AAAAAAAAtAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAyAAAAAAAAAgAAAAAAAAIAAAAAAAAC0AAAAAAAAlAAAAAAAAKwAAAAAAABgAAAAAAgArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAtAAAAAAAALQAAAAAAADYAAAAAAAAYAAAAAAEALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAGAAAAAAAAAMAAAAAAgADAAAAAAEAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAAAgAAAAAAAANgAAAAAAAC0AAAAAAAMDAAAAAAQAAwAAAAACAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAgAAAAAAAAJQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACUAAAAAAACBAAAAAAAAIAAAAAAAAC0AAAAAAAAlAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAACUAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAlAAAAAAAAgQAAAAAAACAAAAAAAAA3AAAAAAAALQAAAAAAAw==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAABAAAAAAAAAQAAAAAAAIEAAAAAAAAYAAAAAAIAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAQAAAAAAAAEAAAAAAACBAAAAAAAAGAAAAAACACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAABkAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAABvAAAAAAAAbwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAABvAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAbwAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAANgAAAAAAAC0AAAAAAAMtAAAAAAADGAAAAAAAAC4AAAAAAAAtAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAyAAAAAAAAAgAAAAAAAAIAAAAAAAAC0AAAAAAAAlAAAAAAAAKwAAAAAAABgAAAAAAgArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAtAAAAAAAALQAAAAAAADYAAAAAAAAYAAAAAAEALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAGAAAAAAAAAMAAAAABQADAAAAAAIAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAAAgAAAAAAAANgAAAAAAAC0AAAAAAAMDAAAAAAMAAwAAAAAFAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAgAAAAAAAAJQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACUAAAAAAACBAAAAAAAAIAAAAAAAAC0AAAAAAAAlAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAACUAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAlAAAAAAAAgQAAAAAAACAAAAAAAAA3AAAAAAAALQAAAAAAAw==
           version: 7
         1,-4:
           ind: 1,-4
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAAAeAAAAAAAAIAAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAHgAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAAEAAAAAAAAgAAAAAAAAgQAAAAAAAB4AAAAAAAAgAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAIAGAAAAAABAIEAAAAAAAAeAAAAAAAAIAAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAGAAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAADYAAAAAAAAtAAAAAAADLgAAAAAAABgAAAAAAAA3AAAAAAAALQAAAAAAAzUAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAADYAAAAAAAAuAAAAAAAAGAAAAAABABgAAAAAAQAYAAAAAAIAGAAAAAABABgAAAAAAgA3AAAAAAAANQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAGAAAAAACADYAAAAAAAAuAAAAAAAAGAAAAAABABgAAAAAAAA2AAAAAAAALQAAAAAAAzUAAAAAAAAYAAAAAAIAGAAAAAABADcAAAAAAAA1AAAAAAAAgQAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAGAAAAAAAABgAAAAAAAA2AAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAANQAAAAAAABgAAAAAAAAYAAAAAAEALQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAABgAAAAAAgAtAAAAAAADLgAAAAAAABgAAAAAAgA2AAAAAAAACQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAkAAAAAAAA1AAAAAAAAGAAAAAABADcAAAAAAAAtAAAAAAADGAAAAAAAACsAAAAAAAAYAAAAAAIAGAAAAAACABgAAAAAAgAYAAAAAAEALQAAAAAAAAkAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAJAAAAAAAALQAAAAAAABgAAAAAAAAYAAAAAAIAGAAAAAACABgAAAAAAAAgAAAAAAAAGAAAAAAAAC0AAAAAAAM1AAAAAAAAGAAAAAAAADcAAAAAAAAJAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAC4AAAAAAAAYAAAAAAAANgAAAAAAAC0AAAAAAAMYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAABgAAAAAAgAYAAAAAAAANwAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAC4AAAAAAAAYAAAAAAIAGAAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAM1AAAAAAAAgQAAAAAAADcAAAAAAAA1AAAAAAAAGAAAAAABABgAAAAAAAA3AAAAAAAALQAAAAAAAy4AAAAAAAAYAAAAAAIAGAAAAAAAADYAAAAAAAAuAAAAAAAAgQAAAAAAACAAAAAAAAAlAAAAAAAALQAAAAAAAIEAAAAAAAA1AAAAAAAANwAAAAAAADUAAAAAAAAYAAAAAAIAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAABADYAAAAAAAAuAAAAAAAANgAAAAAAAIEAAAAAAAAgAAAAAAAALQAAAAAAAy4AAAAAAACBAAAAAAAAgQAAAAAAADUAAAAAAAA3AAAAAAAALQAAAAAAAzUAAAAAAAAYAAAAAAIANgAAAAAAAC0AAAAAAAMuAAAAAAAANgAAAAAAAC4AAAAAAACBAAAAAAAAIAAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAAAeAAAAAAAAIAAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAHgAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAAEAAAAAAAAgAAAAAAAAgQAAAAAAAB4AAAAAAAAgAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAIAGAAAAAAAAIEAAAAAAAAeAAAAAAAAIAAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAGAAAAAABAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAADYAAAAAAAAtAAAAAAADLgAAAAAAABgAAAAAAgA3AAAAAAAALQAAAAAAAzUAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAADYAAAAAAAAuAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAQA3AAAAAAAANQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABADYAAAAAAAAuAAAAAAAAGAAAAAACABgAAAAAAAA2AAAAAAAALQAAAAAAAzUAAAAAAAAYAAAAAAEAGAAAAAACADcAAAAAAAA1AAAAAAAAgQAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAGAAAAAAAABgAAAAAAQA2AAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAANQAAAAAAABgAAAAAAQAYAAAAAAIALQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAABgAAAAAAgAtAAAAAAADLgAAAAAAABgAAAAAAQA2AAAAAAAACQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAkAAAAAAAA1AAAAAAAAGAAAAAABADcAAAAAAAAtAAAAAAADGAAAAAACACsAAAAAAAAYAAAAAAEAGAAAAAACABgAAAAAAgAYAAAAAAEALQAAAAAAAAkAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAJAAAAAAAALQAAAAAAABgAAAAAAAAYAAAAAAEAGAAAAAAAABgAAAAAAAAgAAAAAAAAGAAAAAACAC0AAAAAAAM1AAAAAAAAGAAAAAABADcAAAAAAAAJAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAC4AAAAAAAAYAAAAAAAANgAAAAAAAC0AAAAAAAMYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAABgAAAAAAAAYAAAAAAAANwAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAC4AAAAAAAAYAAAAAAIAGAAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAM1AAAAAAAAgQAAAAAAADcAAAAAAAA1AAAAAAAAGAAAAAAAABgAAAAAAgA3AAAAAAAALQAAAAAAAy4AAAAAAAAYAAAAAAAAGAAAAAACADYAAAAAAAAuAAAAAAAAgQAAAAAAACAAAAAAAAAlAAAAAAAALQAAAAAAAIEAAAAAAAA1AAAAAAAANwAAAAAAADUAAAAAAAAYAAAAAAIAGAAAAAAAABgAAAAAAQAYAAAAAAEAGAAAAAABADYAAAAAAAAuAAAAAAAANgAAAAAAAIEAAAAAAAAgAAAAAAAALQAAAAAAAy4AAAAAAACBAAAAAAAAgQAAAAAAADUAAAAAAAA3AAAAAAAALQAAAAAAAzUAAAAAAAAYAAAAAAAANgAAAAAAAC0AAAAAAAMuAAAAAAAANgAAAAAAAC4AAAAAAACBAAAAAAAAIAAAAAAAAA==
           version: 7
         -1,-4:
           ind: -1,-4
-          tiles: gQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAAgAAAAAAAAIAAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAC0AAAAAAAM1AAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABAIEAAAAAAAACAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAlAAAAAAAANwAAAAAAADUAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAA3AAAAAAAANQAAAAAAAIEAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAAIAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADUAAAAAAAAlAAAAAAAAJQAAAAAAACAAAAAAAABvAAAAAAAAHgAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAACAAAAAAAAA3AAAAAAAANQAAAAAAACUAAAAAAAAgAAAAAAAAbwAAAAAAAB4AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAgAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAAIAAAAAAAAG8AAAAAAAAeAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAHgAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAB4AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAACAAAAAAAAAeAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAAA==
+          tiles: gQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAAgAAAAAAAAIAAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAC0AAAAAAAM1AAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAAACAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAlAAAAAAAANwAAAAAAADUAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAA3AAAAAAAANQAAAAAAAIEAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAAIAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADUAAAAAAAAlAAAAAAAAJQAAAAAAACAAAAAAAABvAAAAAAAAHgAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAACAAAAAAAAA3AAAAAAAANQAAAAAAACUAAAAAAAAgAAAAAAAAbwAAAAAAAB4AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAgAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAAIAAAAAAAAG8AAAAAAAAeAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAHgAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAB4AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAACAAAAAAAAAeAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAAA==
           version: 7
         0,-5:
           ind: 0,-5
-          tiles: LwAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAA2AAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy8AAAAAAACBAAAAAAAAAgAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAJQAAAAAAACsAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAADcAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAAAEAAAAAAAA2AAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAAAYAAAAAAEAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAAAgQAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAAA2AAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAA2AAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAABAAAAAAAALQAAAAAAAAIAAAAAAACBAAAAAAAAKQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAJQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAABoAAAAAAAACAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAALQAAAAAAAy0AAAAAAAM1AAAAAAAAgQAAAAAAAAIAAAAAAAAaAAAAAAAAAgAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAC0AAAAAAAM1AAAAAAAALQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAgAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAIAAAAAAAAC0AAAAAAAA3AAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAACAAAAAAAAAtAAAAAAAAJQAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACUAAAAAAAAtAAAAAAAAIAAAAAAAAB4AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAIEAAAAAAABvAAAAAAAAbwAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAGAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: LwAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAA2AAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy8AAAAAAACBAAAAAAAAAgAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAJQAAAAAAACsAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAADcAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAAAEAAAAAAAA2AAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAABABgAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAAAgQAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAAA2AAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAQAAAAAAAAEAAAAAAAAIEAAAAAAAA2AAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAABAAAAAAAALQAAAAAAAAIAAAAAAACBAAAAAAAAKQAAAAAAAIEAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAJQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAALQAAAAAAAy0AAAAAAAM1AAAAAAAAgQAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAC0AAAAAAAM1AAAAAAAALQAAAAAAAIEAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAgAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAIAAAAAAAAC0AAAAAAAA3AAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAAQAAAAAAAC0AAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAACAAAAAAAAAtAAAAAAAAJQAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACUAAAAAAAAtAAAAAAAAIAAAAAAAAB4AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAIEAAAAAAABvAAAAAAAAbwAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -2,-4:
           ind: -2,-4
-          tiles: AgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAA8AAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAGAAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAACABgAAAAAAQAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAABgAAAAAAAAYAAAAAAEAGAAAAAAAABgAAAAAAAAYAAAAAAIAGAAAAAAAABgAAAAAAQArAAAAAAAAKwAAAAAAACsAAAAAAAAlAAAAAAAAJQAAAAAAADcAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAIAGAAAAAACABgAAAAAAQAYAAAAAAEAGAAAAAABABgAAAAAAAA1AAAAAAAAJQAAAAAAACUAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAAlAAAAAAAABAAAAAABABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAABABgAAAAAAAAYAAAAAAIAgQAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAGAAAAAACAIEAAAAAAACBAAAAAAAANQAAAAAAADcAAAAAAAAYAAAAAAEAGAAAAAACABgAAAAAAgAYAAAAAAEAGAAAAAACAIEAAAAAAAAYAAAAAAIAGAAAAAACAIEAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAA1AAAAAAAAGAAAAAABABgAAAAAAQAYAAAAAAEAGAAAAAAAABgAAAAAAQCBAAAAAAAAGAAAAAABAIEAAAAAAACBAAAAAAAAIAAAAAAAACUAAAAAAAAlAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAGAAAAAACACAAAAAAAAAlAAAAAAAAJQAAAAAAACAAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAQAeAAAAAAAAHgAAAAAAAC0AAAAAAAIBAAAAAAAANwAAAAAAADUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAB4AAAAAAAAtAAAAAAACAQAAAAAAABgAAAAAAAAtAAAAAAACgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAAYAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAA8AAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAGAAAAAABABgAAAAAAAAYAAAAAAEAGAAAAAAAABgAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAABABgAAAAAAAAYAAAAAAEAGAAAAAABABgAAAAAAgArAAAAAAAAKwAAAAAAACsAAAAAAAAlAAAAAAAAJQAAAAAAADcAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAEAGAAAAAABABgAAAAAAgAYAAAAAAAAGAAAAAAAABgAAAAAAgAYAAAAAAIAGAAAAAAAABgAAAAAAAA1AAAAAAAAJQAAAAAAACUAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAAlAAAAAAAABAAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAABABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAACAIEAAAAAAACBAAAAAAAANQAAAAAAADcAAAAAAAAYAAAAAAIAGAAAAAAAABgAAAAAAgAYAAAAAAEAGAAAAAACAIEAAAAAAAAYAAAAAAIAGAAAAAACAIEAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAA1AAAAAAAAGAAAAAABABgAAAAAAgAYAAAAAAAAGAAAAAACABgAAAAAAgCBAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACUAAAAAAAAlAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAGAAAAAAAACAAAAAAAAAlAAAAAAAAJQAAAAAAACAAAAAAAAAYAAAAAAEAGAAAAAAAABgAAAAAAQAeAAAAAAAAHgAAAAAAAC0AAAAAAAIBAAAAAAAANwAAAAAAADUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAB4AAAAAAAAtAAAAAAACAQAAAAAAABgAAAAAAgAtAAAAAAACgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAA==
           version: 7
         -3,-4:
           ind: -3,-4
-          tiles: gQAAAAAAAIEAAAAAAAAYAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAACABgAAAAAAQCBAAAAAAAAGAAAAAAAABgAAAAAAQAYAAAAAAEAgQAAAAAAABgAAAAAAgAYAAAAAAIAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAgAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAABAIEAAAAAAAAtAAAAAAAAJQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgCBAAAAAAAANwAAAAAAAC0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAACAIEAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAgAXAAAAAAEAFwAAAAABABcAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAEAFwAAAAABABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAIAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAGAAAAAAAABgAAAAAAgA1AAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAIALgAAAAAAAi0AAAAAAAMtAAAAAAADIAAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAAALQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAEAGAAAAAABADcAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAACABgAAAAAAAAtAAAAAAADgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAEALQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAC0AAAAAAAMtAAAAAAAALQAAAAAAAC0AAAAAAAM3AAAAAAAANQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAC0AAAAAAAAuAAAAAAADGAAAAAABADcAAAAAAAAtAAAAAAADLQAAAAAAAy4AAAAAAAAYAAAAAAEAGAAAAAABABgAAAAAAAAYAAAAAAEAGAAAAAABAB4AAAAAAAAeAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAADUAAAAAAAA2AAAAAAAALQAAAAAAAy0AAAAAAAMYAAAAAAAANgAAAAAAAC0AAAAAAAM2AAAAAAAALQAAAAAAAC0AAAAAAAAeAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAACABgAAAAAAQCBAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAEAgQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAABAIEAAAAAAAAYAAAAAAAAGAAAAAACAIEAAAAAAAAtAAAAAAAAJQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgCBAAAAAAAANwAAAAAAAC0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAACAIEAAAAAAAAXAAAAAAIAFwAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAQAYAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAgAXAAAAAAEAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAEAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAAAABgAAAAAAgA1AAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAIALgAAAAAAAi0AAAAAAAMtAAAAAAADIAAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAIALQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAACAC0AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAADcAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAACABgAAAAAAAAtAAAAAAADgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAIALQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACAC0AAAAAAAMtAAAAAAAALQAAAAAAAC0AAAAAAAM3AAAAAAAANQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAC0AAAAAAAAuAAAAAAADGAAAAAABADcAAAAAAAAtAAAAAAADLQAAAAAAAy4AAAAAAAAYAAAAAAEAGAAAAAAAABgAAAAAAQAYAAAAAAEAGAAAAAABAB4AAAAAAAAeAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAADUAAAAAAAA2AAAAAAAALQAAAAAAAy0AAAAAAAMYAAAAAAIANgAAAAAAAC0AAAAAAAM2AAAAAAAALQAAAAAAAC0AAAAAAAAeAAAAAAAAgQAAAAAAAA==
           version: 7
         -3,-3:
           ind: -3,-3
-          tiles: LQAAAAAAAC0AAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAA4EAAAAAAAAtAAAAAAAALgAAAAAAADcAAAAAAAAtAAAAAAADLQAAAAAAAxgAAAAAAQA3AAAAAAAALQAAAAAAAzcAAAAAAAAtAAAAAAAALQAAAAAAAB4AAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAAtAAAAAAAANQAAAAAAABgAAAAAAQA2AAAAAAAALQAAAAAAAy0AAAAAAAM1AAAAAAAAGAAAAAABABgAAAAAAgAYAAAAAAAAGAAAAAACABgAAAAAAQAeAAAAAAAAHgAAAAAAAC0AAAAAAAMtAAAAAAAALQAAAAAAAC0AAAAAAAM2AAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAAAtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACQAAAAAAAAkAAAAAAAAKQAAAAAAACkAAAAAAAAkAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIALQAAAAAAA4EAAAAAAAAkAAAAAAAAJAAAAAAAAIEAAAAAAACBAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAQAYAAAAAAIAGAAAAAACADYAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAABABgAAAAAAQAtAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAQAYAAAAAAAALgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAAAGAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAIAFwAAAAABAIEAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAIAFwAAAAAAABcAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAgAXAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAgQAAAAAAAA==
+          tiles: LQAAAAAAAC0AAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAA4EAAAAAAAAtAAAAAAAALgAAAAAAADcAAAAAAAAtAAAAAAADLQAAAAAAAxgAAAAAAgA3AAAAAAAALQAAAAAAAzcAAAAAAAAtAAAAAAAALQAAAAAAAB4AAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAAtAAAAAAAANQAAAAAAABgAAAAAAgA2AAAAAAAALQAAAAAAAy0AAAAAAAM1AAAAAAAAGAAAAAABABgAAAAAAQAYAAAAAAAAGAAAAAAAABgAAAAAAQAeAAAAAAAAHgAAAAAAAC0AAAAAAAMtAAAAAAAALQAAAAAAAC0AAAAAAAM2AAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAAAtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACQAAAAAAAAkAAAAAAAAKQAAAAAAACkAAAAAAAAkAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEALQAAAAAAA4EAAAAAAAAkAAAAAAAAJAAAAAAAAIEAAAAAAACBAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAgAYAAAAAAEAGAAAAAAAADYAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAAAGAAAAAAAABgAAAAAAAAtAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAABAIEAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAgAYAAAAAAEALgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAEAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAACAIEAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAEAFwAAAAABABcAAAAAAgAXAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAA==
           version: 7
         -3,-2:
           ind: -3,-2
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgCBAAAAAAAAbwAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAGAAAAAABABgAAAAAAQCBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAA2AAAAAAAALQAAAAAAA4EAAAAAAACBAAAAAAAAGAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAALQAAAAAAAC0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAADcAAAAAAAAtAAAAAAADgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAADcAAAAAAAAtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgAXAAAAAAIAFwAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFgAAAAAAABYAAAAAAACBAAAAAAAANgAAAAAAAC0AAAAAAAM1AAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAbwAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAGAAAAAABAIEAAAAAAABvAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAEAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAA2AAAAAAAALQAAAAAAA4EAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAALQAAAAAAAC0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAADcAAAAAAAAtAAAAAAADgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAgAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAADcAAAAAAAAtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAAAABcAAAAAAQAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAgAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQAXAAAAAAIAFwAAAAACABcAAAAAAgAXAAAAAAEAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFgAAAAAAABYAAAAAAACBAAAAAAAANgAAAAAAAC0AAAAAAAM1AAAAAAAAgQAAAAAAAA==
           version: 7
         -3,-1:
           ind: -3,-1
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABYAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADNQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAAAWAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAgAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFgAAAAAAAIEAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC8AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAQAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABYAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADNQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAAAWAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAgAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFgAAAAAAAIEAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC8AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -4,-1:
           ind: -4,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAIAAAAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAQAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAIAAAAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -4,-2:
           ind: -4,-2
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAIAGAAAAAABAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAQAYAAAAAAAAGAAAAAABAAsAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAArAAAAAAAAKwAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAEAGAAAAAABABgAAAAAAQALAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAAKwAAAAAAACsAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAgQAAAAAAABgAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAgAYAAAAAAIACwAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAACsAAAAAAAArAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAADMAAAAAAgAzAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAMwAAAAAEAIEAAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAABABcAAAAAAQAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAAAABcAAAAAAAAXAAAAAAIAgQAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAgAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAIAGAAAAAABAIEAAAAAAAAYAAAAAAIAGAAAAAACABgAAAAAAQAYAAAAAAEAGAAAAAABAAsAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAArAAAAAAAAKwAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAEAGAAAAAAAABgAAAAAAQALAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAAKwAAAAAAACsAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAIAGAAAAAACABgAAAAAAQAYAAAAAAEACwAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAACsAAAAAAAArAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAEAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABAIEAAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAABABcAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAACABcAAAAAAgAXAAAAAAEAgQAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAgAXAAAAAAAAFwAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -5,-2:
           ind: -5,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAABABgAAAAAAQAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAgAYAAAAAAEAGAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAGAAAAAABABgAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAABAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAABABgAAAAAAQAYAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAQAYAAAAAAEAGAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAQCBAAAAAAAAgQAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAACAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -4,-4:
           ind: -4,-4
-          tiles: DAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAALAAAAAAAAgQAAAAAAAA0AAAAAAAANAAAAAAAAKwAAAAAAACsAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACwAAAAAAAIEAAAAAAAANAAAAAAAADQAAAAAAACsAAAAAAAArAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAsAAAAAAACBAAAAAAAADQAAAAAAAA0AAAAAAAArAAAAAAAAKwAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADAAAAAAAAABcAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADNwAAAAAAABcAAAAAAgAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAABgAAAAAAgAXAAAAAAEAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADNwAAAAAAAC0AAAAAAAA1AAAAAAAAFwAAAAACABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAA3AAAAAAAALQAAAAAAAxcAAAAAAQAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAADNQAAAAAAABgAAAAAAQA3AAAAAAAANQAAAAAAAC0AAAAAAAMXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALgAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAzcAAAAAAAA1AAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAADcAAAAAAAAtAAAAAAAALgAAAAAAAYEAAAAAAACBAAAAAAAANwAAAAAAAA==
+          tiles: DAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAALAAAAAAAAgQAAAAAAAA0AAAAAAAANAAAAAAAAKwAAAAAAACsAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACwAAAAAAAIEAAAAAAAANAAAAAAAADQAAAAAAACsAAAAAAAArAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAsAAAAAAACBAAAAAAAADQAAAAAAAA0AAAAAAAArAAAAAAAAKwAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADNwAAAAAAABcAAAAAAgAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAABgAAAAAAgAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADNwAAAAAAAC0AAAAAAAA1AAAAAAAAFwAAAAACABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAA3AAAAAAAALQAAAAAAAxcAAAAAAgAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAADNQAAAAAAABgAAAAAAAA3AAAAAAAANQAAAAAAAC0AAAAAAAMXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALgAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAzcAAAAAAAA1AAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAADcAAAAAAAAtAAAAAAAALgAAAAAAAYEAAAAAAACBAAAAAAAANwAAAAAAAA==
           version: 7
         -4,-3:
           ind: -4,-3
-          tiles: FwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAQA3AAAAAAAANQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAACADcAAAAAAAAtAAAAAAADLQAAAAAAAC0AAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAQAYAAAAAAEAGAAAAAACAC0AAAAAAAAtAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAgAYAAAAAAEANgAAAAAAAC0AAAAAAAMtAAAAAAAALQAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAIANgAAAAAAAC4AAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAANgAAAAAAAC0AAAAAAAA1AAAAAAAAgQAAAAAAAIEAAAAAAAA2AAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAADYAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAM2AAAAAAAALgAAAAAAARcAAAAAAgAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAADLgAAAAAAABgAAAAAAgA2AAAAAAAALgAAAAAAAS0AAAAAAAMXAAAAAAEAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAADYAAAAAAAAtAAAAAAADFwAAAAABABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAzYAAAAAAAAtAAAAAAAALgAAAAAAAhcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAABgAAAAAAQAAAAAAAAAAFwAAAAABABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAM2AAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAxcAAAAAAQAXAAAAAAEAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAAAAAAAAAABcAAAAAAQAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: FwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAQA3AAAAAAAANQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAIAGAAAAAACADcAAAAAAAAtAAAAAAADLQAAAAAAAC0AAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAACABgAAAAAAAAYAAAAAAAAGAAAAAACAC0AAAAAAAAtAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAEANgAAAAAAAC0AAAAAAAMtAAAAAAAALQAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAAANgAAAAAAAC4AAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAANgAAAAAAAC0AAAAAAAA1AAAAAAAAgQAAAAAAAIEAAAAAAAA2AAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAADYAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAM2AAAAAAAALgAAAAAAARcAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAADLgAAAAAAABgAAAAAAAA2AAAAAAAALgAAAAAAAS0AAAAAAAMXAAAAAAIAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAADYAAAAAAAAtAAAAAAADFwAAAAACABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAzYAAAAAAAAtAAAAAAAALgAAAAAAAhcAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAABgAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAM2AAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAxcAAAAAAQAXAAAAAAIAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAAAAAAAAAABcAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -3,-5:
           ind: -3,-5
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADNQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAIAFwAAAAAAABcAAAAAAQAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAQAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACABcAAAAAAgCBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALwAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAABABgAAAAAAgAYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAAy0AAAAAAAA3AAAAAAAANQAAAAAAAAIAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAAAJQAAAAAAAC0AAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADNQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAAAFwAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAACABcAAAAAAQAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAACABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAAAXAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALwAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAACABgAAAAAAAAYAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAAy0AAAAAAAA3AAAAAAAANQAAAAAAAAIAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAAAJQAAAAAAAC0AAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAA==
           version: 7
         -4,-5:
           ind: -4,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAAAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACABcAAAAAAQAXAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAgAXAAAAAAEAFwAAAAACAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA4AAAAAAACBAAAAAAAAgQAAAAAAAA4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAgAXAAAAAAEAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAQAXAAAAAAEAFwAAAAACABcAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAIAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAgAXAAAAAAEAFwAAAAACAIEAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAAAABcAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA4AAAAAAACBAAAAAAAAgQAAAAAAAA4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAA==
           version: 7
         -3,-6:
           ind: -3,-6
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAIEAAAAAAAAXAAAAAAEAFwAAAAACAIEAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAQAXAAAAAAEAAAAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAQAXAAAAAAIAFwAAAAACABcAAAAAAgAXAAAAAAAAFwAAAAACABcAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAIAFwAAAAACAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAABAIEAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAgAXAAAAAAEAFwAAAAABABcAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAgAXAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAEAFwAAAAAAABcAAAAAAQAAAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAgAXAAAAAAIAFwAAAAACAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -5,-4:
           ind: -5,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAACAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAA==
           version: 7
         -5,-5:
           ind: -5,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAgCBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAABAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAABAIEAAAAAAACBAAAAAAAAFwAAAAABAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAQAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAACAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -2,-5:
           ind: -2,-5
-          tiles: gQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAABcAAAAAAQCBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAgAXAAAAAAIAFwAAAAACABcAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAgQAAAAAAABcAAAAAAgAXAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAXAAAAAAIAFwAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAIAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAQAXAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAAAFwAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAAJAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: gQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAABAIEAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAgAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgCBAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAQAXAAAAAAIAFwAAAAABABcAAAAAAgCBAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAgQAAAAAAABcAAAAAAQAXAAAAAAEAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAXAAAAAAEAFwAAAAACAIEAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAIAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAEAFwAAAAACABcAAAAAAgAXAAAAAAEAFwAAAAACAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAkAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAAJAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
         -1,-5:
           ind: -1,-5
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC0AAAAAAAAgAAAAAAAALQAAAAAAAC8AAAAAAACBAAAAAAAALwAAAAAAAC0AAAAAAAAgAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAgQAAAAAAAC8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAANwAAAAAAAC0AAAAAAAAuAAAAAAAALwAAAAAAAIEAAAAAAAAvAAAAAAAANwAAAAAAAC0AAAAAAAAuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACAIEAAAAAAAAYAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAAgAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANgAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAIAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAADcAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAACAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAAgAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC0AAAAAAAAgAAAAAAAALQAAAAAAAC8AAAAAAACBAAAAAAAALwAAAAAAAC0AAAAAAAAgAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAgQAAAAAAAC8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAANwAAAAAAAC0AAAAAAAAuAAAAAAAALwAAAAAAAIEAAAAAAAAvAAAAAAAANwAAAAAAAC0AAAAAAAAuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACAIEAAAAAAAAYAAAAAAAAGAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgCBAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAAgAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANgAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAIAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAADcAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAACAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAAgAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAA==
           version: 7
         -1,-6:
           ind: -1,-6
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAAAABcAAAAAAgAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAACAIEAAAAAAAAXAAAAAAIAFwAAAAACAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABAIEAAAAAAAAXAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAIAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAgCBAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAgQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAAAABcAAAAAAQAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAACAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAQAXAAAAAAIAgQAAAAAAABcAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAIAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAEAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAgQAAAAAAABcAAAAAAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAQCBAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAgQAAAAAAAA==
           version: 7
         0,-6:
           ind: 0,-6
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAACAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAQCBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAIAAAAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAIEAAAAAAAAXAAAAAAEAgQAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAgAAAAAAAAAAFwAAAAAAAIEAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAXAAAAAAIAgQAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAIAFwAAAAAAAIEAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAIAAAAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAgCBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAARAAAAAAAAIEAAAAAAABEAAAAAAAAgQAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAEQAAAAAAACBAAAAAAAARAAAAAAAAIEAAAAAAABEAAAAAAAAgQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAAAAAAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAgQAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAABAIEAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAABcAAAAAAgCBAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAXAAAAAAIAgQAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAIAFwAAAAAAAIEAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAIAAAAAAAAAABcAAAAAAQAXAAAAAAAAFwAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAgCBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAARAAAAAAAAIEAAAAAAABEAAAAAAAAgQAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAEQAAAAAAACBAAAAAAAARAAAAAAAAIEAAAAAAABEAAAAAAAAgQAAAAAAAA==
           version: 7
         0,-7:
           ind: 0,-7
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAQAXAAAAAAIAFwAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAQAAAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAAAAAAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAABABcAAAAAAgAXAAAAAAIAFwAAAAABABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAIAAAAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
         1,-6:
           ind: 1,-6
-          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAaAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABoAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAaAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABoAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         1,-7:
           ind: 1,-7
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAGgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAABoAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAaAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAAaAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABoAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAGgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAABoAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAaAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAAaAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABoAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
         1,-5:
           ind: 1,-5
-          tiles: LQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAJQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAAAEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAoEAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAACBAAAAAAAANwAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAgCBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAACBAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAQAYAAAAAAEAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAABABgAAAAAAgAYAAAAAAEAgQAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAIAGAAAAAACAIEAAAAAAAAYAAAAAAEAGAAAAAABABgAAAAAAQAgAAAAAAAAIAAAAAAAAIEAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAAAYAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAkAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAeAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHgAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAADYAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAA==
+          tiles: LQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAAArAAAAAAAAJQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAAAEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAoEAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAACBAAAAAAAANwAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAAAGAAAAAABABgAAAAAAgCBAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAgAYAAAAAAIAgQAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAAAGAAAAAACAIEAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAgAgAAAAAAAAIAAAAAAAAIEAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAIEAAAAAAAAYAAAAAAEAGAAAAAABABgAAAAAAgCBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAkAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAAC0AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAeAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAHgAAAAAAAIEAAAAAAAAtAAAAAAAAAQAAAAAAADYAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAALQAAAAAAAAEAAAAAAAAtAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAABAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAA==
           version: 7
         2,-6:
           ind: 2,-6
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAAAXAAAAAAEAFwAAAAACAAIAAAAAAACBAAAAAAAAFwAAAAACABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAEAFwAAAAACABcAAAAAAgBvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAQAXAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAIARAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAAAFwAAAAACAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAEAFwAAAAACABcAAAAAAQAXAAAAAAIAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAQAXAAAAAAEAFwAAAAACAIEAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACABcAAAAAAQAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAXAAAAAAEAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAAAAAAAAAABcAAAAAAgAAAAAAAAAAFwAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAgAXAAAAAAIARAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAAAAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAAAFwAAAAACAA==
           version: 7
         2,-5:
           ind: 2,-5
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAgAYAAAAAAEAGAAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAIAGAAAAAACABgAAAAAAQAYAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAgAYAAAAAAIAGAAAAAACABgAAAAAAAAYAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAEAgQAAAAAAABgAAAAAAgAYAAAAAAEAGAAAAAABABgAAAAAAgAYAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         2,-7:
           ind: 2,-7
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAIAFwAAAAACABcAAAAAAQAXAAAAAAIAFwAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAACABcAAAAAAgAXAAAAAAIAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAABAIEAAAAAAAAXAAAAAAIAFwAAAAAAABcAAAAAAgAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAABAIEAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAQAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAEAFwAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAAAABcAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAgAXAAAAAAIAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAABAIEAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAACAIEAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAA==
           version: 7
         3,-5:
           ind: 3,-5
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAIAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         4,-5:
           ind: 4,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAgAXAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAgAXAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAgAAAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAgAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAHgAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAB4AAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAgAXAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAgAXAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAQAXAAAAAAEAFwAAAAACABcAAAAAAQAXAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAACABcAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAHgAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAABABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACAB4AAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAIAFwAAAAABABcAAAAAAQAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         3,-6:
           ind: 3,-6
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAAAFwAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAABABcAAAAAAgAXAAAAAAEAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAQAXAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAABABcAAAAAAgAXAAAAAAIAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAACABcAAAAAAgAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAQAXAAAAAAIAFwAAAAABABcAAAAAAQAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAFwAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAACABcAAAAAAgAXAAAAAAEAFwAAAAABABcAAAAAAgAXAAAAAAIAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAIAFwAAAAABABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAQAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAQAXAAAAAAIAFwAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAQAXAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAEAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAgAAAAAAAAAAFwAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAIAAAAAAAAAABcAAAAAAQAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAAAFwAAAAACAAAAAAAAAAAXAAAAAAIAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAQAXAAAAAAIAFwAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAABABcAAAAAAQAXAAAAAAEAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAQAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAEAFwAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAIAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAACABcAAAAAAQAXAAAAAAEAFwAAAAACABcAAAAAAQAXAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAQAXAAAAAAIAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAABABcAAAAAAgAAAAAAAAAAFwAAAAAAAA==
           version: 7
         4,-4:
           ind: 4,-4
-          tiles: gQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAABgAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAAAAIEAAAAAAAAYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAAAYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAC8AAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAaAAAAAAAARAAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAaAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAABgAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAACAIEAAAAAAAAYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACAIEAAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAC8AAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAaAAAAAAAARAAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAaAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         5,-4:
           ind: 5,-4
-          tiles: LwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAABABcAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAQAXAAAAAAEAFwAAAAACABcAAAAAAQAXAAAAAAAAFwAAAAACABcAAAAAAQAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAIAFwAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAABABcAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAQCBAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAABAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAABABgAAAAAAQAvAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEALwAAAAAAABgAAAAAAQAYAAAAAAEAgQAAAAAAAAQAAAAAAQAEAAAAAAEABAAAAAABAAQAAAAAAQAEAAAAAAEABAAAAAAAAAQAAAAAAQAEAAAAAAEAGAAAAAACABgAAAAAAQCBAAAAAAAAgQAAAAAAAC8AAAAAAAAYAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAIABAAAAAABAAQAAAAAAAAYAAAAAAAAGAAAAAAAAA==
+          tiles: LwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAACABcAAAAAAQAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAgAXAAAAAAIAFwAAAAAAABcAAAAAAQAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAACABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAIAGAAAAAAAAIEAAAAAAACBAAAAAAAABAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAACABgAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAALwAAAAAAABgAAAAAAQAYAAAAAAEAgQAAAAAAAAQAAAAAAAAEAAAAAAEABAAAAAABAAQAAAAAAQAEAAAAAAAABAAAAAAAAAQAAAAAAQAEAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAYAAAAAAEAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAEABAAAAAABAAQAAAAAAQAYAAAAAAAAGAAAAAABAA==
           version: 7
         5,-5:
           ind: 5,-5
-          tiles: FwAAAAAAABcAAAAAAgAXAAAAAAEAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAgAXAAAAAAIAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAIAFwAAAAACABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAQAXAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAAAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAQAXAAAAAAAAFwAAAAAAABcAAAAAAQAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAACABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAHQAAAAAAAB0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: FwAAAAACABcAAAAAAgAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAQAXAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAQAXAAAAAAIAFwAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAEAFwAAAAACABcAAAAAAgAXAAAAAAEAFwAAAAABABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAABABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAAUAAAAAAAAFAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         3,-4:
           ind: 3,-4
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAGAAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAC0AAAAAAAOBAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAAC0AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAFAAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADNQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAGAAAAAACAC8AAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAC0AAAAAAAOBAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADNQAAAAAAAC0AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAFAAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADNQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAgQAAAAAAAA==
           version: 7
         4,-3:
           ind: 4,-3
-          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACAIEAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACAIEAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQCBAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         5,-3:
           ind: 5,-3
-          tiles: GAAAAAABAC8AAAAAAAAYAAAAAAEAGAAAAAACABgAAAAAAQAYAAAAAAIAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAABABgAAAAAAQAYAAAAAAAAGAAAAAABAAQAAAAAAAAEAAAAAAAAGAAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAAAYAAAAAAIAgQAAAAAAABgAAAAAAQAYAAAAAAEAGAAAAAABABgAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEABAAAAAABABgAAAAAAgAvAAAAAAAALwAAAAAAAC8AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAABABgAAAAAAQAEAAAAAAEAgQAAAAAAAAQAAAAAAAACAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAEALwAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAABgAAAAAAgCBAAAAAAAAGAAAAAACABgAAAAAAgAYAAAAAAAAGAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAAAQAvAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAIAGAAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAACABgAAAAAAAAEAAAAAAAABAAAAAABABgAAAAAAACBAAAAAAAALwAAAAAAABgAAAAAAgAYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC8AAAAAAAAYAAAAAAIAGAAAAAABAIEAAAAAAAAEAAAAAAEABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAABAAQAAAAAAQAEAAAAAAEABAAAAAABABgAAAAAAgAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAABAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAIAGAAAAAACABgAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACABcAAAAAAQAXAAAAAAEAFwAAAAACABcAAAAAAQAXAAAAAAEAFwAAAAABABcAAAAAAQAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAAAFwAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAABABcAAAAAAQAXAAAAAAAAFwAAAAAAAA==
+          tiles: GAAAAAAAAC8AAAAAAAAYAAAAAAIAGAAAAAAAABgAAAAAAAAYAAAAAAIAGAAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAACABgAAAAAAAAYAAAAAAEAGAAAAAABAAQAAAAAAQAEAAAAAAAAGAAAAAACAC8AAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAIAGAAAAAACABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEABAAAAAAAABgAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAAAYAAAAAAIAGAAAAAAAABgAAAAAAgAEAAAAAAEAgQAAAAAAAAQAAAAAAQACAAAAAAAABAAAAAABAAQAAAAAAQAYAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAABgAAAAAAQCBAAAAAAAAGAAAAAAAABgAAAAAAgAYAAAAAAIAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQAEAAAAAAEAGAAAAAAAABgAAAAAAQAvAAAAAAAAGAAAAAABABgAAAAAAQAYAAAAAAIAGAAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAAAABgAAAAAAQAYAAAAAAAAGAAAAAABABgAAAAAAQAEAAAAAAEABAAAAAAAABgAAAAAAgCBAAAAAAAALwAAAAAAABgAAAAAAgAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAgAEAAAAAAAABAAAAAABABgAAAAAAQAYAAAAAAEAGAAAAAAAAC8AAAAAAAAYAAAAAAEAGAAAAAAAAIEAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAQAEAAAAAAEABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAQAYAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAEAGAAAAAABAIEAAAAAAACBAAAAAAAABAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAABABgAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAEAFwAAAAACABcAAAAAAQAXAAAAAAAAFwAAAAACABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAgAXAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAEAFwAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAACABcAAAAAAAAXAAAAAAIAFwAAAAACAA==
           version: 7
         3,-3:
           ind: 3,-3
@@ -366,79 +368,79 @@ entities:
           version: 7
         4,-2:
           ind: 4,-2
-          tiles: AgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAB4AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAAgAAAAAAAAIAAAAAAAAeAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAHgAAAAAAACAAAAAAAAAgAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAS8AAAAAAAAtAAAAAAABgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAEvAAAAAAAALQAAAAAAAS0AAAAAAAEtAAAAAAABLQAAAAAAATUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAABLwAAAAAAAC0AAAAAAAEtAAAAAAABLQAAAAAAAS0AAAAAAAEtAAAAAAAALwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANwAAAAAAADUAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAADYAAAAAAAAtAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAA3AAAAAAAALgAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAIQAAAAAAACEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAAAFwAAAAACAA==
+          tiles: AgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAB4AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAAgAAAAAAAAIAAAAAAAAeAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAHgAAAAAAACAAAAAAAAAgAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAS8AAAAAAAAtAAAAAAABgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAEvAAAAAAAALQAAAAAAAS0AAAAAAAEtAAAAAAABLQAAAAAAATUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAABLwAAAAAAAC0AAAAAAAEtAAAAAAABLQAAAAAAAS0AAAAAAAEtAAAAAAAALwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANwAAAAAAADUAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAADYAAAAAAAAtAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAA3AAAAAAAALgAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAIQAAAAAAACEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAABABcAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAA==
           version: 7
         3,-2:
           ind: 3,-2
-          tiles: gQAAAAAAAIEAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAYAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAQCBAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgCBAAAAAAAALgAAAAAAAiAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAABLwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAM1AAAAAAAANgAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAABLQAAAAAAAS8AAAAAAAA3AAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAS0AAAAAAAEvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAAAABgAAAAAAQAYAAAAAAIAGAAAAAACABgAAAAAAgAYAAAAAAIAGAAAAAABACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAACQAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAfAAAAAAIAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAAACAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAQCBAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgCBAAAAAAAALgAAAAAAAiAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAABLwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAM1AAAAAAAANgAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAABLQAAAAAAAS8AAAAAAAA3AAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAANwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAS0AAAAAAAEvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAABgAAAAAAgAYAAAAAAIAGAAAAAAAABgAAAAAAAAYAAAAAAIAGAAAAAACABgAAAAAAAAYAAAAAAIAGAAAAAACACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAACQAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAfAAAAAAEAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAA==
           version: 7
         2,-2:
           ind: 2,-2
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAALwAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABAIEAAAAAAAAYAAAAAAIAGAAAAAABAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAgApAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACAIEAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAQAYAAAAAAEAGAAAAAABABgAAAAAAQAYAAAAAAEAGAAAAAACABgAAAAAAAAYAAAAAAEAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAEAGAAAAAABACkAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAgCBAAAAAAAAGAAAAAACABgAAAAAAgAYAAAAAAEAGAAAAAABAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAACkAAAAAAAApAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAAAGAAAAAABABgAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAA2AAAAAAAALQAAAAAAAy0AAAAAAAM1AAAAAAAANgAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC0AAAAAAAMYAAAAAAIALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAMtAAAAAAADNwAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAzYAAAAAAAArAAAAAAAAGAAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACUAAAAAAAAtAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAALQAAAAAAAxgAAAAAAgAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAQAYAAAAAAAAGAAAAAACABgAAAAAAQAYAAAAAAIAGAAAAAABABgAAAAAAQApAAAAAAAAKQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAKQAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAAZAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAACkAAAAAAAApAAAAAAAAKQAAAAAAACkAAAAAAAApAAAAAAAAgQAAAAAAABcAAAAAAgCBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAApAAAAAAAAKQAAAAAAACkAAAAAAAApAAAAAAAAKQAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAAfAAAAAAIAHwAAAAADAAIAAAAAAAAfAAAAAAQAKQAAAAAAAIEAAAAAAACBAAAAAAAAKQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAABAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAABgAAAAAAgCBAAAAAAAAgQAAAAAAABgAAAAAAQAYAAAAAAEAGAAAAAACABgAAAAAAAAYAAAAAAIAGAAAAAABAIEAAAAAAACBAAAAAAAABQAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAABgAAAAAAAAYAAAAAAEAgQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABAIEAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAEAgQAAAAAAAC8AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAgAYAAAAAAIAGAAAAAACAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAA2AAAAAAAALQAAAAAAAy0AAAAAAAM1AAAAAAAANgAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC0AAAAAAAMYAAAAAAEALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAMtAAAAAAADNwAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAzYAAAAAAAArAAAAAAAAGAAAAAACACsAAAAAAAArAAAAAAAAKwAAAAAAACUAAAAAAAAtAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAALQAAAAAAAxgAAAAAAgAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAQAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAABABgAAAAAAQApAAAAAAAAKQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAKQAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAAZAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAACkAAAAAAAApAAAAAAAAKQAAAAAAACkAAAAAAAApAAAAAAAAgQAAAAAAABcAAAAAAQCBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAApAAAAAAAAKQAAAAAAACkAAAAAAAApAAAAAAAAKQAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAAfAAAAAAIAHwAAAAABAAIAAAAAAAAfAAAAAAAAKQAAAAAAAIEAAAAAAACBAAAAAAAAKQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAgQAAAAAAAA==
           version: 7
         2,-3:
           ind: 2,-3
-          tiles: gQAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAAG8AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAABvAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAAAbwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAAG8AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAABvAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAAAbwAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAABvAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAAA0AAAAAAIANAAAAAAAABgAAAAAAgAYAAAAAAEANAAAAAAEADQAAAAABQCBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAGAAAAAABABgAAAAAAAAYAAAAAAAAGAAAAAACADQAAAAAAgA0AAAAAAQAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAADQAAAAABAAYAAAAAAIAGAAAAAACADQAAAAABAA0AAAAAAUANAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAADQAAAAABQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAYAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAAAYAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAGAAAAAACAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAABgAAAAAAAAvAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAAG8AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAABvAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAAAbwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAAG8AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAABvAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAAAbwAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAABvAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAAA0AAAAAAIANAAAAAAAABgAAAAAAQAYAAAAAAIANAAAAAADADQAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAGAAAAAABABgAAAAAAgAYAAAAAAAAGAAAAAACADQAAAAABQA0AAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAADQAAAAAAgAYAAAAAAEAGAAAAAACADQAAAAAAwA0AAAAAAEANAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABABgAAAAAAQAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         5,-2:
           ind: 5,-2
-          tiles: gQAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAHAAAAAAFABwAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         5,-1:
           ind: 5,-1
-          tiles: FwAAAAABABcAAAAAAQAXAAAAAAIAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAQAXAAAAAAIAFwAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAABABcAAAAAAQAXAAAAAAAAFwAAAAABABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAEAAAAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAEAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: FwAAAAACABcAAAAAAgAXAAAAAAIAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAgAXAAAAAAEAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAQAXAAAAAAEAFwAAAAABABcAAAAAAQAXAAAAAAEAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAACAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAEAFwAAAAACABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAQAXAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAEAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         3,-1:
           ind: 3,-1
-          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAIwAAAAABACMAAAAABQAjAAAAAAEAIwAAAAADAIEAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAACMAAAAABQAjAAAAAAUAHwAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAACAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAACABcAAAAAAQAXAAAAAAAAFwAAAAABABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAQAXAAAAAAEAFwAAAAACABcAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAIAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAABABcAAAAAAgAXAAAAAAIAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAIwAAAAADACMAAAAABQAjAAAAAAMAIwAAAAAFAIEAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAACMAAAAAAAAjAAAAAAEAHwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAIAFwAAAAABAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAIAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAQAXAAAAAAEAFwAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAQAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         4,-1:
           ind: 4,-1
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAACAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAXAAAAAAIAFwAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAEAFwAAAAAAABcAAAAAAQAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAIAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAIAFwAAAAACAAAAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAIAFwAAAAACAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAQAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAAAABcAAAAAAgAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         2,-1:
           ind: 2,-1
-          tiles: KQAAAAAAACkAAAAAAAApAAAAAAAAKQAAAAAAACkAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAACkAAAAAAAApAAAAAAAAKQAAAAAAACkAAAAAAAApAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAAApAAAAAAAAKQAAAAAAAIEAAAAAAAAXAAAAAAIAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAKQAAAAAAAIEAAAAAAAApAAAAAAAAKQAAAAAAACkAAAAAAACBAAAAAAAAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAACBAAAAAAAAKQAAAAAAACkAAAAAAAApAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAQAXAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAgAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: KQAAAAAAACkAAAAAAAApAAAAAAAAKQAAAAAAACkAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAACkAAAAAAAApAAAAAAAAKQAAAAAAACkAAAAAAAApAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAAApAAAAAAAAKQAAAAAAAIEAAAAAAAAXAAAAAAEAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAKQAAAAAAAIEAAAAAAAApAAAAAAAAKQAAAAAAACkAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAACBAAAAAAAAKQAAAAAAACkAAAAAAAApAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAAAFwAAAAACABcAAAAAAQAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAACABcAAAAAAQAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAAAABcAAAAAAQAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         2,-4:
           ind: 2,-4
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAIALQAAAAAAAC0AAAAAAAMtAAAAAAADGAAAAAACABgAAAAAAAAYAAAAAAAAGAAAAAABABgAAAAAAQAYAAAAAAAALQAAAAAAAy0AAAAAAAM1AAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAEAGAAAAAABABgAAAAAAQAYAAAAAAEAGAAAAAABAC0AAAAAAAM1AAAAAAAAGAAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAC0AAAAAAAMtAAAAAAADNQAAAAAAAC0AAAAAAAMtAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANwAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAABADcAAAAAAAAtAAAAAAADNQAAAAAAADcAAAAAAAAtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAADcAAAAAAAAtAAAAAAADLQAAAAAAAyAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAYAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAYAAAAAAIAGAAAAAABACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAEALQAAAAAAAC0AAAAAAAMtAAAAAAADGAAAAAAAABgAAAAAAgAYAAAAAAAAGAAAAAABABgAAAAAAgAYAAAAAAIALQAAAAAAAy0AAAAAAAM1AAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAQAYAAAAAAEAGAAAAAACAC0AAAAAAAM1AAAAAAAAGAAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAC0AAAAAAAMtAAAAAAADNQAAAAAAAC0AAAAAAAMtAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAANwAAAAAAABgAAAAAAQAYAAAAAAIAGAAAAAACADcAAAAAAAAtAAAAAAADNQAAAAAAADcAAAAAAAAtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAQCBAAAAAAAAgQAAAAAAADcAAAAAAAAtAAAAAAADLQAAAAAAAyAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAYAAAAAAEAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAYAAAAAAIAGAAAAAACACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -2,-6:
           ind: -2,-6
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAIAFwAAAAABABcAAAAAAgAXAAAAAAIAFwAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAACAIEAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAACABcAAAAAAgAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAQAXAAAAAAEAAAAAAAAAABcAAAAAAgCBAAAAAAAAFwAAAAABABcAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgCBAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAAAFwAAAAACAIEAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAQAXAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAABABcAAAAAAgAXAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAIAFwAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAQAXAAAAAAAAFwAAAAABABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAABAIEAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAgCBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAIAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAAAFwAAAAACABcAAAAAAQAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAIAgQAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQCBAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAFwAAAAACAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAABABcAAAAAAQAXAAAAAAIAFwAAAAACABcAAAAAAAAXAAAAAAIAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAEAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAgAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAIAgQAAAAAAABcAAAAAAgAAAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAIAAAAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAABABcAAAAAAQCBAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAIAgQAAAAAAABcAAAAAAgAXAAAAAAAAFwAAAAABAIEAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAQAXAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAACABcAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAIAFwAAAAABABcAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAgAAAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAIAFwAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAgCBAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAEAFwAAAAACAIEAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAgCBAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgCBAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAgAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQCBAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAFwAAAAACAA==
           version: 7
         -4,-6:
           ind: -4,-6
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAAAABcAAAAAAQAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAgAAAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAA==
           version: 7
         4,-6:
           ind: 4,-6
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAQAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         5,-6:
           ind: 5,-6
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAEAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAQAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAIAFwAAAAACAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAABAAAAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         6,-3:
           ind: 6,-3
-          tiles: GAAAAAACAIEAAAAAAACBAAAAAAAAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAABABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAEAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAABAIEAAAAAAACBAAAAAAAAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAQCBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAQAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAQAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAgAXAAAAAAEAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAAAFwAAAAABABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAQAAAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: GAAAAAABAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAAAFwAAAAABABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAQCBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAQAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAIAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAIAFwAAAAAAABcAAAAAAQAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAAAXAAAAAAIAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAEAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAQAXAAAAAAEAFwAAAAACABcAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         6,-2:
           ind: 6,-2
-          tiles: FwAAAAAAABcAAAAAAgAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAABABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: FwAAAAABABcAAAAAAgAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAACAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAABABcAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         6,-4:
           ind: 6,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAAAXAAAAAAAAFwAAAAACABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAACAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAABABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAIAFwAAAAAAABcAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAgAXAAAAAAIAFwAAAAABABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAIAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAACAAAAAAAAAAAXAAAAAAIAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAABABcAAAAAAgAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAQAXAAAAAAEAFwAAAAABABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAgAXAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         3,-7:
           ind: 3,-7
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -5,-3:
           ind: -5,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAFwAAAAACAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAQAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAACABcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAIAFwAAAAACAA==
           version: 7
     - type: Broadphase
     - type: Physics
@@ -475,11 +477,11 @@ entities:
             Oxygen: 6666.982
         - temperature: 293.15
           volume: 2500
-          moles:
-            Nitrogen: 6666.982
+          moles: {}
         - temperature: 293.15
           volume: 2500
-          moles: {}
+          moles:
+            Nitrogen: 6666.982
         - temperature: 293.15
           volume: 2500
           moles:
@@ -493,7 +495,7 @@ entities:
           0,0:
             0: 4095
           -1,0:
-            0: 36863
+            0: 34815
           0,3:
             1: 8224
           -1,3:
@@ -501,7 +503,7 @@ entities:
           0,-1:
             0: 53247
           1,0:
-            0: 20479
+            0: 19455
           1,3:
             1: 5200
           1,-1:
@@ -608,7 +610,7 @@ entities:
             0: 143
             1: 16384
           -3,-5:
-            0: 57983
+            0: 58999
           -3,-2:
             0: 3264
           -3,-1:
@@ -620,47 +622,47 @@ entities:
           -2,-2:
             0: 36795
           -2,-5:
-            0: 65343
+            0: 65295
           -1,-5:
             0: 65485
           -4,-8:
-            0: 58589
+            0: 57565
           -4,-9:
             0: 56797
           -5,-8:
             0: 7579
           -4,-7:
-            0: 65518
+            0: 61438
           -5,-7:
             0: 65535
           -4,-6:
-            0: 65308
+            0: 65436
           -5,-6:
             0: 65524
           -5,-5:
             0: 56799
           -3,-8:
-            0: 47359
+            0: 61183
           -3,-7:
-            0: 65395
+            0: 32767
           -3,-6:
-            0: 65411
+            0: 65303
           -3,-9:
             0: 65535
           -2,-8:
-            0: 53759
+            0: 35839
           -2,-7:
-            0: 65533
+            0: 49599
           -2,-6:
-            0: 65521
+            0: 65533
           -2,-9:
             0: 65535
           -1,-8:
             0: 56575
           -1,-7:
-            0: 56797
+            0: 56541
           -1,-6:
-            0: 56796
+            0: 56797
           -1,-9:
             0: 65279
           0,-8:
@@ -762,16 +764,15 @@ entities:
           8,-5:
             0: 40955
           0,-12:
-            0: 375
-            1: 16384
+            0: 16759
           -1,-12:
             0: 47279
+          0,-11:
+            0: 34831
+            1: 4096
           -1,-11:
             0: 13087
             1: 34816
-          0,-11:
-            1: 4100
-            0: 34816
           0,-10:
             1: 32
             0: 63624
@@ -787,24 +788,24 @@ entities:
             0: 49075
           2,-12:
             0: 57359
+          2,-11:
+            0: 61182
           2,-10:
             0: 65280
           2,-13:
             0: 65524
-          2,-11:
-            0: 61166
+          3,-11:
+            0: 43256
           3,-10:
             0: 61670
           3,-12:
-            0: 26336
-          3,-11:
-            0: 24800
+            0: 42720
           3,-13:
             0: 61164
           4,-12:
-            0: 240
+            0: 61680
           4,-11:
-            0: 1911
+            0: 65535
           4,-10:
             0: 61680
           4,-13:
@@ -882,7 +883,7 @@ entities:
           -8,-7:
             0: 56782
           -9,-7:
-            0: 64799
+            0: 64989
           -8,-6:
             0: 65501
           -9,-6:
@@ -1033,7 +1034,7 @@ entities:
           7,-14:
             0: 65523
           7,-17:
-            0: 51711
+            0: 55807
           8,-16:
             0: 271
             2: 17408
@@ -1289,7 +1290,7 @@ entities:
           -17,-8:
             0: 34816
           -16,-7:
-            0: 17935
+            0: 19983
           -17,-7:
             0: 4360
             1: 25104
@@ -1594,7 +1595,7 @@ entities:
             0: 65535
           3,-23:
             1: 16
-            0: 52420
+            0: 52428
           3,-22:
             1: 16
             0: 64716
@@ -1603,7 +1604,7 @@ entities:
           4,-24:
             0: 61167
           4,-21:
-            0: 239
+            0: 254
           1,-26:
             1: 51200
           2,-26:
@@ -1714,21 +1715,31 @@ entities:
           10,-24:
             1: 15
           10,-22:
-            1: 12561
+            1: 47377
           10,-21:
             1: 24234
           11,-24:
             1: 143
-          11,-21:
-            1: 57343
           11,-22:
-            1: 49152
+            1: 4383
+            3: 52224
+          11,-21:
+            1: 65297
+            3: 12
+          11,-23:
+            1: 65504
           12,-24:
             1: 4080
+          12,-23:
+            1: 30576
           12,-22:
-            1: 65160
+            1: 35023
+            3: 4352
+            0: 17408
           12,-21:
-            1: 65535
+            3: 1
+            1: 32712
+            0: 32772
           9,-19:
             0: 47919
           9,-18:
@@ -1737,8 +1748,8 @@ entities:
             0: 65535
           9,-16:
             0: 15
-            3: 4352
-            4: 17408
+            4: 4352
+            3: 17408
           10,-20:
             0: 65280
           10,-19:
@@ -1749,10 +1760,10 @@ entities:
             0: 65535
           10,-16:
             0: 15
-            4: 4352
+            3: 4352
             5: 17408
           11,-20:
-            0: 65024
+            0: 65248
           11,-19:
             0: 62990
           11,-18:
@@ -1762,11 +1773,11 @@ entities:
           11,-16:
             0: 15
             1: 35840
-            4: 4352
+            3: 4352
           12,-20:
-            0: 65280
+            0: 64440
           12,-19:
-            0: 61695
+            0: 64767
           12,-18:
             0: 65535
           12,-17:
@@ -1796,7 +1807,7 @@ entities:
             0: 61183
           12,-16:
             0: 7
-            4: 2184
+            3: 2184
             1: 8960
           13,-20:
             0: 65024
@@ -1810,7 +1821,7 @@ entities:
           13,-21:
             1: 16179
           13,-16:
-            4: 819
+            3: 819
             1: 8
           14,-20:
             0: 53504
@@ -1890,7 +1901,7 @@ entities:
             1: 15
             0: 49152
           20,-18:
-            0: 57297
+            0: 57309
           20,-17:
             0: 4445
           13,-24:
@@ -2014,7 +2025,7 @@ entities:
             0: 59392
           11,-15:
             1: 32904
-            4: 1
+            3: 1
           12,-14:
             0: 62926
           11,-14:
@@ -2042,13 +2053,13 @@ entities:
           14,-13:
             0: 52424
           14,-12:
-            0: 61452
+            0: 61580
           15,-14:
             0: 119
           15,-13:
             0: 30579
           15,-12:
-            0: 28679
+            0: 28695
           16,-11:
             0: 63359
           15,-11:
@@ -2142,8 +2153,7 @@ entities:
           12,-9:
             0: 56784
           11,-9:
-            0: 65416
-            6: 2
+            0: 65528
           12,-8:
             0: 57117
           13,-11:
@@ -2212,13 +2222,13 @@ entities:
           20,-6:
             0: 57293
           20,-5:
-            0: 193
+            0: 205
           11,-8:
-            0: 18024
+            0: 47864
           12,-7:
             0: 61681
           11,-7:
-            0: 63590
+            0: 61627
           12,-6:
             0: 65295
           11,-6:
@@ -2249,31 +2259,31 @@ entities:
             0: 3
             1: 43008
           9,-7:
-            0: 65030
+            0: 65038
           9,-6:
             0: 4991
           9,-5:
             0: 272
             1: 68
           9,-9:
-            0: 15091
+            0: 45811
           9,-8:
-            0: 57574
+            0: 43690
           9,-4:
             0: 4369
             1: 17408
           10,-8:
-            0: 40176
+            0: 65520
           10,-7:
-            0: 64461
+            0: 62351
           10,-6:
             0: 53007
           10,-5:
             0: 63485
-          10,-9:
-            0: 65520
           10,-4:
             0: 4087
+          10,-9:
+            0: 61168
           11,-4:
             0: 4095
           9,-12:
@@ -2352,13 +2362,13 @@ entities:
           11,-3:
             1: 12288
           9,-15:
-            3: 1
-            4: 4
+            4: 1
+            3: 4
             1: 32768
           9,-14:
             0: 36848
           10,-15:
-            4: 1
+            3: 1
             5: 4
           10,-14:
             0: 65520
@@ -2446,60 +2456,62 @@ entities:
     - type: ExplosionAirtightGrid
     - type: ChunkContainer
       chunkEntities:
-      - 7297
-      - 20218
-      - 20219
-      - 20220
-      - 20221
-      - 20222
-      - 20223
-      - 20224
-      - 20225
-      - 20226
-      - 20227
-      - 20228
-      - 20229
-      - 20230
-      - 20231
-      - 20232
-      - 20233
-      - 20234
-      - 20235
-      - 20236
-      - 20237
-      - 20238
-      - 20239
-      - 20240
-      - 20241
-      - 20242
-      - 20243
-      - 20244
-      - 20245
-      - 20246
-      - 20247
-      - 20248
-      - 20249
-      - 20250
-      - 20251
-      - 20252
-      - 20253
-      - 20254
-      - 20255
-      - 20256
-      - 20257
-      - 20258
-      - 20259
-      - 20260
-      - 20261
-      - 20262
-      - 20263
-      - 20264
-      - 20265
-      - 20266
-      - 20267
-      - 20268
-      - 20269
-      - 20270
+      - 17429
+      - 17430
+      - 17524
+      - 17525
+      - 17526
+      - 17527
+      - 17528
+      - 17529
+      - 17557
+      - 17561
+      - 17562
+      - 17563
+      - 17567
+      - 17568
+      - 17569
+      - 17570
+      - 17571
+      - 17614
+      - 17617
+      - 17637
+      - 17648
+      - 17682
+      - 17693
+      - 17694
+      - 17716
+      - 17730
+      - 17732
+      - 17784
+      - 17794
+      - 17795
+      - 17842
+      - 17873
+      - 17874
+      - 17875
+      - 17876
+      - 17916
+      - 17918
+      - 17988
+      - 18010
+      - 18012
+      - 18101
+      - 18102
+      - 18109
+      - 18149
+      - 18150
+      - 18216
+      - 18217
+      - 18219
+      - 18249
+      - 18251
+      - 18266
+      - 18303
+      - 18319
+      - 18320
+      - 18324
+    - type: GridSplitNode
 - proto: ActionStethoscope
   entities:
   - uid: 6661
@@ -2526,36 +2538,10 @@ entities:
       container: 13901
 - proto: ActionToggleInternals
   entities:
-  - uid: 3031
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 7689
-    - type: Action
-      container: 7689
   - uid: 7333
     components:
     - type: Transform
       parent: 5264
-  - uid: 7690
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 7689
-  - uid: 7694
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 7691
-  - uid: 7698
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 7697
   - uid: 7999
     components:
     - type: Transform
@@ -2590,14 +2576,6 @@ entities:
     components:
     - type: Transform
       parent: 18387
-  - uid: 18526
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 18513
-    - type: Action
-      container: 18513
   - uid: 18567
     mapInit: true
     paused: true
@@ -2606,14 +2584,6 @@ entities:
       parent: 19423
     - type: Action
       container: 19423
-  - uid: 18754
-    components:
-    - type: Transform
-      parent: 18753
-  - uid: 18756
-    components:
-    - type: Transform
-      parent: 18755
   - uid: 19632
     mapInit: true
     paused: true
@@ -2788,7 +2758,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: -4.5,-29.5
+      pos: -13.5,-29.5
     - type: DeviceList
       devices:
       - 10003
@@ -2868,24 +2838,6 @@ entities:
       - 19871
       - 19870
       - 8480
-  - uid: 1075
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-27.5
-    - type: DeviceList
-      devices:
-      - 8839
-      - 8489
-      - 9916
-      - 8488
-      - 9874
-      - 7440
-      - 7443
-      - 18797
-      - 8791
-      - 19204
   - uid: 1212
     components:
     - type: Transform
@@ -2992,7 +2944,6 @@ entities:
       pos: -5.5,-9.5
     - type: DeviceList
       devices:
-      - 7442
       - 10430
       - 8675
       - 8769
@@ -3013,9 +2964,8 @@ entities:
       - 10481
       - 19829
       - 19828
-      - 8107
-      - 16242
       - 19830
+      - 16164
   - uid: 5107
     components:
     - type: Transform
@@ -3247,6 +3197,8 @@ entities:
       - 3081
       - 18842
       - 19920
+      - 17099
+      - 17103
   - uid: 7582
     components:
     - type: Transform
@@ -4021,6 +3973,8 @@ entities:
       - 18726
       - 18725
       - 18735
+      - 17307
+      - 17306
   - uid: 16367
     components:
     - type: Transform
@@ -4049,6 +4003,25 @@ entities:
       - 15526
       - 1104
       - 18400
+  - uid: 16438
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -15.5,-24.5
+    - type: DeviceList
+      devices:
+      - 8488
+      - 8489
+      - 379
+      - 16047
+      - 16522
+      - 16514
+      - 16513
+      - 16535
+      - 16021
+      - 15923
+      - 16175
   - uid: 16603
     components:
     - type: Transform
@@ -4061,6 +4034,18 @@ entities:
       - 18762
       - 8847
       - 8849
+  - uid: 16647
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-19.5
+    - type: DeviceList
+      devices:
+      - 16156
+      - 16117
+      - 16045
+      - 16046
   - uid: 17282
     components:
     - type: Transform
@@ -4117,7 +4102,6 @@ entities:
       - 17130
       - 17153
       - 18091
-      - 13567
   - uid: 18059
     components:
     - type: Transform
@@ -4179,7 +4163,6 @@ entities:
       devices:
       - 18092
       - 16173
-      - 13567
       - 3659
   - uid: 18736
     components:
@@ -4248,14 +4231,14 @@ entities:
       - 1112
       - 18761
       - 44
-      - 7440
-      - 16242
-      - 8107
-      - 19203
       - 8843
       - 8844
-      - 8792
       - 8718
+      - 379
+      - 16047
+      - 16117
+      - 16156
+      - 16164
   - uid: 19220
     components:
     - type: Transform
@@ -4728,6 +4711,11 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 14.5,-91.5
+  - uid: 5541
+    components:
+    - type: Transform
+      parent: 2
+      pos: 15.5,-91.5
 - proto: AirlockCargoLocked
   entities:
   - uid: 384
@@ -4748,24 +4736,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 20.5,-82.5
-  - uid: 529
+  - uid: 3685
     components:
     - type: Transform
       parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 16.5,-83.5
-- proto: AirlockChapelGlassLocked
-  entities:
-  - uid: 176
-    components:
-    - type: Transform
-      parent: 2
-      pos: -19.5,-36.5
-  - uid: 180
-    components:
-    - type: Transform
-      parent: 2
-      pos: -19.5,-34.5
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-82.5
 - proto: AirlockChapelLocked
   entities:
   - uid: 2804
@@ -5393,6 +5369,30 @@ entities:
     - type: Transform
       parent: 2
       pos: -56.5,-69.5
+  - uid: 377
+    components:
+    - type: Transform
+      parent: 2
+      pos: 51.5,-80.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        378:
+        - - DoorStatus
+          - DoorBolt
+  - uid: 378
+    components:
+    - type: Transform
+      parent: 2
+      pos: 51.5,-77.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        377:
+        - - DoorStatus
+          - DoorBolt
   - uid: 1471
     components:
     - type: Transform
@@ -5695,11 +5695,6 @@ entities:
       pos: 0.5,-65.5
 - proto: AirlockGlassXeno
   entities:
-  - uid: 270
-    components:
-    - type: Transform
-      parent: 2
-      pos: -3.5,-42.5
   - uid: 327
     components:
     - type: Transform
@@ -6281,6 +6276,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 37.5,-74.5
+  - uid: 7429
+    components:
+    - type: Transform
+      parent: 2
+      pos: 51.5,-73.5
+  - uid: 10774
+    components:
+    - type: Transform
+      parent: 2
+      pos: 50.5,-73.5
 - proto: AirlockMaintBarLocked
   entities:
   - uid: 1448
@@ -6468,7 +6473,7 @@ entities:
       pos: 11.5,-30.5
     - type: Door
       state: Opening
-      secondsUntilStateChange: -297176.12
+      secondsUntilStateChange: -319107.47
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -6500,6 +6505,16 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 16.5,-23.5
+  - uid: 14285
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-21.5
+  - uid: 14349
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,-21.5
 - proto: AirlockMedicalLocked
   entities:
   - uid: 2251
@@ -6571,6 +6586,30 @@ entities:
       pos: -19.5,-18.5
 - proto: AirlockScienceGlassLocked
   entities:
+  - uid: 541
+    components:
+    - type: Transform
+      parent: 2
+      pos: -19.5,-34.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        555:
+        - - DoorStatus
+          - Close
+  - uid: 555
+    components:
+    - type: Transform
+      parent: 2
+      pos: -19.5,-36.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        541:
+        - - DoorStatus
+          - Close
   - uid: 1215
     components:
     - type: Transform
@@ -6581,74 +6620,92 @@ entities:
     - type: Transform
       parent: 2
       pos: -19.5,-30.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        2210:
+        - - DoorStatus
+          - Close
   - uid: 2210
     components:
     - type: Transform
       parent: 2
       pos: -19.5,-28.5
-  - uid: 2379
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-24.5
-  - uid: 2725
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-25.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        2209:
+        - - DoorStatus
+          - Close
 - proto: AirlockScienceLocked
   entities:
+  - uid: 257
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-27.5
   - uid: 513
     components:
     - type: Transform
       parent: 2
       pos: -17.5,-23.5
-  - uid: 519
+  - uid: 632
     components:
     - type: Transform
       parent: 2
-      pos: -7.5,-23.5
-  - uid: 2271
+      rot: 3.141592653589793 rad
+      pos: -4.5,-29.5
+  - uid: 2221
     components:
     - type: Transform
       parent: 2
-      pos: -7.5,-27.5
-  - uid: 3033
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-16.5
-  - uid: 3143
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -15.5,-25.5
-  - uid: 3165
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -15.5,-24.5
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-21.5
   - uid: 3166
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -26.5,-26.5
-  - uid: 11100
+  - uid: 4210
     components:
     - type: Transform
       parent: 2
-      pos: -13.5,-29.5
-  - uid: 13395
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-26.5
+  - uid: 4982
     components:
     - type: Transform
       parent: 2
-      pos: -10.5,-17.5
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-20.5
+  - uid: 5075
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -12.5,-22.5
+  - uid: 5097
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -11.5,-22.5
+  - uid: 7434
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-16.5
+  - uid: 16191
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -15.5,-25.5
 - proto: AirlockSecurityGlassLocked
   entities:
   - uid: 1881
@@ -6767,12 +6824,6 @@ entities:
       pos: 35.5,-41.5
 - proto: AirlockServiceLocked
   entities:
-  - uid: 3617
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -34.5,-27.5
   - uid: 6039
     components:
     - type: Transform
@@ -6815,25 +6866,23 @@ entities:
     - type: Transform
       parent: 2
       pos: -59.5,-64.5
-- proto: AirlockVirologyGlassLocked
+- proto: AirlockVirologyGlass
   entities:
-  - uid: 7953
-    components:
-    - type: Transform
-      parent: 2
-      pos: 31.5,-13.5
-  - uid: 8785
-    components:
-    - type: Transform
-      parent: 2
-      pos: 31.5,-16.5
-- proto: AirlockVirologyLocked
-  entities:
-  - uid: 7807
+  - uid: 12981
     components:
     - type: Transform
       parent: 2
       pos: 35.5,-16.5
+  - uid: 13452
+    components:
+    - type: Transform
+      parent: 2
+      pos: 31.5,-16.5
+  - uid: 17303
+    components:
+    - type: Transform
+      parent: 2
+      pos: 31.5,-13.5
 - proto: AirlockXeno
   entities:
   - uid: 153
@@ -6865,7 +6914,7 @@ entities:
       pos: 34.5,-36.5
     - type: Door
       state: Opening
-      secondsUntilStateChange: -72673.78
+      secondsUntilStateChange: -94605.19
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -6879,6 +6928,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -50.5,-63.5
+  - uid: 557
+    components:
+    - type: Transform
+      parent: 2
+      pos: -3.5,-42.5
   - uid: 586
     components:
     - type: Transform
@@ -6951,12 +7005,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -34.5,-17.5
-  - uid: 3160
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 44.5,-33.5
   - uid: 3291
     components:
     - type: Transform
@@ -6999,11 +7047,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 57.5,-75.5
-  - uid: 3436
-    components:
-    - type: Transform
-      parent: 2
-      pos: 43.5,-25.5
   - uid: 3487
     components:
     - type: Transform
@@ -7016,12 +7059,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 60.5,-64.5
-  - uid: 3592
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 38.5,-34.5
   - uid: 3638
     components:
     - type: Transform
@@ -7033,18 +7070,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 63.5,-56.5
-  - uid: 3685
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 44.5,-32.5
-  - uid: 3687
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 46.5,-33.5
   - uid: 3756
     components:
     - type: Transform
@@ -7170,12 +7195,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 76.5,-40.5
-  - uid: 5892
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 46.5,-32.5
   - uid: 6253
     components:
     - type: Transform
@@ -7260,21 +7279,28 @@ entities:
     - type: Transform
       parent: 2
       pos: 77.5,-55.5
-  - uid: 12960
-    components:
-    - type: Transform
-      parent: 2
-      pos: 43.5,-28.5
   - uid: 13881
     components:
     - type: Transform
       parent: 2
       pos: 75.5,-24.5
+  - uid: 14025
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-43.5
   - uid: 14237
     components:
     - type: Transform
       parent: 2
       pos: 57.5,-66.5
+  - uid: 14699
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 37.5,-30.5
   - uid: 16387
     components:
     - type: Transform
@@ -7285,6 +7311,12 @@ entities:
     - type: Transform
       parent: 2
       pos: -16.5,-42.5
+  - uid: 17384
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 46.5,-30.5
 - proto: AirSensor
   entities:
   - uid: 1800
@@ -7617,22 +7649,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 18818
-  - uid: 8791
-    components:
-    - type: Transform
-      parent: 2
-      pos: -14.5,-25.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 1075
-  - uid: 8792
-    components:
-    - type: Transform
-      parent: 2
-      pos: -5.5,-21.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 19200
   - uid: 8814
     components:
     - type: Transform
@@ -7739,6 +7755,14 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 9236
+  - uid: 16175
+    components:
+    - type: Transform
+      parent: 2
+      pos: -8.5,-27.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 16438
   - uid: 16423
     components:
     - type: Transform
@@ -7764,6 +7788,14 @@ entities:
       deviceLists:
       - 14592
       - 14590
+  - uid: 17307
+    components:
+    - type: Transform
+      parent: 2
+      pos: 31.5,-11.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 16363
   - uid: 17687
     components:
     - type: Transform
@@ -8008,33 +8040,18 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 14759
-- proto: AirTank
+- proto: AltarSpawner
   entities:
-  - uid: 18513
+  - uid: 1135
     components:
     - type: Transform
       parent: 2
-      pos: 46.752895,-75.3866
-    - type: GasTank
-      toggleActionEntity: 18526
-    - type: ActionsContainer
-    - type: ContainerContainer
-      containers:
-        actions: !type:Container
-          ents:
-          - 18526
-- proto: AltarSpawner
-  entities:
+      pos: -19.5,-39.5
   - uid: 7717
     components:
     - type: Transform
       parent: 2
       pos: -22.5,-43.5
-  - uid: 18768
-    components:
-    - type: Transform
-      parent: 2
-      pos: -18.5,-32.5
 - proto: AmeController
   entities:
   - uid: 2283
@@ -8051,31 +8068,21 @@ entities:
       pos: -40.61705,-80.25643
 - proto: AnomalyScanner
   entities:
-  - uid: 8653
+  - uid: 10250
     components:
     - type: Transform
       parent: 2
-      pos: -12.506874,-21.423786
-  - uid: 12911
+      pos: -9.50273,-17.380056
+  - uid: 14125
     components:
     - type: Transform
       parent: 2
-      pos: -12.142291,-21.267427
+      pos: -13.480247,-21.178549
   - uid: 18173
     components:
     - type: Transform
       parent: 2
       pos: -50.451,-54.290306
-  - uid: 19207
-    components:
-    - type: Transform
-      parent: 2
-      pos: -5.6010184,-28.223955
-  - uid: 19209
-    components:
-    - type: Transform
-      parent: 2
-      pos: -6.6181827,-18.475647
 - proto: APCBasic
   entities:
   - uid: 295
@@ -8390,14 +8397,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -12.5,-10.5
-  - uid: 11432
-    components:
-    - type: MetaData
-      name: Science Main APC
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -9.5,-22.5
   - uid: 11637
     components:
     - type: MetaData
@@ -8506,6 +8505,21 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 20.5,-62.5
+  - uid: 16193
+    components:
+    - type: MetaData
+      name: Science R&D APC
+    - type: Transform
+      parent: 2
+      pos: -13.5,-22.5
+  - uid: 16242
+    components:
+    - type: MetaData
+      name: Science Anomaly & Robotics APC
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-19.5
   - uid: 17057
     components:
     - type: MetaData
@@ -8650,13 +8664,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 71.754875,-48.25979
-- proto: AsimovCircuitBoard
-  entities:
-  - uid: 18617
-    components:
-    - type: Transform
-      parent: 2
-      pos: 82.54185,-40.442722
 - proto: AtmosDeviceFanDirectional
   entities:
   - uid: 135
@@ -8689,11 +8696,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 6.5,3.5
-  - uid: 2475
-    components:
-    - type: Transform
-      parent: 2
-      pos: 21.5,-102.5
   - uid: 3042
     components:
     - type: Transform
@@ -8709,11 +8711,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 23.5,-102.5
-  - uid: 4222
-    components:
-    - type: Transform
-      parent: 2
-      pos: 27.5,-102.5
   - uid: 5034
     components:
     - type: Transform
@@ -8784,6 +8781,26 @@ entities:
       pos: 25.5,-9.5
 - proto: AtmosFixBlockerMarker
   entities:
+  - uid: 2944
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-85.5
+  - uid: 3149
+    components:
+    - type: Transform
+      parent: 2
+      pos: 48.5,-85.5
+  - uid: 3168
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-84.5
+  - uid: 3426
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-83.5
   - uid: 3629
     components:
     - type: Transform
@@ -8804,6 +8821,31 @@ entities:
     - type: Transform
       parent: 2
       pos: 53.5,-62.5
+  - uid: 3686
+    components:
+    - type: Transform
+      parent: 2
+      pos: 46.5,-85.5
+  - uid: 3729
+    components:
+    - type: Transform
+      parent: 2
+      pos: 48.5,-84.5
+  - uid: 6922
+    components:
+    - type: Transform
+      parent: 2
+      pos: 46.5,-83.5
+  - uid: 6926
+    components:
+    - type: Transform
+      parent: 2
+      pos: 48.5,-83.5
+  - uid: 10446
+    components:
+    - type: Transform
+      parent: 2
+      pos: 46.5,-84.5
   - uid: 13837
     components:
     - type: Transform
@@ -8956,11 +8998,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 45.5,-37.5
-  - uid: 5834
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-35.5
   - uid: 8146
     components:
     - type: Transform
@@ -9024,16 +9061,22 @@ entities:
       pos: 42.5,-61.5
 - proto: Autolathe
   entities:
-  - uid: 2325
-    components:
-    - type: Transform
-      parent: 2
-      pos: -3.5,-20.5
   - uid: 3013
     components:
     - type: Transform
       parent: 2
       pos: 29.5,-89.5
+  - uid: 5064
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.5,-28.5
+    - type: TechnologyDatabase
+      supportedDisciplines:
+      - Industrial
+      - Arsenal
+      - Experimental
+      - CivilianServices
   - uid: 5705
     components:
     - type: Transform
@@ -9048,23 +9091,11 @@ entities:
       pos: -64.37506,-61.441326
 - proto: BanjoInstrument
   entities:
-  - uid: 285
+  - uid: 12792
     components:
     - type: Transform
       parent: 2
-      pos: -61.48744,-25.476637
-- proto: BannerCargo
-  entities:
-  - uid: 6762
-    components:
-    - type: Transform
-      parent: 2
-      pos: 22.5,-79.5
-  - uid: 6763
-    components:
-    - type: Transform
-      parent: 2
-      pos: 26.5,-79.5
+      pos: -61.62356,-25.437422
 - proto: Barricade
   entities:
   - uid: 1674
@@ -9125,11 +9156,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 76.5,-40.5
-  - uid: 7590
-    components:
-    - type: Transform
-      parent: 2
-      pos: 80.5,-27.5
   - uid: 11847
     components:
     - type: Transform
@@ -9176,11 +9202,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 23.5,-50.5
-  - uid: 7258
-    components:
-    - type: Transform
-      parent: 2
-      pos: 80.5,-26.5
   - uid: 7380
     components:
     - type: Transform
@@ -9338,6 +9359,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 14.5,-63.5
+  - uid: 6457
+    components:
+    - type: Transform
+      parent: 2
+      pos: -40.5,-14.5
+  - uid: 6458
+    components:
+    - type: Transform
+      parent: 2
+      pos: -37.5,-16.5
   - uid: 6814
     components:
     - type: Transform
@@ -9685,6 +9716,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -21.5,-31.5
+  - uid: 6243
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-84.5
   - uid: 8421
     components:
     - type: Transform
@@ -10017,22 +10054,16 @@ entities:
       pos: 73.5,-48.5
 - proto: BorgCharger
   entities:
-  - uid: 2774
+  - uid: 7100
     components:
     - type: Transform
       parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 15.5,-90.5
-  - uid: 5064
+      pos: -3.5,-19.5
+  - uid: 15326
     components:
     - type: Transform
       parent: 2
-      pos: -11.5,-23.5
-  - uid: 5065
-    components:
-    - type: Transform
-      parent: 2
-      pos: -10.5,-23.5
+      pos: -3.5,-20.5
   - uid: 17415
     components:
     - type: Transform
@@ -10101,11 +10132,6 @@ entities:
       pos: -20.542322,-41.278927
 - proto: BoxCartridgeCap
   entities:
-  - uid: 17387
-    components:
-    - type: Transform
-      parent: 2
-      pos: 86.57508,-17.524826
   - uid: 17966
     components:
     - type: Transform
@@ -10238,11 +10264,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 19.714624,-17.186592
-  - uid: 13336
-    components:
-    - type: Transform
-      parent: 2
-      pos: -11.671647,-21.385529
 - proto: BoxLethalshot
   entities:
   - uid: 11826
@@ -10335,11 +10356,11 @@ entities:
       pos: 13.433219,-59.536785
 - proto: BriefcaseBrown
   entities:
-  - uid: 6063
+  - uid: 12791
     components:
     - type: Transform
       parent: 2
-      pos: -33.507446,-25.328426
+      pos: -32.492767,-26.34273
 - proto: BriefcaseBrownFilled
   entities:
   - uid: 9364
@@ -10453,24 +10474,35 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 26.5,-100.5
+  - uid: 7499
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-82.5
   - uid: 8851
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -20.5,-18.5
+  - uid: 11124
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-87.5
+  - uid: 15327
+    components:
+    - type: Transform
+      parent: 2
+      pos: -4.5,-18.5
   - uid: 15387
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 50.5,-66.5
-  - uid: 15697
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 36.5,-27.5
   - uid: 16048
     components:
     - type: Transform
@@ -10489,29 +10521,29 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 57.5,-20.5
-  - uid: 17795
+  - uid: 17305
+    components:
+    - type: Transform
+      parent: 2
+      pos: 32.5,-13.5
+  - uid: 17397
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
-      pos: -9.5,-28.5
+      pos: 38.5,-87.5
+  - uid: 17404
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 36.5,-82.5
   - uid: 17828
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 25.5,-89.5
-  - uid: 17873
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 38.5,-87.5
-  - uid: 17874
-    components:
-    - type: Transform
-      parent: 2
-      pos: 36.5,-82.5
   - uid: 19573
     components:
     - type: Transform
@@ -10581,12 +10613,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 65.5,-53.5
-  - uid: 15699
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 36.5,-29.5
   - uid: 16618
     components:
     - type: Transform
@@ -10656,6 +10682,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 62.5,-19.5
+  - uid: 535
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.5,-22.5
   - uid: 545
     components:
     - type: Transform
@@ -10676,6 +10707,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -27.5,-15.5
+  - uid: 594
+    components:
+    - type: Transform
+      parent: 2
+      pos: -4.5,-23.5
   - uid: 717
     components:
     - type: Transform
@@ -10695,7 +10731,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: -8.5,-22.5
+      pos: -7.5,-21.5
   - uid: 952
     components:
     - type: Transform
@@ -10726,6 +10762,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 35.5,-28.5
+  - uid: 1075
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-22.5
   - uid: 1096
     components:
     - type: Transform
@@ -10741,6 +10782,16 @@ entities:
     - type: Transform
       parent: 2
       pos: -22.5,-18.5
+  - uid: 1140
+    components:
+    - type: Transform
+      parent: 2
+      pos: 39.5,-29.5
+  - uid: 1159
+    components:
+    - type: Transform
+      parent: 2
+      pos: 39.5,-30.5
   - uid: 1172
     components:
     - type: Transform
@@ -10756,6 +10807,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -5.5,-11.5
+  - uid: 1220
+    components:
+    - type: Transform
+      parent: 2
+      pos: 39.5,-28.5
   - uid: 1257
     components:
     - type: Transform
@@ -10786,11 +10842,41 @@ entities:
     - type: Transform
       parent: 2
       pos: -37.5,-12.5
+  - uid: 1477
+    components:
+    - type: Transform
+      parent: 2
+      pos: -8.5,-27.5
+  - uid: 1559
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-30.5
   - uid: 1563
     components:
     - type: Transform
       parent: 2
       pos: -46.5,-66.5
+  - uid: 1642
+    components:
+    - type: Transform
+      parent: 2
+      pos: -33.5,-26.5
+  - uid: 1645
+    components:
+    - type: Transform
+      parent: 2
+      pos: -33.5,-25.5
+  - uid: 1665
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.5,-23.5
+  - uid: 1670
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.5,-24.5
   - uid: 1709
     components:
     - type: Transform
@@ -10831,16 +10917,16 @@ entities:
     - type: Transform
       parent: 2
       pos: -41.5,-79.5
+  - uid: 2154
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-26.5
   - uid: 2241
     components:
     - type: Transform
       parent: 2
       pos: -16.5,-74.5
-  - uid: 2246
-    components:
-    - type: Transform
-      parent: 2
-      pos: 38.5,-28.5
   - uid: 2275
     components:
     - type: Transform
@@ -10871,6 +10957,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 3.5,-72.5
+  - uid: 2475
+    components:
+    - type: Transform
+      parent: 2
+      pos: -11.5,-26.5
   - uid: 2483
     components:
     - type: Transform
@@ -10886,16 +10977,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 59.5,-72.5
+  - uid: 2725
+    components:
+    - type: Transform
+      parent: 2
+      pos: -10.5,-26.5
   - uid: 2739
     components:
     - type: Transform
       parent: 2
       pos: 64.5,-69.5
-  - uid: 2741
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-22.5
   - uid: 2936
     components:
     - type: Transform
@@ -10906,6 +10997,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -42.5,-78.5
+  - uid: 3004
+    components:
+    - type: Transform
+      parent: 2
+      pos: 46.5,-30.5
   - uid: 3022
     components:
     - type: Transform
@@ -10966,21 +11062,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 63.5,-20.5
-  - uid: 3091
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-31.5
-  - uid: 3095
-    components:
-    - type: Transform
-      parent: 2
-      pos: -9.5,-22.5
   - uid: 3129
     components:
     - type: Transform
       parent: 2
       pos: 67.5,-72.5
+  - uid: 3143
+    components:
+    - type: Transform
+      parent: 2
+      pos: -4.5,-28.5
   - uid: 3147
     components:
     - type: Transform
@@ -10991,11 +11082,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 58.5,-68.5
-  - uid: 3149
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-32.5
   - uid: 3153
     components:
     - type: Transform
@@ -11096,6 +11182,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 77.5,-28.5
+  - uid: 3312
+    components:
+    - type: Transform
+      parent: 2
+      pos: 40.5,-30.5
   - uid: 3316
     components:
     - type: Transform
@@ -11191,11 +11282,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 43.5,-38.5
-  - uid: 3426
-    components:
-    - type: Transform
-      parent: 2
-      pos: 39.5,-28.5
   - uid: 3435
     components:
     - type: Transform
@@ -11231,6 +11317,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -14.5,-79.5
+  - uid: 3530
+    components:
+    - type: Transform
+      parent: 2
+      pos: 45.5,-30.5
   - uid: 3554
     components:
     - type: Transform
@@ -11251,6 +11342,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 63.5,-25.5
+  - uid: 3592
+    components:
+    - type: Transform
+      parent: 2
+      pos: 45.5,-27.5
   - uid: 3601
     components:
     - type: Transform
@@ -11261,11 +11357,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 64.5,-67.5
-  - uid: 3608
-    components:
-    - type: Transform
-      parent: 2
-      pos: 37.5,-28.5
   - uid: 3610
     components:
     - type: Transform
@@ -11281,6 +11372,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 46.5,-52.5
+  - uid: 3617
+    components:
+    - type: Transform
+      parent: 2
+      pos: 43.5,-27.5
   - uid: 3622
     components:
     - type: Transform
@@ -11340,67 +11436,22 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 43.5,-27.5
-  - uid: 3686
-    components:
-    - type: Transform
-      parent: 2
-      pos: 40.5,-27.5
+      pos: 41.5,-30.5
   - uid: 3694
     components:
     - type: Transform
       parent: 2
-      pos: 43.5,-26.5
-  - uid: 3695
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-26.5
-  - uid: 3696
-    components:
-    - type: Transform
-      parent: 2
-      pos: 46.5,-27.5
+      pos: -8.5,-26.5
   - uid: 3698
     components:
     - type: Transform
       parent: 2
-      pos: 45.5,-27.5
-  - uid: 3699
-    components:
-    - type: Transform
-      parent: 2
-      pos: 46.5,-28.5
-  - uid: 3700
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-33.5
-  - uid: 3701
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-35.5
-  - uid: 3702
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-30.5
-  - uid: 3703
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-29.5
+      pos: -13.5,-27.5
   - uid: 3704
     components:
     - type: Transform
       parent: 2
       pos: 45.5,-38.5
-  - uid: 3707
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-36.5
   - uid: 3712
     components:
     - type: Transform
@@ -11410,7 +11461,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 45.5,-34.5
+      pos: 45.5,-29.5
   - uid: 3735
     components:
     - type: Transform
@@ -11451,6 +11502,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 31.5,-32.5
+  - uid: 3766
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-77.5
   - uid: 3781
     components:
     - type: Transform
@@ -11551,6 +11607,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 37.5,-79.5
+  - uid: 4003
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-80.5
   - uid: 4017
     components:
     - type: Transform
@@ -11566,6 +11627,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 9.5,-48.5
+  - uid: 4079
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-82.5
   - uid: 4080
     components:
     - type: Transform
@@ -11601,6 +11667,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 58.5,-24.5
+  - uid: 4193
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-78.5
+  - uid: 4199
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-81.5
   - uid: 4206
     components:
     - type: Transform
@@ -11636,6 +11712,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 47.5,-19.5
+  - uid: 4222
+    components:
+    - type: Transform
+      parent: 2
+      pos: -8.5,-19.5
+  - uid: 4224
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-83.5
   - uid: 4264
     components:
     - type: Transform
@@ -11681,6 +11767,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -17.5,-74.5
+  - uid: 4470
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.5,-26.5
   - uid: 4559
     components:
     - type: Transform
@@ -11726,6 +11817,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 32.5,-68.5
+  - uid: 4817
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-79.5
   - uid: 4881
     components:
     - type: Transform
@@ -11761,6 +11857,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 55.5,-16.5
+  - uid: 5072
+    components:
+    - type: Transform
+      parent: 2
+      pos: -4.5,-22.5
   - uid: 5080
     components:
     - type: Transform
@@ -11771,6 +11872,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -12.5,-34.5
+  - uid: 5201
+    components:
+    - type: Transform
+      parent: 2
+      pos: 67.5,-48.5
   - uid: 5207
     components:
     - type: Transform
@@ -11791,11 +11897,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 4.5,-52.5
-  - uid: 5281
-    components:
-    - type: Transform
-      parent: 2
-      pos: 40.5,-28.5
   - uid: 5282
     components:
     - type: Transform
@@ -11861,11 +11962,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 51.5,-41.5
-  - uid: 5307
-    components:
-    - type: Transform
-      parent: 2
-      pos: 41.5,-27.5
   - uid: 5309
     components:
     - type: Transform
@@ -12016,11 +12112,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 80.5,-45.5
-  - uid: 5835
-    components:
-    - type: Transform
-      parent: 2
-      pos: 68.5,-47.5
   - uid: 5857
     components:
     - type: Transform
@@ -12165,7 +12256,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 44.5,-26.5
+      pos: 47.5,-84.5
   - uid: 6384
     components:
     - type: Transform
@@ -12176,6 +12267,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 83.5,-43.5
+  - uid: 6400
+    components:
+    - type: Transform
+      parent: 2
+      pos: 41.5,-27.5
   - uid: 6402
     components:
     - type: Transform
@@ -12196,6 +12292,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -2.5,-36.5
+  - uid: 6554
+    components:
+    - type: Transform
+      parent: 2
+      pos: 37.5,-31.5
   - uid: 6626
     components:
     - type: Transform
@@ -12346,11 +12447,21 @@ entities:
     - type: Transform
       parent: 2
       pos: 52.5,-14.5
+  - uid: 7327
+    components:
+    - type: Transform
+      parent: 2
+      pos: 39.5,-31.5
   - uid: 7339
     components:
     - type: Transform
       parent: 2
       pos: 3.5,-59.5
+  - uid: 7369
+    components:
+    - type: Transform
+      parent: 2
+      pos: 37.5,-29.5
   - uid: 7393
     components:
     - type: Transform
@@ -12405,22 +12516,12 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 86.5,-47.5
+      pos: 84.5,-47.5
   - uid: 7495
     components:
     - type: Transform
       parent: 2
-      pos: 85.5,-47.5
-  - uid: 7499
-    components:
-    - type: Transform
-      parent: 2
-      pos: 85.5,-43.5
-  - uid: 7501
-    components:
-    - type: Transform
-      parent: 2
-      pos: 86.5,-43.5
+      pos: 84.5,-43.5
   - uid: 7502
     components:
     - type: Transform
@@ -12536,11 +12637,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 77.5,-54.5
-  - uid: 7750
-    components:
-    - type: Transform
-      parent: 2
-      pos: 46.5,-29.5
   - uid: 7757
     components:
     - type: Transform
@@ -12556,6 +12652,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 7.5,-59.5
+  - uid: 7891
+    components:
+    - type: Transform
+      parent: 2
+      pos: 37.5,-30.5
   - uid: 7892
     components:
     - type: Transform
@@ -12731,6 +12832,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 59.5,-27.5
+  - uid: 8617
+    components:
+    - type: Transform
+      parent: 2
+      pos: -33.5,-27.5
+  - uid: 8623
+    components:
+    - type: Transform
+      parent: 2
+      pos: 44.5,-27.5
   - uid: 8626
     components:
     - type: Transform
@@ -12751,6 +12862,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 18.5,-82.5
+  - uid: 8733
+    components:
+    - type: Transform
+      parent: 2
+      pos: 42.5,-27.5
+  - uid: 8785
+    components:
+    - type: Transform
+      parent: 2
+      pos: 40.5,-27.5
   - uid: 8798
     components:
     - type: Transform
@@ -12936,6 +13057,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 50.5,-72.5
+  - uid: 9514
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-27.5
   - uid: 9528
     components:
     - type: Transform
@@ -12986,6 +13112,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 47.5,-63.5
+  - uid: 10201
+    components:
+    - type: Transform
+      parent: 2
+      pos: -11.5,-27.5
   - uid: 10267
     components:
     - type: Transform
@@ -13066,11 +13197,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 74.5,-60.5
-  - uid: 10756
-    components:
-    - type: Transform
-      parent: 2
-      pos: 84.5,-43.5
   - uid: 10765
     components:
     - type: Transform
@@ -14931,51 +15057,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -7.5,-20.5
-  - uid: 11430
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-21.5
-  - uid: 11431
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-22.5
-  - uid: 11434
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-25.5
-  - uid: 11435
-    components:
-    - type: Transform
-      parent: 2
-      pos: -6.5,-25.5
-  - uid: 11436
-    components:
-    - type: Transform
-      parent: 2
-      pos: -5.5,-25.5
-  - uid: 11437
-    components:
-    - type: Transform
-      parent: 2
-      pos: -4.5,-25.5
-  - uid: 11438
-    components:
-    - type: Transform
-      parent: 2
-      pos: -8.5,-25.5
-  - uid: 11439
-    components:
-    - type: Transform
-      parent: 2
-      pos: -9.5,-25.5
-  - uid: 11440
-    components:
-    - type: Transform
-      parent: 2
-      pos: -10.5,-25.5
   - uid: 11441
     components:
     - type: Transform
@@ -18931,16 +19012,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -35.5,-27.5
-  - uid: 12634
-    components:
-    - type: Transform
-      parent: 2
-      pos: -34.5,-27.5
-  - uid: 12635
-    components:
-    - type: Transform
-      parent: 2
-      pos: -33.5,-27.5
   - uid: 12636
     components:
     - type: Transform
@@ -19556,11 +19627,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 24.5,-68.5
-  - uid: 12792
-    components:
-    - type: Transform
-      parent: 2
-      pos: 42.5,-27.5
   - uid: 12798
     components:
     - type: Transform
@@ -19981,6 +20047,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 65.5,-43.5
+  - uid: 12961
+    components:
+    - type: Transform
+      parent: 2
+      pos: 39.5,-27.5
   - uid: 12966
     components:
     - type: Transform
@@ -20616,11 +20687,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -13.5,-39.5
-  - uid: 13134
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-29.5
   - uid: 13136
     components:
     - type: Transform
@@ -21516,6 +21582,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 64.5,-56.5
+  - uid: 14027
+    components:
+    - type: Transform
+      parent: 2
+      pos: -6.5,-27.5
   - uid: 14051
     components:
     - type: Transform
@@ -21606,6 +21677,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 75.5,-58.5
+  - uid: 14262
+    components:
+    - type: Transform
+      parent: 2
+      pos: 45.5,-28.5
   - uid: 14263
     components:
     - type: Transform
@@ -23666,11 +23742,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 22.5,-16.5
-  - uid: 19068
-    components:
-    - type: Transform
-      parent: 2
-      pos: -5.5,-26.5
   - uid: 19075
     components:
     - type: Transform
@@ -23696,21 +23767,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -4.5,-27.5
-  - uid: 19083
-    components:
-    - type: Transform
-      parent: 2
-      pos: -3.5,-27.5
-  - uid: 19084
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-24.5
-  - uid: 19085
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-23.5
   - uid: 19086
     components:
     - type: Transform
@@ -24191,11 +24247,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 75.5,-42.5
-  - uid: 19952
-    components:
-    - type: Transform
-      parent: 2
-      pos: 84.5,-47.5
   - uid: 19956
     components:
     - type: Transform
@@ -24278,11 +24329,11 @@ entities:
       pos: 81.5,-49.5
 - proto: CableApcStack
   entities:
-  - uid: 9765
+  - uid: 16926
     components:
     - type: Transform
       parent: 2
-      pos: -12.632856,-28.148214
+      pos: 35.458263,-72.7437
   - uid: 18247
     components:
     - type: Transform
@@ -30189,11 +30240,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -34.5,-18.5
-  - uid: 1477
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-22.5
   - uid: 1543
     components:
     - type: Transform
@@ -30209,11 +30255,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 66.5,-19.5
-  - uid: 1665
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-21.5
   - uid: 1717
     components:
     - type: Transform
@@ -30229,6 +30270,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 33.5,-19.5
+  - uid: 2108
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.5,-22.5
   - uid: 2240
     components:
     - type: Transform
@@ -30269,6 +30315,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 76.5,-71.5
+  - uid: 2741
+    components:
+    - type: Transform
+      parent: 2
+      pos: -12.5,-21.5
   - uid: 2769
     components:
     - type: Transform
@@ -30324,6 +30375,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 61.5,-74.5
+  - uid: 3033
+    components:
+    - type: Transform
+      parent: 2
+      pos: -12.5,-22.5
   - uid: 3051
     components:
     - type: Transform
@@ -30509,6 +30565,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 31.5,-21.5
+  - uid: 4392
+    components:
+    - type: Transform
+      parent: 2
+      pos: -8.5,-19.5
   - uid: 4399
     components:
     - type: Transform
@@ -31364,6 +31425,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -2.5,-48.5
+  - uid: 7796
+    components:
+    - type: Transform
+      parent: 2
+      pos: 67.5,-48.5
   - uid: 7946
     components:
     - type: Transform
@@ -33619,11 +33685,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 13.5,-91.5
-  - uid: 12418
-    components:
-    - type: Transform
-      parent: 2
-      pos: -9.5,-22.5
   - uid: 12467
     components:
     - type: Transform
@@ -34389,11 +34450,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -2.5,-74.5
-  - uid: 15923
-    components:
-    - type: Transform
-      parent: 2
-      pos: -8.5,-22.5
   - uid: 16104
     components:
     - type: Transform
@@ -34514,11 +34570,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -10.5,-43.5
-  - uid: 17693
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-20.5
   - uid: 17927
     components:
     - type: Transform
@@ -35180,6 +35231,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 17.5,-99.5
+- proto: CargoTelepad
+  entities:
+  - uid: 17301
+    components:
+    - type: Transform
+      parent: 2
+      pos: 24.5,-93.5
 - proto: Carpet
   entities:
   - uid: 256
@@ -35188,6 +35246,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 70.5,-53.5
+  - uid: 3450
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 42.5,-30.5
   - uid: 3540
     components:
     - type: Transform
@@ -35255,26 +35319,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 69.5,-52.5
-  - uid: 17424
+  - uid: 8148
     components:
     - type: Transform
       parent: 2
-      pos: 36.5,-44.5
-  - uid: 17425
-    components:
-    - type: Transform
-      parent: 2
-      pos: 36.5,-42.5
-  - uid: 17429
-    components:
-    - type: Transform
-      parent: 2
-      pos: 36.5,-45.5
-  - uid: 17430
-    components:
-    - type: Transform
-      parent: 2
-      pos: 36.5,-43.5
+      rot: -1.5707963267948966 rad
+      pos: 41.5,-30.5
   - uid: 18257
     components:
     - type: Transform
@@ -35701,6 +35751,12 @@ entities:
       pos: -24.5,-35.5
 - proto: CarpetBlue
   entities:
+  - uid: 1804
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-69.5
   - uid: 5129
     components:
     - type: Transform
@@ -35821,11 +35877,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 5.5,-69.5
-  - uid: 20118
-    components:
-    - type: Transform
-      parent: 2
-      pos: 4.5,-69.5
 - proto: CarpetChapel
   entities:
   - uid: 5030
@@ -35853,6 +35904,30 @@ entities:
       pos: -18.5,-33.5
 - proto: CarpetGreen
   entities:
+  - uid: 1667
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 36.5,-43.5
+  - uid: 1668
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 36.5,-45.5
+  - uid: 1673
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 36.5,-42.5
+  - uid: 1696
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 36.5,-44.5
   - uid: 5945
     components:
     - type: Transform
@@ -36535,12 +36610,6 @@ entities:
       parent: 2
       rot: 3.3161255787892263 rad
       pos: -5.52199,-33.37196
-  - uid: 14059
-    components:
-    - type: Transform
-      parent: 2
-      rot: 2.792526803190927 rad
-      pos: -6.443865,-32.46571
   - uid: 14073
     components:
     - type: Transform
@@ -36853,6 +36922,23 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 37.5,-88.5
+  - uid: 1073
+    components:
+    - type: Transform
+      parent: 2
+      pos: 31.5,-29.5
+  - uid: 1171
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 38.5,-34.5
+  - uid: 1209
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 39.5,-34.5
   - uid: 1485
     components:
     - type: Transform
@@ -36886,11 +36972,51 @@ entities:
     - type: Transform
       parent: 2
       pos: -32.5,-48.5
+  - uid: 2536
+    components:
+    - type: Transform
+      parent: 2
+      pos: 32.5,-29.5
+  - uid: 2578
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 43.5,-32.5
+  - uid: 2701
+    components:
+    - type: Transform
+      parent: 2
+      pos: 32.5,-27.5
+  - uid: 2703
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 42.5,-32.5
+  - uid: 2705
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 45.5,-76.5
   - uid: 2930
     components:
     - type: Transform
       parent: 2
       pos: -14.5,-71.5
+  - uid: 2969
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 55.5,-76.5
+  - uid: 2970
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 32.5,-32.5
   - uid: 3049
     components:
     - type: Transform
@@ -36906,6 +37032,18 @@ entities:
     - type: Transform
       parent: 2
       pos: 74.5,-29.5
+  - uid: 3160
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-76.5
+  - uid: 3169
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 35.5,-32.5
   - uid: 3213
     components:
     - type: Transform
@@ -36941,16 +37079,12 @@ entities:
     - type: Transform
       parent: 2
       pos: 31.5,-72.5
-  - uid: 3450
-    components:
-    - type: Transform
-      parent: 2
-      pos: 50.5,-26.5
   - uid: 3471
     components:
     - type: Transform
       parent: 2
-      pos: 49.5,-26.5
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-76.5
   - uid: 3508
     components:
     - type: Transform
@@ -36966,6 +37100,12 @@ entities:
     - type: Transform
       parent: 2
       pos: -15.5,-65.5
+  - uid: 3531
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 36.5,-32.5
   - uid: 3632
     components:
     - type: Transform
@@ -36989,11 +37129,47 @@ entities:
     - type: Transform
       parent: 2
       pos: 33.5,-35.5
+  - uid: 3707
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 47.5,-32.5
   - uid: 3713
     components:
     - type: Transform
       parent: 2
       pos: 79.5,-31.5
+  - uid: 3720
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 28.5,-32.5
+  - uid: 3722
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 37.5,-32.5
+  - uid: 3723
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 34.5,-35.5
+  - uid: 3725
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 28.5,-33.5
+  - uid: 3732
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 48.5,-29.5
   - uid: 3748
     components:
     - type: Transform
@@ -37130,11 +37306,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -8.5,-35.5
-  - uid: 4193
-    components:
-    - type: Transform
-      parent: 2
-      pos: 51.5,-26.5
   - uid: 4393
     components:
     - type: Transform
@@ -37550,12 +37721,66 @@ entities:
     - type: Transform
       parent: 2
       pos: 24.5,-53.5
+  - uid: 6368
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 37.5,-34.5
+  - uid: 6376
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 51.5,-76.5
   - uid: 6381
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 74.5,-31.5
+  - uid: 6394
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-76.5
+  - uid: 6395
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 47.5,-33.5
+  - uid: 6396
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 47.5,-34.5
+  - uid: 6397
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 41.5,-32.5
+  - uid: 6456
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 40.5,-34.5
+  - uid: 6461
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 43.5,-76.5
+  - uid: 6552
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 41.5,-34.5
   - uid: 7084
     components:
     - type: Transform
@@ -37567,6 +37792,12 @@ entities:
     - type: Transform
       parent: 2
       pos: 74.5,-52.5
+  - uid: 7257
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-76.5
   - uid: 7284
     components:
     - type: Transform
@@ -37582,6 +37813,24 @@ entities:
     - type: Transform
       parent: 2
       pos: 33.5,-70.5
+  - uid: 7337
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 37.5,-33.5
+  - uid: 7590
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 45.5,-32.5
+  - uid: 7603
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 48.5,-76.5
   - uid: 7608
     components:
     - type: Transform
@@ -37612,6 +37861,12 @@ entities:
     - type: Transform
       parent: 2
       pos: 75.5,-47.5
+  - uid: 7990
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 41.5,-33.5
   - uid: 8071
     components:
     - type: Transform
@@ -37663,6 +37918,12 @@ entities:
     - type: Transform
       parent: 2
       pos: 77.5,-71.5
+  - uid: 8150
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 56.5,-76.5
   - uid: 8155
     components:
     - type: Transform
@@ -37873,21 +38134,46 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 46.5,-47.5
-  - uid: 9711
-    components:
-    - type: Transform
-      parent: 2
-      pos: 37.5,-30.5
   - uid: 10407
     components:
     - type: Transform
       parent: 2
       pos: 93.5,-50.5
+  - uid: 10447
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 56.5,-75.5
   - uid: 10530
     components:
     - type: Transform
       parent: 2
       pos: -25.5,-21.5
+  - uid: 10661
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 46.5,-32.5
+  - uid: 10668
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 44.5,-32.5
+  - uid: 10818
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 46.5,-76.5
+  - uid: 11402
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 47.5,-76.5
   - uid: 11793
     components:
     - type: Transform
@@ -37899,6 +38185,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 77.5,-29.5
+  - uid: 11979
+    components:
+    - type: Transform
+      parent: 2
+      pos: 30.5,-29.5
   - uid: 12410
     components:
     - type: Transform
@@ -37910,6 +38201,36 @@ entities:
     - type: Transform
       parent: 2
       pos: 33.5,-72.5
+  - uid: 12871
+    components:
+    - type: Transform
+      parent: 2
+      pos: 29.5,-27.5
+  - uid: 12879
+    components:
+    - type: Transform
+      parent: 2
+      pos: 28.5,-29.5
+  - uid: 12881
+    components:
+    - type: Transform
+      parent: 2
+      pos: 28.5,-27.5
+  - uid: 12884
+    components:
+    - type: Transform
+      parent: 2
+      pos: 30.5,-27.5
+  - uid: 12926
+    components:
+    - type: Transform
+      parent: 2
+      pos: 31.5,-27.5
+  - uid: 12952
+    components:
+    - type: Transform
+      parent: 2
+      pos: 29.5,-29.5
   - uid: 12992
     components:
     - type: Transform
@@ -38097,24 +38418,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 3.5,-60.5
-  - uid: 16164
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 39.5,-30.5
-  - uid: 16175
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 40.5,-30.5
-  - uid: 16193
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 41.5,-30.5
   - uid: 16587
     components:
     - type: Transform
@@ -38475,18 +38778,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 83.5,-68.5
-  - uid: 18720
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 83.5,-70.5
-  - uid: 18721
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 82.5,-70.5
   - uid: 18846
     components:
     - type: Transform
@@ -38917,12 +39208,6 @@ entities:
       pos: 60.5,-34.5
 - proto: ChairFolding
   entities:
-  - uid: 86
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -1.6179351,-24.471281
   - uid: 268
     components:
     - type: Transform
@@ -38946,18 +39231,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 34.5,-17.5
-  - uid: 2198
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -1.3679351,-25.409433
-  - uid: 3186
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -1.5554351,-26.347584
   - uid: 4614
     components:
     - type: Transform
@@ -39031,12 +39304,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -48.5,-47.5
-  - uid: 5955
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -61.426323,-25.462961
   - uid: 6904
     components:
     - type: Transform
@@ -39072,6 +39339,24 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 22.5,-19.5
+  - uid: 11430
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -1.5750762,-22.781898
+  - uid: 13337
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -1.5750762,-24.33506
+  - uid: 13975
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -1.3042427,-23.53242
   - uid: 18840
     components:
     - type: Transform
@@ -39092,18 +39377,6 @@ entities:
       pos: -46.5,-44.5
 - proto: ChairFoldingSpawnFolded
   entities:
-  - uid: 7752
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 47.450993,-25.454924
-  - uid: 15417
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 47.482243,-25.298674
   - uid: 16294
     components:
     - type: Transform
@@ -39323,6 +39596,12 @@ entities:
     - type: Transform
       parent: 2
       pos: -6.5,-61.5
+  - uid: 17308
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -61.523342,-25.446423
 - proto: ChairXeno
   entities:
   - uid: 2050
@@ -39372,12 +39651,11 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 41.5,-77.5
-  - uid: 8152
+  - uid: 6973
     components:
     - type: Transform
       parent: 2
-      rot: 3.141592653589793 rad
-      pos: -7.5,-19.5
+      pos: -9.5,-27.5
   - uid: 8153
     components:
     - type: Transform
@@ -39488,13 +39766,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -25.5,-33.5
-- proto: CheapLighter
-  entities:
-  - uid: 3613
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.30708,-27.668627
 - proto: CheapRollerBed
   entities:
   - uid: 2888
@@ -39610,7 +39881,7 @@ entities:
       pos: 27.466145,-45.479877
 - proto: ChunkEntity
   entities:
-  - uid: 7297
+  - uid: 17429
     components:
     - type: ChunkEntity
       root: 2
@@ -39663,7 +39934,7 @@ entities:
             4806: 49,-98
             4807: 50,-98
             4808: 51,-98
-  - uid: 20218
+  - uid: 17430
     components:
     - type: ChunkEntity
       root: 2
@@ -39900,7 +40171,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             242: 22,-85
-  - uid: 20219
+  - uid: 17524
     components:
     - type: ChunkEntity
       root: 2
@@ -40089,16 +40360,6 @@ entities:
             3965: -1,-10
             3966: -2,-10
             3967: -3,-10
-        - node:
-            id: MiniTileCornerOverlayNE
-            color: '#D381C928'
-          decals:
-            3183: -10,-16
-        - node:
-            id: MiniTileCornerOverlayNW
-            color: '#D381C928'
-          decals:
-            3184: -11,-16
         - node:
             id: MiniTileInnerOverlayNE
             color: '#95FF6F72'
@@ -40127,7 +40388,7 @@ entities:
             571: -3,-9
             572: -2,-9
             573: -1,-9
-  - uid: 20220
+  - uid: 17525
     components:
     - type: ChunkEntity
       root: 2
@@ -40357,7 +40618,7 @@ entities:
             1084: 5,-15
             1085: 6,-15
             1086: 7,-15
-  - uid: 20221
+  - uid: 17526
     components:
     - type: ChunkEntity
       root: 2
@@ -40394,7 +40655,7 @@ entities:
           decals:
             2175: -32,-81
             2176: -32,-83
-  - uid: 20222
+  - uid: 17527
     components:
     - type: ChunkEntity
       root: 2
@@ -40536,7 +40797,7 @@ entities:
             angle: 1.5707963267948966 rad
           decals:
             413: 75.21097,-20.015972
-  - uid: 20223
+  - uid: 17528
     components:
     - type: ChunkEntity
       root: 2
@@ -40699,7 +40960,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1724: 56.020706,-14.938012
-  - uid: 20224
+  - uid: 17529
     components:
     - type: ChunkEntity
       root: 2
@@ -41077,7 +41338,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             5238: 58,-20
-  - uid: 20225
+  - uid: 17557
     components:
     - type: ChunkEntity
       root: 2
@@ -41138,7 +41399,7 @@ entities:
             color: '#95FF6F72'
           decals:
             553: 6,1
-  - uid: 20226
+  - uid: 17561
     components:
     - type: ChunkEntity
       root: 2
@@ -41209,7 +41470,7 @@ entities:
             color: '#95FF6F72'
           decals:
             550: -4,1
-  - uid: 20227
+  - uid: 17562
     components:
     - type: ChunkEntity
       root: 2
@@ -41222,277 +41483,185 @@ entities:
         - node:
             id: Arrows
             color: '#FFFFFFFF'
-            angle: 4.71238898038469 rad
+            angle: -1.5707963267948966 rad
           decals:
-            3664: -3,-18
+            18: -8,-30
         - node:
             id: Bot
             color: '#FFFFFFFF'
           decals:
-            3665: -4,-18
-            3666: -5,-18
-            3667: -6,-18
-            3679: -8,-18
-            3680: -7,-18
-            5070: -4,-28
+            19: -9,-30
+            20: -10,-30
+            21: -11,-30
         - node:
             id: BrickTileWhiteCornerNe
             color: '#FFFFFFFF'
           decals:
-            807: -12,-26
+            4: -5,-21
         - node:
             id: BrickTileWhiteCornerNw
             color: '#FFFFFFFF'
           decals:
-            806: -14,-26
+            5: -7,-21
         - node:
             id: BrickTileWhiteCornerSe
             color: '#FFFFFFFF'
           decals:
-            809: -12,-28
+            7: -5,-23
         - node:
             id: BrickTileWhiteCornerSw
             color: '#FFFFFFFF'
           decals:
-            808: -14,-28
+            6: -7,-23
         - node:
             id: BrickTileWhiteLineE
             color: '#FFFFFFFF'
           decals:
-            810: -12,-27
+            11: -5,-22
         - node:
             id: BrickTileWhiteLineN
             color: '#FFFFFFFF'
           decals:
-            813: -13,-26
+            8: -6,-21
         - node:
             id: BrickTileWhiteLineS
             color: '#FFFFFFFF'
           decals:
-            812: -13,-28
+            10: -6,-23
         - node:
             id: BrickTileWhiteLineW
             color: '#FFFFFFFF'
           decals:
-            811: -14,-27
+            9: -7,-22
+        - node:
+            id: CheckerNESW
+            color: '#D381C968'
+          decals:
+            41: -4,-24
+            42: -6,-25
+            43: -4,-25
+            44: -6,-24
         - node:
             id: Delivery
             color: '#FFFFFFFF'
+            angle: 3.141592653589793 rad
           decals:
-            5058: -11,-30
-            5059: -12,-30
-        - node:
-            id: FullTileOverlayGreyscale
-            color: '#D381C967'
-          decals:
-            3889: -4,-29
-            3890: -5,-29
-            3900: -6,-29
+            26: -7,-19
+            27: -6,-19
         - node:
             id: LoadingArea
             color: '#FFFFFFFF'
+            angle: 3.141592653589793 rad
           decals:
-            5054: -12,-31
-            5055: -11,-31
-            5056: -12,-29
-            5057: -11,-29
+            22: -7,-18
+            23: -6,-18
+            24: -7,-20
+            25: -6,-20
         - node:
-            id: LoadingAreaGreyscale
-            color: '#FFFFFFFF'
+            id: MiniTileCornerOverlayNE
+            color: '#D381C926'
           decals:
-            5071: -4,-28
+            17: -4,-28
         - node:
-            id: MiniTileCheckerBOverlay
-            color: '#D381C933'
+            id: MiniTileCornerOverlayNW
+            color: '#D381C926'
           decals:
-            3687: -8,-17
+            16: -5,-28
         - node:
             id: MiniTileCornerOverlaySE
-            color: '#D381C928'
+            color: '#D381C926'
           decals:
-            3186: -10,-17
+            15: -4,-29
         - node:
             id: MiniTileCornerOverlaySW
-            color: '#D381C928'
+            color: '#D381C926'
           decals:
-            3185: -11,-17
+            14: -5,-29
+        - node:
+            id: MiniTileDarkCornerNe
+            color: '#FFFFFFFF'
+          decals:
+            33: -9,-27
+            34: -12,-26
+        - node:
+            id: MiniTileDarkInnerNe
+            color: '#FFFFFFFF'
+          decals:
+            37: -14,-26
+            38: -12,-27
+            39: -9,-28
+        - node:
+            id: MiniTileDarkInnerNw
+            color: '#FFFFFFFF'
+          decals:
+            40: -6,-28
         - node:
             id: MiniTileDarkLineE
             color: '#FFFFFFFF'
           decals:
-            3681: -8,-18
+            35: -14,-25
+            36: -14,-24
         - node:
-            id: MiniTileDarkLineW
+            id: MiniTileDarkLineN
             color: '#FFFFFFFF'
           decals:
-            3682: -7,-18
+            28: -13,-26
+            29: -11,-27
+            30: -10,-27
+            31: -8,-28
+            32: -7,-28
         - node:
-            id: MiniTileEndOverlayE
+            id: MiniTileLineOverlayW
             color: '#D381C933'
           decals:
-            3678: -7,-18
+            51: -8,-17
         - node:
-            id: MiniTileEndOverlayW
-            color: '#D381C933'
-          decals:
-            3677: -8,-18
-        - node:
-            id: MiniTileInnerOverlayNE
-            color: '#D381C933'
-          decals:
-            3686: -8,-18
-        - node:
-            id: MiniTileInnerOverlayNW
-            color: '#D381C933'
-          decals:
-            3685: -7,-18
-        - node:
-            id: MiniTileInnerOverlaySE
-            color: '#D381C933'
-          decals:
-            3683: -8,-18
-        - node:
-            id: MiniTileInnerOverlaySW
-            color: '#D381C933'
-          decals:
-            3684: -7,-18
-        - node:
-            id: WarnCornerGreyscaleNE
-            color: '#D381C996'
-          decals:
-            5074: -4,-20
-        - node:
-            id: WarnCornerGreyscaleNE
-            color: '#FFFFFFFF'
-          decals:
-            5062: -4,-25
-        - node:
-            id: WarnCornerGreyscaleNW
-            color: '#FFFFFFFF'
-          decals:
-            5063: -6,-25
-        - node:
-            id: WarnCornerGreyscaleSE
-            color: '#D381C996'
-          decals:
-            5077: -4,-23
-            5080: -7,-26
-        - node:
-            id: WarnCornerGreyscaleSE
-            color: '#FFFFFFFF'
-          decals:
-            5066: -4,-27
-        - node:
-            id: WarnCornerSmallGreyscaleNW
+            id: WarnCornerSmallGreyscaleNE
             color: '#D381C9FF'
           decals:
-            3120: -8,-24
-            3483: -16,-20
+            50: -11,-25
         - node:
-            id: WarnCornerSmallGreyscaleNW
+            id: WarnCornerSmallNE
             color: '#FFFFFFFF'
           decals:
-            5069: -6,-27
+            47: -11,-25
         - node:
-            id: WarnCornerSmallGreyscaleSE
-            color: '#D381C9FF'
-          decals:
-            3118: -10,-22
-        - node:
-            id: WarnCornerSmallGreyscaleSW
-            color: '#D381C9FF'
-          decals:
-            3116: -8,-22
-        - node:
-            id: WarnCornerSmallNW
+            id: WarnLineE
             color: '#FFFFFFFF'
           decals:
-            3119: -8,-24
-            3473: -16,-20
-        - node:
-            id: WarnCornerSmallSE
-            color: '#FFFFFFFF'
-          decals:
-            3117: -10,-22
-        - node:
-            id: WarnCornerSmallSW
-            color: '#FFFFFFFF'
-          decals:
-            3113: -8,-22
-        - node:
-            id: WarnEndGreyscaleW
-            color: '#FFFFFFFF'
-          decals:
-            5068: -7,-27
+            45: -11,-24
         - node:
             id: WarnLineGreyscaleE
-            color: '#D381C996'
+            color: '#D381C9FF'
           decals:
-            5075: -4,-21
-            5076: -4,-22
-            5081: -7,-25
-        - node:
-            id: WarnLineGreyscaleE
-            color: '#FFFFFFFF'
-          decals:
-            5065: -4,-26
-        - node:
-            id: WarnLineGreyscaleN
-            color: '#D381C996'
-          decals:
-            5072: -6,-20
-            5073: -5,-20
+            48: -11,-24
         - node:
             id: WarnLineGreyscaleN
             color: '#D381C9FF'
           decals:
-            5286: -9,-29
-            5287: -8,-29
-        - node:
-            id: WarnLineGreyscaleN
-            color: '#FFFFFFFF'
-          decals:
-            5064: -5,-25
-        - node:
-            id: WarnLineGreyscaleS
-            color: '#D381C996'
-          decals:
-            5078: -5,-23
-            5079: -6,-23
+            2: -11,-17
+            3: -10,-17
+            13: -5,-24
+            49: -10,-25
         - node:
             id: WarnLineGreyscaleS
             color: '#D381C9FF'
           decals:
             3102: -16,-22
-            3114: -9,-22
-        - node:
-            id: WarnLineGreyscaleS
-            color: '#FFFFFFFF'
-          decals:
-            5061: -5,-27
-            5067: -6,-27
-        - node:
-            id: WarnLineGreyscaleW
-            color: '#D381C9FF'
-          decals:
-            3115: -8,-23
-        - node:
-            id: WarnLineGreyscaleW
-            color: '#FFFFFFFF'
-          decals:
-            5060: -6,-26
         - node:
             id: WarnLineN
             color: '#FFFFFFFF'
           decals:
             3088: -16,-22
-            3111: -9,-22
         - node:
-            id: WarnLineS
+            id: WarnLineW
             color: '#FFFFFFFF'
           decals:
-            3112: -8,-23
-  - uid: 20228
+            0: -11,-17
+            1: -10,-17
+            12: -5,-24
+            46: -10,-25
+  - uid: 17563
     components:
     - type: ChunkEntity
       root: 2
@@ -41560,7 +41729,7 @@ entities:
             color: '#52B4E996'
           decals:
             3975: -39,-17
-  - uid: 20229
+  - uid: 17567
     components:
     - type: ChunkEntity
       root: 2
@@ -41661,7 +41830,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             5192: 13,-43
-  - uid: 20230
+  - uid: 17568
     components:
     - type: ChunkEntity
       root: 2
@@ -41918,7 +42087,7 @@ entities:
             angle: 6.283185307179586 rad
           decals:
             24: 9.606441,-22.615063
-  - uid: 20231
+  - uid: 17569
     components:
     - type: ChunkEntity
       root: 2
@@ -42029,7 +42198,7 @@ entities:
           decals:
             5274: 1,-56
             5275: 1,-57
-  - uid: 20232
+  - uid: 17570
     components:
     - type: ChunkEntity
       root: 2
@@ -42138,7 +42307,17 @@ entities:
             color: '#FF940093'
           decals:
             1870: 41,-15
-  - uid: 20233
+        - node:
+            id: WarnLineGreyscaleN
+            color: '#439909FF'
+          decals:
+            1: 32,-15
+        - node:
+            id: WarnLineW
+            color: '#FFFFFFFF'
+          decals:
+            0: 32,-15
+  - uid: 17571
     components:
     - type: ChunkEntity
       root: 2
@@ -42211,7 +42390,7 @@ entities:
             231: -15,-67
             232: -15,-66
             3906: -13,-70
-  - uid: 20234
+  - uid: 17614
     components:
     - type: ChunkEntity
       root: 2
@@ -42388,7 +42567,7 @@ entities:
           decals:
             4076: 46,-71
             4104: 45,-72
-  - uid: 20235
+  - uid: 17617
     components:
     - type: ChunkEntity
       root: 2
@@ -42460,7 +42639,7 @@ entities:
           decals:
             4071: 51,-67
             4084: 48,-71
-  - uid: 20236
+  - uid: 17637
     components:
     - type: ChunkEntity
       root: 2
@@ -42530,10 +42709,16 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1762: 42,-19
+        - node:
+            id: BrickTileSteelCornerNw
+            color: '#FFFFFFFF'
+          decals:
+            0: 33,-28
         - node:
             id: BrickTileSteelCornerSw
             color: '#FFFFFFFF'
           decals:
+            1: 33,-30
             1763: 42,-20
             1764: 41,-19
         - node:
@@ -42557,6 +42742,8 @@ entities:
             id: BrickTileSteelLineN
             color: '#FFFFFFFF'
           decals:
+            4: 34,-28
+            5: 35,-28
             1787: 47,-20
             1788: 46,-20
             1789: 45,-20
@@ -42566,6 +42753,8 @@ entities:
             id: BrickTileSteelLineS
             color: '#FFFFFFFF'
           decals:
+            2: 34,-30
+            3: 35,-30
             1770: 43,-20
             1771: 44,-20
             1772: 45,-20
@@ -42575,6 +42764,7 @@ entities:
             id: BrickTileSteelLineW
             color: '#FFFFFFFF'
           decals:
+            6: 33,-29
             1748: 41,-18
             1749: 41,-17
         - node:
@@ -42611,41 +42801,11 @@ entities:
             1927: 47,-19
             1928: 46,-18
             1929: 46,-19
-        - node:
-            id: MiniTileDarkCornerNe
-            color: '#FFFFFFFF'
-          decals:
-            4177: 34,-28
-        - node:
-            id: MiniTileDarkCornerSe
-            color: '#FFFFFFFF'
-          decals:
-            4176: 34,-30
-        - node:
-            id: MiniTileDarkInnerNe
-            color: '#FFFFFFFF'
-          decals:
-            4191: 34,-29
-        - node:
-            id: MiniTileDarkInnerSe
-            color: '#FFFFFFFF'
-          decals:
-            4190: 34,-29
         - node:
             id: MiniTileDarkLineN
             color: '#FFFFFFFF'
           decals:
-            4181: 32,-28
-            4182: 33,-28
-            4193: 35,-29
             4383: 35,-18
-        - node:
-            id: MiniTileDarkLineS
-            color: '#FFFFFFFF'
-          decals:
-            4186: 32,-30
-            4187: 33,-30
-            4192: 35,-29
         - node:
             id: MiniTileInnerOverlayNE
             color: '#FF940093'
@@ -42720,7 +42880,7 @@ entities:
             1604: 45,-21
             1605: 46,-21
             1606: 47,-21
-  - uid: 20237
+  - uid: 17648
     components:
     - type: ChunkEntity
       root: 2
@@ -42847,36 +43007,11 @@ entities:
             color: '#FA750096'
           decals:
             4509: 19,-26
-        - node:
-            id: MiniTileDarkCornerNw
-            color: '#FFFFFFFF'
-          decals:
-            4174: 28,-28
-        - node:
-            id: MiniTileDarkCornerSw
-            color: '#FFFFFFFF'
-          decals:
-            4175: 28,-30
-        - node:
-            id: MiniTileDarkLineN
-            color: '#FFFFFFFF'
-          decals:
-            4178: 29,-28
-            4179: 30,-28
-            4180: 31,-28
         - node:
             id: MiniTileDarkLineS
             color: '#FFFFFFFF'
           decals:
             2960: 26,-30
-            4183: 29,-30
-            4184: 30,-30
-            4185: 31,-30
-        - node:
-            id: MiniTileDarkLineW
-            color: '#FFFFFFFF'
-          decals:
-            4188: 28,-29
         - node:
             id: MiniTileInnerOverlayNE
             color: '#52B4E996'
@@ -43007,7 +43142,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             4514: 20,-25
-  - uid: 20238
+  - uid: 17682
     components:
     - type: ChunkEntity
       root: 2
@@ -43177,7 +43312,7 @@ entities:
           decals:
             4632: 73,-48
             4633: 72,-48
-  - uid: 20239
+  - uid: 17693
     components:
     - type: ChunkEntity
       root: 2
@@ -43510,7 +43645,7 @@ entities:
           decals:
             4529: 59,-45
             4530: 60,-45
-  - uid: 20240
+  - uid: 17694
     components:
     - type: ChunkEntity
       root: 2
@@ -43619,7 +43754,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             5328: -16,-57
-  - uid: 20241
+  - uid: 17716
     components:
     - type: ChunkEntity
       root: 2
@@ -43772,7 +43907,7 @@ entities:
             5042: -7,-34
             5043: -6,-34
             5044: -5,-34
-  - uid: 20242
+  - uid: 17730
     components:
     - type: ChunkEntity
       root: 2
@@ -43911,7 +44046,7 @@ entities:
           decals:
             5123: -30,-50
             5124: -30,-49
-  - uid: 20243
+  - uid: 17732
     components:
     - type: ChunkEntity
       root: 2
@@ -43975,18 +44110,7 @@ entities:
             id: FullTileOverlayGreyscale
             color: '#5287D431'
           decals:
-            5421: 5,-74
-            5422: 4,-72
-            5423: 6,-74
-            5424: 6,-73
-            5425: 4,-71
-            5426: 5,-73
             5427: 4,-73
-            5428: 4,-70
-            5429: 5,-70
-            5430: 6,-70
-            5431: 6,-71
-            5432: 6,-72
             5433: 6,-69
         - node:
             id: HalfTileOverlayGreyscale
@@ -44000,12 +44124,6 @@ entities:
           decals:
             1573: 14,-71
             1574: 13,-71
-        - node:
-            id: MiniTileOverlay
-            color: '#5287D431'
-          decals:
-            5434: 5,-72
-            5435: 5,-71
         - node:
             id: MonoOverlay
             color: '#D381C971'
@@ -44078,7 +44196,7 @@ entities:
             5339: 8,-74
             5340: 9,-74
             5341: 10,-74
-  - uid: 20244
+  - uid: 17784
     components:
     - type: ChunkEntity
       root: 2
@@ -44169,7 +44287,7 @@ entities:
             color: '#52B4E996'
           decals:
             3976: -38,-15
-  - uid: 20245
+  - uid: 17794
     components:
     - type: ChunkEntity
       root: 2
@@ -44321,7 +44439,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             5322: 23,-69
-  - uid: 20246
+  - uid: 17795
     components:
     - type: ChunkEntity
       root: 2
@@ -44443,7 +44561,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             5560: 24,-53
-  - uid: 20247
+  - uid: 17842
     components:
     - type: ChunkEntity
       root: 2
@@ -44543,11 +44661,6 @@ entities:
             2895: -19,-27
             2896: -18,-27
             2897: -18,-26
-        - node:
-            id: MiniTileDarkEndW
-            color: '#FFFFFFFF'
-          decals:
-            872: -21,-21
         - node:
             id: MiniTileDarkLineE
             color: '#FFFFFFFF'
@@ -44579,7 +44692,6 @@ entities:
             color: '#D381C9FF'
           decals:
             3124: -18,-24
-            3482: -18,-20
         - node:
             id: WarnCornerSmallGreyscaleNW
             color: '#D381C9FF'
@@ -44590,7 +44702,6 @@ entities:
             color: '#D381C9FF'
           decals:
             3107: -18,-22
-            3481: -18,-17
         - node:
             id: WarnCornerSmallGreyscaleSW
             color: '#D381C9FF'
@@ -44601,7 +44712,6 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3122: -18,-24
-            3472: -18,-20
         - node:
             id: WarnCornerSmallNW
             color: '#FFFFFFFF'
@@ -44612,7 +44722,6 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3092: -18,-22
-            3471: -18,-17
         - node:
             id: WarnCornerSmallSW
             color: '#FFFFFFFF'
@@ -44623,24 +44732,19 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3090: -18,-23
-            3468: -18,-19
-            3469: -18,-18
             5345: -28,-27
         - node:
             id: WarnLineGreyscaleE
             color: '#D381C9FF'
           decals:
             3106: -18,-23
-            3475: -18,-19
-            3476: -18,-18
             5346: -28,-27
         - node:
             id: WarnLineGreyscaleN
             color: '#D381C9FF'
           decals:
-            3477: -17,-20
-            3479: -17,-17
-            3480: -18,-17
+            2: -18,-17
+            3: -17,-17
         - node:
             id: WarnLineGreyscaleS
             color: '#D381C9FF'
@@ -44648,7 +44752,6 @@ entities:
             3101: -17,-22
             3103: -19,-22
             3104: -20,-22
-            3478: -17,-17
         - node:
             id: WarnLineGreyscaleW
             color: '#D381C9FF'
@@ -44661,7 +44764,6 @@ entities:
             3085: -20,-22
             3086: -19,-22
             3087: -17,-22
-            3470: -17,-17
         - node:
             id: WarnLineS
             color: '#FFFFFFFF'
@@ -44671,10 +44773,9 @@ entities:
             id: WarnLineW
             color: '#FFFFFFFF'
           decals:
-            3465: -18,-17
-            3466: -17,-17
-            3467: -17,-20
-  - uid: 20248
+            0: -18,-17
+            1: -17,-17
+  - uid: 17873
     components:
     - type: ChunkEntity
       root: 2
@@ -44684,11 +44785,6 @@ entities:
       decals:
         version: 1
         nodes:
-        - node:
-            id: BotGreyscale
-            color: '#D381C9FF'
-          decals:
-            3560: -28,-78
         - node:
             id: BoxGreyscale
             color: '#D381C9FF'
@@ -44827,7 +44923,7 @@ entities:
             angle: 4.71238898038469 rad
           decals:
             3907: -18,-70
-  - uid: 20249
+  - uid: 17874
     components:
     - type: ChunkEntity
       root: 2
@@ -44969,7 +45065,7 @@ entities:
             3037: 18,-101
             3038: 18,-100
             3039: 18,-99
-  - uid: 20250
+  - uid: 17875
     components:
     - type: ChunkEntity
       root: 2
@@ -45010,14 +45106,20 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2240: 26,-12
+        - node:
+            id: WarnLineGreyscaleN
+            color: '#439909FF'
+          decals:
+            1: 31,-15
         - node:
             id: WarnLineW
             color: '#FFFFFFFF'
           decals:
+            0: 31,-15
             2237: 23,-12
             2238: 24,-12
             2239: 25,-12
-  - uid: 20251
+  - uid: 17876
     components:
     - type: ChunkEntity
       root: 2
@@ -45151,7 +45253,7 @@ entities:
             2335: 14,-83
             2337: 10,-83
             2366: 12,-83
-  - uid: 20252
+  - uid: 17916
     components:
     - type: ChunkEntity
       root: 2
@@ -45251,7 +45353,12 @@ entities:
           decals:
             4144: 94,-47
             4145: 94,-45
-  - uid: 20253
+        - node:
+            id: WarnLineN
+            color: '#FFFFFFFF'
+          decals:
+            12: 95,-44
+  - uid: 17918
     components:
     - type: ChunkEntity
       root: 2
@@ -45273,11 +45380,6 @@ entities:
           decals:
             4134: 92,-50
             4135: 93,-49
-        - node:
-            id: BrickTileDarkEndS
-            color: '#FFFFFFFF'
-          decals:
-            9: 85,-51
         - node:
             id: BrickTileDarkInnerNw
             color: '#FFFFFFFF'
@@ -45310,7 +45412,7 @@ entities:
             3: 86,-50
             4130: 90,-50
             4131: 91,-50
-  - uid: 20254
+  - uid: 17988
     components:
     - type: ChunkEntity
       root: 2
@@ -45347,7 +45449,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             5456: 32,-82
-  - uid: 20255
+  - uid: 18010
     components:
     - type: ChunkEntity
       root: 2
@@ -45418,7 +45520,7 @@ entities:
             5109: -37,-47
             5112: -35,-47
             5113: -36,-47
-  - uid: 20256
+  - uid: 18012
     components:
     - type: ChunkEntity
       root: 2
@@ -45489,7 +45591,7 @@ entities:
             cleanable: True
           decals:
             5466: -40,-77
-  - uid: 20257
+  - uid: 18101
     components:
     - type: ChunkEntity
       root: 2
@@ -45549,24 +45651,6 @@ entities:
             4827: 40,-47
             4828: 40,-48
             4829: 39,-47
-        - node:
-            id: DiagonalCheckerAOverlay
-            color: '#0000008C'
-          decals:
-            1455: 37,-47
-            1456: 36,-47
-            1457: 36,-46
-            1458: 37,-46
-            1459: 37,-45
-            1460: 36,-45
-            1461: 36,-44
-            1462: 37,-44
-            1463: 37,-43
-            1464: 36,-43
-            1465: 36,-42
-            1466: 37,-42
-            1467: 37,-41
-            1468: 36,-41
         - node:
             id: LoadingArea
             color: '#FFFFFFFF'
@@ -45603,7 +45687,7 @@ entities:
             color: '#48D256FF'
           decals:
             4836: 39,-48
-  - uid: 20258
+  - uid: 18102
     components:
     - type: ChunkEntity
       root: 2
@@ -45619,7 +45703,7 @@ entities:
             cleanable: True
           decals:
             950: 80,-68
-  - uid: 20259
+  - uid: 18109
     components:
     - type: ChunkEntity
       root: 2
@@ -45636,7 +45720,7 @@ entities:
           decals:
             958: 80,-29
             960: 80,-27
-  - uid: 20260
+  - uid: 18149
     components:
     - type: ChunkEntity
       root: 2
@@ -45721,7 +45805,7 @@ entities:
           decals:
             311: 31,-39
             312: 31,-38
-  - uid: 20261
+  - uid: 18150
     components:
     - type: ChunkEntity
       root: 2
@@ -45751,7 +45835,7 @@ entities:
             cleanable: True
           decals:
             1519: -53,-69
-  - uid: 20262
+  - uid: 18216
     components:
     - type: ChunkEntity
       root: 2
@@ -45792,7 +45876,7 @@ entities:
           decals:
             4167: 76,-65
             4168: 76,-66
-  - uid: 20263
+  - uid: 18217
     components:
     - type: ChunkEntity
       root: 2
@@ -45821,7 +45905,7 @@ entities:
             3996: 52,-62
             3997: 53,-63
             3998: 53,-64
-  - uid: 20264
+  - uid: 18219
     components:
     - type: ChunkEntity
       root: 2
@@ -45859,7 +45943,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1584: -57,-27
-  - uid: 20265
+  - uid: 18249
     components:
     - type: ChunkEntity
       root: 2
@@ -45985,7 +46069,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             4627: 72,-50
-  - uid: 20266
+  - uid: 18251
     components:
     - type: ChunkEntity
       root: 2
@@ -46051,7 +46135,7 @@ entities:
           decals:
             789: 42,-52
             790: 42,-51
-  - uid: 20267
+  - uid: 18266
     components:
     - type: ChunkEntity
       root: 2
@@ -46098,7 +46182,7 @@ entities:
           decals:
             5121: -30,-43
             5122: -30,-42
-  - uid: 20268
+  - uid: 18303
     components:
     - type: ChunkEntity
       root: 2
@@ -46128,7 +46212,7 @@ entities:
             2529: -56,-64
             2530: -56,-63
             2531: -56,-62
-  - uid: 20269
+  - uid: 18319
     components:
     - type: ChunkEntity
       root: 2
@@ -46179,7 +46263,7 @@ entities:
           decals:
             5117: -35,-50
             5118: -35,-49
-  - uid: 20270
+  - uid: 18320
     components:
     - type: ChunkEntity
       root: 2
@@ -46199,6 +46283,11 @@ entities:
             color: '#FFFFFFFF'
           decals:
             140: -50,-45
+  - uid: 18324
+    components:
+    - type: ChunkEntity
+      root: 2
+      chunk: -1,-6
 - proto: ChurchBell
   entities:
   - uid: 2053
@@ -46266,11 +46355,17 @@ entities:
       pos: -47.31308,-45.27867
 - proto: CircuitImprinter
   entities:
-  - uid: 5897
+  - uid: 8791
     components:
     - type: Transform
       parent: 2
-      pos: -3.5,-21.5
+      pos: -14.5,-27.5
+    - type: TechnologyDatabase
+      supportedDisciplines:
+      - Industrial
+      - Arsenal
+      - Experimental
+      - CivilianServices
 - proto: CleanerDispenser
   entities:
   - uid: 5125
@@ -46399,6 +46494,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 62.5,-63.5
+  - uid: 12801
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-28.5
   - uid: 12971
     components:
     - type: Transform
@@ -46424,21 +46524,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 38.5,-25.5
-  - uid: 15596
-    components:
-    - type: Transform
-      parent: 2
-      pos: 47.5,-31.5
   - uid: 17038
     components:
     - type: Transform
       parent: 2
       pos: -12.5,-80.5
-  - uid: 17396
-    components:
-    - type: Transform
-      parent: 2
-      pos: 83.5,-20.5
   - uid: 17888
     components:
     - type: Transform
@@ -46492,7 +46582,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 9.5,2.5
+      pos: 10.5,-1.5
   - uid: 7701
     components:
     - type: Transform
@@ -46560,6 +46650,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -48.5,-35.5
+  - uid: 5835
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,2.5
   - uid: 5911
     components:
     - type: Transform
@@ -46605,11 +46700,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 36.5,-75.5
-  - uid: 17296
-    components:
-    - type: Transform
-      parent: 2
-      pos: 10.5,-1.5
   - uid: 17368
     components:
     - type: Transform
@@ -46707,16 +46797,16 @@ entities:
       pos: 36.5,-18.5
 - proto: ClosetMaintenanceFilledRandom
   entities:
-  - uid: 919
-    components:
-    - type: Transform
-      parent: 2
-      pos: 37.5,-30.5
   - uid: 3006
     components:
     - type: Transform
       parent: 2
       pos: 53.5,-26.5
+  - uid: 3721
+    components:
+    - type: Transform
+      parent: 2
+      pos: 39.5,-32.5
   - uid: 6013
     components:
     - type: Transform
@@ -46852,11 +46942,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -5.5,-79.5
-  - uid: 17395
+  - uid: 17163
     components:
     - type: Transform
       parent: 2
-      pos: 82.5,-20.5
+      pos: 82.5,-18.5
   - uid: 18250
     components:
     - type: Transform
@@ -47028,37 +47118,11 @@ entities:
       pos: 21.376263,-30.920355
 - proto: ClothingBackpackDuffelSurgeryFilled
   entities:
-  - uid: 5078
+  - uid: 15892
     components:
     - type: Transform
       parent: 2
-      pos: -4.7491665,-28.145197
-    - type: GroupExamine
-      group:
-      - title: null
-        icon: /Textures/Interface/examine-star.png
-        hoverMessage: ""
-        entries:
-        - priority: 0
-          message: >-
-            It provides the following protection:
-
-            - [color=orange]Explosion[/color] damage [color=white]to contents[/color] reduced by [color=lightblue]10%[/color].
-          component: Armor
-        - priority: 0
-          message: This decreases your running speed by [color=yellow]10%[/color].
-          component: ClothingSpeedModifier
-        contextText: verb-examine-group-other
-        components:
-        - Armor
-        - ClothingSpeedModifier
-- proto: ClothingBackpackSalvage
-  entities:
-  - uid: 19414
-    components:
-    - type: Transform
-      parent: 2
-      pos: -61.625114,-24.788584
+      pos: -5.5449595,-24.209423
 - proto: ClothingBackpackSatchelChemistry
   entities:
   - uid: 2201
@@ -47085,6 +47149,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 2.510798,-79.082664
+- proto: ClothingBeltUtility
+  entities:
+  - uid: 14681
+    components:
+    - type: Transform
+      parent: 2
+      pos: -14.216357,-21.50285
 - proto: ClothingBeltUtilityEngineering
   entities:
   - uid: 3767
@@ -47104,11 +47175,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -52.66242,-51.451393
-  - uid: 10560
-    components:
-    - type: Transform
-      parent: 2
-      pos: -12.829791,-21.22573
 - proto: ClothingEyesGlasses
   entities:
   - uid: 6662
@@ -47154,11 +47220,11 @@ entities:
       pos: -41.45619,-26.591906
 - proto: ClothingEyesHudDiagnostic
   entities:
-  - uid: 19299
+  - uid: 14130
     components:
     - type: Transform
       parent: 2
-      pos: -9.340807,-26.550825
+      pos: -14.742444,-21.49598
 - proto: ClothingEyesHudMedical
   entities:
   - uid: 7754
@@ -47209,13 +47275,13 @@ entities:
     - type: Transform
       parent: 2
       pos: -22.554304,-49.354877
-- proto: ClothingHandsGlovesLatex
+- proto: ClothingHandsGlovesFingerlessInsulated
   entities:
-  - uid: 7432
+  - uid: 7726
     components:
     - type: Transform
       parent: 2
-      pos: -4.45287,-28.515823
+      pos: 47.5,-27.5
 - proto: ClothingHandsGlovesMercFingerless
   entities:
   - uid: 7688
@@ -47317,13 +47383,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -42.64476,-62.24417
-- proto: ClothingHeadHatChef
-  entities:
-  - uid: 19742
-    components:
-    - type: Transform
-      parent: 2
-      pos: 42.692513,-34.382397
 - proto: ClothingHeadHatCone
   entities:
   - uid: 2336
@@ -47398,13 +47457,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -9.642316,-74.35967
-- proto: ClothingHeadHatJesterAlt
-  entities:
-  - uid: 17525
-    components:
-    - type: Transform
-      parent: 2
-      pos: 83.39368,-72.298546
 - proto: ClothingHeadHatPaper
   entities:
   - uid: 16035
@@ -47426,13 +47478,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -47.547234,-67.10405
-- proto: ClothingHeadHatSombrero
-  entities:
-  - uid: 15852
-    components:
-    - type: Transform
-      parent: 2
-      pos: -39.57097,-57.9909
 - proto: ClothingHeadHatSquid
   entities:
   - uid: 615
@@ -47447,13 +47492,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 9.493862,-24.97992
-- proto: ClothingHeadHatTacticalMaidHeadband
-  entities:
-  - uid: 17303
-    components:
-    - type: Transform
-      parent: 2
-      pos: 71.34251,-16.212269
 - proto: ClothingHeadHatTophat
   entities:
   - uid: 17440
@@ -47463,11 +47501,11 @@ entities:
       pos: 34.47364,-50.396587
 - proto: ClothingHeadHatWelding
   entities:
-  - uid: 7198
+  - uid: 631
     components:
     - type: Transform
       parent: 2
-      pos: -12.630263,-28.354128
+      pos: -3.6838703,-22.477245
   - uid: 18339
     components:
     - type: Transform
@@ -47487,13 +47525,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 67.39528,-68.335495
-- proto: ClothingHeadHatXmasCrown
-  entities:
-  - uid: 15216
-    components:
-    - type: Transform
-      parent: 2
-      pos: -40.07226,-57.868195
 - proto: ClothingHeadHatYellowsoftFlipped
   entities:
   - uid: 17335
@@ -47501,14 +47532,20 @@ entities:
     - type: Transform
       parent: 2
       pos: 13.455537,-101.396515
-- proto: ClothingHeadHelmetEVA
+- proto: ClothingHeadHelmetBone
   entities:
-  - uid: 15545
+  - uid: 483
     components:
     - type: Transform
       parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 38.77258,-19.393414
+      pos: 78.40473,-25.409029
+- proto: ClothingHeadHelmetEVA
+  entities:
+  - uid: 7441
+    components:
+    - type: Transform
+      parent: 2
+      pos: -61.68606,-24.781172
   - uid: 16569
     components:
     - type: Transform
@@ -47551,13 +47588,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingHeadHelmetEVALarge
-  entities:
-  - uid: 19417
-    components:
-    - type: Transform
-      parent: 2
-      pos: -61.573032,-24.340357
 - proto: ClothingHeadHelmetRiot
   entities:
   - uid: 11848
@@ -47577,13 +47607,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -41.253063,-26.41991
-- proto: ClothingMaskBee
-  entities:
-  - uid: 16046
-    components:
-    - type: Transform
-      parent: 2
-      pos: 82.43702,-18.143408
 - proto: ClothingMaskBreathMedical
   entities:
   - uid: 18336
@@ -47608,15 +47631,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 29.816557,-76.46657
-- proto: ClothingMaskMime
-  entities:
-  - uid: 17524
-    components:
-    - type: MetaData
-      desc: Something about this particular mime mask makes you feel like you should run amok across the station...
-    - type: Transform
-      parent: 2
-      pos: 83.56729,-72.486176
 - proto: ClothingMultipleHeadphones
   entities:
   - uid: 17553
@@ -47638,44 +47652,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -9.488791,-1.3849742
-- proto: ClothingNeckCloakAro
-  entities:
-  - uid: 8150
-    components:
-    - type: Transform
-      parent: 2
-      pos: 39.571434,-28.464401
-    - type: CollisionWake
-      enabled: False
-    - type: Conveyed
-- proto: ClothingNeckCloakBi
-  entities:
-  - uid: 6921
-    components:
-    - type: Transform
-      parent: 2
-      pos: 57.523323,-96.46691
-- proto: ClothingNeckCloakEnby
-  entities:
-  - uid: 13645
-    components:
-    - type: Transform
-      parent: 2
-      pos: 79.02105,-25.344301
-- proto: ClothingNeckCloakGay
-  entities:
-  - uid: 17328
-    components:
-    - type: Transform
-      parent: 2
-      pos: -39.37852,-58.430256
-- proto: ClothingNeckCloakIntersex
-  entities:
-  - uid: 7509
-    components:
-    - type: Transform
-      parent: 2
-      pos: 105.5457,-45.44423
 - proto: ClothingNeckCloakLesbian
   entities:
   - uid: 3874
@@ -47697,13 +47673,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 44.5,-38.5
-- proto: ClothingNeckCloakPirateCap
-  entities:
-  - uid: 17307
-    components:
-    - type: Transform
-      parent: 2
-      pos: -38.53285,-69.49862
 - proto: ClothingNeckCloakTrans
   entities:
   - uid: 17331
@@ -47732,11 +47701,11 @@ entities:
       pos: -21.457745,-46.808807
 - proto: ClothingOuterApronChef
   entities:
-  - uid: 13574
+  - uid: 15894
     components:
     - type: Transform
       parent: 2
-      pos: -5.415833,-28.400003
+      pos: -5.4355845,-24.52214
 - proto: ClothingOuterArmorBulletproof
   entities:
   - uid: 3326
@@ -47792,21 +47761,21 @@ entities:
       pos: -38.381638,-62.42696
 - proto: ClothingOuterCoatLab
   entities:
+  - uid: 12911
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.637653,-21.40556
+  - uid: 13574
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.901543,-21.280472
   - uid: 16581
     components:
     - type: Transform
       parent: 2
       pos: 19.48025,-17.483467
-  - uid: 19195
-    components:
-    - type: Transform
-      parent: 2
-      pos: -10.987556,-21.35373
-  - uid: 19196
-    components:
-    - type: Transform
-      parent: 2
-      pos: -10.737556,-21.166098
 - proto: ClothingOuterDameDane
   entities:
   - uid: 6170
@@ -47867,12 +47836,12 @@ entities:
     - type: InsideEntityStorage
 - proto: ClothingOuterHardsuitEVAPrisoner
   entities:
-  - uid: 7441
+  - uid: 2917
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
-      pos: 38.522278,-19.49277
+      pos: 38.534485,-19.501558
 - proto: ClothingOuterHardsuitSecurity
   entities:
   - uid: 18200
@@ -47917,13 +47886,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -44.48925,-61.39967
-- proto: ClothingOuterVest
-  entities:
-  - uid: 17405
-    components:
-    - type: Transform
-      parent: 2
-      pos: 82.44165,-18.62059
 - proto: ClothingOuterVestHazard
   entities:
   - uid: 2736
@@ -47991,13 +47953,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -60.494183,-61.195236
-- proto: ClothingShoesJester
-  entities:
-  - uid: 17526
-    components:
-    - type: Transform
-      parent: 2
-      pos: 83.45022,-72.70801
 - proto: ClothingShoesSlippers
   entities:
   - uid: 16481
@@ -48017,13 +47972,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 13.501459,-50.591175
-- proto: ClothingUnderSocksBee
-  entities:
-  - uid: 16047
-    components:
-    - type: Transform
-      parent: 2
-      pos: 82.43239,-18.852234
 - proto: ClothingUnderSocksCoder
   entities:
   - uid: 1826
@@ -48043,14 +47991,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 66.51943,-29.493935
-- proto: ClothingUniformJumpskirtLawyerBlack
-  entities:
-  - uid: 4442
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 8.669764,-86.37532
 - proto: ClothingUniformJumpskirtMedicalDoctor
   entities:
   - uid: 6664
@@ -48068,11 +48008,11 @@ entities:
       pos: 42.513027,-17.663967
 - proto: ClothingUniformJumpskirtSeniorOfficer
   entities:
-  - uid: 4803
+  - uid: 17296
     components:
     - type: Transform
       parent: 2
-      pos: 9.473994,-47.657307
+      pos: 9.422632,-47.660923
 - proto: ClothingUniformJumpskirtWeb
   entities:
   - uid: 249
@@ -48083,11 +48023,6 @@ entities:
       pos: 67.63037,-53.474205
 - proto: ClothingUniformJumpskirtYellowOldDress
   entities:
-  - uid: 15236
-    components:
-    - type: Transform
-      parent: 2
-      pos: -47.497868,-43.43454
   - uid: 20217
     components:
     - type: Transform
@@ -48105,20 +48040,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 66.44131,-29.366472
-- proto: ClothingUniformJumpsuitColorMaroon
-  entities:
-  - uid: 17557
-    components:
-    - type: Transform
-      parent: 2
-      pos: -37.338173,-33.307518
-- proto: ClothingUniformJumpsuitColorYellow
-  entities:
-  - uid: 17404
-    components:
-    - type: Transform
-      parent: 2
-      pos: 82.43702,-18.560364
 - proto: ClothingUniformJumpsuitDetective
   entities:
   - uid: 6075
@@ -48128,14 +48049,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingUniformJumpsuitLawyerBlack
-  entities:
-  - uid: 4368
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 8.433652,-86.26877
 - proto: ClothingUniformJumpsuitMedicalDoctor
   entities:
   - uid: 6663
@@ -48143,13 +48056,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 4.3577023,-22.356575
-- proto: ClothingUniformJumpsuitMercenary
-  entities:
-  - uid: 17302
-    components:
-    - type: Transform
-      parent: 2
-      pos: 71.53001,-16.603165
 - proto: ClothingUniformJumpsuitReporter
   entities:
   - uid: 6073
@@ -48210,6 +48116,18 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -56.5,-25.5
+  - uid: 16932
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 43.5,-77.5
+  - uid: 17081
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 45.5,-78.5
   - uid: 17713
     components:
     - type: Transform
@@ -48222,12 +48140,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 2.5,-79.5
-  - uid: 17716
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 42.5,-77.5
   - uid: 18036
     components:
     - type: Transform
@@ -48275,6 +48187,12 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -35.5,-29.5
+  - uid: 17115
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-44.5
   - uid: 17712
     components:
     - type: Transform
@@ -48463,11 +48381,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 9.5,-22.5
-  - uid: 6705
-    components:
-    - type: Transform
-      parent: 2
-      pos: -4.5,-24.5
 - proto: ComputerBroken
   entities:
   - uid: 13796
@@ -48495,17 +48408,32 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 10.5,-88.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        17301:
+        - - OrderSender
+          - OrderReceiver
   - uid: 9462
     components:
     - type: Transform
       parent: 2
       pos: 24.5,-89.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        17301:
+        - - OrderSender
+          - OrderReceiver
   - uid: 13189
     components:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
       pos: 24.5,-87.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        17301:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersEngineering
   entities:
   - uid: 5635
@@ -48536,12 +48464,11 @@ entities:
       pos: 21.5,-67.5
 - proto: ComputerCargoOrdersScience
   entities:
-  - uid: 19205
+  - uid: 9114
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-19.5
+      pos: -8.5,-25.5
 - proto: ComputerCargoOrdersSecurity
   entities:
   - uid: 9332
@@ -48760,18 +48687,24 @@ entities:
       pos: 53.5,-103.5
 - proto: ComputerResearchAndDevelopment
   entities:
-  - uid: 5053
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-19.5
   - uid: 5534
     components:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
       pos: -51.5,-54.5
+  - uid: 15545
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-27.5
+    - type: TechnologyDatabase
+      supportedDisciplines:
+      - Industrial
+      - Arsenal
+      - Experimental
+      - CivilianServices
 - proto: ComputerRoboticsControl
   entities:
   - uid: 15880
@@ -48944,18 +48877,6 @@ entities:
       pos: -14.353454,-63.44882
 - proto: ConveyorBelt
   entities:
-  - uid: 1073
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 41.5,-27.5
-  - uid: 1140
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 42.5,-27.5
   - uid: 2500
     components:
     - type: Transform
@@ -48974,73 +48895,17 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 76.5,-67.5
-  - uid: 3168
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 46.5,-29.5
   - uid: 3314
     components:
     - type: Transform
       parent: 2
       pos: 72.5,-68.5
-  - uid: 3530
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 45.5,-26.5
-  - uid: 3531
-    components:
-    - type: Transform
-      parent: 2
-      pos: 46.5,-26.5
   - uid: 3681
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 20.5,-90.5
-  - uid: 3717
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-30.5
-  - uid: 3718
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-29.5
-  - uid: 3719
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 39.5,-28.5
-  - uid: 3720
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-28.5
-  - uid: 3721
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 40.5,-28.5
-  - uid: 3725
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 34.5,-28.5
-  - uid: 3729
-    components:
-    - type: Transform
-      parent: 2
-      pos: 46.5,-27.5
   - uid: 4946
     components:
     - type: Transform
@@ -49292,41 +49157,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 72.5,-73.5
-  - uid: 6139
-    components:
-    - type: Transform
-      parent: 2
-      pos: 46.5,-28.5
-  - uid: 6388
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 35.5,-28.5
-  - uid: 6396
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 37.5,-28.5
-  - uid: 6397
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 43.5,-26.5
-  - uid: 6400
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 40.5,-27.5
-  - uid: 6401
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 44.5,-26.5
   - uid: 6403
     components:
     - type: Transform
@@ -49367,12 +49197,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 75.5,-68.5
-  - uid: 7891
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 36.5,-28.5
   - uid: 8075
     components:
     - type: Transform
@@ -49384,16 +49208,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 77.5,-63.5
-  - uid: 8089
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-34.5
-  - uid: 8148
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-31.5
   - uid: 8822
     components:
     - type: Transform
@@ -49457,32 +49271,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 72.5,-70.5
-  - uid: 11978
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-36.5
-  - uid: 11979
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-35.5
-  - uid: 11980
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-33.5
-  - uid: 12955
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-32.5
-  - uid: 12962
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 43.5,-27.5
 - proto: CorporateCircuitBoard
   entities:
   - uid: 18621
@@ -49622,6 +49410,11 @@ entities:
       pos: 54.5,-70.5
 - proto: CrateEngineeringCableHV
   entities:
+  - uid: 2246
+    components:
+    - type: Transform
+      parent: 2
+      pos: 83.5,-72.5
   - uid: 3369
     components:
     - type: Transform
@@ -49632,11 +49425,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -49.5,-25.5
-  - uid: 18722
-    components:
-    - type: Transform
-      parent: 2
-      pos: 83.5,-70.5
 - proto: CrateEngineeringCableMV
   entities:
   - uid: 3009
@@ -49737,6 +49525,11 @@ entities:
           ent: null
           showEnts: False
           occludes: True
+  - uid: 9977
+    components:
+    - type: Transform
+      parent: 2
+      pos: -3.5,-24.5
   - uid: 12842
     components:
     - type: Transform
@@ -49749,23 +49542,11 @@ entities:
       pos: 10.5,-25.5
 - proto: CrateFunBoxing
   entities:
-  - uid: 6243
+  - uid: 17114
     components:
     - type: Transform
       parent: 2
       pos: -4.5,-43.5
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          ents:
-          - 6289
-          - 6303
-          showEnts: False
-          occludes: True
-        paper_label: !type:ContainerSlot
-          ent: null
-          showEnts: False
-          occludes: True
 - proto: CrateFunLizardPlushieBulk
   entities:
   - uid: 16273
@@ -49773,6 +49554,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 52.5,-16.5
+- proto: CrateFunPlushie
+  entities:
+  - uid: 17312
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-69.5
 - proto: CrateGenericSteel
   entities:
   - uid: 2004
@@ -49845,11 +49633,11 @@ entities:
       pos: 5.5,-19.5
 - proto: CrateLockBoxScience
   entities:
-  - uid: 536
+  - uid: 610
     components:
     - type: Transform
       parent: 2
-      pos: -10.5,-15.5
+      pos: -4.5,-26.5
   - uid: 4348
     components:
     - type: Transform
@@ -49973,16 +49761,6 @@ entities:
       pos: 43.483654,-18.381348
 - proto: CrayonRainbow
   entities:
-  - uid: 17324
-    components:
-    - type: Transform
-      parent: 2
-      pos: 86.52312,-73.470345
-  - uid: 19375
-    components:
-    - type: Transform
-      parent: 2
-      pos: 78.83267,-25.61246
   - uid: 19376
     components:
     - type: Transform
@@ -50003,6 +49781,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 13.5,-16.5
+- proto: CrewsimovCircuitBoard
+  entities:
+  - uid: 18617
+    components:
+    - type: Transform
+      parent: 2
+      pos: 82.54185,-40.442722
 - proto: CriminalRecordsComputerCircuitboard
   entities:
   - uid: 18304
@@ -50022,11 +49807,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 85.45596,-22.555117
-  - uid: 8702
+  - uid: 15890
     components:
     - type: Transform
       parent: 2
-      pos: -5.39322,-27.521309
+      pos: -5.3574595,-23.662169
   - uid: 17437
     components:
     - type: Transform
@@ -50071,11 +49856,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -4.432915,2.5572884
-  - uid: 19043
-    components:
-    - type: Transform
-      parent: 2
-      pos: 33.526745,-84.59566
 - proto: CryogenicSleepUnit
   entities:
   - uid: 5120
@@ -50258,8 +50038,21 @@ entities:
     - type: Transform
       parent: 2
       pos: 67.5,-46.5
+- proto: d2Dice
+  entities:
+  - uid: 3695
+    components:
+    - type: Transform
+      parent: 2
+      pos: 41.5,-29.5
 - proto: d6Dice
   entities:
+  - uid: 2774
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 42.5,-29.5
   - uid: 6745
     components:
     - type: Transform
@@ -50785,6 +50578,11 @@ entities:
       pos: -52.604927,-39.291473
 - proto: DefibrillatorCabinetFilled
   entities:
+  - uid: 3608
+    components:
+    - type: Transform
+      parent: 2
+      pos: 51.5,-30.5
   - uid: 5238
     components:
     - type: Transform
@@ -50801,16 +50599,17 @@ entities:
     - type: Transform
       parent: 2
       pos: -6.5,3.5
-  - uid: 7369
-    components:
-    - type: Transform
-      parent: 2
-      pos: 51.5,-30.5
   - uid: 10681
     components:
     - type: Transform
       parent: 2
       pos: 13.5,-68.5
+  - uid: 11895
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-18.5
   - uid: 17131
     components:
     - type: Transform
@@ -50883,11 +50682,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 2.5171201,-53.46943
-  - uid: 10527
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.595062,-18.429745
 - proto: DiceBag
   entities:
   - uid: 6052
@@ -50904,12 +50698,6 @@ entities:
       pos: 35.5,-11.5
 - proto: DisposalBend
   entities:
-  - uid: 377
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -14.5,-20.5
   - uid: 1189
     components:
     - type: Transform
@@ -51217,11 +51005,40 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 62.5,-39.5
+  - uid: 9574
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-20.5
   - uid: 9675
     components:
     - type: Transform
       parent: 2
       pos: 62.5,-38.5
+  - uid: 9933
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -11.5,-26.5
+  - uid: 9966
+    components:
+    - type: Transform
+      parent: 2
+      pos: -8.5,-26.5
+  - uid: 9968
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -8.5,-30.5
+  - uid: 9972
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-20.5
   - uid: 10333
     components:
     - type: Transform
@@ -51518,23 +51335,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 12.5,-11.5
-  - uid: 15896
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-20.5
-  - uid: 15906
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -14.5,-25.5
-  - uid: 15907
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -7.5,-30.5
   - uid: 15961
     components:
     - type: Transform
@@ -51821,11 +51621,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 31.5,-40.5
-  - uid: 5496
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-29.5
   - uid: 7894
     components:
     - type: Transform
@@ -51883,11 +51678,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -12.5,-52.5
-  - uid: 15898
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-25.5
   - uid: 15962
     components:
     - type: Transform
@@ -51923,6 +51713,11 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -15.5,-58.5
+  - uid: 9418
+    components:
+    - type: Transform
+      parent: 2
+      pos: -11.5,-23.5
   - uid: 9669
     components:
     - type: Transform
@@ -51987,30 +51782,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 22.5,-58.5
-  - uid: 378
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-20.5
-  - uid: 379
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-20.5
-  - uid: 528
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -12.5,-20.5
-  - uid: 533
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -13.5,-20.5
   - uid: 1462
     components:
     - type: Transform
@@ -52029,12 +51800,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 3.5,-67.5
-  - uid: 2108
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -14.5,-27.5
   - uid: 2109
     components:
     - type: Transform
@@ -52103,12 +51868,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 31.5,-38.5
-  - uid: 5096
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-20.5
   - uid: 5381
     components:
     - type: Transform
@@ -52130,11 +51889,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -21.5,-50.5
-  - uid: 5792
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-28.5
   - uid: 6084
     components:
     - type: Transform
@@ -52536,6 +52290,11 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -35.5,-65.5
+  - uid: 8840
+    components:
+    - type: Transform
+      parent: 2
+      pos: -11.5,-25.5
   - uid: 8842
     components:
     - type: Transform
@@ -52680,6 +52439,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 50.5,-76.5
+  - uid: 9298
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-26.5
   - uid: 9334
     components:
     - type: Transform
@@ -52691,6 +52456,23 @@ entities:
     - type: Transform
       parent: 2
       pos: -2.5,-33.5
+  - uid: 9545
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-20.5
+  - uid: 9605
+    components:
+    - type: Transform
+      parent: 2
+      pos: -11.5,-21.5
+  - uid: 9608
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -8.5,-29.5
   - uid: 9676
     components:
     - type: Transform
@@ -52733,6 +52515,40 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 4.5,-43.5
+  - uid: 9940
+    components:
+    - type: Transform
+      parent: 2
+      pos: -11.5,-24.5
+  - uid: 9965
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-26.5
+  - uid: 9969
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -8.5,-27.5
+  - uid: 9970
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -8.5,-28.5
+  - uid: 9971
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-30.5
+  - uid: 9976
+    components:
+    - type: Transform
+      parent: 2
+      pos: -11.5,-22.5
   - uid: 10280
     components:
     - type: Transform
@@ -54692,83 +54508,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 8.5,-6.5
-  - uid: 15888
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-20.5
-  - uid: 15889
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-21.5
-  - uid: 15890
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-22.5
-  - uid: 15891
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-23.5
-  - uid: 15892
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-24.5
-  - uid: 15894
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-26.5
-  - uid: 15895
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-27.5
-  - uid: 15899
-    components:
-    - type: Transform
-      parent: 2
-      pos: -14.5,-26.5
-  - uid: 15900
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-25.5
-  - uid: 15901
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -12.5,-25.5
-  - uid: 15902
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -11.5,-25.5
-  - uid: 15903
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-25.5
-  - uid: 15904
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-25.5
-  - uid: 15905
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-25.5
   - uid: 15919
     components:
     - type: Transform
@@ -56344,12 +56083,6 @@ entities:
       pos: 74.5,-61.5
 - proto: DisposalTrunk
   entities:
-  - uid: 535
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -14.5,-21.5
   - uid: 1459
     components:
     - type: Transform
@@ -56368,12 +56101,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 21.5,-58.5
-  - uid: 2154
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -14.5,-28.5
   - uid: 2800
     components:
     - type: Transform
@@ -56391,12 +56118,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 31.5,-37.5
-  - uid: 5801
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-29.5
   - uid: 6577
     components:
     - type: Transform
@@ -56409,6 +56130,12 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 20.5,-25.5
+  - uid: 7443
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-23.5
   - uid: 8960
     components:
     - type: Transform
@@ -56425,6 +56152,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 54.5,-41.5
+  - uid: 9600
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-19.5
   - uid: 10290
     components:
     - type: Transform
@@ -56618,11 +56350,6 @@ entities:
       pos: 44.5,-44.5
 - proto: DisposalUnit
   entities:
-  - uid: 375
-    components:
-    - type: Transform
-      parent: 2
-      pos: -14.5,-21.5
   - uid: 1883
     components:
     - type: Transform
@@ -56673,11 +56400,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 29.5,-17.5
-  - uid: 5007
-    components:
-    - type: Transform
-      parent: 2
-      pos: -8.5,-29.5
   - uid: 5170
     components:
     - type: Transform
@@ -56710,6 +56432,8 @@ entities:
       pos: -17.5,-61.5
   - uid: 5833
     components:
+    - type: MetaData
+      name: To Engineering
     - type: Transform
       parent: 2
       pos: 27.5,-65.5
@@ -56803,11 +56527,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 17.5,-65.5
-  - uid: 14395
+  - uid: 14926
     components:
     - type: Transform
       parent: 2
-      pos: -14.5,-28.5
+      pos: -10.5,-23.5
+  - uid: 14928
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-19.5
   - uid: 15539
     components:
     - type: Transform
@@ -56825,6 +56554,8 @@ entities:
       pos: 21.5,-70.5
   - uid: 16550
     components:
+    - type: MetaData
+      name: To Atmos
     - type: Transform
       parent: 2
       pos: -21.5,-60.5
@@ -57119,13 +56850,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -46.486393,-46.93339
-- proto: DrinkEnergyDrinkJug
-  entities:
-  - uid: 17562
-    components:
-    - type: Transform
-      parent: 2
-      pos: -38.577217,-21.50278
 - proto: DrinkFlask
   entities:
   - uid: 5481
@@ -57275,32 +56999,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 27.727837,-45.77474
-- proto: DrinkMugOne
-  entities:
-  - uid: 3394
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.912617,-75.52733
 - proto: DrinkMugRainbow
   entities:
-  - uid: 17325
-    components:
-    - type: Transform
-      parent: 2
-      pos: 35.43417,-87.20909
   - uid: 19664
     components:
     - type: Transform
       parent: 2
       pos: -47.64084,-45.744957
-- proto: DrinkMugRed
-  entities:
-  - uid: 17563
-    components:
-    - type: Transform
-      parent: 2
-      pos: -39.092842,-21.627867
 - proto: DrinkShaker
   entities:
   - uid: 7086
@@ -57336,18 +57041,11 @@ entities:
       pos: -25.331253,-38.492313
 - proto: DrinkSpaceLube
   entities:
-  - uid: 19296
+  - uid: 485
     components:
     - type: Transform
       parent: 2
-      pos: -3.766451,-19.48293
-- proto: DrinkSugarJug
-  entities:
-  - uid: 6812
-    components:
-    - type: Transform
-      parent: 2
-      pos: 8.980915,-47.69106
+      pos: -14.233168,-28.271736
 - proto: DrinkTeacupEmpty
   entities:
   - uid: 20129
@@ -57369,11 +57067,6 @@ entities:
       pos: 6.5117655,-71.929756
 - proto: DrinkWaterBottleFull
   entities:
-  - uid: 901
-    components:
-    - type: Transform
-      parent: 2
-      pos: 40.217396,-32.324863
   - uid: 5597
     components:
     - type: Transform
@@ -57394,11 +57087,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -22.758299,-44.27436
-  - uid: 14928
-    components:
-    - type: Transform
-      parent: 2
-      pos: 40.35802,-32.52799
   - uid: 17710
     components:
     - type: Transform
@@ -57420,17 +57108,17 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: -23.117622,-14.383618
+      pos: -23.80347,-14.414228
   - uid: 18326
     components:
     - type: Transform
       parent: 2
-      pos: -22.961372,-14.195988
+      pos: -23.50437,-14.398603
   - uid: 18327
     components:
     - type: Transform
       parent: 2
-      pos: -22.992622,-14.506653
+      pos: -24.082495,-14.429853
 - proto: DrinkWineBottleFull
   entities:
   - uid: 5697
@@ -57477,12 +57165,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -0.5,-3.5
-  - uid: 4982
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -25.5,-24.5
   - uid: 5462
     components:
     - type: Transform
@@ -57679,12 +57361,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -1.5,-16.5
-  - uid: 14392
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -12.5,-21.5
   - uid: 15153
     components:
     - type: Transform
@@ -57881,18 +57557,18 @@ entities:
       pos: 87.5,-47.5
 - proto: EmergencyNitrogenTankFilled
   entities:
-  - uid: 18755
+  - uid: 3091
     components:
     - type: Transform
       parent: 2
-      pos: 38.632355,-19.621294
+      pos: 38.619953,-18.954683
 - proto: EmergencyOxygenTankFilled
   entities:
-  - uid: 18753
+  - uid: 285
     components:
     - type: Transform
       parent: 2
-      pos: 38.289898,-19.609055
+      pos: 38.307453,-18.923433
 - proto: EmergencyRollerBedSpawnFolded
   entities:
   - uid: 5066
@@ -57955,6 +57631,18 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 63.5,-26.5
+- proto: EnergyGateAirtight
+  entities:
+  - uid: 17425
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,2.5
+  - uid: 17427
+    components:
+    - type: Transform
+      parent: 2
+      pos: -0.5,2.5
 - proto: EnergyGateGenpopEnter
   entities:
   - uid: 5670
@@ -57995,11 +57683,17 @@ entities:
       pos: 65.5,-26.5
 - proto: ExosuitFabricator
   entities:
-  - uid: 1690
+  - uid: 15404
     components:
     - type: Transform
       parent: 2
-      pos: -14.5,-26.5
+      pos: -3.5,-21.5
+    - type: TechnologyDatabase
+      supportedDisciplines:
+      - Industrial
+      - Arsenal
+      - Experimental
+      - CivilianServices
 - proto: ExtinguisherCabinetFilled
   entities:
   - uid: 5781
@@ -58238,6 +57932,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 49.5,-36.5
+  - uid: 3095
+    components:
+    - type: Transform
+      parent: 2
+      pos: -16.5,-24.5
   - uid: 5274
     components:
     - type: Transform
@@ -58258,11 +57957,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 73.5,-47.5
-  - uid: 17427
-    components:
-    - type: Transform
-      parent: 2
-      pos: -16.5,-26.5
   - uid: 20108
     components:
     - type: Transform
@@ -58624,7 +58318,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: -3.5,-29.5
+      pos: -12.5,-29.5
     - type: DeviceList
       devices:
       - 8524
@@ -58697,12 +58391,10 @@ entities:
       - 10479
       - 10480
       - 10481
-      - 7442
-      - 8107
       - 19830
       - 19829
       - 19828
-      - 16242
+      - 16164
   - uid: 9202
     components:
     - type: Transform
@@ -59002,11 +58694,26 @@ entities:
       pos: 13.5,-85.5
     - type: DeviceList
       devices:
-      - 13567
       - 18091
       - 17153
       - 17130
       - 17129
+  - uid: 15895
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -9.5,-22.5
+    - type: DeviceList
+      devices:
+      - 379
+      - 16047
+      - 16117
+      - 16156
+      - 16164
+      - 1112
+      - 18761
+      - 44
   - uid: 16341
     components:
     - type: Transform
@@ -59068,6 +58775,32 @@ entities:
       - 19831
       - 19832
       - 19833
+  - uid: 16449
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -15.5,-27.5
+    - type: DeviceList
+      devices:
+      - 8488
+      - 8489
+      - 379
+      - 16047
+      - 16522
+      - 16514
+      - 16513
+      - 16535
+  - uid: 16606
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-19.5
+    - type: DeviceList
+      devices:
+      - 16156
+      - 16117
   - uid: 16800
     components:
     - type: Transform
@@ -59106,19 +58839,6 @@ entities:
       - 19825
       - 19892
       - 19891
-  - uid: 17794
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-26.5
-    - type: DeviceList
-      devices:
-      - 8489
-      - 8488
-      - 7440
-      - 7443
-      - 19204
   - uid: 17872
     components:
     - type: Transform
@@ -59171,21 +58891,6 @@ entities:
       - 16165
       - 14594
       - 14595
-  - uid: 19201
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -13.5,-22.5
-    - type: DeviceList
-      devices:
-      - 1112
-      - 18761
-      - 44
-      - 7440
-      - 16242
-      - 8107
-      - 19203
   - uid: 19247
     components:
     - type: Transform
@@ -59318,6 +59023,8 @@ entities:
       - 8400
       - 8399
       - 19920
+      - 17099
+      - 17103
   - uid: 20201
     components:
     - type: Transform
@@ -59928,6 +59635,24 @@ entities:
       deviceLists:
       - 14590
       - 14591
+  - uid: 17099
+    components:
+    - type: Transform
+      parent: 2
+      pos: 50.5,-72.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 7310
+      - 19921
+  - uid: 17103
+    components:
+    - type: Transform
+      parent: 2
+      pos: 51.5,-72.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 7310
+      - 19921
   - uid: 17129
     components:
     - type: Transform
@@ -60055,8 +59780,8 @@ entities:
       deviceLists:
       - 9202
       - 16120
-      - 19201
       - 19200
+      - 15895
   - uid: 262
     components:
     - type: Transform
@@ -60067,6 +59792,17 @@ entities:
       - 18864
       - 16807
       - 2197
+  - uid: 379
+    components:
+    - type: Transform
+      parent: 2
+      pos: -12.5,-22.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 16449
+      - 16438
+      - 15895
+      - 19200
   - uid: 530
     components:
     - type: Transform
@@ -60097,8 +59833,8 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 19200
-      - 19201
       - 8130
+      - 15895
   - uid: 1595
     components:
     - type: Transform
@@ -60632,36 +60368,6 @@ entities:
       - 18059
       - 10791
       - 579
-  - uid: 7440
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-23.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 19201
-      - 19200
-      - 1075
-      - 17794
-  - uid: 7442
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-16.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 3897
-      - 9200
-  - uid: 7443
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-27.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 1075
-      - 17794
   - uid: 7459
     components:
     - type: Transform
@@ -60693,17 +60399,6 @@ entities:
       - 9873
       - 16354
       - 16355
-  - uid: 8107
-    components:
-    - type: Transform
-      parent: 2
-      pos: -6.5,-18.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 19201
-      - 19200
-      - 9200
-      - 3897
   - uid: 8402
     components:
     - type: Transform
@@ -60931,13 +60626,13 @@ entities:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
-      pos: -15.5,-24.5
+      pos: -15.5,-26.5
     - type: DeviceNetwork
       deviceLists:
-      - 1075
       - 16120
       - 9202
-      - 17794
+      - 16449
+      - 16438
   - uid: 8489
     components:
     - type: Transform
@@ -60946,10 +60641,10 @@ entities:
       pos: -15.5,-25.5
     - type: DeviceNetwork
       deviceLists:
-      - 1075
       - 16120
       - 9202
-      - 17794
+      - 16449
+      - 16438
   - uid: 8492
     components:
     - type: Transform
@@ -61566,17 +61261,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8767
-  - uid: 13567
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 16.5,-83.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 18493
-      - 18013
-      - 15095
   - uid: 13846
     components:
     - type: Transform
@@ -61743,6 +61427,53 @@ entities:
       deviceLists:
       - 9178
       - 1876
+  - uid: 16047
+    components:
+    - type: Transform
+      parent: 2
+      pos: -11.5,-22.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 16449
+      - 16438
+      - 15895
+      - 19200
+  - uid: 16117
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-21.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 15895
+      - 19200
+      - 16606
+      - 16647
+  - uid: 16156
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-20.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 15895
+      - 19200
+      - 16606
+      - 16647
+  - uid: 16164
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-16.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 15895
+      - 19200
+      - 3897
+      - 9200
   - uid: 16165
     components:
     - type: Transform
@@ -61787,17 +61518,6 @@ entities:
       - 16354
       - 16357
       - 16356
-  - uid: 16242
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-18.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 19200
-      - 19201
-      - 3897
-      - 9200
   - uid: 16247
     components:
     - type: Transform
@@ -61901,11 +61621,61 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 579
+  - uid: 16513
+    components:
+    - type: Transform
+      parent: 2
+      pos: -10.5,-28.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 16449
+      - 16438
+  - uid: 16514
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-28.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 16449
+      - 16438
+  - uid: 16522
+    components:
+    - type: Transform
+      parent: 2
+      pos: -8.5,-28.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 16449
+      - 16438
+  - uid: 16535
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-27.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 16449
+      - 16438
   - uid: 17101
     components:
     - type: Transform
       parent: 2
       pos: -35.5,-74.5
+  - uid: 17306
+    components:
+    - type: Transform
+      parent: 2
+      pos: 31.5,-13.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 16363
+  - uid: 17387
+    components:
+    - type: Transform
+      parent: 2
+      pos: 38.5,-34.5
   - uid: 18091
     components:
     - type: Transform
@@ -62043,9 +61813,9 @@ entities:
       pos: -20.5,-20.5
     - type: DeviceNetwork
       deviceLists:
-      - 19201
       - 19200
       - 16603
+      - 15895
   - uid: 18762
     components:
     - type: Transform
@@ -62127,34 +61897,11 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 30.5,-35.5
-  - uid: 19067
-    components:
-    - type: Transform
-      parent: 2
-      pos: 37.5,-33.5
   - uid: 19078
     components:
     - type: Transform
       parent: 2
       pos: 48.5,-42.5
-  - uid: 19203
-    components:
-    - type: Transform
-      parent: 2
-      pos: -10.5,-17.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 19200
-      - 19201
-  - uid: 19204
-    components:
-    - type: Transform
-      parent: 2
-      pos: -13.5,-29.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 1075
-      - 17794
   - uid: 19234
     components:
     - type: Transform
@@ -63247,11 +62994,18 @@ entities:
       pos: 19.5,-73.5
     - type: Fixtures
       fixtures: {}
-  - uid: 5075
+  - uid: 5082
     components:
     - type: Transform
       parent: 2
-      pos: -4.5,-25.5
+      pos: -4.5,-24.5
+    - type: Fixtures
+      fixtures: {}
+  - uid: 5792
+    components:
+    - type: Transform
+      parent: 2
+      pos: 34.5,-28.5
     - type: Fixtures
       fixtures: {}
   - uid: 6201
@@ -63296,18 +63050,6 @@ entities:
       pos: -20.5,-32.5
     - type: Fixtures
       fixtures: {}
-- proto: FloorTileItemBoxing
-  entities:
-  - uid: 6303
-    components:
-    - type: Transform
-      parent: 6243
-    - type: Stack
-      count: 30
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-      storage: 6243
 - proto: FloorTileItemSteel
   entities:
   - uid: 2497
@@ -63335,108 +63077,11 @@ entities:
       pos: 55.5,-13.5
 - proto: FloraGreyStalagmite
   entities:
-  - uid: 5541
-    components:
-    - type: Transform
-      parent: 2
-      pos: 20.5,-63.5
   - uid: 6553
     components:
     - type: Transform
       parent: 2
       pos: -49.5,-68.5
-  - uid: 15856
-    components:
-    - type: Transform
-      parent: 2
-      pos: -42.5,-33.5
-  - uid: 15857
-    components:
-    - type: Transform
-      parent: 2
-      pos: -41.5,-32.5
-  - uid: 17098
-    components:
-    - type: Transform
-      parent: 2
-      pos: -16.5,-48.5
-  - uid: 17099
-    components:
-    - type: Transform
-      parent: 2
-      pos: -25.5,-51.5
-  - uid: 17103
-    components:
-    - type: Transform
-      parent: 2
-      pos: -6.5,-71.5
-  - uid: 17108
-    components:
-    - type: Transform
-      parent: 2
-      pos: 77.5,-51.5
-  - uid: 17113
-    components:
-    - type: Transform
-      parent: 2
-      pos: -44.5,-22.5
-  - uid: 17114
-    components:
-    - type: Transform
-      parent: 2
-      pos: -46.5,-29.5
-  - uid: 17115
-    components:
-    - type: Transform
-      parent: 2
-      pos: -38.5,-36.5
-  - uid: 17308
-    components:
-    - type: Transform
-      parent: 2
-      pos: -39.5,-71.5
-  - uid: 17309
-    components:
-    - type: Transform
-      parent: 2
-      pos: -40.5,-70.5
-  - uid: 17310
-    components:
-    - type: Transform
-      parent: 2
-      pos: -40.5,-71.5
-  - uid: 17568
-    components:
-    - type: Transform
-      parent: 2
-      pos: -41.5,-70.5
-  - uid: 17569
-    components:
-    - type: Transform
-      parent: 2
-      pos: -41.5,-71.5
-  - uid: 17570
-    components:
-    - type: Transform
-      parent: 2
-      pos: -40.5,-72.5
-  - uid: 17571
-    components:
-    - type: Transform
-      parent: 2
-      pos: -39.5,-70.5
-  - uid: 18266
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 37.5,-21.5
-  - uid: 19011
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -36.5,-76.5
 - proto: FoamCrossbow
   entities:
   - uid: 7960
@@ -63451,11 +63096,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 69.39864,-60.424595
-  - uid: 18854
-    components:
-    - type: Transform
-      parent: 2
-      pos: -39.07116,-69.530205
   - uid: 18933
     components:
     - type: Transform
@@ -63473,13 +63113,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -1.2759836,-68.43135
-- proto: FoodBakedBunHoney
-  entities:
-  - uid: 17400
-    components:
-    - type: Transform
-      parent: 2
-      pos: 83.18266,-18.764208
 - proto: FoodBakedCannabisBrownie
   entities:
   - uid: 4673
@@ -63525,28 +63158,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -44.570675,-45.410374
-  - uid: 5590
-    components:
-    - type: Transform
-      parent: 2
-      pos: -44.382748,-45.738728
-  - uid: 18217
-    components:
-    - type: Transform
-      parent: 2
-      pos: 6.020815,-83.09565
-- proto: FoodBoxPizzaFilled
-  entities:
-  - uid: 18319
-    components:
-    - type: Transform
-      parent: 2
-      pos: -24.519213,-14.14908
-  - uid: 18320
-    components:
-    - type: Transform
-      parent: 2
-      pos: -23.894213,-14.2898035
 - proto: FoodBreadBaguetteSlice
   entities:
   - uid: 18998
@@ -63578,18 +63189,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -24.54712,-39.366432
-- proto: FoodBurgerXeno
-  entities:
-  - uid: 17305
-    components:
-    - type: Transform
-      parent: 2
-      pos: -38.500965,-57.440918
-  - uid: 17306
-    components:
-    - type: Transform
-      parent: 2
-      pos: -38.203186,-57.62665
 - proto: FoodCakeClown
   entities:
   - uid: 5981
@@ -63732,65 +63331,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 35.688534,-91.4795
-- proto: FoodDonut
-  entities:
-  - uid: 5591
-    components:
-    - type: Transform
-      parent: 2
-      pos: -44.45326,-46.331154
-- proto: FoodDonutApple
-  entities:
-  - uid: 17315
-    components:
-    - type: Transform
-      parent: 2
-      pos: 6.042578,-82.31825
-- proto: FoodDonutBungo
-  entities:
-  - uid: 17314
-    components:
-    - type: Transform
-      parent: 2
-      pos: 6.151953,-82.73679
-- proto: FoodDonutCaramel
-  entities:
-  - uid: 17313
-    components:
-    - type: Transform
-      parent: 2
-      pos: 6.651953,-82.97133
-- proto: FoodDonutHomer
-  entities:
-  - uid: 17312
-    components:
-    - type: Transform
-      parent: 2
-      pos: 6.386328,-82.455345
-- proto: FoodDonutJellyScurret
-  entities:
-  - uid: 2917
-    components:
-    - type: Transform
-      parent: 2
-      pos: 72.49038,-74.3934
-    - type: CollisionWake
-      enabled: False
-    - type: Conveyed
 - proto: FoodDonutPink
   entities:
-  - uid: 17561
+  - uid: 17316
     components:
     - type: Transform
       parent: 2
-      pos: -37.754837,-33.443027
-- proto: FoodDonutSpaceman
-  entities:
-  - uid: 17317
-    components:
-    - type: Transform
-      parent: 2
-      pos: 6.745703,-82.29899
+      pos: 6.409142,-82.32676
 - proto: FoodEgg
   entities:
   - uid: 18457
@@ -63826,13 +63373,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 1.4920012,-49.60866
-- proto: FoodFrozenFreezy
-  entities:
-  - uid: 17567
-    components:
-    - type: Transform
-      parent: 2
-      pos: -39.311584,-20.823996
 - proto: FoodFrozenSnowconeMime
   entities:
   - uid: 5994
@@ -63863,13 +63403,13 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: FoodLemon
+- proto: FoodFrozenSundae
   entities:
-  - uid: 18216
+  - uid: 16925
     components:
     - type: Transform
       parent: 2
-      pos: -38.189064,-69.988914
+      pos: -39.406727,-20.732283
 - proto: FoodLily
   entities:
   - uid: 17556
@@ -63877,13 +63417,18 @@ entities:
     - type: Transform
       parent: 2
       pos: -38.619698,-62.26088
-- proto: FoodMeatXenoCutlet
+- proto: FoodMeatXenoCutletCooked
   entities:
-  - uid: 3722
+  - uid: 1843
     components:
     - type: Transform
       parent: 2
-      pos: 42.54103,-26.571922
+      pos: 43.5,-29.5
+  - uid: 17325
+    components:
+    - type: Transform
+      parent: 2
+      pos: 35.568897,-28.652658
 - proto: FoodOrange
   entities:
   - uid: 17558
@@ -63924,13 +63469,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 8.476078,-94.4169
-- proto: FoodPizzaMeatSlice
-  entities:
-  - uid: 17648
-    components:
-    - type: Transform
-      parent: 2
-      pos: -5.017685,-28.423168
 - proto: FoodPlate
   entities:
   - uid: 5680
@@ -63955,11 +63493,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -19.415848,-41.425785
-  - uid: 17401
-    components:
-    - type: Transform
-      parent: 2
-      pos: 82.76137,-18.602058
 - proto: FoodSnackMREBrownie
   entities:
   - uid: 7062
@@ -63991,11 +63524,11 @@ entities:
       pos: 31.474777,-41.36227
 - proto: FoodSnackPopcorn
   entities:
-  - uid: 2199
+  - uid: 11431
     components:
     - type: Transform
       parent: 2
-      pos: -1.6291262,-26.290157
+      pos: -1.365492,-23.480299
 - proto: FoodSnackSemki
   entities:
   - uid: 6219
@@ -64015,20 +63548,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -56.426476,-61.394897
-- proto: FoodTinBeansTrash
-  entities:
-  - uid: 7328
-    components:
-    - type: Transform
-      parent: 2
-      pos: 79.62434,-25.69585
-- proto: FoodTinMRETrash
-  entities:
-  - uid: 7327
-    components:
-    - type: Transform
-      parent: 2
-      pos: 79.27017,-25.581188
 - proto: ForkPlastic
   entities:
   - uid: 6962
@@ -64399,6 +63918,20 @@ entities:
       pos: -22.5,-45.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 5078
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -10.5,-31.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 5834
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 49.5,-81.5
   - uid: 5840
     components:
     - type: Transform
@@ -64410,7 +63943,7 @@ entities:
       parent: 2
       pos: 63.5,-16.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 6471
     components:
     - type: Transform
@@ -64441,7 +63974,7 @@ entities:
       parent: 2
       pos: 65.5,-17.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 7132
     components:
     - type: Transform
@@ -64512,13 +64045,6 @@ entities:
       pos: 81.5,-43.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 7699
-    components:
-    - type: Transform
-      parent: 2
-      pos: 47.5,-77.5
-    - type: AtmosPipeLayers
-      pipeLayer: Tertiary
   - uid: 7839
     components:
     - type: Transform
@@ -64603,6 +64129,13 @@ entities:
       pos: 14.5,-58.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 8016
+    components:
+    - type: Transform
+      parent: 2
+      pos: 75.5,-23.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 8072
     components:
     - type: Transform
@@ -64627,14 +64160,6 @@ entities:
       pos: -39.5,-12.5
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 8810
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 74.5,-23.5
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 8821
     components:
     - type: Transform
@@ -64852,7 +64377,7 @@ entities:
       parent: 2
       pos: 61.5,-15.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 9210
     components:
     - type: Transform
@@ -64874,7 +64399,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 63.5,-17.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 9317
     components:
     - type: Transform
@@ -64897,7 +64422,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 61.5,-16.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 9424
     components:
     - type: Transform
@@ -65161,22 +64686,6 @@ entities:
       pos: 17.5,-28.5
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 9980
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -17.5,-25.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 9981
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -17.5,-24.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 9984
     components:
     - type: Transform
@@ -65185,19 +64694,11 @@ entities:
       pos: 4.5,-41.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 10023
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -14.5,-26.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 10025
     components:
     - type: Transform
       parent: 2
-      pos: -14.5,-25.5
+      pos: -9.5,-26.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 10047
@@ -65347,7 +64848,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 54.5,-15.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 10453
     components:
     - type: Transform
@@ -65379,6 +64880,11 @@ entities:
       pos: 5.5,-17.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 10655
+    components:
+    - type: Transform
+      parent: 2
+      pos: 46.5,-81.5
   - uid: 10753
     components:
     - type: Transform
@@ -65401,7 +64907,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 74.5,-22.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 11335
     components:
     - type: Transform
@@ -65410,6 +64916,14 @@ entities:
       pos: -35.5,-15.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 11436
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -9.5,-30.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 11736
     components:
     - type: Transform
@@ -65497,6 +65011,25 @@ entities:
       pos: -2.5,-39.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 13952
+    components:
+    - type: Transform
+      parent: 2
+      pos: -10.5,-24.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 13978
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 48.5,-81.5
+  - uid: 14084
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 45.5,-81.5
   - uid: 14293
     components:
     - type: Transform
@@ -65584,22 +65117,6 @@ entities:
       pos: 13.5,-20.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 14671
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-25.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 14672
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-25.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 14677
     components:
     - type: Transform
@@ -65624,22 +65141,6 @@ entities:
       pos: -40.5,-66.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 14699
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -16.5,-26.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 14701
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-26.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 14705
     components:
     - type: Transform
@@ -65709,6 +65210,22 @@ entities:
       pos: 13.5,-16.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 15902
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-24.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 15903
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-25.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 16234
     components:
     - type: Transform
@@ -65813,20 +65330,6 @@ entities:
       pos: 52.5,-46.5
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 16931
-    components:
-    - type: Transform
-      parent: 2
-      pos: -6.5,-21.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 16932
-    components:
-    - type: Transform
-      parent: 2
-      pos: -5.5,-20.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 16967
     components:
     - type: Transform
@@ -65998,7 +65501,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 54.5,-18.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 18047
     components:
     - type: Transform
@@ -66110,13 +65613,6 @@ entities:
       pos: 34.5,-13.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 18798
-    components:
-    - type: Transform
-      parent: 2
-      pos: -6.5,-25.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 18825
     components:
     - type: Transform
@@ -66425,12 +65921,6 @@ entities:
       pos: 51.5,-65.5
     - type: AtmosPipeColor
       color: '#947507FF'
-  - uid: 18409
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 47.5,-76.5
 - proto: GasPipeBendAlt2
   entities:
   - uid: 10411
@@ -66486,7 +65976,7 @@ entities:
       parent: 2
       pos: 65.5,-23.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 9486
     components:
     - type: Transform
@@ -66508,6 +65998,13 @@ entities:
       pos: -46.5,-65.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 11853
+    components:
+    - type: Transform
+      parent: 2
+      pos: -11.5,-24.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 12146
     components:
     - type: Transform
@@ -66515,6 +66012,13 @@ entities:
       pos: 18.5,-23.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 14119
+    components:
+    - type: Transform
+      parent: 2
+      pos: -11.5,-21.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 14490
     components:
     - type: Transform
@@ -66587,11 +66091,6 @@ entities:
       color: '#990000FF'
 - proto: GasPipeManifold
   entities:
-  - uid: 3312
-    components:
-    - type: Transform
-      parent: 2
-      pos: 47.5,-78.5
   - uid: 10223
     components:
     - type: Transform
@@ -66608,12 +66107,6 @@ entities:
       pos: 46.5,-66.5
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 18416
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 48.5,-76.5
 - proto: GasPipeSensorDistribution
   entities:
   - uid: 10763
@@ -66656,6 +66149,18 @@ entities:
       color: '#990000FF'
 - proto: GasPipeStraight
   entities:
+  - uid: 164
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 46.5,-86.5
+  - uid: 176
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 48.5,-87.5
   - uid: 303
     components:
     - type: Transform
@@ -66671,12 +66176,6 @@ entities:
       pos: 18.5,-19.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 564
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 49.5,-79.5
   - uid: 752
     components:
     - type: Transform
@@ -66700,7 +66199,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 56.5,-15.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 1100
     components:
     - type: Transform
@@ -66908,6 +66407,12 @@ entities:
       pos: 59.5,-27.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 3613
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 48.5,-86.5
   - uid: 3627
     components:
     - type: Transform
@@ -66930,7 +66435,7 @@ entities:
       parent: 2
       pos: 65.5,-22.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 4116
     components:
     - type: Transform
@@ -66938,14 +66443,14 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 55.5,-15.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 4117
     components:
     - type: Transform
       parent: 2
       pos: 65.5,-19.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 4119
     components:
     - type: Transform
@@ -66953,7 +66458,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 54.5,-16.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 4192
     components:
     - type: Transform
@@ -67072,6 +66577,11 @@ entities:
       pos: -37.5,-63.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 5307
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-80.5
   - uid: 5407
     components:
     - type: Transform
@@ -67088,12 +66598,27 @@ entities:
       pos: 65.5,-27.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 5422
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-81.5
   - uid: 5567
     components:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
       pos: -18.5,-25.5
+  - uid: 5590
+    components:
+    - type: Transform
+      parent: 2
+      pos: 46.5,-82.5
+  - uid: 5591
+    components:
+    - type: Transform
+      parent: 2
+      pos: 45.5,-80.5
   - uid: 5740
     components:
     - type: Transform
@@ -67118,6 +66643,31 @@ entities:
       pos: -27.5,-61.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 5892
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-79.5
+  - uid: 5955
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-78.5
+  - uid: 6063
+    components:
+    - type: Transform
+      parent: 2
+      pos: 49.5,-80.5
+  - uid: 6139
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-82.5
+  - uid: 6246
+    components:
+    - type: Transform
+      parent: 2
+      pos: 49.5,-78.5
   - uid: 6263
     components:
     - type: Transform
@@ -67126,6 +66676,11 @@ entities:
       pos: -38.5,-12.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 6303
+    components:
+    - type: Transform
+      parent: 2
+      pos: 49.5,-79.5
   - uid: 6357
     components:
     - type: Transform
@@ -67133,6 +66688,12 @@ entities:
       pos: 13.5,-71.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 6460
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 46.5,-87.5
   - uid: 6466
     components:
     - type: Transform
@@ -67178,7 +66739,7 @@ entities:
       parent: 2
       pos: 65.5,-21.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 6637
     components:
     - type: Transform
@@ -67289,6 +66850,14 @@ entities:
       pos: 85.5,-47.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 7699
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-30.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 7724
     components:
     - type: Transform
@@ -67297,6 +66866,16 @@ entities:
       pos: 77.5,-44.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 7750
+    components:
+    - type: Transform
+      parent: 2
+      pos: 45.5,-78.5
+  - uid: 7752
+    components:
+    - type: Transform
+      parent: 2
+      pos: 45.5,-79.5
   - uid: 7753
     components:
     - type: Transform
@@ -67516,6 +67095,13 @@ entities:
       pos: 78.5,-44.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 8089
+    components:
+    - type: Transform
+      parent: 2
+      pos: 75.5,-24.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 8097
     components:
     - type: Transform
@@ -67618,11 +67204,6 @@ entities:
       pos: 85.5,-43.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 8621
-    components:
-    - type: Transform
-      parent: 2
-      pos: 47.5,-77.5
   - uid: 8631
     components:
     - type: Transform
@@ -67638,14 +67219,14 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 67.5,-23.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 8636
     components:
     - type: Transform
       parent: 2
       pos: 65.5,-18.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 8662
     components:
     - type: Transform
@@ -67698,7 +67279,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 60.5,-15.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 8809
     components:
     - type: Transform
@@ -67706,7 +67287,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 73.5,-23.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
+  - uid: 8810
+    components:
+    - type: Transform
+      parent: 2
+      pos: 48.5,-82.5
   - uid: 8820
     components:
     - type: Transform
@@ -69330,7 +68916,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 68.5,-23.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 9226
     components:
     - type: Transform
@@ -69338,7 +68924,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 64.5,-23.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 9227
     components:
     - type: Transform
@@ -69346,7 +68932,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 69.5,-23.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 9228
     components:
     - type: Transform
@@ -69390,7 +68976,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 70.5,-23.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 9295
     components:
     - type: Transform
@@ -69414,7 +69000,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 62.5,-16.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 9327
     components:
     - type: Transform
@@ -69438,7 +69024,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 66.5,-23.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 9368
     components:
     - type: Transform
@@ -69462,7 +69048,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 59.5,-15.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 9377
     components:
     - type: Transform
@@ -69500,7 +69086,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 72.5,-23.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 9382
     components:
     - type: Transform
@@ -69622,13 +69208,6 @@ entities:
       pos: 8.5,-63.5
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 9418
-    components:
-    - type: Transform
-      parent: 2
-      pos: -5.5,-21.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 9422
     components:
     - type: Transform
@@ -70034,13 +69613,6 @@ entities:
       pos: -1.5,-31.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 9514
-    components:
-    - type: Transform
-      parent: 2
-      pos: -1.5,-30.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 9515
     components:
     - type: Transform
@@ -70062,6 +69634,14 @@ entities:
       pos: -1.5,-27.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 9518
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-31.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 9519
     components:
     - type: Transform
@@ -70169,14 +69749,6 @@ entities:
       pos: -1.5,-18.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 9545
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -12.5,-26.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 9547
     components:
     - type: Transform
@@ -70376,14 +69948,6 @@ entities:
       pos: -29.5,-12.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 9574
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -7.5,-25.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 9577
     components:
     - type: Transform
@@ -70508,24 +70072,16 @@ entities:
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-26.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 9608
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-26.5
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-30.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 9609
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-26.5
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-30.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 9614
@@ -71253,6 +70809,14 @@ entities:
       pos: -41.5,-42.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 9765
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-30.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 9766
     components:
     - type: Transform
@@ -71572,7 +71136,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 58.5,-15.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 9828
     components:
     - type: Transform
@@ -71817,15 +71381,15 @@ entities:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
-      pos: -15.5,-25.5
+      pos: -3.5,-30.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 9900
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-25.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-30.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 9902
@@ -71856,6 +71420,22 @@ entities:
       pos: 17.5,-27.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 9913
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-30.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 9916
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-31.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 9917
     components:
     - type: Transform
@@ -72000,14 +71580,6 @@ entities:
       pos: 0.5,-30.5
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 9940
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 0.5,-31.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 9941
     components:
     - type: Transform
@@ -72135,68 +71707,12 @@ entities:
       pos: 4.5,-47.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 9965
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-24.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 9966
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-24.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 9968
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-24.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 9969
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-24.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 9970
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-24.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 9971
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-24.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 9972
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-24.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 9973
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-24.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-31.5
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 9974
@@ -72215,28 +71731,12 @@ entities:
       pos: -13.5,-24.5
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 9976
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -14.5,-24.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 9977
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -15.5,-24.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 9978
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-24.5
+      rot: 3.141592653589793 rad
+      pos: -10.5,-28.5
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 9979
@@ -72247,6 +71747,22 @@ entities:
       pos: -18.5,-25.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 9980
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -10.5,-27.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 9981
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -10.5,-26.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 9982
     components:
     - type: Transform
@@ -72443,6 +71959,14 @@ entities:
       pos: -6.5,-41.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 10023
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -11.5,-22.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 10027
     components:
     - type: Transform
@@ -72866,6 +72390,14 @@ entities:
       pos: -35.5,-63.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 10103
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -10.5,-25.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 10104
     components:
     - type: Transform
@@ -73306,7 +72838,7 @@ entities:
       parent: 2
       pos: 65.5,-24.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 10176
     components:
     - type: Transform
@@ -73459,22 +72991,6 @@ entities:
       pos: -39.5,-64.5
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 10200
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -11.5,-24.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 10201
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-26.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 10202
     components:
     - type: Transform
@@ -74478,6 +73994,14 @@ entities:
       pos: 42.5,-51.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 10558
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -11.5,-23.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 10597
     components:
     - type: Transform
@@ -74547,7 +74071,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 64.5,-17.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 10768
     components:
     - type: Transform
@@ -74580,6 +74104,14 @@ entities:
       pos: -38.5,-11.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 11100
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-26.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 11332
     components:
     - type: Transform
@@ -74588,6 +74120,70 @@ entities:
       pos: -35.5,-14.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 11432
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-31.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 11434
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-31.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 11435
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-31.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 11437
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -9.5,-29.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 11438
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -9.5,-28.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 11439
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -9.5,-27.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 11440
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -10.5,-30.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 11470
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -10.5,-29.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 11683
     components:
     - type: Transform
@@ -74806,7 +74402,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 57.5,-15.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 12874
     components:
     - type: Transform
@@ -74830,18 +74426,6 @@ entities:
       pos: 18.5,-24.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 12925
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 49.5,-78.5
-  - uid: 12926
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 47.5,-79.5
   - uid: 12968
     components:
     - type: Transform
@@ -74893,6 +74477,14 @@ entities:
       pos: 10.5,-93.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 13395
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-31.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 13521
     components:
     - type: Transform
@@ -74912,10 +74504,10 @@ entities:
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -12.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-31.5
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 13524
     components:
     - type: Transform
@@ -74979,6 +74571,45 @@ entities:
       pos: -41.5,-65.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 13960
+    components:
+    - type: Transform
+      parent: 2
+      pos: -1.5,-26.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 14036
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 0.5,-24.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 14059
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -12.5,-25.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 14116
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-31.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 14395
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-31.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 14443
     components:
     - type: Transform
@@ -75914,14 +75545,6 @@ entities:
       pos: 9.5,-35.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 14670
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-20.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 14674
     components:
     - type: Transform
@@ -75930,14 +75553,6 @@ entities:
       pos: -13.5,-55.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 14681
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-20.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 14685
     components:
     - type: Transform
@@ -76143,6 +75758,86 @@ entities:
       pos: 17.5,-83.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 15896
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -12.5,-24.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 15898
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -12.5,-23.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 15899
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -12.5,-22.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 15900
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -12.5,-21.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 15904
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-26.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 15905
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-26.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 15906
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-26.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 15907
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-25.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 15912
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-25.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 15913
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -17.5,-25.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 16220
     components:
     - type: Transform
@@ -76401,56 +76096,6 @@ entities:
       pos: 55.5,-42.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 16921
-    components:
-    - type: Transform
-      parent: 2
-      pos: -5.5,-22.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 16922
-    components:
-    - type: Transform
-      parent: 2
-      pos: -5.5,-23.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 16923
-    components:
-    - type: Transform
-      parent: 2
-      pos: -5.5,-24.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 16924
-    components:
-    - type: Transform
-      parent: 2
-      pos: -5.5,-25.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 16925
-    components:
-    - type: Transform
-      parent: 2
-      pos: -6.5,-23.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 16926
-    components:
-    - type: Transform
-      parent: 2
-      pos: -6.5,-22.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 16927
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -7.5,-21.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 16928
     components:
     - type: Transform
@@ -76686,6 +76331,14 @@ entities:
       pos: 58.5,-42.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 17108
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 65.5,-25.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 17110
     components:
     - type: Transform
@@ -77540,7 +77193,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 54.5,-17.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 18052
     components:
     - type: Transform
@@ -78710,7 +78363,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 63.5,-23.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 19859
     components:
     - type: Transform
@@ -78718,7 +78371,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 62.5,-23.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 19860
     components:
     - type: Transform
@@ -78726,7 +78379,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 61.5,-23.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 19861
     components:
     - type: Transform
@@ -78734,7 +78387,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 60.5,-23.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 19862
     components:
     - type: Transform
@@ -78742,7 +78395,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 59.5,-23.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 19863
     components:
     - type: Transform
@@ -79348,6 +79001,14 @@ entities:
       pos: 10.5,-36.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 3842
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 74.5,-23.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 4200
     components:
     - type: Transform
@@ -79502,13 +79163,6 @@ entities:
       pos: -1.5,-21.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 8840
-    components:
-    - type: Transform
-      parent: 2
-      pos: -10.5,-24.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 8858
     components:
     - type: Transform
@@ -79854,14 +79508,6 @@ entities:
       pos: -1.5,-33.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 9518
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-26.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 9524
     components:
     - type: Transform
@@ -79902,21 +79548,6 @@ entities:
       pos: -29.5,-11.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 9600
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -5.5,-26.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 9605
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-24.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 9629
     components:
     - type: Transform
@@ -80166,14 +79797,6 @@ entities:
       pos: 0.5,-23.5
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 9933
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-24.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 9958
     components:
     - type: Transform
@@ -80189,13 +79812,6 @@ entities:
       pos: -14.5,-38.5
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 10026
-    components:
-    - type: Transform
-      parent: 2
-      pos: -10.5,-26.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 10041
     components:
     - type: Transform
@@ -80250,14 +79866,6 @@ entities:
       pos: -25.5,-62.5
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 10103
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -6.5,-24.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 10110
     components:
     - type: Transform
@@ -80349,7 +79957,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 65.5,-20.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 10285
     components:
     - type: Transform
@@ -80457,6 +80065,14 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 33.5,-65.5
+  - uid: 10555
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-30.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 10562
     components:
     - type: Transform
@@ -80480,6 +80096,22 @@ entities:
       pos: 63.5,-18.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 11364
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-31.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 11980
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -13.5,-26.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 12154
     components:
     - type: Transform
@@ -80504,6 +80136,13 @@ entities:
       pos: 14.5,-94.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 12418
+    components:
+    - type: Transform
+      parent: 2
+      pos: -12.5,-20.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 12423
     components:
     - type: Transform
@@ -80717,14 +80356,6 @@ entities:
       pos: -13.5,-20.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 14684
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -11.5,-21.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 14691
     components:
     - type: Transform
@@ -80748,6 +80379,14 @@ entities:
       pos: 60.5,-56.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 15901
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -12.5,-26.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 16096
     components:
     - type: Transform
@@ -80771,7 +80410,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 71.5,-23.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 16424
     components:
     - type: Transform
@@ -80920,14 +80559,6 @@ entities:
       pos: 64.5,-46.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 17682
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -6.5,-26.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 17748
     components:
     - type: Transform
@@ -81034,12 +80665,6 @@ entities:
       pos: 31.5,-24.5
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 18406
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 49.5,-76.5
   - uid: 18419
     components:
     - type: Transform
@@ -81119,30 +80744,18 @@ entities:
     - type: Transform
       parent: 2
       pos: -18.5,-24.5
-  - uid: 12871
-    components:
-    - type: Transform
-      parent: 2
-      pos: 47.5,-75.5
-  - uid: 12879
+  - uid: 7697
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
-      pos: 45.5,-77.5
-    - type: AtmosPipeLayers
-      pipeLayer: Tertiary
+      pos: 48.5,-74.5
   - uid: 13329
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 13.5,-65.5
-  - uid: 14385
-    components:
-    - type: Transform
-      parent: 2
-      pos: 49.5,-74.5
   - uid: 14859
     components:
     - type: Transform
@@ -81222,17 +80835,6 @@ entities:
     - type: GasPressurePump
       targetPressure: 4500
       enabled: True
-  - uid: 7990
-    components:
-    - type: Transform
-      parent: 2
-      pos: 47.5,-76.5
-  - uid: 10655
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 49.5,-77.5
   - uid: 17412
     components:
     - type: Transform
@@ -81319,13 +80921,6 @@ entities:
       pos: 31.5,-67.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 6926
-    components:
-    - type: Transform
-      parent: 2
-      pos: 49.5,-75.5
-    - type: GasValve
-      open: False
   - uid: 7906
     components:
     - type: Transform
@@ -81356,23 +80951,6 @@ entities:
       open: False
     - type: AtmosPipeColor
       color: '#947507FF'
-  - uid: 18401
-    components:
-    - type: Transform
-      parent: 2
-      pos: 47.5,-77.5
-    - type: GasValve
-      open: False
-- proto: GasValveAlt2
-  entities:
-  - uid: 12884
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 46.5,-77.5
-    - type: GasValve
-      open: False
 - proto: GasVentPump
   entities:
   - uid: 518
@@ -82085,28 +81663,6 @@ entities:
       - 19853
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 9874
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -10.5,-27.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 1075
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 9916
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-26.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 1075
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 9962
     components:
     - type: Transform
@@ -82393,6 +81949,27 @@ entities:
       - 9241
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 16021
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.5,-25.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 16438
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 16046
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-20.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 16647
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 16075
     components:
     - type: Transform
@@ -82760,7 +82337,7 @@ entities:
       deviceLists:
       - 18059
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 2406
     components:
     - type: Transform
@@ -82793,7 +82370,7 @@ entities:
       deviceLists:
       - 19876
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 3185
     components:
     - type: Transform
@@ -82815,6 +82392,14 @@ entities:
       - 3424
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 3436
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 75.5,-25.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 3445
     components:
     - type: Transform
@@ -82934,7 +82519,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 58.5,-23.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
     - type: DeviceNetwork
       deviceLists:
       - 579
@@ -83270,17 +82855,6 @@ entities:
       - 19835
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 8839
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -10.5,-25.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 1075
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 8844
     components:
     - type: Transform
@@ -83692,6 +83266,28 @@ entities:
       - 6342
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 15923
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -11.5,-25.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 16438
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 16045
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-21.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 16647
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 16173
     components:
     - type: Transform
@@ -83886,7 +83482,7 @@ entities:
       deviceLists:
       - 18818
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
   - uid: 18083
     components:
     - type: Transform
@@ -83994,17 +83590,6 @@ entities:
       - 15885
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 18797
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -7.5,-25.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 1075
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 19267
     components:
     - type: Transform
@@ -84050,7 +83635,7 @@ entities:
       parent: 2
       pos: 71.5,-22.5
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
     - type: DeviceNetwork
       deviceLists:
       - 6358
@@ -84175,6 +83760,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 79.5,-30.5
+  - uid: 7953
+    components:
+    - type: Transform
+      parent: 2
+      pos: 43.5,-33.5
   - uid: 9615
     components:
     - type: Transform
@@ -84190,6 +83780,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 62.5,-70.5
+  - uid: 12957
+    components:
+    - type: Transform
+      parent: 2
+      pos: 44.5,-33.5
   - uid: 13804
     components:
     - type: Transform
@@ -84255,11 +83850,10 @@ entities:
     - type: Transform
       parent: 2
       pos: 59.5,-66.5
-  - uid: 15846
+  - uid: 16922
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
       pos: 5.5,-32.5
 - proto: GlassBoxLaserFilled
   entities:
@@ -84706,21 +84300,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 14.5,-26.5
-  - uid: 483
+  - uid: 519
     components:
     - type: Transform
       parent: 2
-      pos: -5.5,-23.5
-  - uid: 484
-    components:
-    - type: Transform
-      parent: 2
-      pos: -4.5,-23.5
-  - uid: 485
-    components:
-    - type: Transform
-      parent: 2
-      pos: -3.5,-23.5
+      pos: -2.5,-24.5
   - uid: 537
     components:
     - type: Transform
@@ -84735,32 +84319,17 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 19.5,-43.5
+      pos: 16.5,-83.5
   - uid: 540
     components:
     - type: Transform
       parent: 2
       pos: 20.5,-40.5
-  - uid: 541
-    components:
-    - type: Transform
-      parent: 2
-      pos: 19.5,-44.5
   - uid: 542
     components:
     - type: Transform
       parent: 2
       pos: 14.5,-41.5
-  - uid: 555
-    components:
-    - type: Transform
-      parent: 2
-      pos: 15.5,-41.5
-  - uid: 557
-    components:
-    - type: Transform
-      parent: 2
-      pos: 15.5,-40.5
   - uid: 560
     components:
     - type: Transform
@@ -84776,26 +84345,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 14.5,-43.5
-  - uid: 565
-    components:
-    - type: Transform
-      parent: 2
-      pos: 18.5,-40.5
   - uid: 566
     components:
     - type: Transform
       parent: 2
       pos: 17.5,-39.5
-  - uid: 568
+  - uid: 578
     components:
     - type: Transform
       parent: 2
-      pos: 17.5,-40.5
-  - uid: 581
-    components:
-    - type: Transform
-      parent: 2
-      pos: 16.5,-40.5
+      pos: -7.5,-28.5
   - uid: 600
     components:
     - type: Transform
@@ -85346,26 +84905,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 15.5,-45.5
-  - uid: 1559
-    components:
-    - type: Transform
-      parent: 2
-      pos: 19.5,-40.5
-  - uid: 1560
-    components:
-    - type: Transform
-      parent: 2
-      pos: 19.5,-41.5
   - uid: 1561
     components:
     - type: Transform
       parent: 2
       pos: 59.5,-35.5
-  - uid: 1564
-    components:
-    - type: Transform
-      parent: 2
-      pos: 3.5,-42.5
   - uid: 1592
     components:
     - type: Transform
@@ -85376,11 +84920,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -49.5,-31.5
-  - uid: 1596
-    components:
-    - type: Transform
-      parent: 2
-      pos: 15.5,-43.5
   - uid: 1597
     components:
     - type: Transform
@@ -85421,21 +84960,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -57.5,-27.5
-  - uid: 1642
-    components:
-    - type: Transform
-      parent: 2
-      pos: 17.5,-44.5
   - uid: 1644
     components:
     - type: Transform
       parent: 2
       pos: 18.5,-45.5
-  - uid: 1645
-    components:
-    - type: Transform
-      parent: 2
-      pos: 19.5,-42.5
   - uid: 1646
     components:
     - type: Transform
@@ -85481,21 +85010,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -30.5,-46.5
-  - uid: 1667
-    components:
-    - type: Transform
-      parent: 2
-      pos: 18.5,-44.5
-  - uid: 1668
-    components:
-    - type: Transform
-      parent: 2
-      pos: 16.5,-44.5
-  - uid: 1673
-    components:
-    - type: Transform
-      parent: 2
-      pos: -0.5,-42.5
   - uid: 1681
     components:
     - type: Transform
@@ -85516,11 +85030,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 26.5,-40.5
-  - uid: 1696
-    components:
-    - type: Transform
-      parent: 2
-      pos: 15.5,-44.5
   - uid: 1703
     components:
     - type: Transform
@@ -85541,11 +85050,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -40.5,-51.5
-  - uid: 1760
-    components:
-    - type: Transform
-      parent: 2
-      pos: -2.5,-24.5
   - uid: 1819
     components:
     - type: Transform
@@ -85706,16 +85210,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -49.5,-59.5
-  - uid: 2205
-    components:
-    - type: Transform
-      parent: 2
-      pos: 3.5,-43.5
-  - uid: 2208
-    components:
-    - type: Transform
-      parent: 2
-      pos: 3.5,-44.5
   - uid: 2214
     components:
     - type: Transform
@@ -85911,16 +85405,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 53.5,-58.5
-  - uid: 2536
-    components:
-    - type: Transform
-      parent: 2
-      pos: 43.5,-81.5
-  - uid: 2550
-    components:
-    - type: Transform
-      parent: 2
-      pos: 43.5,-82.5
   - uid: 2567
     components:
     - type: Transform
@@ -85971,11 +85455,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 13.5,-89.5
-  - uid: 2578
-    components:
-    - type: Transform
-      parent: 2
-      pos: 15.5,-91.5
   - uid: 2579
     components:
     - type: Transform
@@ -86091,11 +85570,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 45.5,-79.5
-  - uid: 2701
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-78.5
   - uid: 2713
     components:
     - type: Transform
@@ -86236,11 +85710,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 26.5,-80.5
-  - uid: 3004
-    components:
-    - type: Transform
-      parent: 2
-      pos: 49.5,-78.5
   - uid: 3005
     components:
     - type: Transform
@@ -86326,11 +85795,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 52.5,-66.5
-  - uid: 3421
-    components:
-    - type: Transform
-      parent: 2
-      pos: -2.5,-25.5
   - uid: 3483
     components:
     - type: Transform
@@ -86436,11 +85900,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 38.5,-9.5
-  - uid: 4224
-    components:
-    - type: Transform
-      parent: 2
-      pos: 2.5,-42.5
   - uid: 4233
     components:
     - type: Transform
@@ -86741,11 +86200,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -42.5,-51.5
-  - uid: 4722
-    components:
-    - type: Transform
-      parent: 2
-      pos: -2.5,-26.5
   - uid: 4739
     components:
     - type: Transform
@@ -86771,11 +86225,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 47.5,-79.5
-  - uid: 5069
-    components:
-    - type: Transform
-      parent: 2
-      pos: 47.5,-78.5
   - uid: 5079
     components:
     - type: Transform
@@ -86801,6 +86250,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 7.5,-13.5
+  - uid: 5273
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-40.5
   - uid: 5415
     components:
     - type: Transform
@@ -87226,36 +86680,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 55.5,-85.5
-  - uid: 6456
-    components:
-    - type: Transform
-      parent: 2
-      pos: 49.5,-85.5
-  - uid: 6457
-    components:
-    - type: Transform
-      parent: 2
-      pos: 50.5,-85.5
-  - uid: 6458
-    components:
-    - type: Transform
-      parent: 2
-      pos: 48.5,-84.5
-  - uid: 6459
-    components:
-    - type: Transform
-      parent: 2
-      pos: 44.5,-83.5
-  - uid: 6460
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-83.5
-  - uid: 6461
-    components:
-    - type: Transform
-      parent: 2
-      pos: 46.5,-84.5
   - uid: 6481
     components:
     - type: Transform
@@ -87606,6 +87030,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 10.5,-13.5
+  - uid: 6705
+    components:
+    - type: Transform
+      parent: 2
+      pos: -2.5,-23.5
   - uid: 6865
     components:
     - type: Transform
@@ -87616,11 +87045,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 52.5,-95.5
-  - uid: 6975
-    components:
-    - type: Transform
-      parent: 2
-      pos: -6.5,-23.5
   - uid: 7107
     components:
     - type: Transform
@@ -87641,6 +87065,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 51.5,-35.5
+  - uid: 7198
+    components:
+    - type: Transform
+      parent: 2
+      pos: -2.5,-22.5
   - uid: 7209
     components:
     - type: Transform
@@ -87776,6 +87205,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 20.5,-21.5
+  - uid: 7807
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-44.5
   - uid: 7971
     components:
     - type: Transform
@@ -88391,11 +87825,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -64.5,-48.5
-  - uid: 15878
-    components:
-    - type: Transform
-      parent: 2
-      pos: -5.5,-18.5
   - uid: 16183
     components:
     - type: Transform
@@ -88521,11 +87950,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 1.5,-75.5
-  - uid: 17081
-    components:
-    - type: Transform
-      parent: 2
-      pos: -4.5,-18.5
   - uid: 17119
     components:
     - type: Transform
@@ -88546,11 +87970,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 61.5,-28.5
-  - uid: 17342
-    components:
-    - type: Transform
-      parent: 2
-      pos: -3.5,-18.5
   - uid: 17511
     components:
     - type: Transform
@@ -88851,11 +88270,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -7.5,12.5
-  - uid: 19004
-    components:
-    - type: Transform
-      parent: 2
-      pos: 0.5,-43.5
   - uid: 19284
     components:
     - type: Transform
@@ -89559,11 +88973,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 56.5,-84.5
-  - uid: 15621
-    components:
-    - type: Transform
-      parent: 2
-      pos: 47.5,-84.5
   - uid: 15622
     components:
     - type: Transform
@@ -89943,13 +89352,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -61.358208,-63.517513
-- proto: HappyHonkCluwne
-  entities:
-  - uid: 7218
-    components:
-    - type: Transform
-      parent: 2
-      pos: 78.45767,-25.4561
 - proto: HappyHonkMime
   entities:
   - uid: 6003
@@ -90014,34 +89416,6 @@ entities:
       pos: 52.5,-61.5
     - type: AtmosPipeColor
       color: '#FFAD4FFF'
-  - uid: 10661
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 47.5,-81.5
-  - uid: 10668
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 49.5,-81.5
-  - uid: 18101
-    components:
-    - type: Transform
-      parent: 2
-      pos: 49.5,-80.5
-  - uid: 18102
-    components:
-    - type: Transform
-      parent: 2
-      pos: 47.5,-80.5
-  - uid: 19145
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 48.5,-82.5
 - proto: HeatExchangerBend
   entities:
   - uid: 4136
@@ -90059,18 +89433,6 @@ entities:
       pos: 47.5,-58.5
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 19147
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 47.5,-82.5
-  - uid: 19151
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 49.5,-82.5
 - proto: HighSecArmoryLocked
   entities:
   - uid: 3561
@@ -90307,11 +89669,11 @@ entities:
       pos: 16.5,-29.5
 - proto: HolopadMedicalMorgue
   entities:
-  - uid: 19167
+  - uid: 17113
     components:
     - type: Transform
       parent: 2
-      pos: 35.5,-27.5
+      pos: 32.5,-28.5
 - proto: HolopadMedicalParamed
   entities:
   - uid: 17508
@@ -90333,6 +89695,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 30.5,-18.5
+- proto: HolopadScienceAnomaly
+  entities:
+  - uid: 17320
+    components:
+    - type: Transform
+      parent: 2
+      pos: -12.5,-17.5
 - proto: HolopadScienceArtifact
   entities:
   - uid: 19144
@@ -90342,11 +89711,18 @@ entities:
       pos: -19.5,-24.5
 - proto: HolopadScienceRnd
   entities:
-  - uid: 19142
+  - uid: 17315
     components:
     - type: Transform
       parent: 2
-      pos: -7.5,-20.5
+      pos: -12.5,-26.5
+- proto: HolopadScienceRobotics
+  entities:
+  - uid: 17317
+    components:
+    - type: Transform
+      parent: 2
+      pos: -4.5,-19.5
 - proto: HolopadSecurityArmory
   entities:
   - uid: 18005
@@ -90797,11 +90173,11 @@ entities:
     - type: InsideEntityStorage
 - proto: IngotGold1
   entities:
-  - uid: 15879
+  - uid: 11363
     components:
     - type: Transform
       parent: 2
-      pos: -10.265891,-21.478815
+      pos: -11.7130575,-18.462027
 - proto: IngotSilver
   entities:
   - uid: 3829
@@ -90811,11 +90187,11 @@ entities:
       pos: 10.838615,-44.273556
 - proto: IngotSilver1
   entities:
-  - uid: 8019
+  - uid: 10560
     components:
     - type: Transform
       parent: 2
-      pos: -10.418669,-21.402374
+      pos: -11.587336,-18.541817
   - uid: 18777
     components:
     - type: Transform
@@ -90839,6 +90215,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 0.5,-61.5
+  - uid: 16924
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 92.5,-51.5
   - uid: 17760
     components:
     - type: Transform
@@ -90857,12 +90239,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -45.5,-43.5
-  - uid: 18010
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 85.5,-46.5
   - uid: 19580
     components:
     - type: Transform
@@ -90927,12 +90303,12 @@ entities:
       pos: -5.5,-52.5
 - proto: IntercomScience
   entities:
-  - uid: 11363
+  - uid: 17321
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
-      pos: -8.5,-17.5
+      pos: -11.5,-29.5
 - proto: IntercomSecurity
   entities:
   - uid: 6087
@@ -90946,12 +90322,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 69.5,-25.5
-  - uid: 19381
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 54.5,-26.5
 - proto: IntercomService
   entities:
   - uid: 17768
@@ -91206,11 +90576,6 @@ entities:
       parent: 14704
     - type: Physics
       canCollide: False
-  - uid: 18324
-    components:
-    - type: Transform
-      parent: 2
-      pos: -23.242622,-14.164716
 - proto: Lamp
   entities:
   - uid: 10252
@@ -91385,11 +90750,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 2.5591927,-78.68594
-  - uid: 19735
-    components:
-    - type: Transform
-      parent: 2
-      pos: 42.364388,-34.14802
   - uid: 19746
     components:
     - type: Transform
@@ -91455,6 +90815,19 @@ entities:
         3324:
         - - Pressed
           - Toggle
+- proto: LockableButtonAtmospherics
+  entities:
+  - uid: 7997
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-82.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        6243:
+        - - Pressed
+          - Toggle
 - proto: LockableButtonChiefEngineer
   entities:
   - uid: 6608
@@ -91519,20 +90892,17 @@ entities:
         546:
         - - Pressed
           - Toggle
-- proto: LockableButtonResearch
-  entities:
-  - uid: 2874
+  - uid: 17304
     components:
     - type: Transform
       parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-28.5
+      pos: 32.5,-13.5
     - type: DeviceLinkSource
       linkedPorts:
-        1077:
+        624:
         - - Pressed
           - Toggle
-        3189:
+        9352:
         - - Pressed
           - Toggle
 - proto: LockableButtonSecurity
@@ -91669,6 +91039,11 @@ entities:
       pos: 73.5,-49.5
 - proto: LockerElectricalSuppliesFilled
   entities:
+  - uid: 2208
+    components:
+    - type: Transform
+      parent: 2
+      pos: 82.5,-72.5
   - uid: 5832
     components:
     - type: Transform
@@ -91686,11 +91061,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 6.5,-63.5
-  - uid: 16045
-    components:
-    - type: Transform
-      parent: 2
-      pos: 82.5,-70.5
   - uid: 17796
     components:
     - type: Transform
@@ -92163,18 +91533,16 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 9.5,-75.5
-  - uid: 7100
+  - uid: 4694
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-18.5
-  - uid: 7221
+      pos: -9.5,-15.5
+  - uid: 5065
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-17.5
+      pos: -10.5,-15.5
 - proto: MachineArtifactAnalyzer
   entities:
   - uid: 5037
@@ -92213,11 +91581,6 @@ entities:
       pos: 66.5,-66.5
 - proto: MachineFrame
   entities:
-  - uid: 14973
-    components:
-    - type: Transform
-      parent: 2
-      pos: 43.5,-34.5
   - uid: 17019
     components:
     - type: Transform
@@ -92225,11 +91588,11 @@ entities:
       pos: 2.5,-76.5
 - proto: MachineMaterialSilo
   entities:
-  - uid: 17988
+  - uid: 5656
     components:
     - type: Transform
       parent: 2
-      pos: -8.5,-22.5
+      pos: -9.5,-23.5
 - proto: MagazinePistolEmpty
   entities:
   - uid: 16526
@@ -92284,6 +91647,17 @@ entities:
       pos: 17.5,-98.5
 - proto: MaintenanceFluffSpawner
   entities:
+  - uid: 3718
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 42.5,-33.5
+  - uid: 6812
+    components:
+    - type: Transform
+      parent: 2
+      pos: 79.5,-25.5
   - uid: 17360
     components:
     - type: Transform
@@ -92358,6 +91732,11 @@ entities:
       pos: 54.5,-77.5
 - proto: MaintenanceToolSpawner
   entities:
+  - uid: 1564
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-26.5
   - uid: 7684
     components:
     - type: Transform
@@ -92380,6 +91759,16 @@ entities:
       pos: -3.5,-77.5
 - proto: MaintenanceWeaponSpawner
   entities:
+  - uid: 966
+    components:
+    - type: Transform
+      parent: 2
+      pos: 45.5,-33.5
+  - uid: 2203
+    components:
+    - type: Transform
+      parent: 2
+      pos: 45.5,-26.5
   - uid: 7421
     components:
     - type: Transform
@@ -92406,56 +91795,31 @@ entities:
       pos: -9.56385,-38.433666
 - proto: MaterialBones1
   entities:
+  - uid: 528
+    components:
+    - type: Transform
+      parent: 2
+      pos: -22.497972,-29.53105
   - uid: 7918
     components:
     - type: Transform
       parent: 2
       pos: 72.446846,-56.49303
-  - uid: 10675
+  - uid: 14392
     components:
     - type: Transform
       parent: 2
-      pos: 79.30142,-25.841785
-  - uid: 10843
+      pos: 96.53243,-44.4865
+  - uid: 14684
     components:
     - type: Transform
       parent: 2
-      pos: 96.498116,-44.486084
-  - uid: 17247
-    components:
-    - type: Transform
-      parent: 2
-      pos: 79.27017,-26.060688
-  - uid: 17248
-    components:
-    - type: Transform
-      parent: 2
-      pos: 79.44725,-26.27959
-  - uid: 17249
-    components:
-    - type: Transform
-      parent: 2
-      pos: -64.26435,-27.585804
+      pos: 78.95953,-25.536255
   - uid: 17250
     components:
     - type: Transform
       parent: 2
       pos: 12.563929,-2.5076818
-  - uid: 17253
-    components:
-    - type: Transform
-      parent: 2
-      pos: -37.510273,-57.51299
-  - uid: 17254
-    components:
-    - type: Transform
-      parent: 2
-      pos: 33.540226,-88.563354
-  - uid: 17255
-    components:
-    - type: Transform
-      parent: 2
-      pos: -46.522686,-76.43295
   - uid: 17256
     components:
     - type: Transform
@@ -92466,6 +91830,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -2.4986753,-72.48942
+  - uid: 17310
+    components:
+    - type: Transform
+      parent: 2
+      pos: -64.03123,-28.227356
 - proto: MaterialCloth
   entities:
   - uid: 15918
@@ -92487,11 +91856,11 @@ entities:
       pos: -29.40506,-60.414524
 - proto: MaterialCloth10
   entities:
-  - uid: 6172
+  - uid: 10225
     components:
     - type: Transform
       parent: 2
-      pos: -3.5,-22.5
+      pos: -7.5141397,-25.500095
 - proto: MaterialDurathread
   entities:
   - uid: 16377
@@ -92545,11 +91914,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -5.5,-38.5
-  - uid: 7336
-    components:
-    - type: Transform
-      parent: 2
-      pos: 79.666,-26.185774
 - proto: MaterialWoodPlank10
   entities:
   - uid: 7008
@@ -92584,11 +91948,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -9.5,0.5
-  - uid: 6246
-    components:
-    - type: Transform
-      parent: 2
-      pos: -37.5,-16.5
   - uid: 7765
     components:
     - type: Transform
@@ -92599,11 +91958,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 50.5,-33.5
-  - uid: 8733
-    components:
-    - type: Transform
-      parent: 2
-      pos: -40.5,-14.5
   - uid: 9356
     components:
     - type: Transform
@@ -92737,11 +92091,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -33.9196,-29.568325
-  - uid: 19739
-    components:
-    - type: Transform
-      parent: 2
-      pos: 40.69203,-32.54189
 - proto: MicrophoneInstrument
   entities:
   - uid: 6064
@@ -92754,13 +92103,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 27.508257,-39.500587
-- proto: MicrowaveMachineCircuitboard
-  entities:
-  - uid: 19422
-    components:
-    - type: Transform
-      parent: 2
-      pos: 41.349373,-34.246284
 - proto: Mirror
   entities:
   - uid: 6157
@@ -92880,12 +92222,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 34.5,-30.5
-  - uid: 17637
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -3.5,-28.5
 - proto: MothroachCube
   entities:
   - uid: 17238
@@ -92921,11 +92257,11 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 54.52982,-39.13904
-  - uid: 10555
+  - uid: 12958
     components:
     - type: Transform
       parent: 2
-      pos: -11.327834,-21.173048
+      pos: -13.238625,-21.399727
   - uid: 15483
     components:
     - type: Transform
@@ -93013,11 +92349,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -45.5,-25.5
-  - uid: 8623
-    components:
-    - type: Transform
-      parent: 2
-      pos: 50.5,-77.5
   - uid: 10816
     components:
     - type: Transform
@@ -93028,6 +92359,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -43.5,-79.5
+  - uid: 16927
+    components:
+    - type: Transform
+      parent: 2
+      pos: 46.5,-78.5
   - uid: 19351
     components:
     - type: Transform
@@ -93045,11 +92381,6 @@ entities:
       pos: 40.5,-72.5
 - proto: NitrogenTankFilled
   entities:
-  - uid: 7697
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.59677,-75.42367
   - uid: 18198
     components:
     - type: Transform
@@ -93096,11 +92427,11 @@ entities:
       pos: 43.5,-73.5
 - proto: NitrousOxideTank
   entities:
-  - uid: 18511
+  - uid: 17249
     components:
     - type: Transform
       parent: 2
-      pos: 46.5314,-75.36489
+      pos: 45.410316,-75.42318
 - proto: NitrousOxideTankFilled
   entities:
   - uid: 6652
@@ -93125,11 +92456,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -16.524597,-27.14951
-  - uid: 19413
-    components:
-    - type: Transform
-      parent: 2
-      pos: -61.340405,-25.290606
 - proto: NoticeBoard
   entities:
   - uid: 7003
@@ -93167,16 +92493,21 @@ entities:
       pos: 60.5,-19.5
 - proto: OperatingTable
   entities:
-  - uid: 5072
+  - uid: 3701
     components:
     - type: Transform
       parent: 2
-      pos: -4.5,-25.5
+      pos: 35.5,-28.5
   - uid: 5115
     components:
     - type: Transform
       parent: 2
       pos: 11.5,-23.5
+  - uid: 6172
+    components:
+    - type: Transform
+      parent: 2
+      pos: -4.5,-24.5
 - proto: OreBox
   entities:
   - uid: 17559
@@ -93196,20 +92527,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 31.5,-96.5
-- proto: OrganHumanHeart
-  entities:
-  - uid: 17528
-    components:
-    - type: Transform
-      parent: 2
-      pos: 82.48561,-72.595604
-- proto: OrganSkeletonPersonTorso
-  entities:
-  - uid: 7331
-    components:
-    - type: Transform
-      parent: 2
-      pos: 78.98892,-25.47695
 - proto: OxygenCanister
   entities:
   - uid: 1114
@@ -93217,11 +92534,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -16.5,-47.5
-  - uid: 2306
-    components:
-    - type: Transform
-      parent: 2
-      pos: 15.5,-82.5
   - uid: 3482
     components:
     - type: Transform
@@ -93242,21 +92554,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 85.5,-70.5
-  - uid: 8624
-    components:
-    - type: Transform
-      parent: 2
-      pos: 51.5,-77.5
   - uid: 10814
     components:
     - type: Transform
       parent: 2
       pos: 60.5,-54.5
-  - uid: 15413
-    components:
-    - type: Transform
-      parent: 2
-      pos: 42.5,-29.5
   - uid: 15432
     components:
     - type: Transform
@@ -93272,6 +92574,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -7.5,-58.5
+  - uid: 16931
+    components:
+    - type: Transform
+      parent: 2
+      pos: 48.5,-78.5
   - uid: 18770
     components:
     - type: Transform
@@ -93297,13 +92604,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 39.5,-73.5
-- proto: OxygenTankFilled
-  entities:
-  - uid: 7691
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.417492,-75.34028
 - proto: PaintingCafeTerraceAtNight
   entities:
   - uid: 20140
@@ -93654,14 +92954,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 8.644315,-84.24774
-  - uid: 6289
-    components:
-    - type: Transform
-      parent: 6243
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-      storage: 6243
   - uid: 18766
     components:
     - type: Transform
@@ -93746,13 +93038,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -47.357563,-45.783386
-- proto: PersonalAI
-  entities:
-  - uid: 19300
-    components:
-    - type: Transform
-      parent: 2
-      pos: -9.678529,-26.311075
 - proto: PhoneInstrument
   entities:
   - uid: 14216
@@ -93792,11 +93077,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -52.315937,-52.474583
-  - uid: 19815
-    components:
-    - type: Transform
-      parent: 2
-      pos: -34.31944,-81.546196
 - proto: PillCanisterRandom
   entities:
   - uid: 20137
@@ -93821,6 +93101,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 6.340241,-25.15603
+- proto: PipeBombCable
+  entities:
+  - uid: 17313
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.7292037,-82.632835
 - proto: PlasmaCanister
   entities:
   - uid: 5052
@@ -93845,6 +93132,11 @@ entities:
       pos: 53.5,-72.5
 - proto: PlasmaReinforcedWindowDirectional
   entities:
+  - uid: 596
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-17.5
   - uid: 3731
     components:
     - type: Transform
@@ -93999,25 +93291,17 @@ entities:
       pos: -59.5,-61.5
 - proto: PlasmaTank
   entities:
-  - uid: 7689
+  - uid: 17253
     components:
     - type: Transform
       parent: 2
-      pos: 46.344013,-75.307045
-    - type: GasTank
-      toggleActionEntity: 3031
-    - type: ActionsContainer
-    - type: ContainerContainer
-      containers:
-        actions: !type:Container
-          ents:
-          - 3031
+      pos: 45.629066,-75.563896
   - uid: 18387
     components:
     - type: Transform
       parent: 2
       pos: -25.621885,-66.30062
-- proto: PlasmaWindoorSecureAtmosphericsLocked
+- proto: PlasmaWindoorAtmosphericsLocked
   entities:
   - uid: 10456
     components:
@@ -94049,7 +93333,7 @@ entities:
     - type: Transform
       parent: 2
       pos: 44.5,-61.5
-- proto: PlasmaWindoorSecureChemistryLocked
+- proto: PlasmaWindoorChemistryLocked
   entities:
   - uid: 6282
     components:
@@ -94069,7 +93353,7 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 20.5,-76.5
-- proto: PlasmaWindoorSecureCommandLocked
+- proto: PlasmaWindoorCommandLocked
   entities:
   - uid: 2896
     components:
@@ -94110,7 +93394,7 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 83.5,-45.5
-- proto: PlasmaWindoorSecureEngineeringLocked
+- proto: PlasmaWindoorEngineeringLocked
   entities:
   - uid: 356
     components:
@@ -94142,19 +93426,32 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -32.5,-74.5
-- proto: PlasmaWindoorSecureScienceLocked
+- proto: PlasmaWindoorScienceLocked
   entities:
-  - uid: 11364
+  - uid: 1074
     components:
     - type: Transform
       parent: 2
-      pos: -7.5,-18.5
-  - uid: 13975
+      rot: 3.141592653589793 rad
+      pos: -10.5,-28.5
+  - uid: 1875
     components:
     - type: Transform
       parent: 2
-      pos: -6.5,-18.5
-- proto: PlasmaWindoorSecureSecurityLocked
+      rot: 3.141592653589793 rad
+      pos: -9.5,-28.5
+  - uid: 2199
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -8.5,-28.5
+  - uid: 2874
+    components:
+    - type: Transform
+      parent: 2
+      pos: -10.5,-17.5
+- proto: PlasmaWindoorSecurityLocked
   entities:
   - uid: 2724
     components:
@@ -94188,11 +93485,6 @@ entities:
       pos: 62.5,-20.5
 - proto: PlasticFlapsAirtightClear
   entities:
-  - uid: 3692
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-31.5
   - uid: 6682
     components:
     - type: Transform
@@ -94213,11 +93505,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 72.5,-69.5
-  - uid: 12791
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-34.5
   - uid: 13545
     components:
     - type: Transform
@@ -94242,26 +93529,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 32.5,-85.5
-- proto: PlasticFlapsAirtightOpaque
-  entities:
-  - uid: 19283
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 44.5,-26.5
-  - uid: 19843
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 41.5,-27.5
-  - uid: 19844
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 36.5,-28.5
 - proto: PlayerStationAi
   entities:
   - uid: 10852
@@ -94269,13 +93536,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 91.5,-45.5
-- proto: PlushieArachind
-  entities:
-  - uid: 20121
-    components:
-    - type: Transform
-      parent: 2
-      pos: 5.417511,-69.24368
 - proto: PlushieAtmosian
   entities:
   - uid: 892
@@ -94283,36 +93543,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 52.515114,-62.52821
-- proto: PlushieBee
-  entities:
-  - uid: 17397
-    components:
-    - type: MetaData
-      name: good bee plushie
-      desc: Know who you can trust...
-    - type: Transform
-      parent: 2
-      pos: 83.24284,-18.388948
-  - uid: 17403
-    components:
-    - type: MetaData
-      name: evil bee plushie
-      desc: Or is it?...
-    - type: Transform
-      parent: 2
-      pos: 83.57618,-18.55573
-  - uid: 20120
-    components:
-    - type: Transform
-      parent: 2
-      pos: 5.2693624,-69.42899
-- proto: PlushieDiona
-  entities:
-  - uid: 20119
-    components:
-    - type: Transform
-      parent: 2
-      pos: 4.773992,-69.164925
 - proto: PlushieHampter
   entities:
   - uid: 16194
@@ -94327,32 +93557,8 @@ entities:
     - type: Transform
       parent: 2
       pos: 10.276115,-44.41428
-  - uid: 20122
-    components:
-    - type: Transform
-      parent: 2
-      pos: 5.625844,-69.164925
-- proto: PlushieLizard
-  entities:
-  - uid: 20111
-    components:
-    - type: Transform
-      parent: 2
-      pos: 5.523992,-69.58437
-- proto: PlushieLizardInversed
-  entities:
-  - uid: 6922
-    components:
-    - type: Transform
-      parent: 2
-      pos: 83.443275,-72.485634
 - proto: PlushieLizardMirrored
   entities:
-  - uid: 2944
-    components:
-    - type: Transform
-      parent: 2
-      pos: -40.104343,-58.180084
   - uid: 11678
     components:
     - type: Transform
@@ -94370,11 +93576,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -31.508543,-62.98768
-  - uid: 20123
-    components:
-    - type: Transform
-      parent: 2
-      pos: 5.6860294,-69.66991
 - proto: PlushiePenguin
   entities:
   - uid: 15800
@@ -94382,13 +93583,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 36.477215,-72.420235
-- proto: PlushieRatvar
-  entities:
-  - uid: 20112
-    components:
-    - type: Transform
-      parent: 2
-      pos: 5.1952887,-69.130585
 - proto: PlushieRGBee
   entities:
   - uid: 15420
@@ -94432,11 +93626,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -51.020004,-60.457893
-  - uid: 20117
-    components:
-    - type: Transform
-      parent: 2
-      pos: 4.602696,-69.46879
 - proto: PlushieSlime
   entities:
   - uid: 5788
@@ -94446,28 +93635,13 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 15790
-    components:
-    - type: Transform
-      parent: 2
-      pos: -39.603485,-58.0853
-  - uid: 20113
-    components:
-    - type: Transform
-      parent: 2
-      pos: 5.1814,-69.66991
 - proto: PlushieVox
   entities:
-  - uid: 19377
+  - uid: 17254
     components:
     - type: Transform
       parent: 2
-      pos: 9.483602,-47.419678
-  - uid: 20115
-    components:
-    - type: Transform
-      parent: 2
-      pos: 5.463807,-69.237144
+      pos: 9.445781,-47.39685
 - proto: PlushieVulp
   entities:
   - uid: 13963
@@ -94475,11 +93649,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 21.464287,-73.453964
-  - uid: 20114
-    components:
-    - type: Transform
-      parent: 2
-      pos: 4.352696,-69.23905
 - proto: PlushieXeno
   entities:
   - uid: 11682
@@ -94492,11 +93661,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -22.499308,-16.520548
-  - uid: 20116
-    components:
-    - type: Transform
-      parent: 2
-      pos: 5.536271,-69.37542
 - proto: PortableFlasher
   entities:
   - uid: 2164
@@ -94759,7 +93923,7 @@ entities:
       pos: 16.5,-85.5
 - proto: PosterContrabandDonutCorp
   entities:
-  - uid: 17316
+  - uid: 17314
     components:
     - type: Transform
       parent: 2
@@ -94827,6 +93991,11 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 74.5,-41.5
+  - uid: 17382
+    components:
+    - type: Transform
+      parent: 2
+      pos: 36.5,-29.5
   - uid: 18764
     components:
     - type: Transform
@@ -94857,6 +94026,11 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -18.5,-60.5
+  - uid: 17381
+    components:
+    - type: Transform
+      parent: 2
+      pos: 32.5,-25.5
   - uid: 19154
     components:
     - type: Transform
@@ -94869,13 +94043,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 16.5,-21.5
-- proto: PosterContrabandHackingGuide
-  entities:
-  - uid: 19421
-    components:
-    - type: Transform
-      parent: 2
-      pos: 39.5,-32.5
 - proto: PosterContrabandLamarr
   entities:
   - uid: 17407
@@ -94900,8 +94067,18 @@ entities:
     - type: Transform
       parent: 2
       pos: -21.5,-17.5
+  - uid: 12635
+    components:
+    - type: Transform
+      parent: 2
+      pos: 38.5,-30.5
 - proto: PosterContrabandRouny
   entities:
+  - uid: 2550
+    components:
+    - type: Transform
+      parent: 2
+      pos: 46.5,-28.5
   - uid: 7949
     components:
     - type: Transform
@@ -94939,6 +94116,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 12.5,-14.5
+  - uid: 5096
+    components:
+    - type: Transform
+      parent: 2
+      pos: 21.5,-27.5
 - proto: PosterLegitBotanyFear
   entities:
   - uid: 12496
@@ -95265,6 +94447,11 @@ entities:
       pos: 26.5,-38.5
 - proto: PosterLegitTyrone
   entities:
+  - uid: 12960
+    components:
+    - type: Transform
+      parent: 2
+      pos: 42.5,-26.5
   - uid: 18011
     components:
     - type: Transform
@@ -95355,11 +94542,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 68.5,-46.5
-  - uid: 17301
-    components:
-    - type: Transform
-      parent: 2
-      pos: -61.24472,-24.790556
 - proto: PottedPlant7
   entities:
   - uid: 10797
@@ -95394,20 +94576,18 @@ entities:
     - type: Transform
       parent: 2
       pos: 22.5,-76.5
-- proto: PottedPlantRandomPlastic
-  entities:
-  - uid: 18249
-    components:
-    - type: Transform
-      parent: 2
-      pos: 15.5,-89.5
 - proto: PowerCellMedium
   entities:
-  - uid: 1670
+  - uid: 10026
     components:
     - type: Transform
       parent: 2
-      pos: -12.257856,-28.32542
+      pos: -11.2536545,-18.332308
+  - uid: 10200
+    components:
+    - type: Transform
+      parent: 2
+      pos: -11.4068365,-18.2073
   - uid: 19374
     components:
     - type: Transform
@@ -95463,12 +94643,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 77.5,-21.5
-  - uid: 14432
+  - uid: 10675
     components:
     - type: Transform
       parent: 2
-      rot: 3.141592653589793 rad
-      pos: -11.5,-18.5
+      pos: -9.5,-18.5
+  - uid: 11468
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-17.5
   - uid: 18330
     components:
     - type: Transform
@@ -95511,6 +94695,12 @@ entities:
       pos: 27.420353,-62.29585
 - proto: Poweredlight
   entities:
+  - uid: 611
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -25.5,-24.5
   - uid: 806
     components:
     - type: Transform
@@ -95625,12 +94815,30 @@ entities:
     - type: Transform
       parent: 2
       pos: 64.5,-23.5
+  - uid: 3186
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -10.5,-21.5
+  - uid: 3189
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -13.5,-21.5
   - uid: 3348
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 33.5,-71.5
+  - uid: 3421
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-20.5
   - uid: 3810
     components:
     - type: Transform
@@ -95648,6 +94856,12 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 6.5,-0.5
+  - uid: 4397
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-27.5
   - uid: 4700
     components:
     - type: Transform
@@ -95660,6 +94874,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -27.5,-28.5
+  - uid: 5007
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -20.5,-15.5
   - uid: 5177
     components:
     - type: Transform
@@ -95829,12 +95049,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 21.5,-70.5
-  - uid: 10225
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-15.5
   - uid: 10283
     components:
     - type: Transform
@@ -95863,11 +95077,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 94.5,-44.5
-  - uid: 11470
-    components:
-    - type: Transform
-      parent: 2
-      pos: -11.5,-18.5
   - uid: 11707
     components:
     - type: Transform
@@ -95878,8 +95087,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-27.5
+      pos: -8.5,-25.5
   - uid: 13446
     components:
     - type: Transform
@@ -96050,18 +95258,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 22.5,-76.5
-  - uid: 14116
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-21.5
-  - uid: 14130
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -16.5,-26.5
   - uid: 14150
     components:
     - type: Transform
@@ -96218,17 +95414,17 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 19.5,-55.5
-  - uid: 14370
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -11.5,-21.5
   - uid: 14390
     components:
     - type: Transform
       parent: 2
       pos: -18.5,-19.5
+  - uid: 14407
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-28.5
   - uid: 14412
     components:
     - type: Transform
@@ -96265,6 +95461,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -17.5,-68.5
+  - uid: 14432
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 8.5,-37.5
   - uid: 14721
     components:
     - type: Transform
@@ -96363,12 +95565,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 64.5,-47.5
-  - uid: 15213
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-21.5
   - uid: 15227
     components:
     - type: Transform
@@ -96401,23 +95597,69 @@ entities:
     - type: Transform
       parent: 2
       pos: 53.5,-18.5
+  - uid: 15596
+    components:
+    - type: Transform
+      parent: 2
+      pos: -14.5,-24.5
   - uid: 15640
     components:
     - type: Transform
       parent: 2
       pos: 80.5,-43.5
+  - uid: 15696
+    components:
+    - type: Transform
+      parent: 2
+      pos: -4.5,-26.5
+  - uid: 15697
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-23.5
+  - uid: 15698
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-20.5
+  - uid: 15699
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-15.5
+  - uid: 15700
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-22.5
   - uid: 15787
     components:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
       pos: 80.5,-47.5
-  - uid: 16117
+  - uid: 15790
     components:
     - type: Transform
       parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-25.5
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-17.5
+  - uid: 15846
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -3.5,-17.5
+  - uid: 15849
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-16.5
   - uid: 16147
     components:
     - type: Transform
@@ -96555,18 +95797,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -8.5,-47.5
-  - uid: 18149
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-27.5
-  - uid: 18150
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -25.5,-25.5
   - uid: 18152
     components:
     - type: Transform
@@ -96808,11 +96038,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -66.5,-25.5
-  - uid: 14407
-    components:
-    - type: Transform
-      parent: 2
-      pos: 50.5,-80.5
   - uid: 14420
     components:
     - type: Transform
@@ -96943,12 +96168,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -39.5,-64.5
-  - uid: 5201
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 18.5,-42.5
   - uid: 5302
     components:
     - type: Transform
@@ -96960,13 +96179,16 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -36.5,-50.5
-- proto: PoweredlightPink
+- proto: PoweredlightOrange
   entities:
-  - uid: 2342
+  - uid: 2205
     components:
     - type: Transform
       parent: 2
-      pos: -5.5,-30.5
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-42.5
+- proto: PoweredlightPink
+  entities:
   - uid: 3495
     components:
     - type: Transform
@@ -96999,6 +96221,11 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -31.5,-35.5
+  - uid: 10843
+    components:
+    - type: Transform
+      parent: 2
+      pos: -5.5,-30.5
   - uid: 14224
     components:
     - type: Transform
@@ -97015,6 +96242,11 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 7.5,-43.5
+  - uid: 15852
+    components:
+    - type: Transform
+      parent: 2
+      pos: -11.5,-30.5
   - uid: 17594
     components:
     - type: Transform
@@ -97060,12 +96292,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -20.5,-43.5
-  - uid: 1209
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -59.5,-25.5
   - uid: 1702
     components:
     - type: Transform
@@ -97166,6 +96392,17 @@ entities:
     - type: Transform
       parent: 2
       pos: 48.5,-74.5
+  - uid: 6371
+    components:
+    - type: Transform
+      parent: 2
+      pos: 48.5,-80.5
+  - uid: 6392
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 46.5,-84.5
   - uid: 6603
     components:
     - type: Transform
@@ -97188,17 +96425,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -28.5,-59.5
-  - uid: 7529
-    components:
-    - type: Transform
-      parent: 2
-      pos: -9.5,-24.5
-  - uid: 7997
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 42.5,-26.5
   - uid: 10743
     components:
     - type: Transform
@@ -97384,12 +96610,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 3.5,-54.5
-  - uid: 14285
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -32.5,-25.5
   - uid: 14286
     components:
     - type: Transform
@@ -97407,11 +96627,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 80.5,-23.5
-  - uid: 14349
-    components:
-    - type: Transform
-      parent: 2
-      pos: 82.5,-20.5
   - uid: 14369
     components:
     - type: Transform
@@ -97521,11 +96736,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 57.5,-59.5
-  - uid: 16021
-    components:
-    - type: Transform
-      parent: 2
-      pos: 41.5,-32.5
   - uid: 16041
     components:
     - type: Transform
@@ -97566,11 +96776,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -51.5,-23.5
-  - uid: 16535
-    components:
-    - type: Transform
-      parent: 2
-      pos: -33.5,-27.5
   - uid: 16545
     components:
     - type: Transform
@@ -97703,6 +96908,12 @@ entities:
       pos: 31.5,-48.5
 - proto: PoweredWarmSmallLight
   entities:
+  - uid: 529
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 43.5,-30.5
   - uid: 1187
     components:
     - type: Transform
@@ -97727,18 +96938,24 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -17.5,-41.5
+  - uid: 3687
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 42.5,-30.5
+  - uid: 3699
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 41.5,-30.5
   - uid: 4183
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -16.5,-43.5
-  - uid: 5656
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -7.5,-28.5
   - uid: 7719
     components:
     - type: Transform
@@ -97765,11 +96982,11 @@ entities:
       pos: 68.5,-48.5
 - proto: Protolathe
   entities:
-  - uid: 19088
+  - uid: 7432
     components:
     - type: Transform
       parent: 2
-      pos: -4.5,-19.5
+      pos: -12.5,-28.5
     - type: TechnologyDatabase
       supportedDisciplines:
       - Industrial
@@ -97942,11 +97159,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -26.5,-43.5
-  - uid: 17529
-    components:
-    - type: Transform
-      parent: 2
-      pos: 82.5,-72.5
   - uid: 18332
     components:
     - type: Transform
@@ -98291,11 +97503,6 @@ entities:
       pos: 56.5,-41.5
 - proto: PuddleFluorosulfuricAcid
   entities:
-  - uid: 3169
-    components:
-    - type: Transform
-      parent: 2
-      pos: 42.5,-26.5
   - uid: 7934
     components:
     - type: Transform
@@ -98455,11 +97662,6 @@ entities:
       pos: 57.5,-42.5
 - proto: Rack
   entities:
-  - uid: 1160
-    components:
-    - type: Transform
-      parent: 2
-      pos: -12.5,-23.5
   - uid: 2503
     components:
     - type: Transform
@@ -98558,6 +97760,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 69.5,-32.5
+  - uid: 7297
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 42.5,-33.5
   - uid: 7675
     components:
     - type: Transform
@@ -98680,6 +97888,21 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 29.5,-61.5
+  - uid: 12634
+    components:
+    - type: Transform
+      parent: 2
+      pos: 45.5,-33.5
+  - uid: 12925
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-26.5
+  - uid: 12959
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-27.5
   - uid: 13906
     components:
     - type: Transform
@@ -98696,6 +97919,11 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 27.5,-63.5
+  - uid: 14973
+    components:
+    - type: Transform
+      parent: 2
+      pos: 45.5,-75.5
   - uid: 15024
     components:
     - type: Transform
@@ -98719,6 +97947,11 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 46.5,-73.5
+  - uid: 15891
+    components:
+    - type: Transform
+      parent: 2
+      pos: -5.5,-23.5
   - uid: 16033
     components:
     - type: Transform
@@ -98800,11 +98033,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 32.5,-61.5
-  - uid: 19297
-    components:
-    - type: Transform
-      parent: 2
-      pos: -5.5,-27.5
   - uid: 19357
     components:
     - type: Transform
@@ -98816,11 +98044,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 50.5,-94.5
-  - uid: 19737
-    components:
-    - type: Transform
-      parent: 2
-      pos: 40.5,-32.5
   - uid: 19965
     components:
     - type: Transform
@@ -98980,6 +98203,12 @@ entities:
     - type: Transform
       parent: 2
       pos: 56.5,-14.5
+  - uid: 7501
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 0.5,2.5
   - uid: 8111
     components:
     - type: Transform
@@ -99091,6 +98320,24 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -8.5,-79.5
+  - uid: 17400
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -1.5,2.5
+  - uid: 17405
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 5.5,2.5
+  - uid: 17424
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,2.5
   - uid: 17668
     components:
     - type: Transform
@@ -99171,11 +98418,6 @@ entities:
       pos: -12.5,-17.5
 - proto: RandomArtifactSpawner
   entities:
-  - uid: 1135
-    components:
-    - type: Transform
-      parent: 2
-      pos: -39.5,-75.5
   - uid: 5150
     components:
     - type: Transform
@@ -99186,6 +98428,13 @@ entities:
     - type: Transform
       parent: 2
       pos: -19.5,-32.5
+- proto: RandomArtifactSpawner20
+  entities:
+  - uid: 7698
+    components:
+    - type: Transform
+      parent: 2
+      pos: -39.5,-76.5
 - proto: RandomDrinkBottle
   entities:
   - uid: 15435
@@ -99234,83 +98483,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 21.5,-20.5
-- proto: RandomGreyStalagmite
-  entities:
-  - uid: 3766
-    components:
-    - type: Transform
-      parent: 2
-      pos: -9.5,-75.5
-  - uid: 8836
-    components:
-    - type: Transform
-      parent: 2
-      pos: -43.5,-78.5
-  - uid: 10818
-    components:
-    - type: Transform
-      parent: 2
-      pos: 71.5,-70.5
-  - uid: 14262
-    components:
-    - type: Transform
-      parent: 2
-      pos: 76.5,-58.5
-  - uid: 15269
-    components:
-    - type: Transform
-      parent: 2
-      pos: -43.5,-77.5
-  - uid: 15404
-    components:
-    - type: Transform
-      parent: 2
-      pos: 75.5,-57.5
-  - uid: 15471
-    components:
-    - type: Transform
-      parent: 2
-      pos: 64.5,-58.5
-  - uid: 15478
-    components:
-    - type: Transform
-      parent: 2
-      pos: 66.5,-60.5
-  - uid: 16606
-    components:
-    - type: Transform
-      parent: 2
-      pos: 76.5,-57.5
-  - uid: 17730
-    components:
-    - type: Transform
-      parent: 2
-      pos: -8.5,-75.5
-  - uid: 17732
-    components:
-    - type: Transform
-      parent: 2
-      pos: 72.5,-59.5
-  - uid: 17784
-    components:
-    - type: Transform
-      parent: 2
-      pos: -36.5,-73.5
-  - uid: 18512
-    components:
-    - type: Transform
-      parent: 2
-      pos: 35.5,-32.5
-  - uid: 19588
-    components:
-    - type: Transform
-      parent: 2
-      pos: 4.5,-78.5
-  - uid: 19589
-    components:
-    - type: Transform
-      parent: 2
-      pos: -0.5,-75.5
 - proto: RandomInstruments
   entities:
   - uid: 6007
@@ -99342,11 +98514,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 72.5,-66.5
-  - uid: 19217
-    components:
-    - type: Transform
-      parent: 2
-      pos: 38.5,-33.5
 - proto: RandomPosterContraband
   entities:
   - uid: 6911
@@ -99354,11 +98521,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 56.5,-97.5
-  - uid: 12952
-    components:
-    - type: Transform
-      parent: 2
-      pos: 47.5,-28.5
   - uid: 15134
     components:
     - type: Transform
@@ -99448,21 +98610,16 @@ entities:
       pos: 10.5,-46.5
 - proto: RandomProduce
   entities:
-  - uid: 19740
+  - uid: 919
     components:
     - type: Transform
       parent: 2
-      pos: 39.5,-33.5
-  - uid: 19741
+      pos: 44.5,-30.5
+  - uid: 1568
     components:
     - type: Transform
       parent: 2
-      pos: 41.5,-34.5
-  - uid: 19743
-    components:
-    - type: Transform
-      parent: 2
-      pos: 43.5,-33.5
+      pos: 36.5,-34.5
   - uid: 20049
     components:
     - type: Transform
@@ -99504,26 +98661,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 2.5,-66.5
-  - uid: 17163
-    components:
-    - type: Transform
-      parent: 2
-      pos: -10.5,-19.5
   - uid: 17171
     components:
     - type: Transform
       parent: 2
       pos: 23.5,-65.5
-  - uid: 17320
-    components:
-    - type: Transform
-      parent: 2
-      pos: 50.5,-82.5
-  - uid: 17321
-    components:
-    - type: Transform
-      parent: 2
-      pos: 48.5,-80.5
   - uid: 17359
     components:
     - type: Transform
@@ -99580,11 +98722,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -34.5,-52.5
-  - uid: 9913
-    components:
-    - type: Transform
-      parent: 2
-      pos: -42.5,-67.5
   - uid: 10767
     components:
     - type: Transform
@@ -99602,11 +98739,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -35.5,-38.5
-  - uid: 5273
-    components:
-    - type: Transform
-      parent: 2
-      pos: 10.5,-19.5
   - uid: 8663
     components:
     - type: Transform
@@ -99653,11 +98785,6 @@ entities:
       pos: -52.72353,-51.759876
 - proto: ReagentContainerFlour
   entities:
-  - uid: 7031
-    components:
-    - type: Transform
-      parent: 2
-      pos: 40.70177,-32.37174
   - uid: 15274
     components:
     - type: Transform
@@ -99672,6 +98799,13 @@ entities:
       parent: 14704
     - type: Physics
       canCollide: False
+- proto: ReagentContainerSugarSmall
+  entities:
+  - uid: 17255
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.738771,-47.697575
 - proto: ReagentGrinderMachineCircuitboard
   entities:
   - uid: 7696
@@ -99736,6 +98870,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -22.5,-34.5
+  - uid: 564
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-44.5
   - uid: 808
     components:
     - type: Transform
@@ -99821,6 +98960,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -17.5,-30.5
+  - uid: 5077
+    components:
+    - type: Transform
+      parent: 2
+      pos: 14.5,-40.5
   - uid: 6248
     components:
     - type: Transform
@@ -99972,6 +99116,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 51.5,-64.5
+  - uid: 13909
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.5,-77.5
   - uid: 13942
     components:
     - type: Transform
@@ -99982,6 +99131,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 20.5,-41.5
+  - uid: 14069
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.5,-76.5
   - uid: 14151
     components:
     - type: Transform
@@ -100278,81 +99432,72 @@ entities:
       pos: 14.5,-39.5
 - proto: ReinforcedUraniumWindow
   entities:
-  - uid: 7264
+  - uid: 270
     components:
     - type: Transform
       parent: 2
-      pos: 19.5,-41.5
-  - uid: 8016
+      rot: -1.5707963267948966 rad
+      pos: 49.5,-85.5
+  - uid: 4001
     components:
     - type: Transform
       parent: 2
-      pos: 16.5,-40.5
-  - uid: 10446
+      rot: -1.5707963267948966 rad
+      pos: 45.5,-83.5
+  - uid: 4005
     components:
     - type: Transform
       parent: 2
-      pos: 19.5,-40.5
-  - uid: 10447
+      rot: -1.5707963267948966 rad
+      pos: 45.5,-84.5
+  - uid: 4268
     components:
     - type: Transform
       parent: 2
-      pos: 19.5,-43.5
-  - uid: 10774
+      rot: -1.5707963267948966 rad
+      pos: 45.5,-85.5
+  - uid: 4368
     components:
     - type: Transform
       parent: 2
-      pos: 19.5,-42.5
-  - uid: 11402
+      rot: -1.5707963267948966 rad
+      pos: 49.5,-83.5
+  - uid: 4418
     components:
     - type: Transform
       parent: 2
-      pos: 15.5,-40.5
-  - uid: 13274
+      rot: -1.5707963267948966 rad
+      pos: 47.5,-86.5
+  - uid: 4442
     components:
     - type: Transform
       parent: 2
-      pos: 17.5,-44.5
-  - uid: 13452
+      rot: -1.5707963267948966 rad
+      pos: 48.5,-82.5
+  - uid: 4492
     components:
     - type: Transform
       parent: 2
-      pos: 16.5,-44.5
-  - uid: 13978
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-86.5
+  - uid: 4741
     components:
     - type: Transform
       parent: 2
-      pos: 18.5,-40.5
-  - uid: 14005
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-82.5
+  - uid: 4803
     components:
     - type: Transform
       parent: 2
-      pos: 18.5,-44.5
-  - uid: 14025
+      rot: -1.5707963267948966 rad
+      pos: 47.5,-82.5
+  - uid: 5004
     components:
     - type: Transform
       parent: 2
-      pos: 17.5,-40.5
-  - uid: 14029
-    components:
-    - type: Transform
-      parent: 2
-      pos: 19.5,-44.5
-  - uid: 14047
-    components:
-    - type: Transform
-      parent: 2
-      pos: 15.5,-41.5
-  - uid: 15698
-    components:
-    - type: Transform
-      parent: 2
-      pos: 15.5,-44.5
-  - uid: 17173
-    components:
-    - type: Transform
-      parent: 2
-      pos: 15.5,-43.5
+      rot: -1.5707963267948966 rad
+      pos: 48.5,-86.5
 - proto: ReinforcedWindow
   entities:
   - uid: 79
@@ -100845,11 +99990,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 26.5,-87.5
-  - uid: 4741
-    components:
-    - type: Transform
-      parent: 2
-      pos: 15.5,-91.5
   - uid: 4745
     components:
     - type: Transform
@@ -101502,6 +100642,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 80.5,-29.5
+- proto: SawElectric
+  entities:
+  - uid: 5496
+    components:
+    - type: Transform
+      parent: 2
+      pos: 35.53492,-27.479969
 - proto: Scalpel
   entities:
   - uid: 6654
@@ -101514,12 +100661,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 66.53385,-63.488316
-  - uid: 19301
+  - uid: 14370
     components:
     - type: Transform
       parent: 2
-      rot: -0.6108652381980153 rad
-      pos: -3.5512772,-24.750254
+      pos: 35.40992,-27.21416
 - proto: Screen
   entities:
   - uid: 15174
@@ -101749,18 +100895,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -14.446809,-60.429398
-  - uid: 16647
+  - uid: 15888
     components:
     - type: Transform
       parent: 2
-      pos: -12.36079,-23.400194
-- proto: SheetGlass10
-  entities:
-  - uid: 19738
-    components:
-    - type: Transform
-      parent: 2
-      pos: 42.067513,-34.49177
+      pos: -3.413918,-22.43804
 - proto: SheetPlasma
   entities:
   - uid: 3506
@@ -101831,16 +100970,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 32.50578,-91.90742
-  - uid: 17916
+  - uid: 10527
     components:
     - type: Transform
       parent: 2
-      pos: -3.6233544,-22.398033
-  - uid: 17918
+      pos: -7.6287227,-25.375008
+  - uid: 13134
     components:
     - type: Transform
       parent: 2
-      pos: -3.3852344,-22.270124
+      pos: -7.3370557,-25.395857
 - proto: SheetRGlass
   entities:
   - uid: 17971
@@ -101869,16 +101008,16 @@ entities:
       count: 4
 - proto: SheetSteel
   entities:
-  - uid: 1074
-    components:
-    - type: Transform
-      parent: 2
-      pos: -12.694123,-23.379345
   - uid: 1882
     components:
     - type: Transform
       parent: 2
       pos: 46.415913,-73.32666
+  - uid: 3010
+    components:
+    - type: Transform
+      parent: 2
+      pos: -14.564964,-28.459366
   - uid: 3341
     components:
     - type: Transform
@@ -101904,16 +101043,16 @@ entities:
     - type: Transform
       parent: 2
       pos: -13.478059,-60.538773
-  - uid: 13337
-    components:
-    - type: Transform
-      parent: 2
-      pos: -3.438326,-19.436022
   - uid: 13646
     components:
     - type: Transform
       parent: 2
       pos: 45.696777,-73.20621
+  - uid: 15879
+    components:
+    - type: Transform
+      parent: 2
+      pos: -3.648293,-22.344223
   - uid: 17134
     components:
     - type: Transform
@@ -102067,27 +101206,27 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -11.5,-53.5
-  - uid: 1077
-    components:
-    - type: Transform
-      parent: 2
-      pos: -10.5,-29.5
   - uid: 1216
     components:
     - type: Transform
       parent: 2
       pos: 9.5,-74.5
-  - uid: 3189
+  - uid: 1963
     components:
     - type: Transform
       parent: 2
-      pos: -11.5,-29.5
+      pos: -6.5,-18.5
   - uid: 6040
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -30.5,-23.5
+  - uid: 9874
+    components:
+    - type: Transform
+      parent: 2
+      pos: -5.5,-18.5
   - uid: 15886
     components:
     - type: Transform
@@ -102937,47 +102076,21 @@ entities:
         12744:
         - - Pressed
           - Toggle
-  - uid: 17875
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 38.5,-87.5
-    - type: DeviceLinkSource
-      linkedPorts:
-        4943:
-        - - Pressed
-          - Toggle
-        4942:
-        - - Pressed
-          - Toggle
-        4944:
-        - - Pressed
-          - Toggle
-        4945:
-        - - Pressed
-          - Toggle
-  - uid: 17876
-    components:
-    - type: Transform
-      parent: 2
-      pos: 36.5,-82.5
-    - type: DeviceLinkSource
-      linkedPorts:
-        4941:
-        - - Pressed
-          - Toggle
-        4940:
-        - - Pressed
-          - Toggle
-        4939:
-        - - Pressed
-          - Toggle
-        4938:
-        - - Pressed
-          - Toggle
 - proto: SignalButtonDirectional
   entities:
+  - uid: 533
+    components:
+    - type: Transform
+      parent: 2
+      pos: -4.5,-18.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        1963:
+        - - Pressed
+          - Toggle
+        9874:
+        - - Pressed
+          - Toggle
   - uid: 5437
     components:
     - type: Transform
@@ -103012,6 +102125,26 @@ entities:
         6210:
         - - Pressed
           - Toggle
+  - uid: 10756
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 38.5,-87.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        4943:
+        - - Pressed
+          - Toggle
+        4942:
+        - - Pressed
+          - Toggle
+        4944:
+        - - Pressed
+          - Toggle
+        4945:
+        - - Pressed
+          - Toggle
   - uid: 12415
     components:
     - type: Transform
@@ -103088,178 +102221,6 @@ entities:
         2528:
         - - Pressed
           - Toggle
-  - uid: 15700
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 36.5,-27.5
-    - type: DeviceLinkSource
-      linkedPorts:
-        3725:
-        - - Pressed
-          - Forward
-        6388:
-        - - Pressed
-          - Forward
-        7891:
-        - - Pressed
-          - Forward
-        6396:
-        - - Pressed
-          - Forward
-        3720:
-        - - Pressed
-          - Forward
-        3719:
-        - - Pressed
-          - Forward
-        3721:
-        - - Pressed
-          - Forward
-        6400:
-        - - Pressed
-          - Forward
-        1073:
-        - - Pressed
-          - Forward
-        1140:
-        - - Pressed
-          - Forward
-        12962:
-        - - Pressed
-          - Forward
-        6397:
-        - - Pressed
-          - Forward
-        6401:
-        - - Pressed
-          - Forward
-        3530:
-        - - Pressed
-          - Forward
-        3531:
-        - - Pressed
-          - Forward
-        3729:
-        - - Pressed
-          - Forward
-        6139:
-        - - Pressed
-          - Forward
-        3168:
-        - - Pressed
-          - Forward
-        3718:
-        - - Pressed
-          - Forward
-        3717:
-        - - Pressed
-          - Forward
-        8148:
-        - - Pressed
-          - Forward
-        12955:
-        - - Pressed
-          - Forward
-        11980:
-        - - Pressed
-          - Forward
-        8089:
-        - - Pressed
-          - Forward
-        11979:
-        - - Pressed
-          - Forward
-        11978:
-        - - Pressed
-          - Forward
-  - uid: 15849
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 36.5,-29.5
-    - type: DeviceLinkSource
-      linkedPorts:
-        3725:
-        - - Pressed
-          - Off
-        6388:
-        - - Pressed
-          - Off
-        7891:
-        - - Pressed
-          - Off
-        6396:
-        - - Pressed
-          - Off
-        3720:
-        - - Pressed
-          - Off
-        3719:
-        - - Pressed
-          - Off
-        3721:
-        - - Pressed
-          - Off
-        6400:
-        - - Pressed
-          - Off
-        1073:
-        - - Pressed
-          - Off
-        1140:
-        - - Pressed
-          - Off
-        12962:
-        - - Pressed
-          - Off
-        6397:
-        - - Pressed
-          - Off
-        6401:
-        - - Pressed
-          - Off
-        3530:
-        - - Pressed
-          - Off
-        3531:
-        - - Pressed
-          - Off
-        3729:
-        - - Pressed
-          - Off
-        6139:
-        - - Pressed
-          - Off
-        3168:
-        - - Pressed
-          - Off
-        3718:
-        - - Pressed
-          - Off
-        3717:
-        - - Pressed
-          - Off
-        8148:
-        - - Pressed
-          - Off
-        12955:
-        - - Pressed
-          - Off
-        11980:
-        - - Pressed
-          - Off
-        8089:
-        - - Pressed
-          - Off
-        11979:
-        - - Pressed
-          - Off
-        11978:
-        - - Pressed
-          - Off
   - uid: 16040
     components:
     - type: Transform
@@ -103288,6 +102249,66 @@ entities:
         10890:
         - - Pressed
           - Toggle
+  - uid: 17396
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-82.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        4941:
+        - - Pressed
+          - Toggle
+        4940:
+        - - Pressed
+          - Toggle
+        4939:
+        - - Pressed
+          - Toggle
+        4938:
+        - - Pressed
+          - Toggle
+  - uid: 17401
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-87.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        4945:
+        - - Pressed
+          - Toggle
+        4944:
+        - - Pressed
+          - Toggle
+        4942:
+        - - Pressed
+          - Toggle
+        4943:
+        - - Pressed
+          - Toggle
+  - uid: 17403
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 36.5,-82.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        4941:
+        - - Pressed
+          - Toggle
+        4940:
+        - - Pressed
+          - Toggle
+        4939:
+        - - Pressed
+          - Toggle
+        4938:
+        - - Pressed
+          - Toggle
   - uid: 18371
     components:
     - type: Transform
@@ -103386,11 +102407,11 @@ entities:
       pos: -26.5,-25.5
 - proto: SignAnomaly2
   entities:
-  - uid: 16191
+  - uid: 15621
     components:
     - type: Transform
       parent: 2
-      pos: -8.5,-18.5
+      pos: -11.5,-17.5
 - proto: SignArmory
   entities:
   - uid: 208
@@ -103443,6 +102464,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 26.5,-68.5
+  - uid: 17098
+    components:
+    - type: Transform
+      parent: 2
+      pos: 49.5,-73.5
 - proto: SignBar
   entities:
   - uid: 16195
@@ -103892,6 +102918,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 62.5,-22.5
+  - uid: 6763
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-77.5
   - uid: 7888
     components:
     - type: Transform
@@ -103903,12 +102935,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 44.49919,-51.71689
-  - uid: 9298
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 52.5,-77.5
   - uid: 13204
     components:
     - type: Transform
@@ -103921,6 +102947,12 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -26.501286,-54.06827
+  - uid: 14671
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-77.5
   - uid: 15910
     components:
     - type: Transform
@@ -104011,6 +103043,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -3.4992862,-8.714865
+  - uid: 17324
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-14.5
   - uid: 17374
     components:
     - type: Transform
@@ -104275,18 +103313,18 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -15.5,-51.5
+  - uid: 14672
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-29.5
   - uid: 16149
     components:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
       pos: 7.50015,-51.71722
-  - uid: 16156
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 1.5,-29.5
   - uid: 16157
     components:
     - type: Transform
@@ -104297,7 +103335,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      rot: 3.141592653589793 rad
+      rot: 1.5707963267948966 rad
       pos: -26.50015,-33.285137
   - uid: 17811
     components:
@@ -104894,18 +103932,19 @@ entities:
       pos: -12.5,-78.5
 - proto: SignRND
   entities:
-  - uid: 19073
+  - uid: 14670
     components:
     - type: Transform
       parent: 2
-      pos: -2.5,-18.5
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-28.5
 - proto: SignRobo
   entities:
-  - uid: 2221
+  - uid: 13336
     components:
     - type: Transform
       parent: 2
-      pos: -12.5,-29.5
+      pos: -7.5,-18.5
 - proto: SignSalvage
   entities:
   - uid: 6923
@@ -104932,11 +103971,11 @@ entities:
       pos: 53.5,-104.5
 - proto: SignScience
   entities:
-  - uid: 6645
+  - uid: 8792
     components:
     - type: Transform
       parent: 2
-      pos: -8.5,-15.5
+      pos: -3.5,-29.5
   - uid: 18197
     components:
     - type: Transform
@@ -104980,18 +104019,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 16.5,-90.5
-  - uid: 15694
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 39.5,-27.5
-  - uid: 15696
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 45.5,-28.5
   - uid: 18910
     components:
     - type: Transform
@@ -105150,6 +104177,11 @@ entities:
       pos: 39.5,-18.5
 - proto: SignSpace
   entities:
+  - uid: 6393
+    components:
+    - type: Transform
+      parent: 2
+      pos: 50.5,-77.5
   - uid: 8658
     components:
     - type: Transform
@@ -105261,17 +104293,17 @@ entities:
       pos: 20.5,-70.5
 - proto: SinkWide
   entities:
-  - uid: 1875
-    components:
-    - type: Transform
-      parent: 2
-      pos: -9.5,-15.5
   - uid: 4717
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 44.5,-42.5
+  - uid: 4722
+    components:
+    - type: Transform
+      parent: 2
+      pos: -3.5,-26.5
   - uid: 5357
     components:
     - type: Transform
@@ -105284,25 +104316,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 44.5,-43.5
-  - uid: 14036
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -6.5,-26.5
   - uid: 19090
     components:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
       pos: 12.5,-25.5
-- proto: Skub
-  entities:
-  - uid: 16871
-    components:
-    - type: Transform
-      parent: 2
-      pos: -61.753063,-25.19519
 - proto: SmartFridge
   entities:
   - uid: 13948
@@ -105405,12 +104424,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 61.5,-67.5
-  - uid: 5004
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -22.5,-14.5
   - uid: 7005
     components:
     - type: Transform
@@ -105977,11 +104990,11 @@ entities:
       pos: 30.5,-27.5
 - proto: SpawnMobRaccoonMorticia
   entities:
-  - uid: 6973
+  - uid: 17302
     components:
     - type: Transform
       parent: 2
-      pos: 24.5,-93.5
+      pos: 24.5,-97.5
 - proto: SpawnMobShiva
   entities:
   - uid: 1803
@@ -106046,16 +105059,21 @@ entities:
       pos: 32.5,-48.5
 - proto: SpawnPointBorg
   entities:
-  - uid: 15326
+  - uid: 14405
     components:
     - type: Transform
       parent: 2
-      pos: -11.5,-23.5
-  - uid: 15327
+      pos: -6.5,-21.5
+  - uid: 14408
     components:
     - type: Transform
       parent: 2
-      pos: -10.5,-23.5
+      pos: -5.5,-21.5
+  - uid: 15694
+    components:
+    - type: Transform
+      parent: 2
+      pos: -4.5,-21.5
 - proto: SpawnPointBotanist
   entities:
   - uid: 15313
@@ -106413,26 +105431,31 @@ entities:
       pos: 14.5,-94.5
 - proto: SpawnPointScientist
   entities:
-  - uid: 4694
-    components:
-    - type: Transform
-      parent: 2
-      pos: -6.5,-19.5
-  - uid: 15300
-    components:
-    - type: Transform
-      parent: 2
-      pos: -4.5,-25.5
   - uid: 15301
     components:
     - type: Transform
       parent: 2
       pos: -21.5,-25.5
-  - uid: 19618
+  - uid: 15853
     components:
     - type: Transform
       parent: 2
-      pos: -12.5,-26.5
+      pos: -4.5,-24.5
+  - uid: 15856
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-27.5
+  - uid: 15857
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.5,-17.5
+  - uid: 15878
+    components:
+    - type: Transform
+      parent: 2
+      pos: -20.5,-25.5
 - proto: SpawnPointSecurityCadet
   entities:
   - uid: 908
@@ -106569,13 +105592,13 @@ entities:
     - type: Transform
       parent: 2
       pos: -53.5,-65.5
-- proto: SpearReinforced
+- proto: SpearBone
   entities:
-  - uid: 7337
+  - uid: 3730
     components:
     - type: Transform
       parent: 2
-      pos: 78.48892,-25.591612
+      pos: 78.51151,-25.470703
 - proto: SpeedLoaderMagnum
   entities:
   - uid: 10259
@@ -106583,28 +105606,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 68.498024,-48.389458
-- proto: SprayBottle
-  entities:
-  - uid: 7125
-    components:
-    - type: MetaData
-      name: bee spray
-      desc: 'May contain: Bees.'
-    - type: Transform
-      parent: 2
-      pos: 83.78669,-18.784428
-    - type: Tag
-      tags:
-      - Spray
-    - type: Solution
-      solution:
-        temperature: 293.15
-        maxVol: 60
-        reagents:
-        - ReagentId: BuzzochloricBees
-          data: []
-          Quantity: 60
-        canReact: True
 - proto: SprayBottleSpaceCleaner
   entities:
   - uid: 6971
@@ -106956,11 +105957,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -1.5,-2.5
-  - uid: 13960
-    components:
-    - type: Transform
-      parent: 2
-      pos: -9.5,-29.5
   - uid: 14154
     components:
     - type: Transform
@@ -107090,6 +106086,26 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 60.5,-71.5
+  - uid: 3031
+    components:
+    - type: Transform
+      parent: 2
+      pos: 40.5,-28.5
+  - uid: 3692
+    components:
+    - type: Transform
+      parent: 2
+      pos: 43.5,-28.5
+  - uid: 3700
+    components:
+    - type: Transform
+      parent: 2
+      pos: 42.5,-28.5
+  - uid: 3703
+    components:
+    - type: Transform
+      parent: 2
+      pos: 41.5,-28.5
   - uid: 7057
     components:
     - type: Transform
@@ -107127,6 +106143,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -22.5,-24.5
+  - uid: 6375
+    components:
+    - type: Transform
+      parent: 2
+      pos: 48.5,-74.5
   - uid: 7247
     components:
     - type: Transform
@@ -107152,16 +106173,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -1.5,-56.5
-  - uid: 12881
-    components:
-    - type: Transform
-      parent: 2
-      pos: 51.5,-74.5
-  - uid: 14408
-    components:
-    - type: Transform
-      parent: 2
-      pos: 50.5,-74.5
 - proto: Stunbaton
   entities:
   - uid: 16289
@@ -108036,6 +107047,17 @@ entities:
       id: AME West
       setupAvailableNetworks:
       - SurveillanceCameraGeneral
+  - uid: 14385
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-4.5
+    - type: SurveillanceCamera
+      nameSet: True
+      id: Arrivals, Tools
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
   - uid: 16546
     components:
     - type: Transform
@@ -108127,7 +107149,7 @@ entities:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
-      pos: -1.5,-22.5
+      pos: -1.5,-21.5
     - type: SurveillanceCamera
       nameSet: True
       id: East Science Hallway
@@ -108300,7 +107322,7 @@ entities:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
-      pos: -6.5,-30.5
+      pos: -5.5,-30.5
     - type: SurveillanceCamera
       nameSet: True
       id: AME Hall, North
@@ -108353,7 +107375,7 @@ entities:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
-      pos: 50.5,-44.5
+      pos: 50.5,-43.5
     - type: SurveillanceCamera
       nameSet: True
       id: Security Hallway
@@ -108591,6 +107613,49 @@ entities:
       pos: 35.5,-95.5
 - proto: SurveillanceCameraScience
   entities:
+  - uid: 16856
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.5,-21.5
+    - type: SurveillanceCamera
+      nameSet: True
+      id: Anomaly Lab
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+  - uid: 16859
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-21.5
+    - type: SurveillanceCamera
+      nameSet: True
+      id: Robotics
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+  - uid: 16871
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-27.5
+    - type: SurveillanceCamera
+      nameSet: True
+      id: R&D Machinery
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+  - uid: 16921
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-25.5
+    - type: SurveillanceCamera
+      nameSet: True
+      id: R&D Front Desk
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
   - uid: 16981
     components:
     - type: Transform
@@ -108602,17 +107667,6 @@ entities:
       id: RD's Office
       setupAvailableNetworks:
       - SurveillanceCameraScience
-  - uid: 17614
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -9.5,-24.5
-    - type: SurveillanceCamera
-      nameSet: True
-      id: Robotics
-      setupAvailableNetworks:
-      - SurveillanceCameraScience
   - uid: 17615
     components:
     - type: Transform
@@ -108624,16 +107678,6 @@ entities:
       id: Xenoarcheology
       setupAvailableNetworks:
       - SurveillanceCameraScience
-  - uid: 17617
-    components:
-    - type: Transform
-      parent: 2
-      pos: -12.5,-21.5
-    - type: SurveillanceCamera
-      nameSet: True
-      id: Science Main Hall
-      setupAvailableNetworks:
-      - SurveillanceCameraScience
   - uid: 19094
     components:
     - type: Transform
@@ -108854,6 +107898,17 @@ entities:
       id: Bartender Backroom
       setupAvailableNetworks:
       - SurveillanceCameraService
+  - uid: 15300
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -15.5,-33.5
+    - type: SurveillanceCamera
+      nameSet: True
+      id: Altar Viewing Gallery
+      setupAvailableNetworks:
+      - SurveillanceCameraService
   - uid: 17596
     components:
     - type: Transform
@@ -109132,16 +108187,6 @@ entities:
       pos: -31.5,-25.5
 - proto: SurvivalKnife
   entities:
-  - uid: 17304
-    components:
-    - type: Transform
-      parent: 2
-      pos: 71.9411,-16.53467
-  - uid: 17527
-    components:
-    - type: Transform
-      parent: 2
-      pos: 83.72667,-72.569664
   - uid: 19675
     components:
     - type: Transform
@@ -109221,12 +108266,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 29.5,-13.5
-  - uid: 1802
+  - uid: 1690
     components:
     - type: Transform
       parent: 2
-      rot: 3.141592653589793 rad
-      pos: -3.5,-19.5
+      pos: -9.5,-17.5
+  - uid: 1853
+    components:
+    - type: Transform
+      parent: 2
+      pos: -14.5,-28.5
   - uid: 2294
     components:
     - type: Transform
@@ -109644,6 +108693,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 65.5,-31.5
+  - uid: 7509
+    components:
+    - type: Transform
+      parent: 2
+      pos: -32.5,-26.5
   - uid: 7586
     components:
     - type: Transform
@@ -109692,11 +108746,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 30.5,-76.5
-  - uid: 8017
-    components:
-    - type: Transform
-      parent: 2
-      pos: -3.5,-22.5
   - uid: 9289
     components:
     - type: Transform
@@ -109819,11 +108868,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 21.5,-30.5
-  - uid: 18219
-    components:
-    - type: Transform
-      parent: 2
-      pos: -22.5,-14.5
   - uid: 18246
     components:
     - type: Transform
@@ -109852,6 +108896,16 @@ entities:
       pos: -1.5,-55.5
 - proto: TableCarpet
   entities:
+  - uid: 3696
+    components:
+    - type: Transform
+      parent: 2
+      pos: 44.5,-30.5
+  - uid: 6401
+    components:
+    - type: Transform
+      parent: 2
+      pos: 41.5,-29.5
   - uid: 6722
     components:
     - type: Transform
@@ -109902,6 +108956,21 @@ entities:
     - type: Transform
       parent: 2
       pos: 69.5,-46.5
+  - uid: 7689
+    components:
+    - type: Transform
+      parent: 2
+      pos: 40.5,-29.5
+  - uid: 7690
+    components:
+    - type: Transform
+      parent: 2
+      pos: 43.5,-29.5
+  - uid: 7691
+    components:
+    - type: Transform
+      parent: 2
+      pos: 42.5,-29.5
   - uid: 7970
     components:
     - type: Transform
@@ -109934,11 +109003,21 @@ entities:
     - type: Transform
       parent: 2
       pos: 26.5,-70.5
+  - uid: 1802
+    components:
+    - type: Transform
+      parent: 2
+      pos: -8.5,-28.5
   - uid: 2750
     components:
     - type: Transform
       parent: 2
       pos: -20.5,-47.5
+  - uid: 4629
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-28.5
   - uid: 4793
     components:
     - type: Transform
@@ -109959,13 +109038,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 18.5,-76.5
-- proto: TableFancyPink
-  entities:
-  - uid: 15853
+  - uid: 5897
     components:
     - type: Transform
       parent: 2
-      pos: -37.5,-33.5
+      pos: -10.5,-28.5
 - proto: TableFancyPurple
   entities:
   - uid: 165
@@ -110214,16 +109291,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 36.5,-13.5
-  - uid: 9111
-    components:
-    - type: Transform
-      parent: 2
-      pos: -4.5,-28.5
-  - uid: 9114
-    components:
-    - type: Transform
-      parent: 2
-      pos: -5.5,-28.5
   - uid: 9589
     components:
     - type: Transform
@@ -110660,6 +109727,11 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 81.5,-51.5
+  - uid: 15213
+    components:
+    - type: Transform
+      parent: 2
+      pos: -3.5,-22.5
   - uid: 17271
     components:
     - type: Transform
@@ -110749,6 +109821,12 @@ entities:
     - type: Transform
       parent: 2
       pos: 29.5,-30.5
+  - uid: 598
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -5.5,-24.5
   - uid: 1809
     components:
     - type: Transform
@@ -110760,6 +109838,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 27.5,-28.5
+  - uid: 5801
+    components:
+    - type: Transform
+      parent: 2
+      pos: 35.5,-27.5
   - uid: 8101
     components:
     - type: Transform
@@ -110909,11 +109992,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -25.5,-38.5
-  - uid: 486
+  - uid: 575
     components:
     - type: Transform
       parent: 2
-      pos: -6.5,-18.5
+      pos: -9.5,-18.5
   - uid: 920
     components:
     - type: Transform
@@ -110940,6 +110023,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -15.5,-30.5
+  - uid: 2198
+    components:
+    - type: Transform
+      parent: 2
+      pos: -11.5,-18.5
   - uid: 2316
     components:
     - type: Transform
@@ -110950,16 +110038,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -19.5,-41.5
-  - uid: 5082
-    components:
-    - type: Transform
-      parent: 2
-      pos: -12.5,-21.5
-  - uid: 5090
-    components:
-    - type: Transform
-      parent: 2
-      pos: -10.5,-21.5
   - uid: 5101
     components:
     - type: Transform
@@ -110986,11 +110064,11 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -25.5,-39.5
-  - uid: 7429
+  - uid: 7442
     components:
     - type: Transform
       parent: 2
-      pos: 45.5,-75.5
+      pos: -7.5,-25.5
   - uid: 7543
     components:
     - type: Transform
@@ -111070,16 +110148,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -32.5,-21.5
-  - uid: 14069
-    components:
-    - type: Transform
-      parent: 2
-      pos: -33.5,-25.5
-  - uid: 14119
-    components:
-    - type: Transform
-      parent: 2
-      pos: -11.5,-21.5
   - uid: 14578
     components:
     - type: Transform
@@ -111091,12 +110159,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -37.5,-75.5
-  - uid: 14926
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 41.5,-34.5
   - uid: 15115
     components:
     - type: Transform
@@ -111122,6 +110184,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 66.5,-68.5
+  - uid: 15471
+    components:
+    - type: Transform
+      parent: 2
+      pos: -14.5,-21.5
+  - uid: 15478
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.5,-21.5
   - uid: 15479
     components:
     - type: Transform
@@ -111158,11 +110230,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -32.5,-29.5
-  - uid: 16438
-    components:
-    - type: Transform
-      parent: 2
-      pos: -12.5,-28.5
   - uid: 16440
     components:
     - type: Transform
@@ -111178,11 +110245,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -16.5,-27.5
-  - uid: 16513
-    components:
-    - type: Transform
-      parent: 2
-      pos: -11.5,-18.5
   - uid: 16598
     components:
     - type: Transform
@@ -111218,11 +110280,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -24.5,-16.5
-  - uid: 17694
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-18.5
   - uid: 17779
     components:
     - type: Transform
@@ -111268,11 +110325,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -52.5,-52.5
-  - uid: 18109
-    components:
-    - type: Transform
-      parent: 2
-      pos: -13.5,-21.5
   - uid: 18267
     components:
     - type: Transform
@@ -111288,17 +110340,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -52.5,-39.5
-  - uid: 19206
-    components:
-    - type: Transform
-      parent: 2
-      pos: -9.5,-26.5
-  - uid: 19496
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 46.5,-75.5
   - uid: 20162
     components:
     - type: Transform
@@ -111524,6 +110565,21 @@ entities:
     - type: Transform
       parent: 2
       pos: 51.5,-35.5
+  - uid: 11978
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,-83.5
+  - uid: 12955
+    components:
+    - type: Transform
+      parent: 2
+      pos: 68.5,-60.5
+  - uid: 12956
+    components:
+    - type: Transform
+      parent: 2
+      pos: 70.5,-59.5
   - uid: 15273
     components:
     - type: Transform
@@ -111598,6 +110654,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 62.51025,-57.18848
+  - uid: 15889
+    components:
+    - type: Transform
+      parent: 2
+      pos: -5.5762095,-23.458902
   - uid: 17751
     components:
     - type: Transform
@@ -111627,11 +110688,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -46.50093,-12.413582
-  - uid: 19298
-    components:
-    - type: Transform
-      parent: 2
-      pos: -5.51822,-27.396221
 - proto: ToolboxGoldFilled
   entities:
   - uid: 5149
@@ -111671,16 +110727,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 58.46033,-35.476738
+  - uid: 10837
+    components:
+    - type: Transform
+      parent: 2
+      pos: -14.555741,-21.210285
   - uid: 15482
     components:
     - type: Transform
       parent: 2
       pos: 62.040775,-57.438656
-  - uid: 17842
-    components:
-    - type: Transform
-      parent: 2
-      pos: -13.449109,-21.35588
 - proto: ToolboxMechanicalFilledAllTools
   entities:
   - uid: 5380
@@ -111706,11 +110762,6 @@ entities:
     - type: InsideEntityStorage
 - proto: ToyAmongPequeno
   entities:
-  - uid: 17384
-    components:
-    - type: Transform
-      parent: 2
-      pos: 35.4657,-82.51966
   - uid: 17386
     components:
     - type: Transform
@@ -111730,18 +110781,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -2.0095367,-62.857395
-  - uid: 18012
-    components:
-    - type: Transform
-      parent: 2
-      pos: -22.796017,-18.004782
-- proto: ToyFigurineResearchDirector
-  entities:
-  - uid: 11468
-    components:
-    - type: Transform
-      parent: 2
-      pos: -23.410599,-17.994358
 - proto: ToyFigurineSalvage
   entities:
   - uid: 6034
@@ -111770,23 +110809,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 11.488949,-44.128864
-  - uid: 17381
-    components:
-    - type: Transform
-      parent: 2
-      pos: 35.55537,-87.765205
   - uid: 18018
     components:
     - type: Transform
       parent: 2
       pos: 15.464093,-63.08658
-- proto: ToyNuke
-  entities:
-  - uid: 17382
-    components:
-    - type: Transform
-      parent: 2
-      pos: 35.326195,-88.369736
 - proto: ToyRipley
   entities:
   - uid: 17383
@@ -111822,13 +110849,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 72.64958,-67.37068
-- proto: TrashBagHolding
-  entities:
-  - uid: 11124
+  - uid: 17395
     components:
     - type: Transform
       parent: 2
-      pos: 29.729424,-81.673744
+      pos: 29.732185,-81.68248
 - proto: TrashBakedBananaPeel
   entities:
   - uid: 4304
@@ -111850,6 +110875,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -20.356453,-65.337494
+  - uid: 17309
+    components:
+    - type: Transform
+      parent: 2
+      pos: -61.367092,-24.523907
 - proto: TubaInstrument
   entities:
   - uid: 19532
@@ -112219,6 +111249,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 17.5,-49.5
+  - uid: 17248
+    components:
+    - type: Transform
+      parent: 2
+      pos: -42.5,-67.5
 - proto: VendingMachineCoffee
   entities:
   - uid: 4630
@@ -112323,6 +111358,11 @@ entities:
       pos: 49.5,-55.5
 - proto: VendingMachineMedical
   entities:
+  - uid: 7768
+    components:
+    - type: Transform
+      parent: 2
+      pos: 10.5,-19.5
   - uid: 7801
     components:
     - type: Transform
@@ -112358,18 +111398,18 @@ entities:
       pos: 15.5,-48.5
 - proto: VendingMachineRoboDrobe
   entities:
-  - uid: 16522
+  - uid: 584
     components:
     - type: Transform
       parent: 2
-      pos: -13.5,-23.5
+      pos: -7.5,-23.5
 - proto: VendingMachineRobotics
   entities:
-  - uid: 16514
+  - uid: 15413
     components:
     - type: Transform
       parent: 2
-      pos: -14.5,-27.5
+      pos: -7.5,-19.5
 - proto: VendingMachineSalvage
   entities:
   - uid: 6893
@@ -112444,11 +111484,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 68.5,-57.5
-  - uid: 19362
-    components:
-    - type: Transform
-      parent: 2
-      pos: -2.5,-44.5
 - proto: VendingMachineSustenance
   entities:
   - uid: 14273
@@ -112499,11 +111534,11 @@ entities:
       pos: 17.5,-50.5
 - proto: VendingMachineVendomat
   entities:
-  - uid: 5097
+  - uid: 16923
     components:
     - type: Transform
       parent: 2
-      pos: -8.5,-28.5
+      pos: -6.5,-29.5
   - uid: 17242
     components:
     - type: Transform
@@ -115060,6 +114095,11 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 79.5,-42.5
+  - uid: 486
+    components:
+    - type: Transform
+      parent: 2
+      pos: -5.5,-28.5
   - uid: 500
     components:
     - type: Transform
@@ -115145,6 +114185,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -23.5,-21.5
+  - uid: 536
+    components:
+    - type: Transform
+      parent: 2
+      pos: -2.5,-25.5
   - uid: 550
     components:
     - type: Transform
@@ -115165,6 +114210,16 @@ entities:
     - type: Transform
       parent: 2
       pos: -18.5,-14.5
+  - uid: 574
+    components:
+    - type: Transform
+      parent: 2
+      pos: -2.5,-26.5
+  - uid: 576
+    components:
+    - type: Transform
+      parent: 2
+      pos: -8.5,-17.5
   - uid: 590
     components:
     - type: Transform
@@ -115180,26 +114235,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -23.5,-28.5
-  - uid: 594
-    components:
-    - type: Transform
-      parent: 2
-      pos: -9.5,-28.5
-  - uid: 596
-    components:
-    - type: Transform
-      parent: 2
-      pos: -9.5,-27.5
-  - uid: 597
-    components:
-    - type: Transform
-      parent: 2
-      pos: -8.5,-27.5
-  - uid: 598
-    components:
-    - type: Transform
-      parent: 2
-      pos: -6.5,-27.5
   - uid: 603
     components:
     - type: Transform
@@ -115215,41 +114250,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -20.5,-17.5
-  - uid: 608
-    components:
-    - type: Transform
-      parent: 2
-      pos: -2.5,-23.5
-  - uid: 609
-    components:
-    - type: Transform
-      parent: 2
-      pos: -2.5,-22.5
-  - uid: 610
-    components:
-    - type: Transform
-      parent: 2
-      pos: -2.5,-21.5
-  - uid: 611
-    components:
-    - type: Transform
-      parent: 2
-      pos: -2.5,-20.5
   - uid: 612
     components:
     - type: Transform
       parent: 2
       pos: -2.5,-19.5
-  - uid: 631
-    components:
-    - type: Transform
-      parent: 2
-      pos: -8.5,-18.5
-  - uid: 632
-    components:
-    - type: Transform
-      parent: 2
-      pos: -8.5,-17.5
   - uid: 636
     components:
     - type: Transform
@@ -116812,11 +115817,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -2.5,-29.5
-  - uid: 1699
-    components:
-    - type: Transform
-      parent: 2
-      pos: -4.5,-29.5
   - uid: 1700
     components:
     - type: Transform
@@ -117927,11 +116927,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 29.5,-58.5
-  - uid: 2111
-    components:
-    - type: Transform
-      parent: 2
-      pos: -6.5,-28.5
   - uid: 2114
     components:
     - type: Transform
@@ -118216,7 +117211,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: -12.5,-29.5
+      pos: -4.5,-18.5
   - uid: 2247
     components:
     - type: Transform
@@ -118282,6 +117277,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -16.5,-71.5
+  - uid: 2271
+    components:
+    - type: Transform
+      parent: 2
+      pos: -3.5,-18.5
   - uid: 2272
     components:
     - type: Transform
@@ -118782,11 +117782,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 46.5,-79.5
-  - uid: 2703
-    components:
-    - type: Transform
-      parent: 2
-      pos: 46.5,-78.5
   - uid: 2710
     components:
     - type: Transform
@@ -118917,16 +117912,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 17.5,-69.5
-  - uid: 2969
-    components:
-    - type: Transform
-      parent: 2
-      pos: 50.5,-78.5
-  - uid: 2970
-    components:
-    - type: Transform
-      parent: 2
-      pos: 50.5,-79.5
   - uid: 2971
     components:
     - type: Transform
@@ -119042,16 +118027,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 65.5,-74.5
-  - uid: 3010
-    components:
-    - type: Transform
-      parent: 2
-      pos: -9.5,-29.5
-  - uid: 3011
-    components:
-    - type: Transform
-      parent: 2
-      pos: -6.5,-29.5
   - uid: 3014
     components:
     - type: Transform
@@ -120134,26 +119109,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 81.5,-19.5
-  - uid: 4001
-    components:
-    - type: Transform
-      parent: 2
-      pos: 83.5,-17.5
-  - uid: 4003
-    components:
-    - type: Transform
-      parent: 2
-      pos: 82.5,-17.5
   - uid: 4004
     components:
     - type: Transform
       parent: 2
       pos: 81.5,-18.5
-  - uid: 4005
-    components:
-    - type: Transform
-      parent: 2
-      pos: 81.5,-17.5
   - uid: 4006
     components:
     - type: Transform
@@ -120714,6 +119674,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 56.5,-73.5
+  - uid: 4310
+    components:
+    - type: Transform
+      parent: 2
+      pos: -6.5,-28.5
   - uid: 4314
     components:
     - type: Transform
@@ -120824,6 +119789,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 41.5,-60.5
+  - uid: 4469
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-18.5
   - uid: 4478
     components:
     - type: Transform
@@ -120899,11 +119869,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 30.5,-14.5
-  - uid: 4629
-    components:
-    - type: Transform
-      parent: 2
-      pos: -15.5,-26.5
   - uid: 4633
     components:
     - type: Transform
@@ -120994,16 +119959,16 @@ entities:
     - type: Transform
       parent: 2
       pos: -2.5,-18.5
+  - uid: 5053
+    components:
+    - type: Transform
+      parent: 2
+      pos: -8.5,-18.5
   - uid: 5076
     components:
     - type: Transform
       parent: 2
       pos: 48.5,-79.5
-  - uid: 5077
-    components:
-    - type: Transform
-      parent: 2
-      pos: 48.5,-78.5
   - uid: 5081
     components:
     - type: Transform
@@ -121214,6 +120179,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 34.5,-75.5
+  - uid: 6388
+    components:
+    - type: Transform
+      parent: 2
+      pos: 83.5,-17.5
   - uid: 6415
     components:
     - type: Transform
@@ -121224,16 +120194,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 39.5,-79.5
-  - uid: 6552
-    components:
-    - type: Transform
-      parent: 2
-      pos: 83.5,-19.5
-  - uid: 6554
-    components:
-    - type: Transform
-      parent: 2
-      pos: 82.5,-19.5
   - uid: 6669
     components:
     - type: Transform
@@ -121308,6 +120268,11 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 61.5,-53.5
+  - uid: 7221
+    components:
+    - type: Transform
+      parent: 2
+      pos: -2.5,-21.5
   - uid: 7235
     components:
     - type: Transform
@@ -121324,16 +120289,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 38.5,-72.5
-  - uid: 7257
-    components:
-    - type: Transform
-      parent: 2
-      pos: 51.5,-78.5
-  - uid: 7259
-    components:
-    - type: Transform
-      parent: 2
-      pos: 51.5,-79.5
   - uid: 7263
     components:
     - type: Transform
@@ -121940,6 +120895,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 6.5,-81.5
+  - uid: 8839
+    components:
+    - type: Transform
+      parent: 2
+      pos: -2.5,-20.5
   - uid: 8867
     components:
     - type: Transform
@@ -122238,11 +121198,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 71.5,-56.5
-  - uid: 11853
-    components:
-    - type: Transform
-      parent: 2
-      pos: -8.5,-26.5
   - uid: 11916
     components:
     - type: Transform
@@ -122449,11 +121404,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 76.5,-18.5
-  - uid: 14125
-    components:
-    - type: Transform
-      parent: 2
-      pos: -9.5,-17.5
   - uid: 14127
     components:
     - type: Transform
@@ -122567,6 +121517,11 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 48.5,-62.5
+  - uid: 15216
+    components:
+    - type: Transform
+      parent: 2
+      pos: -8.5,-19.5
   - uid: 15225
     components:
     - type: Transform
@@ -122616,16 +121571,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 11.5,-67.5
-  - uid: 15912
-    components:
-    - type: Transform
-      parent: 2
-      pos: 83.5,-71.5
-  - uid: 15913
-    components:
-    - type: Transform
-      parent: 2
-      pos: 82.5,-71.5
   - uid: 16145
     components:
     - type: Transform
@@ -122736,21 +121681,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -23.5,-89.5
-  - uid: 16856
-    components:
-    - type: Transform
-      parent: 2
-      pos: 50.5,-73.5
   - uid: 16857
     components:
     - type: Transform
       parent: 2
       pos: 49.5,-73.5
-  - uid: 16859
-    components:
-    - type: Transform
-      parent: 2
-      pos: 51.5,-73.5
   - uid: 16991
     components:
     - type: Transform
@@ -122771,11 +121706,21 @@ entities:
     - type: Transform
       parent: 2
       pos: 56.5,-58.5
+  - uid: 17173
+    components:
+    - type: Transform
+      parent: 2
+      pos: 82.5,-17.5
   - uid: 17244
     components:
     - type: Transform
       parent: 2
       pos: 73.5,-50.5
+  - uid: 17247
+    components:
+    - type: Transform
+      parent: 2
+      pos: 81.5,-17.5
   - uid: 17252
     components:
     - type: Transform
@@ -123631,29 +122576,29 @@ entities:
     - type: Transform
       parent: 2
       pos: 20.5,-81.5
-  - uid: 8351
+- proto: WallSolidChitin
+  entities:
+  - uid: 86
     components:
     - type: Transform
       parent: 2
-      pos: 16.5,-82.5
-- proto: WallSolidChitin
-  entities:
+      pos: -8.5,-24.5
   - uid: 125
     components:
     - type: Transform
       parent: 2
       pos: -14.5,-22.5
-  - uid: 164
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 39.5,-32.5
   - uid: 170
     components:
     - type: Transform
       parent: 2
       pos: -18.5,-23.5
+  - uid: 180
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 45.5,-86.5
   - uid: 181
     components:
     - type: Transform
@@ -123709,7 +122654,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: -8.5,-23.5
+      pos: -15.5,-24.5
   - uid: 236
     components:
     - type: Transform
@@ -123735,11 +122680,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -48.5,-28.5
-  - uid: 257
-    components:
-    - type: Transform
-      parent: 2
-      pos: -9.5,-23.5
   - uid: 337
     components:
     - type: Transform
@@ -123750,6 +122690,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -18.5,-49.5
+  - uid: 375
+    components:
+    - type: Transform
+      parent: 2
+      pos: -6.5,-25.5
   - uid: 376
     components:
     - type: Transform
@@ -123930,6 +122875,18 @@ entities:
     - type: Transform
       parent: 2
       pos: -23.5,-49.5
+  - uid: 565
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 38.5,-33.5
+  - uid: 568
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 40.5,-33.5
   - uid: 570
     components:
     - type: Transform
@@ -123945,41 +122902,38 @@ entities:
     - type: Transform
       parent: 2
       pos: -19.5,-23.5
-  - uid: 574
-    components:
-    - type: Transform
-      parent: 2
-      pos: -9.5,-22.5
-  - uid: 575
-    components:
-    - type: Transform
-      parent: 2
-      pos: -10.5,-22.5
-  - uid: 576
-    components:
-    - type: Transform
-      parent: 2
-      pos: -11.5,-22.5
   - uid: 577
     components:
     - type: Transform
       parent: 2
-      pos: -12.5,-22.5
-  - uid: 578
+      pos: -8.5,-23.5
+  - uid: 581
     components:
     - type: Transform
       parent: 2
-      pos: -13.5,-22.5
-  - uid: 584
-    components:
-    - type: Transform
-      parent: 2
-      pos: -15.5,-23.5
+      rot: 3.141592653589793 rad
+      pos: 39.5,-33.5
   - uid: 589
     components:
     - type: Transform
       parent: 2
       pos: -16.5,-23.5
+  - uid: 597
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-29.5
+  - uid: 608
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.5,-22.5
+  - uid: 609
+    components:
+    - type: Transform
+      parent: 2
+      pos: -4.5,-25.5
   - uid: 652
     components:
     - type: Transform
@@ -124055,6 +123009,12 @@ entities:
     - type: Transform
       parent: 2
       pos: 72.5,-66.5
+  - uid: 901
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 43.5,-25.5
   - uid: 925
     components:
     - type: Transform
@@ -124085,11 +123045,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -1.5,-42.5
-  - uid: 966
-    components:
-    - type: Transform
-      parent: 2
-      pos: 0.5,-42.5
   - uid: 968
     components:
     - type: Transform
@@ -125091,11 +124046,21 @@ entities:
     - type: Transform
       parent: 2
       pos: -56.5,-24.5
+  - uid: 1560
+    components:
+    - type: Transform
+      parent: 2
+      pos: -34.5,-27.5
   - uid: 1581
     components:
     - type: Transform
       parent: 2
       pos: -52.5,-27.5
+  - uid: 1596
+    components:
+    - type: Transform
+      parent: 2
+      pos: 45.5,-35.5
   - uid: 1624
     components:
     - type: Transform
@@ -125121,6 +124086,12 @@ entities:
     - type: Transform
       parent: 2
       pos: -60.5,-26.5
+  - uid: 1699
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-29.5
   - uid: 1714
     components:
     - type: Transform
@@ -125132,6 +124103,11 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -14.5,-33.5
+  - uid: 1760
+    components:
+    - type: Transform
+      parent: 2
+      pos: -3.5,-25.5
   - uid: 1807
     components:
     - type: Transform
@@ -125374,12 +124350,32 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 24.5,-19.5
+  - uid: 2306
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,-25.5
+  - uid: 2325
+    components:
+    - type: Transform
+      parent: 2
+      pos: -8.5,-22.5
+  - uid: 2342
+    components:
+    - type: Transform
+      parent: 2
+      pos: -5.5,-25.5
   - uid: 2343
     components:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
       pos: -14.5,-36.5
+  - uid: 2379
+    components:
+    - type: Transform
+      parent: 2
+      pos: -6.5,-23.5
   - uid: 2380
     components:
     - type: Transform
@@ -125566,11 +124562,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 18.5,-57.5
-  - uid: 2705
-    components:
-    - type: Transform
-      parent: 2
-      pos: -33.5,-26.5
   - uid: 2706
     components:
     - type: Transform
@@ -125677,6 +124668,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -17.5,-44.5
+  - uid: 3011
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-22.5
   - uid: 3012
     components:
     - type: Transform
@@ -125796,6 +124792,12 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 68.5,-59.5
+  - uid: 3394
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 38.5,-29.5
   - uid: 3416
     components:
     - type: Transform
@@ -125930,33 +124932,24 @@ entities:
     - type: Transform
       parent: 2
       pos: 58.5,-66.5
-  - uid: 3723
+  - uid: 3717
     components:
     - type: Transform
       parent: 2
-      pos: 42.5,-28.5
-  - uid: 3727
+      rot: 3.141592653589793 rad
+      pos: 38.5,-28.5
+  - uid: 3719
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 44.5,-27.5
+      rot: 3.141592653589793 rad
+      pos: 40.5,-32.5
   - uid: 3728
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 44.5,-28.5
-  - uid: 3730
-    components:
-    - type: Transform
-      parent: 2
-      pos: 44.5,-34.5
-  - uid: 3732
-    components:
-    - type: Transform
-      parent: 2
-      pos: 46.5,-34.5
+      rot: 3.141592653589793 rad
+      pos: 38.5,-32.5
   - uid: 3738
     components:
     - type: Transform
@@ -126037,11 +125030,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 35.5,-31.5
-  - uid: 3842
-    components:
-    - type: Transform
-      parent: 2
-      pos: 47.5,-30.5
   - uid: 3862
     components:
     - type: Transform
@@ -126166,11 +125154,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 21.5,-14.5
-  - uid: 4268
-    components:
-    - type: Transform
-      parent: 2
-      pos: -32.5,-26.5
   - uid: 4269
     components:
     - type: Transform
@@ -126191,11 +125174,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -19.5,-44.5
-  - uid: 4492
-    components:
-    - type: Transform
-      parent: 2
-      pos: 42.5,-31.5
   - uid: 4541
     components:
     - type: Transform
@@ -126402,11 +125380,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -57.5,-26.5
-  - uid: 4817
-    components:
-    - type: Transform
-      parent: 2
-      pos: -60.5,-25.5
   - uid: 5002
     components:
     - type: Transform
@@ -126417,6 +125390,16 @@ entities:
     - type: Transform
       parent: 2
       pos: -58.5,-64.5
+  - uid: 5069
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-44.5
+  - uid: 5090
+    components:
+    - type: Transform
+      parent: 2
+      pos: -10.5,-22.5
   - uid: 5098
     components:
     - type: Transform
@@ -126439,11 +125422,16 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 40.5,-35.5
+  - uid: 5281
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-42.5
   - uid: 5303
     components:
     - type: Transform
       parent: 2
-      pos: 47.5,-28.5
+      pos: 1.5,-42.5
   - uid: 5316
     components:
     - type: Transform
@@ -126600,6 +125588,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 74.5,-34.5
+  - uid: 6289
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-42.5
   - uid: 6296
     components:
     - type: Transform
@@ -126615,30 +125608,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 78.5,-29.5
-  - uid: 6368
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 39.5,-31.5
-  - uid: 6371
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 39.5,-27.5
-  - uid: 6375
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-32.5
-  - uid: 6376
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 40.5,-31.5
   - uid: 6377
     components:
     - type: Transform
@@ -126665,32 +125634,17 @@ entities:
     - type: Transform
       parent: 2
       pos: 36.5,-26.5
-  - uid: 6392
-    components:
-    - type: Transform
-      parent: 2
-      pos: 40.5,-29.5
-  - uid: 6393
-    components:
-    - type: Transform
-      parent: 2
-      pos: 41.5,-29.5
-  - uid: 6394
-    components:
-    - type: Transform
-      parent: 2
-      pos: 39.5,-29.5
-  - uid: 6395
-    components:
-    - type: Transform
-      parent: 2
-      pos: 38.5,-29.5
   - uid: 6399
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 44.5,-25.5
+  - uid: 6459
+    components:
+    - type: Transform
+      parent: 2
+      pos: 50.5,-79.5
   - uid: 6612
     components:
     - type: Transform
@@ -126701,17 +125655,40 @@ entities:
     - type: Transform
       parent: 2
       pos: 3.5,-71.5
+  - uid: 6645
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-29.5
   - uid: 6657
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 24.5,-20.5
+  - uid: 6762
+    components:
+    - type: Transform
+      parent: 2
+      pos: 50.5,-80.5
+  - uid: 6921
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 45.5,-31.5
   - uid: 7006
     components:
     - type: Transform
       parent: 2
       pos: 35.5,-40.5
+  - uid: 7031
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 46.5,-27.5
   - uid: 7048
     components:
     - type: Transform
@@ -126728,6 +125705,12 @@ entities:
     - type: Transform
       parent: 2
       pos: 35.5,-25.5
+  - uid: 7125
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 40.5,-31.5
   - uid: 7141
     components:
     - type: Transform
@@ -126747,8 +125730,8 @@ entities:
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 47.5,-26.5
+      rot: 3.141592653589793 rad
+      pos: 44.5,-31.5
   - uid: 7188
     components:
     - type: Transform
@@ -126764,11 +125747,35 @@ entities:
     - type: Transform
       parent: 2
       pos: 53.5,-47.5
+  - uid: 7218
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 46.5,-28.5
   - uid: 7233
     components:
     - type: Transform
       parent: 2
       pos: 31.5,-31.5
+  - uid: 7258
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 46.5,-29.5
+  - uid: 7259
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 43.5,-31.5
+  - uid: 7264
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 42.5,-31.5
   - uid: 7290
     components:
     - type: Transform
@@ -126779,6 +125786,24 @@ entities:
     - type: Transform
       parent: 2
       pos: -15.5,-41.5
+  - uid: 7328
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 46.5,-31.5
+  - uid: 7331
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 41.5,-31.5
+  - uid: 7336
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 46.5,-26.5
   - uid: 7340
     components:
     - type: Transform
@@ -126799,12 +125824,22 @@ entities:
     - type: Transform
       parent: 2
       pos: 78.5,-65.5
+  - uid: 7440
+    components:
+    - type: Transform
+      parent: 2
+      pos: -6.5,-24.5
   - uid: 7461
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 6.5,-74.5
+  - uid: 7529
+    components:
+    - type: Transform
+      parent: 2
+      pos: -15.5,-23.5
   - uid: 7537
     components:
     - type: Transform
@@ -126843,11 +125878,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 32.5,-25.5
-  - uid: 7603
-    components:
-    - type: Transform
-      parent: 2
-      pos: 37.5,-29.5
   - uid: 7610
     components:
     - type: Transform
@@ -126864,6 +125894,11 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 53.5,-41.5
+  - uid: 7694
+    components:
+    - type: Transform
+      parent: 2
+      pos: 52.5,-80.5
   - uid: 7705
     components:
     - type: Transform
@@ -126874,11 +125909,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 72.5,-61.5
-  - uid: 7726
-    components:
-    - type: Transform
-      parent: 2
-      pos: 41.5,-28.5
   - uid: 7730
     components:
     - type: Transform
@@ -126943,6 +125973,18 @@ entities:
     - type: Transform
       parent: 2
       pos: 76.5,-55.5
+  - uid: 8017
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-29.5
+  - uid: 8019
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-28.5
   - uid: 8036
     components:
     - type: Transform
@@ -126959,6 +126001,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 49.5,-45.5
+  - uid: 8107
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-24.5
   - uid: 8115
     components:
     - type: Transform
@@ -127046,18 +126093,54 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 70.5,-59.5
+      rot: -1.5707963267948966 rad
+      pos: 49.5,-86.5
+  - uid: 8621
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 49.5,-82.5
+  - uid: 8624
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 38.5,-30.5
   - uid: 8630
     components:
     - type: Transform
       parent: 2
       pos: 54.5,-47.5
+  - uid: 8653
+    components:
+    - type: Transform
+      parent: 2
+      pos: -5.5,-26.5
+  - uid: 8691
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 38.5,-31.5
   - uid: 8813
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 53.5,-25.5
+  - uid: 8836
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-77.5
+  - uid: 9111
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-29.5
   - uid: 9328
     components:
     - type: Transform
@@ -127150,6 +126233,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 59.5,-58.5
+  - uid: 9711
+    components:
+    - type: Transform
+      parent: 2
+      pos: 50.5,-78.5
   - uid: 10291
     components:
     - type: Transform
@@ -127305,12 +126393,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 69.5,-65.5
-  - uid: 11895
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 68.5,-60.5
   - uid: 11898
     components:
     - type: Transform
@@ -127362,32 +126444,16 @@ entities:
     - type: Transform
       parent: 2
       pos: -37.5,-74.5
-  - uid: 12801
-    components:
-    - type: Transform
-      parent: 2
-      pos: 44.5,-31.5
   - uid: 12841
     components:
     - type: Transform
       parent: 2
-      pos: 46.5,-31.5
-  - uid: 12957
+      pos: 42.5,-26.5
+  - uid: 12962
     components:
     - type: Transform
       parent: 2
-      pos: 44.5,-30.5
-  - uid: 12959
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 45.5,-28.5
-  - uid: 12961
-    components:
-    - type: Transform
-      parent: 2
-      pos: 44.5,-29.5
+      pos: 36.5,-28.5
   - uid: 12973
     components:
     - type: Transform
@@ -127418,18 +126484,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 38.5,-26.5
-  - uid: 12981
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 43.5,-31.5
-  - uid: 12983
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 41.5,-31.5
   - uid: 12990
     components:
     - type: Transform
@@ -127447,6 +126501,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 76.5,-32.5
+  - uid: 13645
+    components:
+    - type: Transform
+      parent: 2
+      pos: -0.5,-42.5
   - uid: 13650
     components:
     - type: Transform
@@ -127481,7 +126540,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 47.5,-27.5
+      pos: 0.5,-42.5
   - uid: 13874
     components:
     - type: Transform
@@ -127508,35 +126567,24 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 68.5,-61.5
-  - uid: 13909
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-33.5
   - uid: 13947
     components:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
       pos: -14.5,-34.5
-  - uid: 13952
-    components:
-    - type: Transform
-      parent: 2
-      pos: -15.5,-29.5
   - uid: 13961
     components:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
       pos: -14.5,-35.5
-  - uid: 14027
+  - uid: 14029
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
-      pos: -14.5,-29.5
+      pos: 45.5,-82.5
   - uid: 14046
     components:
     - type: Transform
@@ -127606,11 +126654,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 50.5,-25.5
-  - uid: 14405
-    components:
-    - type: Transform
-      parent: 2
-      pos: 47.5,-29.5
   - uid: 14458
     components:
     - type: Transform
@@ -127642,6 +126685,12 @@ entities:
     - type: Transform
       parent: 2
       pos: -17.5,-52.5
+  - uid: 14701
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 44.5,-29.5
   - uid: 14711
     components:
     - type: Transform
@@ -127949,11 +126998,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 12.5,-92.5
-  - uid: 18251
-    components:
-    - type: Transform
-      parent: 2
-      pos: 17.5,-82.5
 - proto: WardrobeMixedFilled
   entities:
   - uid: 11461
@@ -128048,16 +127092,16 @@ entities:
     - type: Transform
       parent: 2
       pos: -26.5,-47.5
-  - uid: 7434
-    components:
-    - type: Transform
-      parent: 2
-      pos: -9.5,-18.5
   - uid: 7777
     components:
     - type: Transform
       parent: 2
       pos: 23.5,-18.5
+  - uid: 8351
+    components:
+    - type: Transform
+      parent: 2
+      pos: -22.5,-14.5
   - uid: 8564
     components:
     - type: Transform
@@ -128068,6 +127112,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 51.5,-54.5
+  - uid: 15417
+    components:
+    - type: Transform
+      parent: 2
+      pos: -6.5,-26.5
 - proto: WaterTankFull
   entities:
   - uid: 3764
@@ -128207,6 +127256,24 @@ entities:
       deviceLists:
       - 10829
       - 19023
+  - uid: 15236
+    components:
+    - type: Transform
+      parent: 2
+      pos: 83.5,-49.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 19023
+      - 10829
+  - uid: 15269
+    components:
+    - type: Transform
+      parent: 2
+      pos: 83.5,-41.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 19023
+      - 10829
   - uid: 19485
     components:
     - type: Transform
@@ -128237,12 +127304,12 @@ entities:
       pos: 95.5,-44.5
     - type: DeviceList
       devices:
-      - 10842
+      - 15269
+      - 15236
       - 7576
       - 19485
       - 19486
-      - 10837
-      - 10250
+      - 10842
   - uid: 19023
     components:
     - type: Transform
@@ -128251,32 +127318,14 @@ entities:
       pos: 78.5,-45.5
     - type: DeviceList
       devices:
-      - 10837
-      - 10250
-      - 10842
-      - 19486
-      - 19485
       - 7576
+      - 19485
+      - 19486
+      - 10842
+      - 15269
+      - 15236
 - proto: WeaponEnergyTurretCommand
   entities:
-  - uid: 10250
-    components:
-    - type: Transform
-      parent: 2
-      pos: 83.5,-49.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 10829
-      - 19023
-  - uid: 10837
-    components:
-    - type: Transform
-      parent: 2
-      pos: 83.5,-41.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 10829
-      - 19023
   - uid: 19396
     components:
     - type: Transform
@@ -128348,16 +127397,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 52.5,-21.5
-  - uid: 12956
-    components:
-    - type: Transform
-      parent: 2
-      pos: 37.5,-27.5
-  - uid: 12958
-    components:
-    - type: Transform
-      parent: 2
-      pos: 46.5,-30.5
 - proto: WeaponWaterPistol
   entities:
   - uid: 16714
@@ -128469,6 +127508,12 @@ entities:
       pos: 46.5,-41.5
 - proto: Windoor
   entities:
+  - uid: 3702
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 39.5,-29.5
   - uid: 4706
     components:
     - type: Transform
@@ -128521,11 +127566,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 79.5,-22.5
-  - uid: 7768
-    components:
-    - type: Transform
-      parent: 2
-      pos: 30.5,-16.5
   - uid: 8011
     components:
     - type: Transform
@@ -128543,11 +127583,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 59.5,-40.5
-  - uid: 8617
-    components:
-    - type: Transform
-      parent: 2
-      pos: 32.5,-16.5
   - uid: 9213
     components:
     - type: Transform
@@ -128571,135 +127606,30 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 53.5,-13.5
+  - uid: 12983
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-15.5
+  - uid: 13274
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 30.5,-16.5
+  - uid: 13567
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 32.5,-16.5
   - uid: 16121
     components:
     - type: Transform
       parent: 2
       pos: 40.5,-18.5
-- proto: WindoorBarKitchenLocked
-  entities:
-  - uid: 7018
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-44.5
-  - uid: 7019
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-43.5
-  - uid: 7020
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-42.5
-  - uid: 18763
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-45.5
-  - uid: 19747
-    components:
-    - type: Transform
-      parent: 2
-      pos: 39.5,-46.5
-- proto: WindoorCargoLocked
-  entities:
-  - uid: 3041
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 27.5,-85.5
-  - uid: 15175
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 21.5,-85.5
-- proto: WindoorHydroponicsLocked
-  entities:
-  - uid: 5164
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-50.5
-  - uid: 5172
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-51.5
-  - uid: 5178
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-54.5
-  - uid: 5179
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-53.5
-  - uid: 10607
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 1.5,-55.5
-  - uid: 12508
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 1.5,-56.5
-- proto: WindoorPlasma
-  entities:
-  - uid: 2876
-    components:
-    - type: Transform
-      parent: 2
-      pos: -16.5,-36.5
-  - uid: 6144
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-49.5
-  - uid: 6285
-    components:
-    - type: Transform
-      parent: 2
-      pos: 18.5,-76.5
-  - uid: 6286
-    components:
-    - type: Transform
-      parent: 2
-      pos: 19.5,-76.5
-  - uid: 6287
-    components:
-    - type: Transform
-      parent: 2
-      pos: 20.5,-76.5
-  - uid: 8491
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -6.5,-18.5
-  - uid: 10558
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -7.5,-18.5
-- proto: WindoorSecureArmoryLocked
+- proto: WindoorArmoryLocked
   entities:
   - uid: 1211
     components:
@@ -128775,21 +127705,52 @@ entities:
     - type: Transform
       parent: 2
       pos: 69.5,-32.5
-- proto: WindoorSecureAtmosphericsLocked
+- proto: WindoorBarKitchenLocked
   entities:
-  - uid: 8009
+  - uid: 7018
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
-      pos: 26.5,-70.5
-  - uid: 8010
+      pos: 38.5,-44.5
+  - uid: 7019
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
-      pos: 26.5,-69.5
-- proto: WindoorSecureCommandLocked
+      pos: 38.5,-43.5
+  - uid: 7020
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-42.5
+  - uid: 18763
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-45.5
+  - uid: 19747
+    components:
+    - type: Transform
+      parent: 2
+      pos: 39.5,-46.5
+- proto: WindoorCargoLocked
+  entities:
+  - uid: 3041
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 27.5,-85.5
+  - uid: 15175
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 21.5,-85.5
+- proto: WindoorCommandLocked
   entities:
   - uid: 13568
     components:
@@ -128803,7 +127764,7 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 29.5,-60.5
-- proto: WindoorSecureEngineeringLocked
+- proto: WindoorEngineeringLocked
   entities:
   - uid: 4657
     components:
@@ -128856,6 +127817,18 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 67.5,-21.5
+  - uid: 8009
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 26.5,-70.5
+  - uid: 8010
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 26.5,-69.5
   - uid: 8021
     components:
     - type: Transform
@@ -128872,7 +127845,7 @@ entities:
     - type: Transform
       parent: 2
       pos: -11.5,-71.5
-- proto: WindoorSecureExternalLocked
+- proto: WindoorExternalLocked
   entities:
   - uid: 5974
     components:
@@ -128891,7 +127864,7 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 7.5,-17.5
-- proto: WindoorSecureHeadOfPersonnelLocked
+- proto: WindoorHeadOfPersonnelLocked
   entities:
   - uid: 2934
     components:
@@ -128905,7 +127878,45 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 12.5,-59.5
-- proto: WindoorSecureMedicalLocked
+- proto: WindoorHydroponicsLocked
+  entities:
+  - uid: 5164
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-50.5
+  - uid: 5172
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-51.5
+  - uid: 5178
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-54.5
+  - uid: 5179
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-53.5
+  - uid: 10607
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 1.5,-55.5
+  - uid: 12508
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 1.5,-56.5
+- proto: WindoorMedicalLocked
   entities:
   - uid: 292
     components:
@@ -128918,24 +127929,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 7.5,-27.5
-  - uid: 5422
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 32.5,-16.5
-  - uid: 7796
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 30.5,-16.5
-  - uid: 8691
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 33.5,-15.5
   - uid: 9483
     components:
     - type: Transform
@@ -128957,7 +127950,58 @@ entities:
     - type: Transform
       parent: 2
       pos: 14.5,-70.5
-- proto: WindoorSecureSecurityLocked
+- proto: WindoorPlasma
+  entities:
+  - uid: 1854
+    components:
+    - type: Transform
+      parent: 2
+      pos: -10.5,-28.5
+  - uid: 1961
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-28.5
+  - uid: 2876
+    components:
+    - type: Transform
+      parent: 2
+      pos: -16.5,-36.5
+  - uid: 6144
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-49.5
+  - uid: 6285
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,-76.5
+  - uid: 6286
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,-76.5
+  - uid: 6287
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,-76.5
+  - uid: 8702
+    components:
+    - type: Transform
+      parent: 2
+      pos: -8.5,-28.5
+- proto: WindoorScienceLocked
+  entities:
+  - uid: 8491
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -4.5,-23.5
+- proto: WindoorSecurityLocked
   entities:
   - uid: 3579
     components:
@@ -129049,7 +128093,7 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 61.5,-27.5
-- proto: WindoorSecureServiceLocked
+- proto: WindoorServiceLocked
   entities:
   - uid: 6038
     components:
@@ -129119,6 +128163,12 @@ entities:
       pos: 40.5,-47.5
 - proto: WindowFrostedDirectional
   entities:
+  - uid: 3727
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 40.5,-29.5
   - uid: 6162
     components:
     - type: Transform
@@ -129144,6 +128194,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 18.5,-31.5
+  - uid: 484
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -5.5,-23.5
   - uid: 2223
     components:
     - type: Transform
@@ -129321,6 +128377,12 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 25.5,-51.5
+  - uid: 8152
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -3.5,-23.5
   - uid: 8367
     components:
     - type: Transform
@@ -129467,6 +128529,11 @@ entities:
       pos: -25.41542,-22.406422
 - proto: Wrench
   entities:
+  - uid: 2111
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.481896,-17.432177
   - uid: 6656
     components:
     - type: Transform
@@ -129502,11 +128569,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 0.46065357,-56.502483
-  - uid: 18303
-    components:
-    - type: Transform
-      parent: 2
-      pos: -13.546322,-21.423643
   - uid: 18373
     components:
     - type: Transform
@@ -129619,22 +128681,22 @@ entities:
     - type: Transform
       parent: 2
       pos: 0.5,-38.5
+  - uid: 1077
+    components:
+    - type: Transform
+      parent: 2
+      pos: -2.5,-23.5
   - uid: 1123
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 53.5,-66.5
-  - uid: 1159
+  - uid: 1160
     components:
     - type: Transform
       parent: 2
-      pos: 3.5,-43.5
-  - uid: 1171
-    components:
-    - type: Transform
-      parent: 2
-      pos: 3.5,-44.5
+      pos: -2.5,-24.5
   - uid: 1184
     components:
     - type: Transform
@@ -129650,21 +128712,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 2.5,-40.5
-  - uid: 1220
-    components:
-    - type: Transform
-      parent: 2
-      pos: 2.5,-42.5
   - uid: 1231
     components:
     - type: Transform
       parent: 2
       pos: -1.5,-40.5
-  - uid: 1568
-    components:
-    - type: Transform
-      parent: 2
-      pos: -13.5,-76.5
   - uid: 1593
     components:
     - type: Transform
@@ -129680,11 +128732,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 50.5,-22.5
-  - uid: 1804
-    components:
-    - type: Transform
-      parent: 2
-      pos: 47.5,-78.5
   - uid: 1817
     components:
     - type: Transform
@@ -129710,11 +128757,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 22.5,-40.5
-  - uid: 1843
-    components:
-    - type: Transform
-      parent: 2
-      pos: -12.5,-76.5
   - uid: 1844
     components:
     - type: Transform
@@ -129745,16 +128787,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 22.5,-44.5
-  - uid: 1853
-    components:
-    - type: Transform
-      parent: 2
-      pos: -3.5,-23.5
-  - uid: 1854
-    components:
-    - type: Transform
-      parent: 2
-      pos: -4.5,-23.5
   - uid: 1857
     components:
     - type: Transform
@@ -129775,21 +128807,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -20.5,-19.5
-  - uid: 1961
-    components:
-    - type: Transform
-      parent: 2
-      pos: -5.5,-23.5
-  - uid: 1963
-    components:
-    - type: Transform
-      parent: 2
-      pos: -6.5,-23.5
-  - uid: 2203
-    components:
-    - type: Transform
-      parent: 2
-      pos: 3.5,-42.5
   - uid: 2204
     components:
     - type: Transform
@@ -130026,6 +129043,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 7.5,-70.5
+  - uid: 3165
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-28.5
   - uid: 3220
     components:
     - type: Transform
@@ -130186,11 +129208,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 45.5,-79.5
-  - uid: 4079
-    components:
-    - type: Transform
-      parent: 2
-      pos: 45.5,-78.5
   - uid: 4195
     components:
     - type: Transform
@@ -130211,11 +129228,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -46.5,-70.5
-  - uid: 4199
-    components:
-    - type: Transform
-      parent: 2
-      pos: -12.5,-77.5
   - uid: 4207
     components:
     - type: Transform
@@ -130226,11 +129238,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 81.5,-33.5
-  - uid: 4210
-    components:
-    - type: Transform
-      parent: 2
-      pos: -4.5,-18.5
   - uid: 4221
     components:
     - type: Transform
@@ -130241,11 +129248,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -1.5,-39.5
-  - uid: 4310
-    components:
-    - type: Transform
-      parent: 2
-      pos: -3.5,-18.5
   - uid: 4313
     components:
     - type: Transform
@@ -130286,16 +129288,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 22.5,-41.5
-  - uid: 4392
-    components:
-    - type: Transform
-      parent: 2
-      pos: -5.5,-18.5
-  - uid: 4397
-    components:
-    - type: Transform
-      parent: 2
-      pos: -2.5,-26.5
   - uid: 4398
     components:
     - type: Transform
@@ -130326,11 +129318,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 80.5,-31.5
-  - uid: 4418
-    components:
-    - type: Transform
-      parent: 2
-      pos: -13.5,-77.5
   - uid: 4420
     components:
     - type: Transform
@@ -130396,16 +129383,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 77.5,-17.5
-  - uid: 4469
-    components:
-    - type: Transform
-      parent: 2
-      pos: -2.5,-25.5
-  - uid: 4470
-    components:
-    - type: Transform
-      parent: 2
-      pos: -2.5,-24.5
   - uid: 4471
     components:
     - type: Transform
@@ -130993,6 +129970,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 44.5,-58.5
+  - uid: 6975
+    components:
+    - type: Transform
+      parent: 2
+      pos: -2.5,-22.5
   - uid: 7409
     components:
     - type: Transform
@@ -131173,11 +130155,16 @@ entities:
     - type: Transform
       parent: 2
       pos: -30.5,-44.5
-  - uid: 14084
+  - uid: 14005
     components:
     - type: Transform
       parent: 2
-      pos: 0.5,-43.5
+      pos: -12.5,-77.5
+  - uid: 14047
+    components:
+    - type: Transform
+      parent: 2
+      pos: -12.5,-76.5
   - uid: 14115
     components:
     - type: Transform
@@ -131220,11 +130207,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 46.5,-62.5
-  - uid: 16449
-    components:
-    - type: Transform
-      parent: 2
-      pos: 49.5,-78.5
   - uid: 16677
     components:
     - type: Transform
@@ -131271,11 +130253,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -16.5,-70.5
-  - uid: 19005
-    components:
-    - type: Transform
-      parent: 2
-      pos: -0.5,-42.5
   - uid: 19193
     components:
     - type: Transform
@@ -131306,4 +130283,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 7.5,-71.5
+- proto: ZiptiesBroken
+  entities:
+  - uid: 17328
+    components:
+    - type: Transform
+      parent: 2
+      pos: 35.1793,-28.563358
+  - uid: 17342
+    components:
+    - type: Transform
+      parent: 2
+      pos: 35.61558,-29.265411
 ...
diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index b7128f7df6..266085bccb 100644
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -4,14 +4,25 @@ meta:
   engineVersion: 289.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/23/2026 15:02:00
-  entityCount: 23941
+  time: 09/10/2026 23:17:57
+  entityCount: 23929
 maps:
 - 5350
 grids:
 - 30
 orphans: []
 nullspace:
+- 11787
+- 11788
+- 11789
+- 11790
+- 11791
+- 11792
+- 11793
+- 11794
+- 11864
+- 12012
+- 12083
 - 20341
 - 20600
 - 20606
@@ -19,6 +30,7 @@ nullspace:
 - 20609
 - 20610
 - 20611
+- 23196
 - 23890
 - 23891
 - 23892
@@ -59,18 +71,6 @@ nullspace:
 - 23927
 - 23928
 - 23929
-- 23930
-- 23931
-- 23932
-- 23933
-- 23934
-- 23935
-- 23936
-- 23937
-- 23938
-- 23939
-- 23940
-- 23941
 tilemap:
   0: Space
   43: FloorArcadeBlue
@@ -100,6 +100,7 @@ tilemap:
   63: FloorLaundry
   64: FloorLino
   67: FloorMime
+  1: FloorMowedAstroGrass
   76: FloorPlanetGrass
   77: FloorPlastic
   78: FloorRGlass
@@ -146,7 +147,7 @@ entities:
           version: 7
         0,-1:
           ind: 0,-1
-          tiles: fgAAAAAAAH4AAAAAAABsAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAB+AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAADMAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAAmAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAA8AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAJgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAfAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAACYAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAAzAAAAAAIAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAMwAAAAADADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAzAAAAAAMAJgAAAAAAADMAAAAAAgAzAAAAAAQAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAA==
+          tiles: fgAAAAAAAH4AAAAAAABsAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAB+AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAAEAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAAmAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAA8AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAJgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAfAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAACYAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAABAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAAQAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAABAAAAAAAAJgAAAAAAAAEAAAAAAAABAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAA==
           version: 7
         -2,0:
           ind: -2,0
@@ -174,7 +175,7 @@ entities:
           version: 7
         -4,0:
           ind: -4,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAAAAAAAAAAH0AAAAAAQB9AAAAAAEAfgAAAAAAAGwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAAAAAAAAAAB9AAAAAAIAAAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAAAAAAAAAAH0AAAAAAgAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAAAAAAAAAAB9AAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAAAAAAAAAAfQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAAyAAAAAAEAfgAAAAAAADEAAAAABAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAAAAAAAAAAH0AAAAAAQB9AAAAAAEAfgAAAAAAAGwAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAAAAAAAAAAB9AAAAAAIAAAAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAAAAAAAAAAH0AAAAAAgAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAAAAAAAAAAB9AAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAAAAAAAAAAfQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAA==
           version: 7
         -3,-1:
           ind: -3,-1
@@ -198,7 +199,7 @@ entities:
           version: 7
         -4,1:
           ind: -4,1
-          tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH0AAAAAAQB9AAAAAAIAfQAAAAACAH0AAAAAAQB9AAAAAAIAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADEAAAAAAwAxAAAAAAMAMQAAAAABADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAB9AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAfQAAAAABAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAxAAAAAAUAMQAAAAAAADEAAAAABAA8AAAAAAAAPAAAAAAAADwAAAAAAAAfAAAAAAAAfQAAAAABAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAMQAAAAABADEAAAAAAAAxAAAAAAQAPAAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAMQAAAAAFAH4AAAAAAAAxAAAAAAUAfgAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAABAAAAAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAA==
+          tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAH0AAAAAAQB9AAAAAAIAfQAAAAACAH0AAAAAAQB9AAAAAAIAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADEAAAAAAwAxAAAAAAMAMQAAAAABADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAB9AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAfQAAAAABAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAxAAAAAAUAMQAAAAAAADEAAAAABAA8AAAAAAAAPAAAAAAAADwAAAAAAAAfAAAAAAAAfQAAAAABAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAMQAAAAABADEAAAAAAAAxAAAAAAQAPAAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAAQAAAAAAAH4AAAAAAAABAAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAABAAAAAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAA==
           version: 7
         -4,2:
           ind: -4,2
@@ -226,7 +227,7 @@ entities:
           version: 7
         -1,2:
           ind: -1,2
-          tiles: HwAAAAAAAB8AAAAAAAAfAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAACQAAAAAAAAfAAAAAAAAegAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAEAAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAEAAAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAHwAAAAAAAHoAAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAABAAAAAAAAAegAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAHoAAAAAAABAAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAQAAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAQAAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAGwAAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAAfAAAAAAAAHwAAAAAAACQAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAJAAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAMAAAAAAUADAAAAAACAAwAAAAAAQAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAAAAH0AAAAAAgB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAkAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAgB9AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAABAH0AAAAAAQB9AAAAAAIAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAgB9AAAAAAAAfQAAAAABAH0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAEAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAABAAAAAAAAAAB9AAAAAAEAfQAAAAABAA==
+          tiles: HwAAAAAAAB8AAAAAAAAfAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAACQAAAAAAAAfAAAAAAAAegAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAEAAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAEAAAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAHwAAAAAAAHoAAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAABAAAAAAAAAegAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAHoAAAAAAABAAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAQAAAAAAAAHoAAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB6AAAAAAAAQAAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAGwAAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAAfAAAAAAAAHwAAAAAAACQAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAJAAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAAAAH0AAAAAAgB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAkAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAgB9AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAABAH0AAAAAAQB9AAAAAAIAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAgB9AAAAAAAAfQAAAAABAH0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAEAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAABAAAAAAAAAAB9AAAAAAEAfQAAAAABAA==
           version: 7
         0,2:
           ind: 0,2
@@ -266,7 +267,7 @@ entities:
           version: 7
         -2,-2:
           ind: -2,-2
-          tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHoAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAegAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAADAAAAAABAHAAAAAAAABwAAAAAAAAcAAAAAAAAH4AAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAB+AAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAwAAAAAAgBwAAAAAAAAcAAAAAAAAHAAAAAAAAB+AAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAfgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAH4AAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAADAAAAAAFAHAAAAAAAABwAAAAAAAAcAAAAAAAAH4AAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAB+AAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAwAAAAAAgBwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAfgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAH4AAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAA==
+          tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHoAAAAAAAB6AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHoAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAegAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAAAAHoAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAH4AAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAQAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAH4AAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAB+AAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAEAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAB+AAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAfgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAH4AAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAQAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAH4AAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAB+AAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAEAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAfgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAH4AAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAA==
           version: 7
         -3,-2:
           ind: -3,-2
@@ -2929,6 +2930,17 @@ entities:
       chunkHistory: {}
     - type: ChunkContainer
       chunkEntities:
+      - 11787
+      - 11788
+      - 11789
+      - 11790
+      - 11791
+      - 11792
+      - 11793
+      - 11794
+      - 11864
+      - 12012
+      - 12083
       - 20341
       - 20600
       - 20606
@@ -2936,6 +2948,7 @@ entities:
       - 20609
       - 20610
       - 20611
+      - 23196
       - 23890
       - 23891
       - 23892
@@ -2976,18 +2989,7 @@ entities:
       - 23927
       - 23928
       - 23929
-      - 23930
-      - 23931
-      - 23932
-      - 23933
-      - 23934
-      - 23935
-      - 23936
-      - 23937
-      - 23938
-      - 23939
-      - 23940
-      - 23941
+    - type: GridSplitNode
   - uid: 5350
     components:
     - type: MetaData
@@ -5910,12 +5912,32 @@ entities:
         11800:
         - - DoorStatus
           - DoorBolt
+  - uid: 11704
+    components:
+    - type: Transform
+      parent: 30
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-3.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1475:
+        - - DoorStatus
+          - Close
   - uid: 11710
     components:
     - type: Transform
       parent: 30
-      rot: 1.5707963267948966 rad
-      pos: 36.5,-3.5
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-5.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1083:
+        - - DoorStatus
+          - Close
   - uid: 11800
     components:
     - type: Transform
@@ -5926,12 +5948,6 @@ entities:
         11658:
         - - DoorStatus
           - DoorBolt
-  - uid: 12083
-    components:
-    - type: Transform
-      parent: 30
-      rot: 1.5707963267948966 rad
-      pos: 36.5,-5.5
 - proto: AirlockExternalGlassEngineeringLocked
   entities:
   - uid: 20059
@@ -6080,6 +6096,34 @@ entities:
     - type: Transform
       parent: 30
       pos: -59.5,2.5
+- proto: AirlockExternalGlassShuttleCargo
+  entities:
+  - uid: 1083
+    components:
+    - type: Transform
+      parent: 30
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-5.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        11710:
+        - - DoorStatus
+          - Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 1475
+    components:
+    - type: Transform
+      parent: 30
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-3.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        11704:
+        - - DoorStatus
+          - Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: AirlockExternalGlassShuttleEmergencyLocked
   entities:
   - uid: 16406
@@ -6122,18 +6166,6 @@ entities:
       pos: -53.5,36.5
 - proto: AirlockExternalGlassShuttleLocked
   entities:
-  - uid: 11864
-    components:
-    - type: Transform
-      parent: 30
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-5.5
-  - uid: 12012
-    components:
-    - type: Transform
-      parent: 30
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-3.5
   - uid: 15244
     components:
     - type: Transform
@@ -7036,7 +7068,7 @@ entities:
       pos: 34.5,45.5
     - type: Door
       state: Opening
-      secondsUntilStateChange: -58851.754
+      secondsUntilStateChange: -59275.88
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -8873,13 +8905,6 @@ entities:
     - type: Transform
       parent: 30
       pos: -28.507416,-46.550377
-- proto: AsimovCircuitBoard
-  entities:
-  - uid: 21606
-    components:
-    - type: Transform
-      parent: 30
-      pos: -3.4068027,64.40575
 - proto: AsteroidRock
   entities:
   - uid: 332
@@ -9515,18 +9540,6 @@ entities:
       parent: 30
       rot: 3.141592653589793 rad
       pos: 25.5,43.5
-  - uid: 1083
-    components:
-    - type: Transform
-      parent: 30
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-3.5
-  - uid: 1475
-    components:
-    - type: Transform
-      parent: 30
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-5.5
   - uid: 1490
     components:
     - type: Transform
@@ -42398,11 +42411,18 @@ entities:
       pos: -5.5,-50.5
 - proto: CargoMailTeleporter
   entities:
-  - uid: 23196
+  - uid: 11783
     components:
     - type: Transform
       parent: 30
-      pos: 27.5,-1.5
+      pos: 16.5,2.5
+- proto: CargoTelepad
+  entities:
+  - uid: 11785
+    components:
+    - type: Transform
+      parent: 30
+      pos: 25.5,-2.5
 - proto: Carpet
   entities:
   - uid: 560
@@ -49282,7 +49302,7 @@ entities:
       pos: -56.515633,10.561228
 - proto: ChunkEntity
   entities:
-  - uid: 20341
+  - uid: 11787
     components:
     - type: ChunkEntity
       root: 30
@@ -49548,7 +49568,7 @@ entities:
             1280: -44,32
             2183: -42,32
             2184: -45,32
-  - uid: 20600
+  - uid: 11788
     components:
     - type: ChunkEntity
       root: 30
@@ -49600,7 +49620,7 @@ entities:
             1284: -52,32
             1285: -53,32
             1292: -54,32
-  - uid: 20606
+  - uid: 11789
     components:
     - type: ChunkEntity
       root: 30
@@ -49784,7 +49804,7 @@ entities:
             1622: 28,16
             1630: 27,16
             1631: 26,16
-  - uid: 20607
+  - uid: 11790
     components:
     - type: ChunkEntity
       root: 30
@@ -50033,7 +50053,7 @@ entities:
             1606: 9,-17
             1607: 8,-17
             1608: 7,-17
-  - uid: 20609
+  - uid: 11791
     components:
     - type: ChunkEntity
       root: 30
@@ -50128,7 +50148,7 @@ entities:
             1181: 19,-21
             2802: 16,-19
             2803: 17,-19
-  - uid: 20610
+  - uid: 11792
     components:
     - type: ChunkEntity
       root: 30
@@ -50157,7 +50177,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3387: 21,-37
-  - uid: 20611
+  - uid: 11793
     components:
     - type: ChunkEntity
       root: 30
@@ -50488,7 +50508,7 @@ entities:
             2358: -31,-3
             2359: -31,-2
             2360: -31,-1
-  - uid: 23890
+  - uid: 11794
     components:
     - type: ChunkEntity
       root: 30
@@ -50571,7 +50591,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1119: 32,-12
-  - uid: 23891
+  - uid: 11864
     components:
     - type: ChunkEntity
       root: 30
@@ -50736,7 +50756,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1600: 0,15
-  - uid: 23892
+  - uid: 12012
     components:
     - type: ChunkEntity
       root: 30
@@ -50941,7 +50961,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3062: -37,22
-  - uid: 23893
+  - uid: 12083
     components:
     - type: ChunkEntity
       root: 30
@@ -51149,7 +51169,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3065: -37,12
-  - uid: 23894
+  - uid: 20341
     components:
     - type: ChunkEntity
       root: 30
@@ -51332,7 +51352,7 @@ entities:
             1289: -50,29
             1290: -49,29
             1291: -54,29
-  - uid: 23895
+  - uid: 20600
     components:
     - type: ChunkEntity
       root: 30
@@ -51452,7 +51472,7 @@ entities:
             1295: -24,52
             1296: -25,52
             1297: -26,52
-  - uid: 23896
+  - uid: 20606
     components:
     - type: ChunkEntity
       root: 30
@@ -51605,7 +51625,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1336: -22,30
-  - uid: 23897
+  - uid: 20607
     components:
     - type: ChunkEntity
       root: 30
@@ -51885,7 +51905,7 @@ entities:
             7: 0,21
             8: 0,22
             9: 0,23
-  - uid: 23898
+  - uid: 20609
     components:
     - type: ChunkEntity
       root: 30
@@ -51997,7 +52017,7 @@ entities:
             1436: 4,34
             1437: 5,34
             1438: 2,34
-  - uid: 23899
+  - uid: 20610
     components:
     - type: ChunkEntity
       root: 30
@@ -52309,7 +52329,7 @@ entities:
             3073: -5,-3
             3074: -1,-3
             3110: -5,-12
-  - uid: 23900
+  - uid: 20611
     components:
     - type: ChunkEntity
       root: 30
@@ -52581,7 +52601,7 @@ entities:
             1616: 3,-8
             1617: 3,-7
             1618: 3,-6
-  - uid: 23901
+  - uid: 23196
     components:
     - type: ChunkEntity
       root: 30
@@ -52791,7 +52811,7 @@ entities:
             1649: 27,0
             1650: 27,1
             1651: 27,2
-  - uid: 23902
+  - uid: 23890
     components:
     - type: ChunkEntity
       root: 30
@@ -53011,7 +53031,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1443: -19,32
-  - uid: 23903
+  - uid: 23891
     components:
     - type: ChunkEntity
       root: 30
@@ -53218,7 +53238,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3187: -38,51
-  - uid: 23904
+  - uid: 23892
     components:
     - type: ChunkEntity
       root: 30
@@ -53438,7 +53458,7 @@ entities:
             3092: 21,-4
             3093: 20,-4
             3094: 19,-4
-  - uid: 23905
+  - uid: 23893
     components:
     - type: ChunkEntity
       root: 30
@@ -53538,7 +53558,7 @@ entities:
             688: 37,12
             689: 36,12
             690: 35,12
-  - uid: 23906
+  - uid: 23894
     components:
     - type: ChunkEntity
       root: 30
@@ -53796,7 +53816,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1432: -2,31
-  - uid: 23907
+  - uid: 23895
     components:
     - type: ChunkEntity
       root: 30
@@ -53867,7 +53887,7 @@ entities:
           decals:
             1528: 34,30
             1529: 33,30
-  - uid: 23908
+  - uid: 23896
     components:
     - type: ChunkEntity
       root: 30
@@ -54198,7 +54218,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1461: -9,41
-  - uid: 23909
+  - uid: 23897
     components:
     - type: ChunkEntity
       root: 30
@@ -54258,7 +54278,7 @@ entities:
             1536: 43,38
             1537: 43,39
             1538: 43,40
-  - uid: 23910
+  - uid: 23898
     components:
     - type: ChunkEntity
       root: 30
@@ -54338,7 +54358,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3170: 29,42
-  - uid: 23911
+  - uid: 23899
     components:
     - type: ChunkEntity
       root: 30
@@ -54614,7 +54634,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3107: -4,-22
-  - uid: 23912
+  - uid: 23900
     components:
     - type: ChunkEntity
       root: 30
@@ -54739,7 +54759,7 @@ entities:
             1596: -3,15
             1597: -2,15
             1598: -1,15
-  - uid: 23913
+  - uid: 23901
     components:
     - type: ChunkEntity
       root: 30
@@ -54895,7 +54915,7 @@ entities:
           decals:
             2423: -47,-10
             2424: -47,-9
-  - uid: 23914
+  - uid: 23902
     components:
     - type: ChunkEntity
       root: 30
@@ -55140,7 +55160,7 @@ entities:
             2526: -23,-23
             2527: -23,-17
             2642: -31,-18
-  - uid: 23915
+  - uid: 23903
     components:
     - type: ChunkEntity
       root: 30
@@ -55292,7 +55312,7 @@ entities:
             2875: -1,-48
             3357: -3,-48
             3358: -4,-48
-  - uid: 23916
+  - uid: 23904
     components:
     - type: ChunkEntity
       root: 30
@@ -55434,7 +55454,7 @@ entities:
             2816: -9,-51
             2867: -2,-52
             2868: -1,-52
-  - uid: 23917
+  - uid: 23905
     components:
     - type: ChunkEntity
       root: 30
@@ -55560,7 +55580,7 @@ entities:
             2878: 2,-48
             3382: 3,-48
             3383: 4,-48
-  - uid: 23918
+  - uid: 23906
     components:
     - type: ChunkEntity
       root: 30
@@ -55632,7 +55652,7 @@ entities:
           decals:
             2869: 0,-52
             2870: 0,-52
-  - uid: 23919
+  - uid: 23907
     components:
     - type: ChunkEntity
       root: 30
@@ -55706,7 +55726,7 @@ entities:
             angle: 1.5707963267948966 rad
           decals:
             892: -57,-22
-  - uid: 23920
+  - uid: 23908
     components:
     - type: ChunkEntity
       root: 30
@@ -55729,7 +55749,7 @@ entities:
             angle: -3.141592653589793 rad
           decals:
             3414: -22,-72
-  - uid: 23921
+  - uid: 23909
     components:
     - type: ChunkEntity
       root: 30
@@ -55818,7 +55838,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2941: -18,-53
-  - uid: 23922
+  - uid: 23910
     components:
     - type: ChunkEntity
       root: 30
@@ -55880,7 +55900,7 @@ entities:
             angle: -1.5707963267948966 rad
           decals:
             893: -47,-22
-  - uid: 23923
+  - uid: 23911
     components:
     - type: ChunkEntity
       root: 30
@@ -56066,7 +56086,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1566: -56,-54
-  - uid: 23924
+  - uid: 23912
     components:
     - type: ChunkEntity
       root: 30
@@ -56238,7 +56258,7 @@ entities:
             1551: -74,-54
             1552: -74,-53
             1553: -74,-52
-  - uid: 23925
+  - uid: 23913
     components:
     - type: ChunkEntity
       root: 30
@@ -56406,7 +56426,7 @@ entities:
             1681: -58,13
             1682: -58,14
             1683: -58,15
-  - uid: 23926
+  - uid: 23914
     components:
     - type: ChunkEntity
       root: 30
@@ -56599,7 +56619,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3066: -30,3
-  - uid: 23927
+  - uid: 23915
     components:
     - type: ChunkEntity
       root: 30
@@ -56703,7 +56723,7 @@ entities:
             855: -26,-37
             856: -28,-37
             857: -28,-37
-  - uid: 23928
+  - uid: 23916
     components:
     - type: ChunkEntity
       root: 30
@@ -56743,7 +56763,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             966: -67.18431,-28.324245
-  - uid: 23929
+  - uid: 23917
     components:
     - type: ChunkEntity
       root: 30
@@ -56877,7 +56897,7 @@ entities:
             780: -79,-48
             781: -78,-48
             782: -77,-48
-  - uid: 23930
+  - uid: 23918
     components:
     - type: ChunkEntity
       root: 30
@@ -56932,7 +56952,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1591: -52.942307,-42.899807
-  - uid: 23931
+  - uid: 23919
     components:
     - type: ChunkEntity
       root: 30
@@ -56966,7 +56986,7 @@ entities:
             cleanable: True
           decals:
             700: 52,19
-  - uid: 23932
+  - uid: 23920
     components:
     - type: ChunkEntity
       root: 30
@@ -57011,7 +57031,7 @@ entities:
             color: '#EFB34196'
           decals:
             778: -81,-48
-  - uid: 23933
+  - uid: 23921
     components:
     - type: ChunkEntity
       root: 30
@@ -57060,7 +57080,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3028: -5,78
-  - uid: 23934
+  - uid: 23922
     components:
     - type: ChunkEntity
       root: 30
@@ -57117,7 +57137,7 @@ entities:
           decals:
             3355: -50,52
             3356: -50,56
-  - uid: 23935
+  - uid: 23923
     components:
     - type: ChunkEntity
       root: 30
@@ -57139,7 +57159,7 @@ entities:
           decals:
             906: -4,62
             907: -4,63
-  - uid: 23936
+  - uid: 23924
     components:
     - type: ChunkEntity
       root: 30
@@ -57166,7 +57186,7 @@ entities:
             color: '#DE3A3A96'
           decals:
             3312: -52,67
-  - uid: 23937
+  - uid: 23925
     components:
     - type: ChunkEntity
       root: 30
@@ -57209,7 +57229,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3031: 4,79
-  - uid: 23938
+  - uid: 23926
     components:
     - type: ChunkEntity
       root: 30
@@ -57231,7 +57251,7 @@ entities:
           decals:
             903: 2,62
             904: 2,63
-  - uid: 23939
+  - uid: 23927
     components:
     - type: ChunkEntity
       root: 30
@@ -57274,7 +57294,7 @@ entities:
             color: '#DE3A3A96'
           decals:
             3310: -44,67
-  - uid: 23940
+  - uid: 23928
     components:
     - type: ChunkEntity
       root: 30
@@ -57299,7 +57319,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3034: 4,87
-  - uid: 23941
+  - uid: 23929
     components:
     - type: ChunkEntity
       root: 30
@@ -59874,11 +59894,28 @@ entities:
     - type: Transform
       parent: 30
       pos: 24.5,2.5
-  - uid: 11704
+  - uid: 11718
     components:
     - type: Transform
       parent: 30
-      pos: 16.5,2.5
+      rot: 3.141592653589793 rad
+      pos: 17.5,-2.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        11785:
+        - - OrderSender
+          - OrderReceiver
+  - uid: 11729
+    components:
+    - type: Transform
+      parent: 30
+      rot: 1.5707963267948966 rad
+      pos: 15.5,0.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        11785:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersEngineering
   entities:
   - uid: 21714
@@ -59887,6 +59924,11 @@ entities:
       parent: 30
       rot: 3.141592653589793 rad
       pos: -24.5,-44.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        11785:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersMedical
   entities:
   - uid: 2187
@@ -59895,6 +59937,11 @@ entities:
       parent: 30
       rot: -1.5707963267948966 rad
       pos: -12.5,-20.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        11785:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersScience
   entities:
   - uid: 21715
@@ -59903,6 +59950,11 @@ entities:
       parent: 30
       rot: -1.5707963267948966 rad
       pos: 23.5,12.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        11785:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersSecurity
   entities:
   - uid: 21719
@@ -59910,6 +59962,11 @@ entities:
     - type: Transform
       parent: 30
       pos: -30.5,51.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        11785:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersService
   entities:
   - uid: 22904
@@ -59917,6 +59974,11 @@ entities:
     - type: Transform
       parent: 30
       pos: -12.5,16.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        11785:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerComms
   entities:
   - uid: 5009
@@ -60180,12 +60242,6 @@ entities:
       parent: 30
       rot: -1.5707963267948966 rad
       pos: 35.5,-4.5
-  - uid: 11718
-    components:
-    - type: Transform
-      parent: 30
-      rot: 1.5707963267948966 rad
-      pos: 15.5,0.5
 - proto: ComputerSolarControl
   entities:
   - uid: 5594
@@ -61033,6 +61089,13 @@ entities:
     - type: SingletonDeviceNetServer
       available: False
       active: False
+- proto: CrewsimovCircuitBoard
+  entities:
+  - uid: 21606
+    components:
+    - type: Transform
+      parent: 30
+      pos: -3.4068027,64.40575
 - proto: Crowbar
   entities:
   - uid: 18695
@@ -110704,6 +110767,13 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: MailCart
+  entities:
+  - uid: 11784
+    components:
+    - type: Transform
+      parent: 30
+      pos: 18.5,2.5
 - proto: MaintenanceFluffSpawner
   entities:
   - uid: 9199
@@ -111912,66 +111982,6 @@ entities:
     - type: Transform
       parent: 30
       pos: 25.685026,1.976799
-  - uid: 11783
-    components:
-    - type: Transform
-      parent: 30
-      pos: 18.397085,2.638605
-  - uid: 11784
-    components:
-    - type: Transform
-      parent: 30
-      pos: 18.47521,2.59173
-  - uid: 11785
-    components:
-    - type: Transform
-      parent: 30
-      pos: 18.60021,2.52923
-  - uid: 11786
-    components:
-    - type: Transform
-      parent: 30
-      pos: 18.428335,2.62298
-  - uid: 11787
-    components:
-    - type: Transform
-      parent: 30
-      pos: 18.53771,2.56048
-  - uid: 11788
-    components:
-    - type: Transform
-      parent: 30
-      pos: 18.60021,2.52923
-  - uid: 11789
-    components:
-    - type: Transform
-      parent: 30
-      pos: 18.428335,2.62298
-  - uid: 11790
-    components:
-    - type: Transform
-      parent: 30
-      pos: 18.490835,2.59173
-  - uid: 11791
-    components:
-    - type: Transform
-      parent: 30
-      pos: 18.56896,2.544855
-  - uid: 11792
-    components:
-    - type: Transform
-      parent: 30
-      pos: 18.397085,2.638605
-  - uid: 11793
-    components:
-    - type: Transform
-      parent: 30
-      pos: 18.490835,2.59173
-  - uid: 11794
-    components:
-    - type: Transform
-      parent: 30
-      pos: 18.60021,2.52923
   - uid: 17650
     components:
     - type: Transform
@@ -131933,11 +131943,6 @@ entities:
     - type: Transform
       parent: 30
       pos: 20.5,2.5
-  - uid: 11729
-    components:
-    - type: Transform
-      parent: 30
-      pos: 18.5,2.5
   - uid: 11730
     components:
     - type: Transform
@@ -151704,6 +151709,11 @@ entities:
     - type: Transform
       parent: 30
       pos: -23.5,4.5
+  - uid: 11786
+    components:
+    - type: Transform
+      parent: 30
+      pos: 17.5,-2.5
   - uid: 12728
     components:
     - type: Transform
diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml
index 6802da8902..fd68bac942 100644
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
@@ -4,16 +4,14 @@ meta:
   engineVersion: 289.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/22/2026 13:31:38
-  entityCount: 16511
+  time: 09/10/2026 21:56:10
+  entityCount: 16513
 maps:
 - 126
 grids:
 - 2
 orphans: []
 nullspace:
-- 15155
-- 15534
 - 15658
 - 15681
 - 16468
@@ -60,6 +58,8 @@ nullspace:
 - 16509
 - 16510
 - 16511
+- 16512
+- 16513
 tilemap:
   0: Space
   41: FloorArcadeBlue
@@ -2052,8 +2052,6 @@ entities:
     - type: ExplosionAirtightGrid
     - type: ChunkContainer
       chunkEntities:
-      - 15155
-      - 15534
       - 15658
       - 15681
       - 16468
@@ -2100,6 +2098,8 @@ entities:
       - 16509
       - 16510
       - 16511
+      - 16512
+      - 16513
   - uid: 126
     components:
     - type: MetaData
@@ -4228,7 +4228,7 @@ entities:
       invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
-        607:
+        451:
         - - DoorStatus
           - DoorBolt
   - uid: 428
@@ -4241,7 +4241,7 @@ entities:
       invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
-        451:
+        607:
         - - DoorStatus
           - DoorBolt
   - uid: 974
@@ -4395,6 +4395,38 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -9.5,-16.5
+- proto: AirlockExternalGlassShuttleCargo
+  entities:
+  - uid: 451
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 3.5,24.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        553:
+        - - DoorStatus
+          - InputA
+        - - DockStatus
+          - InputB
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 607
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 3.5,26.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        10982:
+        - - DoorStatus
+          - InputA
+        - - DockStatus
+          - InputB
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: AirlockExternalGlassShuttleEmergencyLocked
   entities:
   - uid: 139
@@ -4446,36 +4478,6 @@ entities:
       invokeCounter: 1
 - proto: AirlockExternalGlassShuttleLocked
   entities:
-  - uid: 451
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 3.5,26.5
-    - type: DeviceLinkSource
-      linkedPorts:
-        10982:
-        - - DoorStatus
-          - InputA
-        - - DockStatus
-          - InputB
-    - type: DeviceLinkSink
-      invokeCounter: 1
-  - uid: 607
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 3.5,24.5
-    - type: DeviceLinkSource
-      linkedPorts:
-        553:
-        - - DoorStatus
-          - InputA
-        - - DockStatus
-          - InputB
-    - type: DeviceLinkSink
-      invokeCounter: 1
   - uid: 9303
     components:
     - type: Transform
@@ -5194,7 +5196,7 @@ entities:
       pos: 88.5,-10.5
     - type: Door
       state: Opening
-      secondsUntilStateChange: -7441.542
+      secondsUntilStateChange: -10138.046
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -7067,13 +7069,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 38.30913,-29.45608
-- proto: AsimovCircuitBoard
-  entities:
-  - uid: 14276
-    components:
-    - type: Transform
-      parent: 2
-      pos: 86.51151,28.70847
 - proto: AtmosDeviceFanDirectional
   entities:
   - uid: 16
@@ -32189,6 +32184,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 17.5,23.5
+- proto: CargoTelepad
+  entities:
+  - uid: 15155
+    components:
+    - type: Transform
+      parent: 2
+      pos: 12.5,30.5
 - proto: Carpet
   entities:
   - uid: 266
@@ -37333,7 +37335,7 @@ entities:
       pos: -17.5,0.5
 - proto: ChunkEntity
   entities:
-  - uid: 15155
+  - uid: 15658
     components:
     - type: ChunkEntity
       root: 2
@@ -37405,7 +37407,7 @@ entities:
             4385: -14,0
             4386: -15,0
             4387: -16,0
-  - uid: 15534
+  - uid: 15681
     components:
     - type: ChunkEntity
       root: 2
@@ -37811,7 +37813,7 @@ entities:
             3522: 17.269722,20.829908
             3523: 16.759306,20.339985
             3524: 16.155138,20.871605
-  - uid: 15658
+  - uid: 16468
     components:
     - type: ChunkEntity
       root: 2
@@ -38286,7 +38288,7 @@ entities:
             3382: 10.194764,22.185247
             3383: 9.790189,21.868116
             3384: 10.158244,21.353868
-  - uid: 15681
+  - uid: 16469
     components:
     - type: ChunkEntity
       root: 2
@@ -38347,7 +38349,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2731: -23,-23
-  - uid: 16468
+  - uid: 16470
     components:
     - type: ChunkEntity
       root: 2
@@ -38451,7 +38453,7 @@ entities:
             2658: -22,-15
             2659: -23,-16
             2686: -23,-12
-  - uid: 16469
+  - uid: 16471
     components:
     - type: ChunkEntity
       root: 2
@@ -38738,7 +38740,7 @@ entities:
             873: 30.736248,-12.531016
             874: 29.954998,-11.531016
             875: 29.470623,-11.749766
-  - uid: 16470
+  - uid: 16472
     components:
     - type: ChunkEntity
       root: 2
@@ -38929,7 +38931,7 @@ entities:
             1094: -2,-11
             1095: -3,-11
             1096: -4,-11
-  - uid: 16471
+  - uid: 16473
     components:
     - type: ChunkEntity
       root: 2
@@ -39309,7 +39311,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             5301: 43,24
-  - uid: 16472
+  - uid: 16474
     components:
     - type: ChunkEntity
       root: 2
@@ -39367,7 +39369,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2732: -6,-20
-  - uid: 16473
+  - uid: 16475
     components:
     - type: ChunkEntity
       root: 2
@@ -39842,7 +39844,7 @@ entities:
             angle: -4.71238898038469 rad
           decals:
             509: 19.872448,-39.76645
-  - uid: 16474
+  - uid: 16476
     components:
     - type: ChunkEntity
       root: 2
@@ -40139,7 +40141,7 @@ entities:
             2289: 55.174343,-14.3750925
             2290: 55.549343,-14.7657175
             2291: 56.455593,-14.1563425
-  - uid: 16475
+  - uid: 16477
     components:
     - type: ChunkEntity
       root: 2
@@ -40344,7 +40346,7 @@ entities:
             1896: 8,-8
             1897: 8,-9
             1898: 8,-10
-  - uid: 16476
+  - uid: 16478
     components:
     - type: ChunkEntity
       root: 2
@@ -40569,7 +40571,7 @@ entities:
             cleanable: True
           decals:
             4514: 35,-33
-  - uid: 16477
+  - uid: 16479
     components:
     - type: ChunkEntity
       root: 2
@@ -40748,7 +40750,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             6894: 64,10
-  - uid: 16478
+  - uid: 16480
     components:
     - type: ChunkEntity
       root: 2
@@ -40768,7 +40770,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3102: 96,27
-  - uid: 16479
+  - uid: 16481
     components:
     - type: ChunkEntity
       root: 2
@@ -40854,7 +40856,7 @@ entities:
             color: '#D4D4D428'
           decals:
             2469: 40,-19
-  - uid: 16480
+  - uid: 16482
     components:
     - type: ChunkEntity
       root: 2
@@ -41303,7 +41305,7 @@ entities:
             594: 21.536638,-27.946724
             595: 20.599138,-27.556099
             597: 20.724138,-25.931099
-  - uid: 16481
+  - uid: 16483
     components:
     - type: ChunkEntity
       root: 2
@@ -41658,7 +41660,7 @@ entities:
           decals:
             6257: 60,10
             6258: 60,9
-  - uid: 16482
+  - uid: 16484
     components:
     - type: ChunkEntity
       root: 2
@@ -41795,7 +41797,7 @@ entities:
             color: '#DE3A3A47'
           decals:
             1716: 25,47
-  - uid: 16483
+  - uid: 16485
     components:
     - type: ChunkEntity
       root: 2
@@ -41969,7 +41971,7 @@ entities:
           decals:
             4522: 2,-32
             4523: 2,-31
-  - uid: 16484
+  - uid: 16486
     components:
     - type: ChunkEntity
       root: 2
@@ -42090,7 +42092,7 @@ entities:
             color: '#334E6DC8'
           decals:
             3114: 67,23
-  - uid: 16485
+  - uid: 16487
     components:
     - type: ChunkEntity
       root: 2
@@ -42175,7 +42177,7 @@ entities:
             7012: 51,-46
             7023: 50,-48
             7024: 49,-45
-  - uid: 16486
+  - uid: 16488
     components:
     - type: ChunkEntity
       root: 2
@@ -42197,7 +42199,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3156: 28,-53
-  - uid: 16487
+  - uid: 16489
     components:
     - type: ChunkEntity
       root: 2
@@ -42220,7 +42222,7 @@ entities:
             3151: 14,-51
             3152: 14,-52
             3153: 14,-53
-  - uid: 16488
+  - uid: 16490
     components:
     - type: ChunkEntity
       root: 2
@@ -42354,7 +42356,7 @@ entities:
             5146: 13,-36
             5147: 13,-35
             5148: 13,-34
-  - uid: 16489
+  - uid: 16491
     components:
     - type: ChunkEntity
       root: 2
@@ -42587,7 +42589,7 @@ entities:
             3547: 6.580261,32.77003
             3548: 7.2885942,33.08275
             3549: 7.799011,32.811726
-  - uid: 16490
+  - uid: 16492
     components:
     - type: ChunkEntity
       root: 2
@@ -42843,7 +42845,7 @@ entities:
             6305: 46,40
             6314: 46,41
             6315: 42,42
-  - uid: 16491
+  - uid: 16493
     components:
     - type: ChunkEntity
       root: 2
@@ -43122,7 +43124,7 @@ entities:
             color: '#DE3A3A96'
           decals:
             6297: 58.007366,36.859516
-  - uid: 16492
+  - uid: 16494
     components:
     - type: ChunkEntity
       root: 2
@@ -43370,7 +43372,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             6726: 59,25
-  - uid: 16493
+  - uid: 16495
     components:
     - type: ChunkEntity
       root: 2
@@ -43475,7 +43477,7 @@ entities:
             angle: 0.13962634015954636 rad
           decals:
             6457: 62.048172,49.059433
-  - uid: 16494
+  - uid: 16496
     components:
     - type: ChunkEntity
       root: 2
@@ -43749,7 +43751,7 @@ entities:
             color: '#9FED5896'
           decals:
             6934: 42,-8
-  - uid: 16495
+  - uid: 16497
     components:
     - type: ChunkEntity
       root: 2
@@ -43916,7 +43918,7 @@ entities:
             color: '#D381C996'
           decals:
             6817: 44,10
-  - uid: 16496
+  - uid: 16498
     components:
     - type: ChunkEntity
       root: 2
@@ -43969,7 +43971,7 @@ entities:
             color: '#9FED5896'
           decals:
             2207: 82,-4
-  - uid: 16497
+  - uid: 16499
     components:
     - type: ChunkEntity
       root: 2
@@ -44122,7 +44124,7 @@ entities:
           decals:
             2240: 77,-1
             2241: 78,-1
-  - uid: 16498
+  - uid: 16500
     components:
     - type: ChunkEntity
       root: 2
@@ -44208,7 +44210,7 @@ entities:
           decals:
             5267: 67,47
             5268: 67,46
-  - uid: 16499
+  - uid: 16501
     components:
     - type: ChunkEntity
       root: 2
@@ -44412,7 +44414,7 @@ entities:
             color: '#34A2C0B2'
           decals:
             909: 18,5
-  - uid: 16500
+  - uid: 16502
     components:
     - type: ChunkEntity
       root: 2
@@ -44517,7 +44519,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3247: 5,15
-  - uid: 16501
+  - uid: 16503
     components:
     - type: ChunkEntity
       root: 2
@@ -44555,7 +44557,7 @@ entities:
             4390: -19,0
             4391: -20,0
             4392: -21,0
-  - uid: 16502
+  - uid: 16504
     components:
     - type: ChunkEntity
       root: 2
@@ -44604,7 +44606,7 @@ entities:
             7001: 49,-49
             7009: 51,-49
             7022: 48,-49
-  - uid: 16503
+  - uid: 16505
     components:
     - type: ChunkEntity
       root: 2
@@ -44648,7 +44650,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             5263: 92,30
-  - uid: 16504
+  - uid: 16506
     components:
     - type: ChunkEntity
       root: 2
@@ -44690,7 +44692,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2556: 40,-49
-  - uid: 16505
+  - uid: 16507
     components:
     - type: ChunkEntity
       root: 2
@@ -44715,7 +44717,7 @@ entities:
             1713: 24,48
             1714: 23,48
             1715: 22,48
-  - uid: 16506
+  - uid: 16508
     components:
     - type: ChunkEntity
       root: 2
@@ -44730,7 +44732,7 @@ entities:
             color: '#9FED581F'
           decals:
             1709: 32,48
-  - uid: 16507
+  - uid: 16509
     components:
     - type: ChunkEntity
       root: 2
@@ -44879,7 +44881,7 @@ entities:
             2493: 104,-17
             2494: 103,-17
             2495: 106,-19
-  - uid: 16508
+  - uid: 16510
     components:
     - type: ChunkEntity
       root: 2
@@ -44947,7 +44949,7 @@ entities:
             color: '#D381C996'
           decals:
             2530: 104,-16
-  - uid: 16509
+  - uid: 16511
     components:
     - type: ChunkEntity
       root: 2
@@ -44968,7 +44970,7 @@ entities:
           decals:
             3110: 80,34
             6896: 80,34
-  - uid: 16510
+  - uid: 16512
     components:
     - type: ChunkEntity
       root: 2
@@ -44983,7 +44985,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             5264: 96,33
-  - uid: 16511
+  - uid: 16513
     components:
     - type: ChunkEntity
       root: 2
@@ -46586,11 +46588,21 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 7.5,21.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        15155:
+        - - OrderSender
+          - OrderReceiver
   - uid: 5285
     components:
     - type: Transform
       parent: 2
       pos: 20.5,23.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        15155:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersEngineering
   entities:
   - uid: 2050
@@ -46598,6 +46610,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 20.5,-23.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        15155:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersMedical
   entities:
   - uid: 10276
@@ -46605,6 +46622,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 71.5,8.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        15155:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersScience
   entities:
   - uid: 12164
@@ -46613,6 +46635,11 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 57.5,17.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        15155:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersSecurity
   entities:
   - uid: 2367
@@ -46621,6 +46648,11 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 39.5,24.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        15155:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersService
   entities:
   - uid: 6619
@@ -46629,6 +46661,11 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 32.5,-7.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        15155:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerComms
   entities:
   - uid: 405
@@ -47620,6 +47657,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 15.5,-17.5
+- proto: CrewsimovCircuitBoard
+  entities:
+  - uid: 14276
+    components:
+    - type: Transform
+      parent: 2
+      pos: 86.51151,28.70847
 - proto: Crowbar
   entities:
   - uid: 686
@@ -47752,7 +47796,7 @@ entities:
       pos: 59.5,39.5
     - type: Door
       state: Closing
-      secondsUntilStateChange: -39008.316
+      secondsUntilStateChange: -41704.82
 - proto: CurtainsWhiteOpen
   entities:
   - uid: 5741
@@ -77354,7 +77398,7 @@ entities:
       pos: 12.5,12.5
     - type: Door
       state: Closing
-      secondsUntilStateChange: -24474.053
+      secondsUntilStateChange: -27170.557
   - uid: 5750
     components:
     - type: Transform
@@ -78888,6 +78932,14 @@ entities:
     - type: Transform
       parent: 2
       pos: 19.434057,-38.4118
+- proto: MailCart
+  entities:
+  - uid: 15534
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 17.5,22.5
 - proto: MaintenanceFluffSpawner
   entities:
   - uid: 7459
diff --git a/Resources/Maps/plasma.yml b/Resources/Maps/plasma.yml
index b42bbf9236..1be4afe5e7 100644
--- a/Resources/Maps/plasma.yml
+++ b/Resources/Maps/plasma.yml
@@ -4,34 +4,14 @@ meta:
   engineVersion: 289.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/22/2026 17:04:05
-  entityCount: 27203
+  time: 09/10/2026 21:38:49
+  entityCount: 27223
 maps:
 - 1
 grids:
 - 2
 orphans: []
 nullspace:
-- 27138
-- 27139
-- 27140
-- 27141
-- 27142
-- 27143
-- 27144
-- 27145
-- 27146
-- 27147
-- 27148
-- 27149
-- 27150
-- 27151
-- 27152
-- 27153
-- 27154
-- 27155
-- 27156
-- 27157
 - 27158
 - 27159
 - 27160
@@ -78,6 +58,26 @@ nullspace:
 - 27201
 - 27202
 - 27203
+- 27204
+- 27205
+- 27206
+- 27207
+- 27208
+- 27209
+- 27210
+- 27211
+- 27212
+- 27213
+- 27214
+- 27215
+- 27216
+- 27217
+- 27218
+- 27219
+- 27220
+- 27221
+- 27222
+- 27223
 tilemap:
   0: Space
   28: FloorArcadeRed
@@ -119,6 +119,7 @@ tilemap:
   44: FloorSteelCheckerDark
   29: FloorSteelCheckerLight
   45: FloorSteelMini
+  34: FloorSteelMono
   11: FloorTechMaint2
   13: FloorWhite
   5: FloorWood
@@ -161,7 +162,7 @@ entities:
           version: 7
         -1,0:
           ind: -1,0
-          tiles: gwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABQAHAAAAAAMAAAAAAAAAAIMAAAAAAAABAAAAAAEAgwAAAAAAAAAAAAAAAACDAAAAAAAAAQAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAEAAAAAAAAAAAAAAAAAAACDAAAAAAAAAQAAAAABAIMAAAAAAAAAAAAAAAAAgwAAAAAAAAEAAAAAAgCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAEAAAAAAQCDAAAAAAAAAAAAAAAAAIMAAAAAAAABAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABgAAAAAAAAAAAAAAAAAAAIMAAAAAAAABAAAAAAAAgwAAAAAAAAAAAAAAAACDAAAAAAAAAQAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAAQAAAAABAIMAAAAAAAAAAAAAAAAAgwAAAAAAAAEAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAwCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAEAAQAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAEAAAAAAACDAAAAAAAAAAAAAAAAAIMAAAAAAAABAAAAAAIABwAAAAAEAAcAAAAAAwAHAAAAAAQABwAAAAAGAAcAAAAABAAHAAAAAAUABwAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAIMAAAAAAAABAAAAAAAAgwAAAAAAAAAAAAAAAACDAAAAAAAAAQAAAAAAAAcAAAAAAwAHAAAAAAIABwAAAAACAAcAAAAAAgAHAAAAAAEABwAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAAQAAAAABAIMAAAAAAAAAAAAAAAAAgwAAAAAAAAEAAAAAAAAHAAAAAAIABwAAAAAFAAcAAAAAAQAHAAAAAAIABwAAAAACAAcAAAAABAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAEAAAAAAgCDAAAAAAAAAAAAAAAAAIMAAAAAAAABAAAAAAEABwAAAAAEAAcAAAAAAQAHAAAAAAMABwAAAAABAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAIMAAAAAAAABAAAAAAAAgwAAAAAAAAAAAAAAAACDAAAAAAAAAQAAAAABAAcAAAAABAAHAAAAAAIABwAAAAAGAAcAAAAABgAHAAAAAAIABwAAAAABAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAAQAAAAAAAIMAAAAAAAAAAAAAAAAAgwAAAAAAAAEAAAAAAAAHAAAAAAIABwAAAAAGAAcAAAAABAAHAAAAAAQABwAAAAAAAAcAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIABwAAAAAAAAcAAAAAAwAHAAAAAAIABwAAAAADAAcAAAAABQABAAAAAAIAAQAAAAABAAEAAAAAAQABAAAAAAEAAQAAAAACAAEAAAAAAgABAAAAAAIAAQAAAAACAAEAAAAAAgABAAAAAAIAAQAAAAAAAA==
+          tiles: gwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABQAHAAAAAAMAAAAAAAAAAIMAAAAAAAABAAAAAAEAgwAAAAAAAAAAAAAAAACDAAAAAAAAAQAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAEAAAAAAAAAAAAAAAAAAACDAAAAAAAAAQAAAAABAIMAAAAAAAAAAAAAAAAAgwAAAAAAAAEAAAAAAgCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAEAAAAAAQCDAAAAAAAAAAAAAAAAAIMAAAAAAAABAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABgAAAAAAAAAAAAAAAAAAAIMAAAAAAAABAAAAAAAAgwAAAAAAAAAAAAAAAACDAAAAAAAAAQAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAAQAAAAABAIMAAAAAAAAAAAAAAAAAgwAAAAAAAAEAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAEAAQAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAACDAAAAAAAABwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAEAAAAAAACDAAAAAAAAAAAAAAAAAIMAAAAAAAABAAAAAAIABwAAAAAEAAcAAAAAAwAHAAAAAAQABwAAAAAGAAcAAAAABAAHAAAAAAUABwAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAIMAAAAAAAABAAAAAAAAgwAAAAAAAAAAAAAAAACDAAAAAAAAAQAAAAAAAAcAAAAAAwAHAAAAAAIABwAAAAACAAcAAAAAAgAHAAAAAAEABwAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAAQAAAAABAIMAAAAAAAAAAAAAAAAAgwAAAAAAAAEAAAAAAAAHAAAAAAIABwAAAAAFAAcAAAAAAQAHAAAAAAIABwAAAAACAAcAAAAABAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAEAAAAAAgCDAAAAAAAAAAAAAAAAAIMAAAAAAAABAAAAAAEABwAAAAAEAAcAAAAAAQAHAAAAAAMABwAAAAABAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAIMAAAAAAAABAAAAAAAAgwAAAAAAAAAAAAAAAACDAAAAAAAAAQAAAAABAAcAAAAABAAHAAAAAAIABwAAAAAGAAcAAAAABgAHAAAAAAIABwAAAAABAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAAQAAAAAAAIMAAAAAAAAAAAAAAAAAgwAAAAAAAAEAAAAAAAAHAAAAAAIABwAAAAAGAAcAAAAABAAHAAAAAAQABwAAAAAAAAcAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIABwAAAAAAAAcAAAAAAwAHAAAAAAIABwAAAAADAAcAAAAABQABAAAAAAIAAQAAAAABAAEAAAAAAQABAAAAAAEAAQAAAAACAAEAAAAAAgABAAAAAAIAAQAAAAACAAEAAAAAAgABAAAAAAIAAQAAAAAAAA==
           version: 7
         -1,-1:
           ind: -1,-1
@@ -177,7 +178,7 @@ entities:
           version: 7
         -5,-5:
           ind: -5,-5
-          tiles: BwAAAAAAAAcAAAAAAAAHAAAAAAEABwAAAAAFAAcAAAAABQAHAAAAAAUABwAAAAAEAAcAAAAAAgCDAAAAAAAAgwAAAAAAAAcAAAAABAAHAAAAAAIABwAAAAADAIMAAAAAAACDAAAAAAAABwAAAAAEAAcAAAAABQAHAAAAAAAABwAAAAAEAAcAAAAAAAAHAAAAAAQABwAAAAAEAAcAAAAAAwAHAAAAAAMAgwAAAAAAAAcAAAAAAQAHAAAAAAIABwAAAAAAAAcAAAAAAwAHAAAAAAYAgwAAAAAAAAcAAAAAAAAHAAAAAAEABwAAAAAEAAcAAAAABQAHAAAAAAAABwAAAAAEAAcAAAAAAgAHAAAAAAIABwAAAAACAIMAAAAAAAAHAAAAAAAABwAAAAABAAcAAAAABgAHAAAAAAIABwAAAAADAIMAAAAAAAAHAAAAAAEABwAAAAACAAcAAAAABgAHAAAAAAQABwAAAAADAAcAAAAABgAHAAAAAAEABwAAAAACAAcAAAAABQCDAAAAAAAABwAAAAAAAAcAAAAAAgAHAAAAAAEABwAAAAAFAAcAAAAABACDAAAAAAAABwAAAAADAAcAAAAAAAAHAAAAAAEABwAAAAAGAAcAAAAABgAHAAAAAAIABwAAAAAEAAcAAAAAAQAHAAAAAAAAgwAAAAAAAAcAAAAAAAAHAAAAAAMABwAAAAACAAcAAAAAAgAHAAAAAAIAgwAAAAAAAAcAAAAAAAAHAAAAAAYABwAAAAAFAAcAAAAABQAHAAAAAAEABwAAAAACAAcAAAAABgAHAAAAAAYABwAAAAAEAIMAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAwAHAAAAAAAABwAAAAADAIMAAAAAAAAHAAAAAAAABwAAAAAFAAcAAAAAAQAHAAAAAAAABwAAAAACAAcAAAAAAAAHAAAAAAQABwAAAAAAAAcAAAAABQCDAAAAAAAABwAAAAAGAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAwCDAAAAAAAABwAAAAAEAAcAAAAABQAHAAAAAAQABwAAAAAEAAcAAAAAAwAHAAAAAAYABwAAAAAEAAcAAAAABAAHAAAAAAQAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABAAHAAAAAAAABwAAAAAEAAcAAAAAAgAHAAAAAAAABwAAAAAEAAcAAAAABQAHAAAAAAMABwAAAAAFAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAEABwAAAAAFAAcAAAAABAAHAAAAAAIABwAAAAAEAAcAAAAABAAHAAAAAAIABwAAAAAGAAcAAAAAAQCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAGAAcAAAAAAAAHAAAAAAUABwAAAAACAAcAAAAABQAHAAAAAAAABwAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAAFAAcAAAAAAAAHAAAAAAUABwAAAAADAAcAAAAABAAHAAAAAAIABwAAAAAGAAcAAAAAAwAHAAAAAAAABwAAAAADAAcAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAwAHAAAAAAIABwAAAAAAAAcAAAAAAQAHAAAAAAMABwAAAAACAAcAAAAAAgAHAAAAAAUABwAAAAAFAAcAAAAAAwAHAAAAAAQABwAAAAADAAcAAAAAAgAHAAAAAAEABwAAAAACAAcAAAAAAwAHAAAAAAYABwAAAAACAAcAAAAABQAHAAAAAAMABwAAAAADAAcAAAAAAgAHAAAAAAEABwAAAAACAAcAAAAAAAAHAAAAAAQABwAAAAADAAcAAAAAAwAHAAAAAAQABwAAAAADAAcAAAAABQAHAAAAAAUABwAAAAADAAcAAAAAAgAHAAAAAAQABwAAAAAFAAcAAAAAAgAHAAAAAAUABwAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAABAAcAAAAABQAHAAAAAAEABwAAAAAGAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAABwAAAAADAAcAAAAABQAHAAAAAAAABwAAAAAGAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAA==
+          tiles: BwAAAAAAAAcAAAAAAAAHAAAAAAEABwAAAAAFAAcAAAAABQAHAAAAAAUABwAAAAAEAAcAAAAAAgCDAAAAAAAAgwAAAAAAAAcAAAAABAAHAAAAAAIABwAAAAADAIMAAAAAAACDAAAAAAAABwAAAAAEAAcAAAAABQAHAAAAAAAABwAAAAAEAAcAAAAAAAAHAAAAAAQABwAAAAAEAAcAAAAAAwAHAAAAAAMAgwAAAAAAAAcAAAAAAQAHAAAAAAIABwAAAAAAAAcAAAAAAwAHAAAAAAYAgwAAAAAAAAcAAAAAAAAHAAAAAAEABwAAAAAEAAcAAAAABQAHAAAAAAAABwAAAAAEAAcAAAAAAgAHAAAAAAIABwAAAAACAIMAAAAAAAAHAAAAAAAABwAAAAABAAcAAAAABgAHAAAAAAIABwAAAAADAIMAAAAAAAAHAAAAAAEABwAAAAACAAcAAAAABgAHAAAAAAQABwAAAAADAAcAAAAABgAHAAAAAAEABwAAAAACAAcAAAAABQCDAAAAAAAABwAAAAAAAAcAAAAAAgAHAAAAAAEABwAAAAAFAAcAAAAABACDAAAAAAAABwAAAAADAAcAAAAAAAAHAAAAAAEABwAAAAAGAAcAAAAABgAHAAAAAAIABwAAAAAEAAcAAAAAAQAHAAAAAAAAgwAAAAAAAAcAAAAAAAAHAAAAAAMABwAAAAACAAcAAAAAAgAHAAAAAAIAgwAAAAAAAAcAAAAAAAAHAAAAAAYABwAAAAAFAAcAAAAABQAHAAAAAAEABwAAAAACAAcAAAAABgAHAAAAAAYABwAAAAAEAIMAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAwAHAAAAAAAABwAAAAADAIMAAAAAAAAHAAAAAAAABwAAAAAFAAcAAAAAAQAHAAAAAAAABwAAAAACAAcAAAAAAAAHAAAAAAQABwAAAAAAAAcAAAAABQCDAAAAAAAABwAAAAAGAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAwCDAAAAAAAABwAAAAAEAAcAAAAABQAHAAAAAAQABwAAAAAEAAcAAAAAAwAHAAAAAAYABwAAAAAEAAcAAAAABAAHAAAAAAQAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABAAHAAAAAAAABwAAAAAEAAcAAAAAAgAHAAAAAAAABwAAAAAEAAcAAAAABQAHAAAAAAMABwAAAAAFAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAEABwAAAAAFAAcAAAAABAAHAAAAAAIABwAAAAAEAAcAAAAABAAHAAAAAAIABwAAAAAGAAcAAAAAAQCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAGAAcAAAAAAAAHAAAAAAUABwAAAAACAAcAAAAABQAHAAAAAAAABwAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAAFAAcAAAAAAAAHAAAAAAUABwAAAAADAAcAAAAABAAHAAAAAAIABwAAAAAGAAcAAAAAAwAHAAAAAAAABwAAAAADAAcAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAAAwAHAAAAAAIABwAAAAAAAAcAAAAAAQAHAAAAAAMABwAAAAACAAcAAAAAAgAHAAAAAAUABwAAAAAFAAcAAAAAAwAHAAAAAAQABwAAAAADAAcAAAAAAgAHAAAAAAEABwAAAAACAAcAAAAAAwAHAAAAAAYABwAAAAACAAcAAAAABQAHAAAAAAMABwAAAAADAAcAAAAAAgAHAAAAAAEABwAAAAACAAcAAAAAAAAHAAAAAAQABwAAAAADAAcAAAAAAwAHAAAAAAQABwAAAAADAAcAAAAABQAHAAAAAAUABwAAAAADAAcAAAAAAgAHAAAAAAQABwAAAAAFAAcAAAAAAgAHAAAAAAUABwAAAAABAAcAAAAAAAAHAAAAAAAABwAAAAABAAcAAAAABQAHAAAAAAEABwAAAAAGAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAABwAAAAADAAcAAAAABQAHAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAA==
           version: 7
         -2,-1:
           ind: -2,-1
@@ -185,7 +186,7 @@ entities:
           version: 7
         -3,0:
           ind: -3,0
-          tiles: gwAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAMAAAAAAAAFAAAAAAAAIwAAAAAAACMAAAAAAAAFAAAAAAAABQAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAEABwAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAgABAAAAAAIAAQAAAAAAAAEAAAAAAgABAAAAAAEAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAAAAAcAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAgAHAAAAAAEABwAAAAAGAAcAAAAABAAHAAAAAAUAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAABAAcAAAAAAwAHAAAAAAQABwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAEABwAAAAAAAAcAAAAABgCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAABACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAABgAHAAAAAAIAgwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAABwAAAAAEAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAcAAAAABQCDAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAA==
+          tiles: gwAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAMAAAAAAAAFAAAAAAAAIwAAAAAAACMAAAAAAAAFAAAAAAAABQAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAEAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAACDAAAAAAAABAAAAAAAAIMAAAAAAAAHAAAAAAEABwAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAgABAAAAAAIAAQAAAAAAAAEAAAAAAgABAAAAAAEAgwAAAAAAAAQAAAAAAACDAAAAAAAABwAAAAAAAAcAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAgAHAAAAAAEABwAAAAAGAAcAAAAABAAHAAAAAAUAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAABAAcAAAAAAwAHAAAAAAQABwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAEABwAAAAAAAAcAAAAABgCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAABACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAABgAHAAAAAAIAgwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAABwAAAAAEAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAcAAAAABQCDAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAA==
           version: 7
         -3,-1:
           ind: -3,-1
@@ -193,7 +194,7 @@ entities:
           version: 7
         -6,0:
           ind: -6,0
-          tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAgwAAAAAAAAcAAAAAAwCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAADAAAAAABACAAAAAAAAAMAAAAAAEAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAIMAAAAAAAAHAAAAAAUAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAwAAAAAAQAgAAAAAAAADAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAACDAAAAAAAABwAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAMAAAAAAEAIAAAAAAAAAwAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAMAAAAAAACDAAAAAAAAAwAAAAAAACAAAAAAAAAgAAAAAAAAAwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAIAgwAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAADAAAAAAAAgwAAAAAAAAMAAAAAAAAgAAAAAAAAIAAAAAAAAAMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAAAAIMAAAAAAACDAAAAAAAAAwAAAAAAACAAAAAAAAAgAAAAAAAAAwAAAAAAAIMAAAAAAAADAAAAAAAAIAAAAAAAACAAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAQCDAAAAAAAAgwAAAAAAAAMAAAAAAAAgAAAAAAAAIAAAAAAAAAMAAAAAAACDAAAAAAAAAwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAYAAAAAAAAAAAAAAAAAAAADAAAAAAAAIAAAAAAAACAAAAAAAAADAAAAAAAAgwAAAAAAAAMAAAAAAAAgAAAAAAAAIAAAAAAAAAMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAwAAAAAAAIMAAAAAAAADAAAAAAAAIAAAAAAAACAAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAIMAAAAAAAAgAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAACgAAAAAAAAoAAAAAAAAHAAAAAAMABwAAAAADAAcAAAAAAwCDAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAACgAAAAABAAoAAAAAAQAKAAAAAAEABwAAAAAAAAcAAAAABQAHAAAAAAIABwAAAAACAAcAAAAAAgAHAAAAAAUAgwAAAAAAAAEAAAAAAAABAAAAAAIAAAAAAAAAAA==
+          tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAgwAAAAAAAAcAAAAAAwCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAADAAAAAABACAAAAAAAAAMAAAAAAEAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAIMAAAAAAAAHAAAAAAUAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAwAAAAAAQAgAAAAAAAADAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAACDAAAAAAAABwAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAMAAAAAAEAIAAAAAAAAAwAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAMAAAAAAACDAAAAAAAAAwAAAAAAACAAAAAAAAAgAAAAAAAAAwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAIAgwAAAAAAAAQAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAADAAAAAAAAgwAAAAAAAAMAAAAAAAAgAAAAAAAAIAAAAAAAAAMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAAAAIMAAAAAAAAEAAAAAAAAAwAAAAAAACAAAAAAAAAgAAAAAAAAAwAAAAAAAIMAAAAAAAADAAAAAAAAIAAAAAAAACAAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAQCDAAAAAAAABAAAAAAAAAMAAAAAAAAgAAAAAAAAIAAAAAAAAAMAAAAAAACDAAAAAAAAAwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAYAAAAAAAAAAAAAAAAAAAADAAAAAAAAIAAAAAAAACAAAAAAAAADAAAAAAAAgwAAAAAAAAMAAAAAAAAgAAAAAAAAIAAAAAAAAAMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAwAAAAAAAIMAAAAAAAADAAAAAAAAIAAAAAAAACAAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAIMAAAAAAAAgAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIgAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAACgAAAAAAAAoAAAAAAAAHAAAAAAMABwAAAAADAAcAAAAAAwCDAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAACIAAAAAAAAiAAAAAAAACgAAAAABAAoAAAAAAQAKAAAAAAEABwAAAAAAAAcAAAAABQAHAAAAAAIABwAAAAACAAcAAAAAAgAHAAAAAAUAgwAAAAAAAAEAAAAAAAABAAAAAAIAAAAAAAAAAA==
           version: 7
         -4,-1:
           ind: -4,-1
@@ -209,7 +210,7 @@ entities:
           version: 7
         -5,0:
           ind: -5,0
-          tiles: gwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAACDAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAsAAAAAAAALAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAADAAcAAAAAAwAHAAAAAAEABwAAAAAGAAcAAAAABQAAAAAAAAAAAQAAAAACAAAAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAAAjAAAAAAAAIwAAAAAAAAMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABQAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAIwAAAAAAACMAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAIMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQABAAAAAAIAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAACAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAEAAQAAAAAAAAEAAAAAAgABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: gwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAACDAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAsAAAAAAAALAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAADAAcAAAAAAwAHAAAAAAEABwAAAAAGAAcAAAAABQAAAAAAAAAAAQAAAAACAAAAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAAAjAAAAAAAAIwAAAAAAAAMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABQAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAIwAAAAAAACMAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAIMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAEAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQABAAAAAAIAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAACAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAEAAQAAAAAAAAEAAAAAAgABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -6,-1:
           ind: -6,-1
@@ -249,11 +250,11 @@ entities:
           version: 7
         -6,-2:
           ind: -6,-2
-          tiles: IAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAgAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAIMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAACAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAACAAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAIAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAgAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAACAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAIAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAgAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAACAAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAALAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAAsAAAAAAAALAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAALAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAACDAAAAAAAAIAAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAA==
+          tiles: IAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAgAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAIMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAACAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAACAAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAIAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAgAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAACAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAIAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAgAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAACAAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAALAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAAsAAAAAAAALAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAALAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAACDAAAAAAAAIAAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAA==
           version: 7
         -5,-4:
           ind: -5,-4
-          tiles: BwAAAAAGAAcAAAAAAQAHAAAAAAIABwAAAAADAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAQAAAAAAAAEAAAAAAAAAcAAAAAAgAHAAAAAAMABwAAAAAGAAcAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAAHAAAAAAUABwAAAAABAAcAAAAABAAHAAAAAAUAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAA0AAAAAAAANAAAAAAAABwAAAAADAAcAAAAABAAHAAAAAAQABwAAAAACAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAAcAAAAABAAHAAAAAAQABwAAAAABAAcAAAAABQCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAADQAAAAAAAA0AAAAAAAAHAAAAAAQABwAAAAAFAAcAAAAAAgAHAAAAAAMAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAAANAAAAAAAABwAAAAAGAAcAAAAABgAHAAAAAAQABwAAAAAEAAsAAAAAAACDAAAAAAAAgwAAAAAAAAsAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAIAAAAAAAACAAAAAAAABwAAAAACAAcAAAAAAwALAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAHAAAAAAEABwAAAAAAAAcAAAAAAwAHAAAAAAAACwAAAAAAAIMAAAAAAACDAAAAAAAACwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAABwAAAAACAAcAAAAAAgAHAAAAAAEABwAAAAAGAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAIAAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAAC8AAAAABQAvAAAAAAIAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAAABwAAAAACAAcAAAAAAwAHAAAAAAEABwAAAAAFAAcAAAAAAwCDAAAAAAAAIAAAAAAAAIMAAAAAAAAvAAAAAAAALwAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAABAAcAAAAAAwAHAAAAAAYABwAAAAAFAAcAAAAABAAHAAAAAAYABwAAAAABAAIAAAAAAAACAAAAAAAALwAAAAAAAC8AAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABAAHAAAAAAAABwAAAAAFAAcAAAAAAQAHAAAAAAMABwAAAAAAAAcAAAAABAAHAAAAAAEABwAAAAAGAA==
+          tiles: BwAAAAAGAAcAAAAAAQAHAAAAAAIAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAQAAAAAAAAEAAAAAAAAAcAAAAAAgAHAAAAAAMABwAAAAAGAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAAHAAAAAAUABwAAAAABAAcAAAAABACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAA0AAAAAAAANAAAAAAAABwAAAAADAAcAAAAABAAHAAAAAAQAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAAcAAAAABAAHAAAAAAQABwAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAADQAAAAAAAA0AAAAAAAAHAAAAAAQABwAAAAAFAAcAAAAAAgAHAAAAAAMAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAAANAAAAAAAABwAAAAAGAAcAAAAABgAHAAAAAAQABwAAAAAEAAsAAAAAAACDAAAAAAAAgwAAAAAAAAsAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAIAAAAAAAACAAAAAAAABwAAAAACAAcAAAAAAwALAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAHAAAAAAEABwAAAAAAAAcAAAAAAwAHAAAAAAAACwAAAAAAAIMAAAAAAACDAAAAAAAACwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAABwAAAAACAAcAAAAAAgAHAAAAAAEABwAAAAAGAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAIAAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAAC8AAAAABQAvAAAAAAIAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAAABwAAAAACAAcAAAAAAwAHAAAAAAEABwAAAAAFAAcAAAAAAwCDAAAAAAAAIAAAAAAAAIMAAAAAAAAvAAAAAAAALwAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAABAAcAAAAAAwAHAAAAAAYABwAAAAAFAAcAAAAABAAHAAAAAAYABwAAAAABAAIAAAAAAAACAAAAAAAALwAAAAAAAC8AAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABAAHAAAAAAAABwAAAAAFAAcAAAAAAQAHAAAAAAMABwAAAAAAAAcAAAAABAAHAAAAAAEABwAAAAAGAA==
           version: 7
         -6,-3:
           ind: -6,-3
@@ -309,11 +310,11 @@ entities:
           version: 7
         -7,0:
           ind: -7,0
-          tiles: gwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABgCDAAAAAAAABwAAAAAFAAcAAAAAAwAKAAAAAAAACgAAAAABAAcAAAAABQCDAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAABAAAAAAIAgwAAAAAAAAcAAAAABAAHAAAAAAAACgAAAAACAAoAAAAAAAACAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAAQAAAAACAIMAAAAAAAAHAAAAAAQABwAAAAAEAAoAAAAAAAAKAAAAAAEABwAAAAABAIMAAAAAAAADAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAAEAAAAAAACDAAAAAAAABwAAAAACAAcAAAAAAQAKAAAAAAIACgAAAAADAAcAAAAABQCDAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAgwAAAAAAAIMAAAAAAAASAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAAAgwAAAAAAAAcAAAAAAwAHAAAAAAIACgAAAAACAAoAAAAAAwACAAAAAAAAAgAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAAAHAAAAAAUABwAAAAAEAIMAAAAAAAAHAAAAAAYABwAAAAABAAoAAAAAAwAKAAAAAAMAAgAAAAAAAAIAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAABIAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABQCDAAAAAAAABwAAAAAGAAcAAAAABAAKAAAAAAAACgAAAAACAAcAAAAAAQAHAAAAAAYAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAIMAAAAAAAABAAAAAAAAgwAAAAAAAAcAAAAAAAAHAAAAAAIACgAAAAAAAAoAAAAAAwAKAAAAAAIACgAAAAABAAoAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAACDAAAAAAAAAQAAAAAAAIMAAAAAAAAHAAAAAAAABwAAAAAGAAoAAAAAAQAKAAAAAAMACgAAAAABAAoAAAAAAQAgAAAAAAAAIAAAAAAAAIMAAAAAAAAgAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAgwAAAAAAAAEAAAAAAACDAAAAAAAABwAAAAACAAcAAAAABgAKAAAAAAMACgAAAAAAAAoAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAAwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAUAgwAAAAAAAAcAAAAABgACAAAAAAAACgAAAAAAAAoAAAAAAAAgAAAAAAAABwAAAAAAAAcAAAAAAAAgAAAAAAAAgwAAAAAAAAMAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAAAHAAAAAAEABwAAAAABAIMAAAAAAAACAAAAAAAAAgAAAAAAAAoAAAAAAgAKAAAAAAEAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAIAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAAAgAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAA==
+          tiles: gwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABgCDAAAAAAAABwAAAAAFAAcAAAAAAwAKAAAAAAAACgAAAAABAAcAAAAABQCDAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAABAAAAAAIAgwAAAAAAAAcAAAAABAAHAAAAAAAACgAAAAACAAoAAAAAAAACAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAAQAAAAACAIMAAAAAAAAHAAAAAAQABwAAAAAEAAoAAAAAAAAKAAAAAAEABwAAAAABAIMAAAAAAAADAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAAEAAAAAAACDAAAAAAAABwAAAAACAAcAAAAAAQAKAAAAAAIACgAAAAADAAcAAAAABQCDAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAgwAAAAAAAIMAAAAAAAASAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAAAgwAAAAAAAAcAAAAAAwAHAAAAAAIACgAAAAACAAoAAAAAAwACAAAAAAAAAgAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAAAHAAAAAAUABwAAAAAEAIMAAAAAAAAHAAAAAAYABwAAAAABAAoAAAAAAwAKAAAAAAMAAgAAAAAAAAIAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAABIAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABQCDAAAAAAAABwAAAAAGAAcAAAAABAAKAAAAAAAACgAAAAACAAcAAAAAAQAHAAAAAAYAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAIMAAAAAAAABAAAAAAAAgwAAAAAAAAcAAAAAAAAHAAAAAAIACgAAAAAAAAoAAAAAAwAKAAAAAAIACgAAAAABAAoAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAACDAAAAAAAAAQAAAAAAAIMAAAAAAAAHAAAAAAAABwAAAAAGAAoAAAAAAQAKAAAAAAMACgAAAAABAAoAAAAAAQAgAAAAAAAAIAAAAAAAAIMAAAAAAAAgAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAgwAAAAAAAAEAAAAAAACDAAAAAAAABwAAAAACAAcAAAAABgAKAAAAAAMACgAAAAAAAAoAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAAwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAUAgwAAAAAAAAcAAAAABgACAAAAAAAACgAAAAAAAAoAAAAAAAAgAAAAAAAABwAAAAAAAAcAAAAAAAAgAAAAAAAAgwAAAAAAAAMAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAAAHAAAAAAEABwAAAAABAIMAAAAAAAACAAAAAAAAAgAAAAAAAAoAAAAAAgAKAAAAAAEAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAIAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAAAgAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIgAAAAAAAA==
           version: 7
         -9,-4:
           ind: -9,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAIAAQAAAAACAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAIAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACQAAAAAAQAFAAAAAAAABQAAAAAAAAUAAAAAAACDAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAJAAAAAAAAAUAAAAAAAAkAAAAAAEAgwAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAgCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAACDAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAgwAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAACDAAAAAAAAIAAAAAAAAIMAAAAAAAAgAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAjAAAAAAAAIwAAAAAAACMAAAAAAAAFAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAUAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAAwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAIAAQAAAAACAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAIAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACQAAAAAAQAFAAAAAAAABQAAAAAAAAUAAAAAAACDAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAJAAAAAAAAAUAAAAAAAAkAAAAAAEAgwAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAgCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAACDAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAABAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAgwAAAAAAACAAAAAAAACDAAAAAAAABAAAAAAAAAQAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAACDAAAAAAAAIAAAAAAAAIMAAAAAAAAgAAAAAAAAgwAAAAAAAAQAAAAAAAAEAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAjAAAAAAAAIwAAAAAAACMAAAAAAAAFAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIMAAAAAAAAEAAAAAAAABAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAAQAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAUAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAAwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAgwAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAA==
           version: 7
         -8,-2:
           ind: -8,-2
@@ -329,11 +330,11 @@ entities:
           version: 7
         -6,1:
           ind: -6,1
-          tiles: IAAAAAAAACAAAAAAAAAgAAAAAAAACgAAAAAAAAcAAAAABQAHAAAAAAEABwAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAABAAcAAAAABACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAACgAAAAADAAoAAAAAAgAHAAAAAAIABwAAAAAEAAcAAAAAAgAHAAAAAAUABwAAAAADAAcAAAAAAgCDAAAAAAAAgwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAAAoAAAAAAgAHAAAAAAMABwAAAAADAAcAAAAABAAHAAAAAAUABwAAAAAFAAcAAAAAAQAHAAAAAAIAgwAAAAAAAIMAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAKAAAAAAMABwAAAAADAAcAAAAAAgAHAAAAAAYABwAAAAABAAcAAAAABgAHAAAAAAQABwAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAACAAAAAAAAAKAAAAAAMACgAAAAABAAcAAAAABQAHAAAAAAMABwAAAAAFAAcAAAAABAAHAAAAAAIABwAAAAADAIMAAAAAAACDAAAAAAAAgwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAgAAAAAAAACgAAAAABAAcAAAAAAAAHAAAAAAUABwAAAAACAAcAAAAABAAHAAAAAAMABwAAAAADAAcAAAAABgCDAAAAAAAAgwAAAAAAAIMAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAIAAAAAAAAAoAAAAAAAAHAAAAAAEABwAAAAAFAAcAAAAABAAHAAAAAAUABwAAAAACAAcAAAAABgAHAAAAAAEAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAACAAAAAAAAAHAAAAAAYABwAAAAADABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAIAAQAAAAAAAAAAAAAAAAAgAAAAAAAABwAAAAAEAAcAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAcAAAAAAgAHAAAAAAUAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAIAAQAAAAABAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAMAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAACDAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAADAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAgwAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAwAAAAAAAIMAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAMAAAAAAACDAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAACDAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAgwAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAgwAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAA==
+          tiles: IAAAAAAAACIAAAAAAAAgAAAAAAAACgAAAAAAAAcAAAAABQAHAAAAAAEABwAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAABAAcAAAAABACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAACAAAAAAAAAiAAAAAAAACgAAAAADAAoAAAAAAgAHAAAAAAIABwAAAAAEAAcAAAAAAgAHAAAAAAUABwAAAAADAAcAAAAAAgCDAAAAAAAAgwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAgAAAAAAAAIgAAAAAAAAoAAAAAAgAHAAAAAAMABwAAAAADAAcAAAAABAAHAAAAAAUABwAAAAAFAAcAAAAAAQAHAAAAAAIAgwAAAAAAAIMAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAIAAAAAAAACIAAAAAAAAKAAAAAAMABwAAAAADAAcAAAAAAgAHAAAAAAYABwAAAAABAAcAAAAABgAHAAAAAAQABwAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAACAAAAAAAAAKAAAAAAMACgAAAAABAAcAAAAABQAHAAAAAAMABwAAAAAFAAcAAAAABAAHAAAAAAIABwAAAAADAIMAAAAAAACDAAAAAAAAgwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAgAAAAAAAACgAAAAABAAcAAAAAAAAHAAAAAAUABwAAAAACAAcAAAAABAAHAAAAAAMABwAAAAADAAcAAAAABgCDAAAAAAAAgwAAAAAAAIMAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAIAAAAAAAAAoAAAAAAAAHAAAAAAEABwAAAAAFAAcAAAAABAAHAAAAAAUABwAAAAACAAcAAAAABgAHAAAAAAEAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAACAAAAAAAAAHAAAAAAYABwAAAAADABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAIAAQAAAAAAAAAAAAAAAAAgAAAAAAAABwAAAAAEAAcAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAcAAAAAAgAHAAAAAAUAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAIAAQAAAAABAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAMAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAACDAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAADAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAgwAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAwAAAAAAAIMAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAMAAAAAAACDAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAACDAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAgwAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAgwAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAA==
           version: 7
         -6,2:
           ind: -6,2
-          tiles: IAAAAAAAACAAAAAAAAAgAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAAAFAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAgABAAAAAAIAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAIMAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAACDAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAgwAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAIAAQAAAAABAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAIAAQAAAAACAAEAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAABAAEAAAAAAQABAAAAAAIAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIAgwAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: IAAAAAAAACAAAAAAAAAgAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAAAFAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAgABAAAAAAIAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAIMAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAACDAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAgwAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAIMAAAAAAAAEAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAIAAQAAAAABAAAAAAAAAACDAAAAAAAABAAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQAAAAAAAAAAgwAAAAAAAAQAAAAAAACDAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAIAAQAAAAACAAEAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAABAAEAAAAAAQABAAAAAAIAAAAAAAAAAIMAAAAAAAAEAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIAgwAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -7,1:
           ind: -7,1
@@ -341,11 +342,11 @@ entities:
           version: 7
         -7,2:
           ind: -7,2
-          tiles: gwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAAGAAcAAAAAAwAHAAAAAAIAgwAAAAAAAIMAAAAAAAADAAAAAAAAAwAAAAAAAAcAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAABAAHAAAAAAEABwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAwAHAAAAAAMABwAAAAABAIMAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAwAHAAAAAAIABwAAAAACAAcAAAAAAgCDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAIABwAAAAADAAcAAAAABgCDAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAABwAAAAAGAAcAAAAABgAHAAAAAAYABwAAAAAEAAcAAAAAAgAHAAAAAAQAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAQAHAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAAAwAAAAAAAAcAAAAAAAAHAAAAAAIABwAAAAABAAcAAAAABgAHAAAAAAIABwAAAAAGAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAMABwAAAAACAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAMABwAAAAAFAAcAAAAABgAHAAAAAAAABwAAAAAEAAcAAAAABACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAACAAcAAAAAAQABAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAFAAcAAAAABgAHAAAAAAUABwAAAAACAAcAAAAAAwAHAAAAAAIABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQCDAAAAAAAAAQAAAAAAAIMAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAEAAAAAAQCDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAAABAAAAAAIAgwAAAAAAAAEAAAAAAQABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAAAAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: gwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAAGAAcAAAAAAwAHAAAAAAIAgwAAAAAAAIMAAAAAAAADAAAAAAAAAwAAAAAAAAcAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAABAAHAAAAAAEABwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAwAHAAAAAAMABwAAAAABAIMAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAwAHAAAAAAIABwAAAAACAAcAAAAAAgCDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAIABwAAAAADAAcAAAAABgCDAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAABwAAAAAGAAcAAAAABgAHAAAAAAYABwAAAAAEAAcAAAAAAgAHAAAAAAQAgwAAAAAAAAQAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAQAHAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAAAwAAAAAAAAcAAAAAAAAHAAAAAAIABwAAAAABAAcAAAAABgAHAAAAAAIABwAAAAAGAIMAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAHAAAAAAMABwAAAAACAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAMABwAAAAAFAAcAAAAABgAHAAAAAAAABwAAAAAEAAcAAAAABACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAACAAcAAAAAAQABAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAFAAcAAAAABgAHAAAAAAUABwAAAAACAAcAAAAAAwAHAAAAAAIABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQCDAAAAAAAAAQAAAAAAAIMAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAEAAAAAAQCDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAAABAAAAAAIAgwAAAAAAAAEAAAAAAQABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAAAAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -7,-5:
           ind: -7,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAACAAEAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAcAAAAAAwAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAQAHAAAAAAUAAAAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAGAAcAAAAABQAHAAAAAAEABwAAAAADAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAFAAcAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAABAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAEAAcAAAAAAAAHAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAcAAAAABgAHAAAAAAMABwAAAAAGAAcAAAAAAQAHAAAAAAIABwAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAAcAAAAAAwAHAAAAAAEABwAAAAABAAcAAAAAAAAHAAAAAAYABwAAAAADAAcAAAAABQATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAAAcAAAAAAAAHAAAAAAIABwAAAAAFAAcAAAAABAAHAAAAAAQABwAAAAABAAcAAAAAAQAHAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAQAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAQAHAAAAAAUABwAAAAACAAcAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAMABwAAAAAGAAcAAAAAAQAHAAAAAAQAAQAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAACAAEAAAAAAgCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAAAAAcAAAAABgAHAAAAAAQABwAAAAADAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAACAAEAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAcAAAAAAwAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAQAHAAAAAAUAAAAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAGAAcAAAAABQAHAAAAAAEABwAAAAADAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAFAAcAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAABAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAEAAcAAAAAAAAHAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAcAAAAABgAHAAAAAAMABwAAAAAGAAcAAAAAAQAHAAAAAAIABwAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAAcAAAAAAwAHAAAAAAEABwAAAAABAAcAAAAAAAAHAAAAAAYABwAAAAADAAcAAAAABQATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAAAcAAAAAAAAHAAAAAAIABwAAAAAFAAcAAAAABAAHAAAAAAQABwAAAAABAAcAAAAAAQAHAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAQAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAQAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAAAEAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAQAHAAAAAAUABwAAAAACAAcAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAABAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAMABwAAAAAGAAcAAAAAAQAHAAAAAAQAAQAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAACAAEAAAAAAgCDAAAAAAAAgwAAAAAAAAQAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAAAAAcAAAAABgAHAAAAAAQABwAAAAADAA==
           version: 7
         -8,1:
           ind: -8,1
@@ -361,7 +362,7 @@ entities:
           version: 7
         -9,0:
           ind: -9,0
-          tiles: AQAAAAABAAEAAAAAAQAAAAAAAAAAAQAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAJgAAAAADAIMAAAAAAACDAAAAAAAABwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAAAAAEAAAAAAQCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAgCDAAAAAAAAEgAAAAAAABIAAAAAAAABAAAAAAIAAQAAAAACAAAAAAAAAAABAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAYAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAABAAEAAAAAAgAAAAAAAAAAAQAAAAAAAAcAAAAABgCDAAAAAAAABwAAAAADAAcAAAAABAAHAAAAAAUABwAAAAAEAAIAAAAAAACDAAAAAAAABwAAAAABAIMAAAAAAAASAAAAAAAAEgAAAAAAAAEAAAAAAQABAAAAAAEAAAAAAAAAAAEAAAAAAQAHAAAAAAMAgwAAAAAAAAcAAAAABgAHAAAAAAAABwAAAAAGAAcAAAAAAAACAAAAAAAAgwAAAAAAAAcAAAAAAwCDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAQABAAAAAAEABwAAAAADAIMAAAAAAAAHAAAAAAIABwAAAAACAAcAAAAABgAHAAAAAAYAAgAAAAAAAIMAAAAAAAAHAAAAAAUAgwAAAAAAABIAAAAAAAASAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAQCDAAAAAAAABwAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAEAAIAAAAAAACDAAAAAAAABwAAAAADAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAEAgwAAAAAAAAAAAAAAAAAHAAAAAAAAgwAAAAAAAAcAAAAABgAHAAAAAAYABwAAAAADAAcAAAAAAQACAAAAAAAAgwAAAAAAAAcAAAAAAwCDAAAAAAAAEgAAAAAAABIAAAAAAACDAAAAAAAAAQAAAAACAIMAAAAAAAAAAAAAAAAABwAAAAAFAIMAAAAAAAAHAAAAAAUABwAAAAAAAAcAAAAAAgAHAAAAAAYAAgAAAAAAAIMAAAAAAAAHAAAAAAQAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAgCDAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAACAAIAAAAAAACDAAAAAAAABwAAAAAEAIMAAAAAAAASAAAAAAAAEgAAAAAAAIMAAAAAAAABAAAAAAIAgwAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAgACAAAAAAAAgwAAAAAAAAcAAAAAAwCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAACAIMAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAQAAgAAAAAAAIMAAAAAAAAHAAAAAAAAgwAAAAAAABIAAAAAAAASAAAAAAAAAAAAAAAAAAEAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAAFAAIAAAAAAACDAAAAAAAABwAAAAAEAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAAABAAAAAAIAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAgACAAAAAAAAgwAAAAAAAAcAAAAABgCDAAAAAAAAEgAAAAAAABIAAAAAAAAAAAAAAAAAAQAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAMAAgAAAAAAAIMAAAAAAAAHAAAAAAQAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAACDAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAACAAIAAAAAAACDAAAAAAAABwAAAAADAAcAAAAAAAAHAAAAAAMABwAAAAAEAA==
+          tiles: AQAAAAABAAEAAAAAAQAAAAAAAAAAAQAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAJgAAAAADAIMAAAAAAACDAAAAAAAABwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAAAAAEAAAAAAQCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAgCDAAAAAAAAEgAAAAAAABIAAAAAAAABAAAAAAIAAQAAAAACAAAAAAAAAAABAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAYAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAABAAEAAAAAAgAAAAAAAAAAAQAAAAAAAAcAAAAABgCDAAAAAAAABwAAAAADAAcAAAAABAAHAAAAAAUABwAAAAAEAAIAAAAAAACDAAAAAAAABwAAAAABAIMAAAAAAAASAAAAAAAAEgAAAAAAAAEAAAAAAQABAAAAAAEAAAAAAAAAAAEAAAAAAQAHAAAAAAMAgwAAAAAAAAcAAAAABgAHAAAAAAAABwAAAAAGAAcAAAAAAAACAAAAAAAAgwAAAAAAAAcAAAAAAwCDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAQABAAAAAAEABwAAAAADAIMAAAAAAAAHAAAAAAIABwAAAAACAAcAAAAABgAHAAAAAAYAAgAAAAAAAIMAAAAAAAAHAAAAAAUAgwAAAAAAABIAAAAAAAASAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAQCDAAAAAAAABwAAAAADAAcAAAAAAAAHAAAAAAAABwAAAAAEAAIAAAAAAACDAAAAAAAABwAAAAADAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAEAgwAAAAAAAAAAAAAAAAAHAAAAAAAAgwAAAAAAAAcAAAAABgAHAAAAAAYABwAAAAADAAcAAAAAAQACAAAAAAAAgwAAAAAAAAcAAAAAAwCDAAAAAAAAEgAAAAAAABIAAAAAAACDAAAAAAAAAQAAAAACAIMAAAAAAAAAAAAAAAAABwAAAAAFAIMAAAAAAAAHAAAAAAUABwAAAAAAAAcAAAAAAgAHAAAAAAYAAgAAAAAAAIMAAAAAAAAHAAAAAAQAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAgCDAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAACAAIAAAAAAACDAAAAAAAABwAAAAAEAIMAAAAAAAASAAAAAAAAEgAAAAAAAIMAAAAAAAABAAAAAAIAgwAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAgACAAAAAAAAgwAAAAAAAAcAAAAAAwCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAACAIMAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAQAAgAAAAAAAIMAAAAAAAAHAAAAAAAAgwAAAAAAABIAAAAAAAASAAAAAAAAAAAAAAAAAAEAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAAFAAIAAAAAAACDAAAAAAAABwAAAAAEAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAAABAAAAAAIABAAAAAAAAAQAAAAAAAAEAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAgACAAAAAAAAgwAAAAAAAAcAAAAABgCDAAAAAAAAEgAAAAAAABIAAAAAAAAAAAAAAAAAAQAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAMAAgAAAAAAAIMAAAAAAAAHAAAAAAQAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAACDAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAACAAIAAAAAAACDAAAAAAAABwAAAAADAAcAAAAAAAAHAAAAAAMABwAAAAAEAA==
           version: 7
         -9,-1:
           ind: -9,-1
@@ -369,11 +370,11 @@ entities:
           version: 7
         -9,-2:
           ind: -9,-2
-          tiles: gwAAAAAAAAEAAAAAAgCDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAABgCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAEAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAYABwAAAAAGAIMAAAAAAAAHAAAAAAAABwAAAAAFAAcAAAAABgAHAAAAAAYABwAAAAAFAAcAAAAABACDAAAAAAAAAQAAAAACAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAUABwAAAAACAIMAAAAAAACDAAAAAAAABwAAAAADAAcAAAAABQAHAAAAAAYABwAAAAACAAcAAAAABAAHAAAAAAUAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAABAAcAAAAAAAAHAAAAAAUABwAAAAAEAAcAAAAAAQAHAAAAAAAABwAAAAADAAEAAAAAAQABAAAAAAIAAQAAAAAAAAEAAAAAAgABAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAYAAgAAAAAAAAcAAAAAAwAHAAAAAAYABwAAAAADAAcAAAAAAQAHAAAAAAEAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAADAAIAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAAAAAAAAAAAHAAAAAAIABwAAAAAAAIMAAAAAAAAHAAAAAAQABwAAAAAEAAcAAAAABgACAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAABwAAAAAEAIMAAAAAAACDAAAAAAAABwAAAAAGAAcAAAAABAAHAAAAAAAAAgAAAAAAAIMAAAAAAACDAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAAAAAAAAAAAEAAAAAAQAAAAAAAAAABwAAAAACAAcAAAAABQCDAAAAAAAABwAAAAAEAAcAAAAABQAHAAAAAAYABwAAAAACAAIAAAAAAACDAAAAAAAAgwAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABQACAAAAAAAAgwAAAAAAAIMAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAAAAAAAAAAAgwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAIMAAAAAAAAHAAAAAAIAAgAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAABAIMAAAAAAAALAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAAsAAAAAAACDAAAAAAAABwAAAAAFAAIAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAACDAAAAAAAACwAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAALAAAAAAAAgwAAAAAAAAcAAAAAAAACAAAAAAAAgwAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAIMAAAAAAAABAAAAAAIAgwAAAAAAAAsAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAACwAAAAAAAIMAAAAAAAAHAAAAAAYAAgAAAAAAAIMAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAACAIMAAAAAAAALAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAAsAAAAAAACDAAAAAAAABwAAAAAAAAIAAAAAAACDAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAgwAAAAAAAA==
+          tiles: gwAAAAAAAAEAAAAAAgCDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAABgCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAEAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAYABwAAAAAGAIMAAAAAAAAHAAAAAAAABwAAAAAFAAcAAAAABgAHAAAAAAYABwAAAAAFAAcAAAAABACDAAAAAAAAAQAAAAACAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAUABwAAAAACAIMAAAAAAACDAAAAAAAABwAAAAADAAcAAAAABQAHAAAAAAYABwAAAAACAAcAAAAABAAHAAAAAAUAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAABAAcAAAAAAAAHAAAAAAUABwAAAAAEAAcAAAAAAQAHAAAAAAAABwAAAAADAAEAAAAAAQABAAAAAAIAAQAAAAAAAAEAAAAAAgABAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAAAEAAAAAAAABAAAAAAAAIMAAAAAAAAHAAAAAAYAAgAAAAAAAAcAAAAAAwAHAAAAAAYABwAAAAADAAcAAAAAAQAHAAAAAAEAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAADAAIAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAAAAAAAAAAAHAAAAAAIABwAAAAAAAIMAAAAAAAAHAAAAAAQABwAAAAAEAAcAAAAABgACAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAABwAAAAAEAIMAAAAAAACDAAAAAAAABwAAAAAGAAcAAAAABAAHAAAAAAAAAgAAAAAAAIMAAAAAAACDAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAAAAAAAAAAAEAAAAAAQAAAAAAAAAABwAAAAACAAcAAAAABQCDAAAAAAAABwAAAAAEAAcAAAAABQAHAAAAAAYABwAAAAACAAIAAAAAAACDAAAAAAAAgwAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABQACAAAAAAAAgwAAAAAAAIMAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAAAAAAAAAAAgwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAIMAAAAAAAAHAAAAAAIAAgAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAABAIMAAAAAAAALAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAAsAAAAAAACDAAAAAAAABwAAAAAFAAIAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAEAAAAAAACDAAAAAAAACwAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAALAAAAAAAAgwAAAAAAAAcAAAAAAAACAAAAAAAAgwAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAIMAAAAAAAABAAAAAAIAgwAAAAAAAAsAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAACwAAAAAAAIMAAAAAAAAHAAAAAAYAAgAAAAAAAIMAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAACAIMAAAAAAAALAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAAsAAAAAAACDAAAAAAAABwAAAAAAAAIAAAAAAACDAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAgwAAAAAAAA==
           version: 7
         -9,1:
           ind: -9,1
-          tiles: gwAAAAAAAAEAAAAAAgCDAAAAAAAAAAAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAABwAAAAAGAAIAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAEAgwAAAAAAAAAAAAAAAACDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAcAAAAAAAACAAAAAAAABwAAAAAEAAcAAAAAAAAHAAAAAAEABwAAAAADAAcAAAAABgCDAAAAAAAAAQAAAAACAIMAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAAAHAAAAAAYAAgAAAAAAAAcAAAAAAQAHAAAAAAUABwAAAAABAAcAAAAAAwAHAAAAAAAAgwAAAAAAAAEAAAAAAQCDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAABwAAAAAEAAIAAAAAAAAHAAAAAAMABwAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAEAAAAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAcAAAAABAACAAAAAAAABwAAAAABAAcAAAAABAAHAAAAAAIABwAAAAAEAAcAAAAABgABAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAAAAgAAAAAAAAcAAAAABQAHAAAAAAUABwAAAAAEAAcAAAAABQAHAAAAAAIAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABAAHAAAAAAUAIAAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAIAAQAAAAACAAEAAAAAAgABAAAAAAIAAQAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAQAGAAAAAAAABgAAAAAAAAYAAAAAAAAIAAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAAGABgAAAAAAAAYAAAAAAAAGAAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAFAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAHAAAAAAIAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAUABwAAAAAAAAcAAAAAAgAHAAAAAAQABwAAAAAFAAcAAAAAAwAHAAAAAAYABwAAAAABAIMAAAAAAACDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAACAAcAAAAABQAHAAAAAAYABwAAAAAAAAcAAAAABgAHAAAAAAIABwAAAAAGAAcAAAAABgCDAAAAAAAAgwAAAAAAAA==
+          tiles: gwAAAAAAAAEAAAAAAgCDAAAAAAAAAAAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAABwAAAAAGAAIAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAEAgwAAAAAAAAAAAAAAAACDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAcAAAAAAAACAAAAAAAABwAAAAAEAAcAAAAAAAAHAAAAAAEABwAAAAADAAcAAAAABgCDAAAAAAAAAQAAAAACAIMAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAAAHAAAAAAYAAgAAAAAAAAcAAAAAAQAHAAAAAAUABwAAAAABAAcAAAAAAwAHAAAAAAAAgwAAAAAAAAEAAAAAAQCDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAABwAAAAAEAAIAAAAAAAAHAAAAAAMABwAAAAACAAcAAAAAAAAHAAAAAAAABwAAAAAEAAAAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAcAAAAABAACAAAAAAAABwAAAAABAAcAAAAABAAHAAAAAAIABwAAAAAEAAcAAAAABgABAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAAAAgAAAAAAAAcAAAAABQAHAAAAAAUABwAAAAAEAAcAAAAABQAHAAAAAAIAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAIAAQAAAAACAAEAAAAAAgABAAAAAAIAAQAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAFAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAUABwAAAAAAAAcAAAAAAgCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAACAAcAAAAABQAHAAAAAAYABwAAAAAAAAcAAAAABgAHAAAAAAIABwAAAAAGAAcAAAAABgCDAAAAAAAAgwAAAAAAAA==
           version: 7
         -10,-3:
           ind: -10,-3
@@ -401,7 +402,7 @@ entities:
           version: 7
         -2,1:
           ind: -2,1
-          tiles: IAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAwAAAAAAABoAAAAAAAAaAAAAAAAAAwAAAAAAAAMAAAAAAAAHAAAAAAYABwAAAAAGACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAMAAAAAAAAaAAAAAAAAGgAAAAAAAAMAAAAAAAADAAAAAAAABwAAAAAAAAcAAAAABQCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAADAAAAAAAAGgAAAAAAABoAAAAAAAADAAAAAAAAAwAAAAAAAAcAAAAABQAHAAAAAAYAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAABoAAAAAAAAaAAAAAAAAAwAAAAAAAAMAAAAAAAAHAAAAAAYABwAAAAACACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAaAAAAAAAAGgAAAAAAAAMAAAAAAAADAAAAAAAABwAAAAAFAAcAAAAABQAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAABwAAAAADAAcAAAAAAwAHAAAAAAQABwAAAAABAAcAAAAABgAHAAAAAAMAgwAAAAAAAIMAAAAAAAAEAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAAAHAAAAAAEABwAAAAAFAAcAAAAABgAHAAAAAAUABwAAAAABAIMAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAACDAAAAAAAABwAAAAAGAAcAAAAAAAAHAAAAAAQABwAAAAADAAcAAAAAAgAHAAAAAAIABwAAAAABAAcAAAAAAQAHAAAAAAYABwAAAAAFAAcAAAAAAgCDAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAgwAAAAAAAAcAAAAABgAHAAAAAAQABwAAAAABAAcAAAAAAwAHAAAAAAMABwAAAAAFAAcAAAAABQAHAAAAAAUABwAAAAABAAEAAAAAAgABAAAAAAIAgwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAIMAAAAAAAAHAAAAAAYABwAAAAAEAAcAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: IAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAwAAAAAAABoAAAAAAAAaAAAAAAAAAwAAAAAAAAMAAAAAAACDAAAAAAAABwAAAAAGACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAMAAAAAAAAaAAAAAAAAGgAAAAAAAAMAAAAAAAADAAAAAAAAgwAAAAAAAAcAAAAABQCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAADAAAAAAAAGgAAAAAAABoAAAAAAAADAAAAAAAAAwAAAAAAAIMAAAAAAAAHAAAAAAYAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAABoAAAAAAAAaAAAAAAAAAwAAAAAAAAMAAAAAAACDAAAAAAAABwAAAAACACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAaAAAAAAAAGgAAAAAAAAMAAAAAAAADAAAAAAAAgwAAAAAAAAcAAAAABQAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAMAgwAAAAAAAIMAAAAAAAAEAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAAAHAAAAAAEABwAAAAAFAAcAAAAABgAHAAAAAAUABwAAAAABAIMAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAACDAAAAAAAABwAAAAAGAAcAAAAAAAAHAAAAAAQABwAAAAADAAcAAAAAAgAHAAAAAAIABwAAAAABAAcAAAAAAQAHAAAAAAYABwAAAAAFAAcAAAAAAgCDAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAgwAAAAAAAAcAAAAABgAHAAAAAAQABwAAAAABAAcAAAAAAwAHAAAAAAMABwAAAAAFAAcAAAAABQAHAAAAAAUABwAAAAABAAEAAAAAAgABAAAAAAIAgwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAIMAAAAAAAAHAAAAAAYABwAAAAAEAAcAAAAAAQAHAAAAAAAABwAAAAAAAAcAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -1,1:
           ind: -1,1
@@ -433,7 +434,7 @@ entities:
           version: 7
         -3,-5:
           ind: -3,-5
-          tiles: BwAAAAAFAAcAAAAAAAAHAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAAcAAAAAAgAHAAAAAAEABwAAAAAEAAcAAAAABAAHAAAAAAYABwAAAAADAAcAAAAAAgAHAAAAAAMABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAAABwAAAAADAAcAAAAABQAHAAAAAAEABwAAAAAFAAcAAAAAAwAHAAAAAAUABwAAAAACAAcAAAAAAgAHAAAAAAAABwAAAAAGAAcAAAAABgAHAAAAAAQAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAAFAAcAAAAAAAAHAAAAAAAABwAAAAAEAAcAAAAABgAHAAAAAAEABwAAAAAFAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAAFAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAAAwAHAAAAAAEABwAAAAADAAcAAAAAAQAHAAAAAAIABwAAAAABAAcAAAAAAgCDAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAEABwAAAAAFAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAEAgwAAAAAAABIAAAAAAAAMAAAAAAEAEgAAAAAAAIMAAAAAAAAHAAAAAAMABwAAAAAFAAcAAAAAAQAHAAAAAAAABwAAAAACAAcAAAAABgAhAAAAAAAAIQAAAAAAACEAAAAAAACDAAAAAAAABwAAAAAAAIMAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAACDAAAAAAAABwAAAAACAAcAAAAAAQAHAAAAAAQABwAAAAADAAcAAAAABQAHAAAAAAEAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAUABwAAAAABAAcAAAAABQAHAAAAAAEABwAAAAAFAAcAAAAABQAHAAAAAAIABwAAAAAAAAcAAAAAAwAHAAAAAAIAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAAABwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABgCDAAAAAAAAGgAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAAAgwAAAAAAABoAAAAAAAAaAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAACDAAAAAAAABwAAAAAAAIMAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAgwAAAAAAAIMAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABACDAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAABoAAAAAAAAaAAAAAAAAgwAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAEAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAABwAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAAA==
+          tiles: BwAAAAAFAAcAAAAAAAAHAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAAcAAAAAAgAHAAAAAAEABwAAAAAEAAcAAAAABAAHAAAAAAYABwAAAAADAAcAAAAAAgAHAAAAAAMABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAABAAAAAAAAIMAAAAAAAAHAAAAAAAABwAAAAADAAcAAAAABQAHAAAAAAEABwAAAAAFAAcAAAAAAwAHAAAAAAUABwAAAAACAAcAAAAAAgAHAAAAAAAABwAAAAAGAAcAAAAABgAHAAAAAAQAgwAAAAAAAAQAAAAAAACDAAAAAAAABwAAAAAFAAcAAAAAAAAHAAAAAAAABwAAAAAEAAcAAAAABgAHAAAAAAEABwAAAAAFAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABwAAAAAFAIMAAAAAAAAEAAAAAAAAgwAAAAAAAAcAAAAAAwAHAAAAAAEABwAAAAADAAcAAAAAAQAHAAAAAAIABwAAAAABAAcAAAAAAgCDAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAABAAAAAAAAIMAAAAAAAAHAAAAAAEABwAAAAAFAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAEAgwAAAAAAABIAAAAAAAAMAAAAAAEAEgAAAAAAAIMAAAAAAAAHAAAAAAMABwAAAAAFAAcAAAAAAQAHAAAAAAAABwAAAAACAAcAAAAABgAhAAAAAAAAIQAAAAAAACEAAAAAAACDAAAAAAAABwAAAAAAAIMAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAACDAAAAAAAABwAAAAACAAcAAAAAAQAHAAAAAAQABwAAAAADAAcAAAAABQAHAAAAAAEAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAUABwAAAAABAAcAAAAABQAHAAAAAAEABwAAAAAFAAcAAAAABQAHAAAAAAIABwAAAAAAAAcAAAAAAwAHAAAAAAIAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAAABwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABgCDAAAAAAAAGgAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAAAgwAAAAAAABoAAAAAAAAaAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAACDAAAAAAAABwAAAAAAAIMAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAgwAAAAAAAIMAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAcAAAAABACDAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAABoAAAAAAAAaAAAAAAAAgwAAAAAAACAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAHAAAAAAEAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACDAAAAAAAABwAAAAABAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgwAAAAAAAA==
           version: 7
         -4,-6:
           ind: -4,-6
@@ -445,7 +446,7 @@ entities:
           version: 7
         -1,-5:
           ind: -1,-5
-          tiles: AQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAACAAEAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAEAAQAAAAACAAEAAAAAAgABAAAAAAIAAQAAAAACAAEAAAAAAQABAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAEAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAACAAEAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAEAAQAAAAACAAEAAAAAAgABAAAAAAIAAQAAAAACAAEAAAAAAQABAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAACDAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAEAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -2,-6:
           ind: -2,-6
@@ -465,7 +466,7 @@ entities:
           version: 7
         -8,-5:
           ind: -8,-5
-          tiles: AAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAwAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAMAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAAAAAEAAAAAAgAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAADAAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAAAwAAAAAAQAaAAAAAAAAGgAAAAAAABoAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAMAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAAAAIMAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAADAAAAAAAAAMAAAAAAAAMAAAAAAAADAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAwAAAAAAQADAAAAAAAAAwAAAAAAAAMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAABAAEAAAAAAgCDAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAEADAAAAAAAAAwAAAAAAQADAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAAAAAEAAAAAAQAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAADAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAwAAAAAAAADAAAAAAAADAAAAAABAAwAAAAAAQCDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAgCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAMAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAABAIMAAAAAAAABAAAAAAIAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAADAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAABMAAAAAAAATAAAAAAAAAQAAAAACAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAwAAAAAAAAwAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAMAAAAAAAAMAAAAAAAAAwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAADAAAAAAAAAMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAABMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAACAA==
+          tiles: AAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAwAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAMAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAAAAAEAAAAAAgAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAADAAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAABAAAAAAIAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAAAwAAAAAAQAaAAAAAAAAGgAAAAAAABoAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAMAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAAAAIMAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAADAAAAAAAAAMAAAAAAAAMAAAAAAAADAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAwAAAAAAQADAAAAAAAAAwAAAAAAAAMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAABAAEAAAAAAgCDAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAEADAAAAAAAAAwAAAAAAQADAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAAAAAEAAAAAAQAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAADAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAwAAAAAAAADAAAAAAAADAAAAAABAAwAAAAAAQCDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAgCDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAMAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAABAIMAAAAAAAABAAAAAAIAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAADAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABMAAAAAAAATAAAAAAAAAQAAAAACAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAwAAAAAAAAwAAAAAAAADAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAAMAAAAAAAAMAAAAAAAAAwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAADAAAAAAAADAAAAAAAAAMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAAABAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAgwAAAAAAABMAAAAAAACDAAAAAAAAgwAAAAAAAIMAAAAAAACDAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAACAA==
           version: 7
         -8,-6:
           ind: -8,-6
@@ -2842,26 +2843,6 @@ entities:
     - type: ExplosionAirtightGrid
     - type: ChunkContainer
       chunkEntities:
-      - 27138
-      - 27139
-      - 27140
-      - 27141
-      - 27142
-      - 27143
-      - 27144
-      - 27145
-      - 27146
-      - 27147
-      - 27148
-      - 27149
-      - 27150
-      - 27151
-      - 27152
-      - 27153
-      - 27154
-      - 27155
-      - 27156
-      - 27157
       - 27158
       - 27159
       - 27160
@@ -2908,6 +2889,26 @@ entities:
       - 27201
       - 27202
       - 27203
+      - 27204
+      - 27205
+      - 27206
+      - 27207
+      - 27208
+      - 27209
+      - 27210
+      - 27211
+      - 27212
+      - 27213
+      - 27214
+      - 27215
+      - 27216
+      - 27217
+      - 27218
+      - 27219
+      - 27220
+      - 27221
+      - 27222
+      - 27223
 - proto: AccordionInstrument
   entities:
   - uid: 25884
@@ -2926,7 +2927,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: -89.49506,-22.368973
+      pos: -91.7545,-17.31215
   - uid: 24353
     components:
     - type: Transform
@@ -5641,7 +5642,7 @@ entities:
       invokeCounter: 2
     - type: DeviceLinkSource
       linkedPorts:
-        10563:
+        6587:
         - - DoorStatus
           - DoorBolt
   - uid: 10566
@@ -5654,7 +5655,7 @@ entities:
       invokeCounter: 2
     - type: DeviceLinkSource
       linkedPorts:
-        10564:
+        10563:
         - - DoorStatus
           - DoorBolt
   - uid: 21370
@@ -5931,6 +5932,38 @@ entities:
       pos: -39.5,19.5
     - type: DeviceLinkSink
       invokeCounter: 2
+- proto: AirlockExternalGlassShuttleCargo
+  entities:
+  - uid: 6587
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -81.5,18.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        8961:
+        - - DoorStatus
+          - InputA
+        - - DockStatus
+          - InputB
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 10563
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -81.5,20.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        12421:
+        - - DoorStatus
+          - InputA
+        - - DockStatus
+          - InputB
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: AirlockExternalGlassShuttleEmergencyLocked
   entities:
   - uid: 8718
@@ -6407,36 +6440,6 @@ entities:
           - InputB
     - type: DeviceLinkSink
       invokeCounter: 2
-  - uid: 10563
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -81.5,18.5
-    - type: DeviceLinkSource
-      linkedPorts:
-        8961:
-        - - DoorStatus
-          - InputA
-        - - DockStatus
-          - InputB
-    - type: DeviceLinkSink
-      invokeCounter: 2
-  - uid: 10564
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -81.5,20.5
-    - type: DeviceLinkSource
-      linkedPorts:
-        12421:
-        - - DoorStatus
-          - InputA
-        - - DockStatus
-          - InputB
-    - type: DeviceLinkSink
-      invokeCounter: 2
   - uid: 24212
     components:
     - type: Transform
@@ -7454,7 +7457,7 @@ entities:
       pos: -131.5,-45.5
     - type: Door
       state: Opening
-      secondsUntilStateChange: -91111.48
+      secondsUntilStateChange: -101415.96
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -8058,8 +8061,8 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 6929
-      - 26265
       - 9587
+      - 4005
   - uid: 18721
     components:
     - type: Transform
@@ -9528,13 +9531,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -53.49543,-40.523304
-- proto: AsimovCircuitBoard
-  entities:
-  - uid: 24941
-    components:
-    - type: Transform
-      parent: 2
-      pos: -118.54267,-70.58629
 - proto: AsteroidRock
   entities:
   - uid: 145
@@ -19545,8 +19541,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -55.5,-38.5
+      pos: -55.289032,-36.748703
 - proto: BarSignComboCafe
   entities:
   - uid: 9228
@@ -20760,7 +20755,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: -62.434715,-2.3035812
+      pos: -62.623447,-2.2316713
 - proto: BoxFolderGreen
   entities:
   - uid: 19468
@@ -20895,7 +20890,26 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: -55.446175,-36.496502
+      pos: -55.71085,-36.311203
+    - type: GroupExamine
+      group:
+      - title: null
+        icon: /Textures/Interface/examine-star.png
+        hoverMessage: ""
+        entries:
+        - priority: 0
+          message: >-
+            It provides the following protection:
+
+            - [color=orange]Explosion[/color] damage [color=white]to contents[/color] reduced by [color=lightblue]10%[/color].
+          component: Armor
+        - priority: 0
+          message: This decreases your running speed by [color=yellow]10%[/color].
+          component: ClothingSpeedModifier
+        contextText: verb-examine-group-other
+        components:
+        - Armor
+        - ClothingSpeedModifier
 - proto: BoxPillCanister
   entities:
   - uid: 16667
@@ -50943,6 +50957,13 @@ entities:
     - type: Transform
       parent: 2
       pos: -102.5,16.5
+- proto: CargoTelepad
+  entities:
+  - uid: 27157
+    components:
+    - type: Transform
+      parent: 2
+      pos: -88.5,19.5
 - proto: Carpet
   entities:
   - uid: 3375
@@ -53342,21 +53363,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -125.5,11.5
-  - uid: 9997
-    components:
-    - type: Transform
-      parent: 2
-      pos: -94.5,36.5
-  - uid: 9998
-    components:
-    - type: Transform
-      parent: 2
-      pos: -94.5,37.5
-  - uid: 9999
-    components:
-    - type: Transform
-      parent: 2
-      pos: -94.5,39.5
   - uid: 10000
     components:
     - type: Transform
@@ -53372,11 +53378,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -94.5,42.5
-  - uid: 10003
-    components:
-    - type: Transform
-      parent: 2
-      pos: -94.5,38.5
   - uid: 10014
     components:
     - type: Transform
@@ -53872,6 +53873,11 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -154.5,2.5
+  - uid: 13936
+    components:
+    - type: Transform
+      parent: 2
+      pos: -105.5,12.5
   - uid: 13958
     components:
     - type: Transform
@@ -59951,7 +59957,7 @@ entities:
       pos: -85.48848,-41.319702
 - proto: ChunkEntity
   entities:
-  - uid: 27138
+  - uid: 27158
     components:
     - type: ChunkEntity
       root: 2
@@ -60294,7 +60300,7 @@ entities:
             7763: -116,-43
             7764: -115,-43
             7765: -114,-43
-  - uid: 27139
+  - uid: 27159
     components:
     - type: ChunkEntity
       root: 2
@@ -60468,7 +60474,7 @@ entities:
           decals:
             2408: -113,17
             2409: -114,17
-  - uid: 27140
+  - uid: 27160
     components:
     - type: ChunkEntity
       root: 2
@@ -60858,7 +60864,7 @@ entities:
           decals:
             1451: -58,-21
             1452: -59,-21
-  - uid: 27141
+  - uid: 27161
     components:
     - type: ChunkEntity
       root: 2
@@ -61106,7 +61112,7 @@ entities:
             724: -27,-51
             725: -27,-50
             726: -27,-49
-  - uid: 27142
+  - uid: 27162
     components:
     - type: ChunkEntity
       root: 2
@@ -61357,7 +61363,7 @@ entities:
             6803: -104,15
             6804: -103,15
             6805: -99,15
-  - uid: 27143
+  - uid: 27163
     components:
     - type: ChunkEntity
       root: 2
@@ -61480,7 +61486,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             292: -47,1
-  - uid: 27144
+  - uid: 27164
     components:
     - type: ChunkEntity
       root: 2
@@ -61652,7 +61658,7 @@ entities:
             7807: -121,10
             7808: -120,10
             7809: -119,10
-  - uid: 27145
+  - uid: 27165
     components:
     - type: ChunkEntity
       root: 2
@@ -61997,7 +62003,7 @@ entities:
           decals:
             7873: -22,-21
             7874: -22,-20
-  - uid: 27146
+  - uid: 27166
     components:
     - type: ChunkEntity
       root: 2
@@ -62198,7 +62204,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             7605: -98,-9
-  - uid: 27147
+  - uid: 27167
     components:
     - type: ChunkEntity
       root: 2
@@ -62488,7 +62494,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             308: -47,-6
-  - uid: 27148
+  - uid: 27168
     components:
     - type: ChunkEntity
       root: 2
@@ -62694,7 +62700,7 @@ entities:
             color: '#DE3A3A96'
           decals:
             8075: -78,-29
-  - uid: 27149
+  - uid: 27169
     components:
     - type: ChunkEntity
       root: 2
@@ -62930,7 +62936,7 @@ entities:
             1308: -31,-11
             1309: -30,-11
             1310: -29,-11
-  - uid: 27150
+  - uid: 27170
     components:
     - type: ChunkEntity
       root: 2
@@ -62985,6 +62991,26 @@ entities:
             color: '#FFFFFFFF'
             cleanable: True
           decals:
+            11: -92,-20
+            12: -92,-19
+            13: -91,-21
+            15: -91,-20
+            16: -90,-20
+            17: -90,-19
+            18: -90,-18
+            20: -92,-22
+            23: -90,-21
+            24: -88,-21
+            25: -87,-21
+            28: -89,-22
+            29: -89,-23
+            31: -87,-23
+            32: -87,-24
+            33: -88,-24
+            34: -89,-24
+            35: -93,-23
+            39: -91,-19
+            40: -91,-23
             4053: -96,-18
             4054: -96,-19
             4055: -96,-20
@@ -63004,6 +63030,7 @@ entities:
             color: '#FFFFFFFF'
             cleanable: True
           decals:
+            14: -91,-22
             7908: -82,-27
             8415: -95,-23
             8417: -95,-25
@@ -63015,6 +63042,10 @@ entities:
             color: '#FFFFFFFF'
             cleanable: True
           decals:
+            19: -90,-22
+            21: -91,-18
+            27: -87,-22
+            38: -91,-19
             7979: -95,-27
             8077: -94,-32
             8423: -96,-26
@@ -63028,6 +63059,13 @@ entities:
             color: '#FFFFFFFF'
             cleanable: True
           decals:
+            9: -92,-21
+            22: -90,-22
+            26: -88,-22
+            30: -88,-23
+            36: -92,-23
+            37: -91,-18
+            41: -91,-24
             3423: -93,-26
             3424: -92,-26
             3428: -94,-27
@@ -63078,38 +63116,16 @@ entities:
             4011: -89,-26
             4013: -84,-26
             4015: -81,-26
-            4016: -88,-24
-            4017: -90,-24
-            4018: -89,-23
             4019: -87,-24
             4020: -87,-24
-            4021: -87,-22
-            4022: -89,-22
-            4023: -91,-22
-            4024: -92,-22
-            4025: -93,-23
             4026: -93,-24
             4027: -92,-24
-            4028: -92,-23
-            4029: -92,-22
             4030: -93,-22
-            4031: -92,-21
-            4032: -92,-21
-            4033: -91,-21
             4034: -93,-21
             4035: -93,-20
-            4036: -91,-20
-            4037: -91,-19
-            4038: -92,-19
             4039: -93,-19
             4040: -92,-18
-            4041: -91,-18
-            4042: -92,-20
             4043: -89,-21
-            4044: -90,-22
-            4045: -88,-22
-            4046: -88,-23
-            4047: -91,-23
             7078: -83,-28
             7080: -81,-27
             7081: -88,-26
@@ -63142,17 +63158,19 @@ entities:
             id: HalfTileOverlayGreyscale
             color: '#DE3A3A96'
           decals:
+            10: -91,-18
             1780: -92,-18
         - node:
             id: HalfTileOverlayGreyscale180
             color: '#DE3A3A96'
           decals:
+            7: -91,-24
             1776: -92,-24
         - node:
             id: HalfTileOverlayGreyscale270
             color: '#DE3A3A96'
           decals:
-            1768: -93,-23
+            3: -93,-23
             1769: -93,-22
             1770: -93,-21
             1771: -93,-20
@@ -63161,13 +63179,14 @@ entities:
             id: HalfTileOverlayGreyscale90
             color: '#DE3A3A96'
           decals:
-            1777: -91,-23
-            1778: -91,-20
-            1779: -91,-19
+            4: -90,-19
+            5: -90,-20
+            6: -91,-23
         - node:
             id: QuarterTileOverlayGreyscale
             color: '#DE3A3A96'
           decals:
+            2: -90,-18
             1697: -93,-26
             1698: -92,-26
             1699: -91,-26
@@ -63186,6 +63205,7 @@ entities:
             id: QuarterTileOverlayGreyscale180
             color: '#DE3A3A96'
           decals:
+            1: -90,-18
             1689: -95,-18
             1690: -95,-19
             1691: -95,-20
@@ -63212,6 +63232,12 @@ entities:
             8007: -96,-30
             8008: -96,-31
             8009: -96,-32
+        - node:
+            id: QuarterTileOverlayGreyscale90
+            color: '#DE3A3A96'
+          decals:
+            0: -90,-18
+            8: -91,-24
         - node:
             id: StandClear
             color: '#FFFFFFFF'
@@ -63222,21 +63248,11 @@ entities:
             color: '#DE3A3A96'
           decals:
             1773: -93,-18
-        - node:
-            id: ThreeQuarterTileOverlayGreyscale180
-            color: '#DE3A3A96'
-          decals:
-            1775: -91,-24
         - node:
             id: ThreeQuarterTileOverlayGreyscale270
             color: '#DE3A3A96'
           decals:
             1767: -93,-24
-        - node:
-            id: ThreeQuarterTileOverlayGreyscale90
-            color: '#DE3A3A96'
-          decals:
-            1774: -91,-18
         - node:
             id: WarnCornerNE
             color: '#FFFFFFFF'
@@ -63325,7 +63341,7 @@ entities:
             1784: -82,-32
             1785: -81,-32
             8262: -84,-32
-  - uid: 27151
+  - uid: 27171
     components:
     - type: ChunkEntity
       root: 2
@@ -63530,7 +63546,7 @@ entities:
           decals:
             6683: -119,-66
             6684: -119,-67
-  - uid: 27152
+  - uid: 27172
     components:
     - type: ChunkEntity
       root: 2
@@ -63605,7 +63621,7 @@ entities:
             color: '#D381C996'
           decals:
             7011: -122,-83
-  - uid: 27153
+  - uid: 27173
     components:
     - type: ChunkEntity
       root: 2
@@ -63789,7 +63805,7 @@ entities:
             86: -65,-6
             115: -65,-12
             116: -65,-11
-  - uid: 27154
+  - uid: 27174
     components:
     - type: ChunkEntity
       root: 2
@@ -63959,7 +63975,7 @@ entities:
           decals:
             2181: -132,-17
             2182: -132,-18
-  - uid: 27155
+  - uid: 27175
     components:
     - type: ChunkEntity
       root: 2
@@ -64236,7 +64252,7 @@ entities:
             271: -54,-6
             272: -54,-7
             290: -54,-1
-  - uid: 27156
+  - uid: 27176
     components:
     - type: ChunkEntity
       root: 2
@@ -64433,7 +64449,7 @@ entities:
             475: -29,0
             630: -30,4
             631: -30,8
-  - uid: 27157
+  - uid: 27177
     components:
     - type: ChunkEntity
       root: 2
@@ -64757,7 +64773,7 @@ entities:
             542: -40,-25
             543: -39,-25
             1204: -48,-23
-  - uid: 27158
+  - uid: 27178
     components:
     - type: ChunkEntity
       root: 2
@@ -64991,7 +65007,7 @@ entities:
             458: -14,-13
             459: -14,-14
             460: -14,-15
-  - uid: 27159
+  - uid: 27179
     components:
     - type: ChunkEntity
       root: 2
@@ -65139,7 +65155,7 @@ entities:
             966: -12,-20
             996: -12,-21
             1004: -12,-19
-  - uid: 27160
+  - uid: 27180
     components:
     - type: ChunkEntity
       root: 2
@@ -65524,7 +65540,7 @@ entities:
             1941: -85,-35
             1942: -85,-34
             1943: -85,-33
-  - uid: 27161
+  - uid: 27181
     components:
     - type: ChunkEntity
       root: 2
@@ -65725,7 +65741,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2175: -128,-16
-  - uid: 27162
+  - uid: 27182
     components:
     - type: ChunkEntity
       root: 2
@@ -65828,7 +65844,7 @@ entities:
             2055: -151,-4
             2056: -149,-4
             2058: -151,-12
-  - uid: 27163
+  - uid: 27183
     components:
     - type: ChunkEntity
       root: 2
@@ -66025,7 +66041,7 @@ entities:
           decals:
             2382: -89,12
             2383: -90,12
-  - uid: 27164
+  - uid: 27184
     components:
     - type: ChunkEntity
       root: 2
@@ -66250,7 +66266,7 @@ entities:
             2633: -135,-46
             2634: -134,-46
             2635: -133,-46
-  - uid: 27165
+  - uid: 27185
     components:
     - type: ChunkEntity
       root: 2
@@ -66467,7 +66483,7 @@ entities:
             2798: -104,-37
             7366: -105,-37
             8167: -97,-43
-  - uid: 27166
+  - uid: 27186
     components:
     - type: ChunkEntity
       root: 2
@@ -66773,7 +66789,7 @@ entities:
             cleanable: True
           decals:
             5965: -40,-47
-  - uid: 27167
+  - uid: 27187
     components:
     - type: ChunkEntity
       root: 2
@@ -66814,7 +66830,7 @@ entities:
             2759: -131,-49
             2760: -130,-49
             2761: -129,-49
-  - uid: 27168
+  - uid: 27188
     components:
     - type: ChunkEntity
       root: 2
@@ -66897,7 +66913,7 @@ entities:
             6522: -95,35
             6523: -94,35
             7863: -96,35
-  - uid: 27169
+  - uid: 27189
     components:
     - type: ChunkEntity
       root: 2
@@ -67078,7 +67094,7 @@ entities:
             6510: -94,30
             6511: -93,30
             6512: -92,30
-  - uid: 27170
+  - uid: 27190
     components:
     - type: ChunkEntity
       root: 2
@@ -67364,7 +67380,7 @@ entities:
             703: -31,-40
             704: -30,-40
             705: -29,-40
-  - uid: 27171
+  - uid: 27191
     components:
     - type: ChunkEntity
       root: 2
@@ -67526,7 +67542,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2176: -128,-17
-  - uid: 27172
+  - uid: 27192
     components:
     - type: ChunkEntity
       root: 2
@@ -67777,7 +67793,7 @@ entities:
             7998: -101,-31
             7999: -101,-30
             8001: -101,-29
-  - uid: 27173
+  - uid: 27193
     components:
     - type: ChunkEntity
       root: 2
@@ -68076,7 +68092,7 @@ entities:
           decals:
             7606: -96,-8
             7608: -93,-10
-  - uid: 27174
+  - uid: 27194
     components:
     - type: ChunkEntity
       root: 2
@@ -68233,7 +68249,7 @@ entities:
             5456: -134,-1
             5457: -135,-1
             5461: -134,-5
-  - uid: 27175
+  - uid: 27195
     components:
     - type: ChunkEntity
       root: 2
@@ -68418,7 +68434,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             291: -54,0
-  - uid: 27176
+  - uid: 27196
     components:
     - type: ChunkEntity
       root: 2
@@ -68514,7 +68530,7 @@ entities:
           decals:
             176: -68,0
             177: -67,0
-  - uid: 27177
+  - uid: 27197
     components:
     - type: ChunkEntity
       root: 2
@@ -68706,7 +68722,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1038: -64,-37
-  - uid: 27178
+  - uid: 27198
     components:
     - type: ChunkEntity
       root: 2
@@ -68809,7 +68825,7 @@ entities:
             6342: -148,-43
             6343: -147,-43
             6344: -149,-43
-  - uid: 27179
+  - uid: 27199
     components:
     - type: ChunkEntity
       root: 2
@@ -68852,7 +68868,7 @@ entities:
             6345: -149,-49
             6346: -148,-49
             6347: -147,-49
-  - uid: 27180
+  - uid: 27200
     components:
     - type: ChunkEntity
       root: 2
@@ -69052,7 +69068,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             6103: -67,-38
-  - uid: 27181
+  - uid: 27201
     components:
     - type: ChunkEntity
       root: 2
@@ -69249,7 +69265,7 @@ entities:
             7284: -56,-52
             7303: -53,-56
             7304: -53,-55
-  - uid: 27182
+  - uid: 27202
     components:
     - type: ChunkEntity
       root: 2
@@ -69328,7 +69344,7 @@ entities:
             5458: -135,0
             5459: -134,0
             5460: -134,1
-  - uid: 27183
+  - uid: 27203
     components:
     - type: ChunkEntity
       root: 2
@@ -69438,7 +69454,7 @@ entities:
             8084: -98,-51
             8085: -98,-50
             8086: -98,-49
-  - uid: 27184
+  - uid: 27204
     components:
     - type: ChunkEntity
       root: 2
@@ -69615,7 +69631,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             7599: -91,-63
-  - uid: 27185
+  - uid: 27205
     components:
     - type: ChunkEntity
       root: 2
@@ -69758,7 +69774,7 @@ entities:
             2953: -36,-70
             2954: -34,-70
             2955: -35,-70
-  - uid: 27186
+  - uid: 27206
     components:
     - type: ChunkEntity
       root: 2
@@ -69789,7 +69805,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             7818: -52,-66
-  - uid: 27187
+  - uid: 27207
     components:
     - type: ChunkEntity
       root: 2
@@ -69923,7 +69939,7 @@ entities:
             7841: -76,-56
             7847: -73,-58
             7849: -73,-56
-  - uid: 27188
+  - uid: 27208
     components:
     - type: ChunkEntity
       root: 2
@@ -70133,7 +70149,7 @@ entities:
             color: '#B02E26FF'
           decals:
             7771: -35.00467,-54.105
-  - uid: 27189
+  - uid: 27209
     components:
     - type: ChunkEntity
       root: 2
@@ -70199,7 +70215,7 @@ entities:
             393: -36,18
             394: -36,20
             395: -36,19
-  - uid: 27190
+  - uid: 27210
     components:
     - type: ChunkEntity
       root: 2
@@ -70251,7 +70267,7 @@ entities:
             cleanable: True
           decals:
             5397: -16,-55
-  - uid: 27191
+  - uid: 27211
     components:
     - type: ChunkEntity
       root: 2
@@ -70358,7 +70374,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2938: -25,-68
-  - uid: 27192
+  - uid: 27212
     components:
     - type: ChunkEntity
       root: 2
@@ -70425,7 +70441,7 @@ entities:
           decals:
             7896: -91.05765,-72.96845
             7897: -93.05765,-71.09345
-  - uid: 27193
+  - uid: 27213
     components:
     - type: ChunkEntity
       root: 2
@@ -70499,7 +70515,7 @@ entities:
             5445: -6,-38
             5446: -4,-35
             5447: -4,-35
-  - uid: 27194
+  - uid: 27214
     components:
     - type: ChunkEntity
       root: 2
@@ -70569,7 +70585,7 @@ entities:
             7237: -137,26
             7238: -137,27
             7239: -137,28
-  - uid: 27195
+  - uid: 27215
     components:
     - type: ChunkEntity
       root: 2
@@ -70604,7 +70620,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             7825: -77,-73
-  - uid: 27196
+  - uid: 27216
     components:
     - type: ChunkEntity
       root: 2
@@ -70709,7 +70725,6 @@ entities:
             6799: -99,16
             6800: -100,16
             6801: -101,16
-            6802: -102,16
             7102: -97,21
             7103: -97,22
             7106: -97,19
@@ -70762,7 +70777,7 @@ entities:
             color: '#FFFFFFFF'
             angle: -1.5707963267948966 rad
           decals:
-            6806: -102,16
+            0: -101,16
         - node:
             id: LoadingArea
             color: '#FFFFFFFF'
@@ -70833,7 +70848,7 @@ entities:
           decals:
             2916: -111,22
             2922: -110,21
-  - uid: 27197
+  - uid: 27217
     components:
     - type: ChunkEntity
       root: 2
@@ -71030,7 +71045,7 @@ entities:
             7766: -114,-49
             7767: -115,-49
             7768: -116,-49
-  - uid: 27198
+  - uid: 27218
     components:
     - type: ChunkEntity
       root: 2
@@ -71115,7 +71130,7 @@ entities:
             399: -30,21
             405: -32,21
             406: -28,21
-  - uid: 27199
+  - uid: 27219
     components:
     - type: ChunkEntity
       root: 2
@@ -71162,7 +71177,7 @@ entities:
             5669: -10,6
             5670: -9,6
             5671: -8,6
-  - uid: 27200
+  - uid: 27220
     components:
     - type: ChunkEntity
       root: 2
@@ -71195,7 +71210,7 @@ entities:
             6529: -98,33
             6530: -98,34
             6534: -98,35
-  - uid: 27201
+  - uid: 27221
     components:
     - type: ChunkEntity
       root: 2
@@ -71228,7 +71243,7 @@ entities:
             6540: -113.43667,36.99878
             6541: -112.06167,35.358154
             6542: -113.98354,35.201904
-  - uid: 27202
+  - uid: 27222
     components:
     - type: ChunkEntity
       root: 2
@@ -71244,7 +71259,7 @@ entities:
             cleanable: True
           decals:
             7057: -102.71358,-66.1344
-  - uid: 27203
+  - uid: 27223
     components:
     - type: ChunkEntity
       root: 2
@@ -71939,32 +71954,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -104.5,19.5
-- proto: ClosetTool
-  entities:
-  - uid: 6752
-    components:
-    - type: Transform
-      parent: 2
-      pos: -88.5,-17.5
-    - type: EntityStorage
-      air:
-        temperature: 293.14673
-        volume: 200
-        moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
-        immutable: False
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          ents:
-          - 4018
-          showEnts: False
-          occludes: True
-        paper_label: !type:ContainerSlot
-          ent: null
-          showEnts: False
-          occludes: True
 - proto: ClosetToolFilled
   entities:
   - uid: 4977
@@ -72094,13 +72083,6 @@ entities:
       pos: -107.5,-15.5
 - proto: ClothingBeltUtilityFilled
   entities:
-  - uid: 4018
-    components:
-    - type: Transform
-      parent: 6752
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
   - uid: 24497
     components:
     - type: Transform
@@ -72912,12 +72894,22 @@ entities:
     - type: Transform
       parent: 2
       pos: -101.5,12.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        27157:
+        - - OrderSender
+          - OrderReceiver
   - uid: 17840
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -98.5,13.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        27157:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersEngineering
   entities:
   - uid: 22274
@@ -72926,6 +72918,11 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -112.5,-18.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        27157:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersMedical
   entities:
   - uid: 19332
@@ -72934,6 +72931,11 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -21.5,-46.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        27157:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersScience
   entities:
   - uid: 25821
@@ -72941,6 +72943,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -131.5,-38.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        27157:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersSecurity
   entities:
   - uid: 12908
@@ -72949,6 +72956,11 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -80.5,-27.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        27157:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersService
   entities:
   - uid: 24116
@@ -72956,6 +72968,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -72.5,-24.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        27157:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerComms
   entities:
   - uid: 2690
@@ -73023,6 +73040,12 @@ entities:
       pos: -122.5,-76.5
 - proto: ComputerCriminalRecords
   entities:
+  - uid: 1059
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -89.5,-19.5
   - uid: 2117
     components:
     - type: Transform
@@ -73034,12 +73057,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -64.5,7.5
-  - uid: 6674
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -90.5,-19.5
   - uid: 6727
     components:
     - type: Transform
@@ -73355,12 +73372,12 @@ entities:
     - type: Transform
       parent: 2
       pos: -56.5,7.5
-  - uid: 6666
+  - uid: 4018
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
-      pos: -90.5,-18.5
+      pos: -89.5,-18.5
   - uid: 23059
     components:
     - type: Transform
@@ -73396,6 +73413,12 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -60.5,-53.5
+  - uid: 6553
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -89.5,-17.5
   - uid: 8171
     components:
     - type: Transform
@@ -73430,11 +73453,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -86.5,-50.5
-  - uid: 22057
-    components:
-    - type: Transform
-      parent: 2
-      pos: -89.5,-20.5
   - uid: 22267
     components:
     - type: Transform
@@ -73549,12 +73567,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -112.5,18.5
-  - uid: 6587
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -100.5,16.5
   - uid: 6610
     components:
     - type: Transform
@@ -74720,6 +74732,13 @@ entities:
     - type: Transform
       parent: 2
       pos: -84.5,2.5
+- proto: CrewsimovCircuitBoard
+  entities:
+  - uid: 24941
+    components:
+    - type: Transform
+      parent: 2
+      pos: -118.54267,-70.58629
 - proto: Crowbar
   entities:
   - uid: 981
@@ -84478,11 +84497,11 @@ entities:
       pos: -132.5,-52.5
 - proto: DresserWardenFilled
   entities:
-  - uid: 17821
+  - uid: 27142
     components:
     - type: Transform
       parent: 2
-      pos: -88.5,-20.5
+      pos: -90.5,-17.5
 - proto: DrinkBahamaMama
   entities:
   - uid: 19095
@@ -84516,6 +84535,18 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+  - uid: 27154
+    components:
+    - type: Transform
+      parent: 2
+      pos: -61.535065,-23.379587
+- proto: DrinkCoffeeJug
+  entities:
+  - uid: 2297
+    components:
+    - type: Transform
+      parent: 2
+      pos: -96.49904,10.521601
 - proto: DrinkGoldenCup
   entities:
   - uid: 4305
@@ -84656,6 +84687,12 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -84.5,-20.5
+  - uid: 6752
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -95.5,-31.5
   - uid: 8156
     components:
     - type: Transform
@@ -84711,12 +84748,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -59.5,0.5
-  - uid: 12637
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -95.5,-29.5
   - uid: 26483
     components:
     - type: Transform
@@ -84878,11 +84909,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -71.5,-58.5
-  - uid: 24311
-    components:
-    - type: Transform
-      parent: 2
-      pos: -110.5,-43.5
   - uid: 24313
     components:
     - type: Transform
@@ -84913,6 +84939,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -36.5,-16.5
+  - uid: 7463
+    components:
+    - type: Transform
+      parent: 2
+      pos: -112.5,-42.5
   - uid: 10641
     components:
     - type: Transform
@@ -85002,6 +85033,13 @@ entities:
       pos: -40.5,-20.5
     - type: FaxMachine
       name: Chemistry
+  - uid: 4799
+    components:
+    - type: Transform
+      parent: 2
+      pos: -89.5,-23.5
+    - type: FaxMachine
+      name: Warden
   - uid: 5738
     components:
     - type: MetaData
@@ -85028,16 +85066,6 @@ entities:
       currentLabel: Bridge
     - type: NameModifier
       baseName: long range fax machine
-  - uid: 10175
-    components:
-    - type: MetaData
-      name: long range fax machine
-    - type: Transform
-      parent: 2
-      pos: -90.5,-17.5
-    - type: FaxMachine
-      name: Warden
-    - type: Label
   - uid: 10749
     components:
     - type: Transform
@@ -85378,6 +85406,34 @@ entities:
       - 2980
       - 2987
       - 6938
+  - uid: 4005
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -96.5,-29.5
+    - type: DeviceList
+      devices:
+      - 18710
+      - 26268
+      - 23411
+      - 13606
+      - 26269
+      - 2281
+      - 16009
+      - 16948
+      - 16010
+  - uid: 4471
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -71.5,-23.5
+    - type: DeviceList
+      devices:
+      - 1658
+      - 442
+      - 12894
   - uid: 8155
     components:
     - type: MetaData
@@ -85407,6 +85463,42 @@ entities:
       - 14590
       - 13444
       - 13445
+  - uid: 9680
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -106.5,-14.5
+    - type: DeviceList
+      devices:
+      - 13586
+      - 14509
+      - 14513
+      - 14751
+      - 20533
+      - 6585
+      - 6915
+      - 12947
+      - 12943
+      - 12944
+      - 22574
+      - 13833
+      - 13854
+  - uid: 10175
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -101.5,-28.5
+    - type: DeviceList
+      devices:
+      - 6585
+      - 6915
+      - 15885
+      - 24698
+      - 11281
+      - 21753
+      - 21953
   - uid: 12768
     components:
     - type: Transform
@@ -85824,6 +85916,16 @@ entities:
       - 22802
       - 22797
       - 15417
+  - uid: 24311
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -104.5,13.5
+    - type: DeviceList
+      devices:
+      - 25556
+      - 25557
   - uid: 24312
     components:
     - type: Transform
@@ -85837,6 +85939,20 @@ entities:
       - 14162
       - 11743
       - 25584
+  - uid: 24626
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -97.5,8.5
+    - type: DeviceList
+      devices:
+      - 25646
+      - 9265
+      - 20533
+      - 14751
+      - 9303
+      - 25779
   - uid: 24784
     components:
     - type: Transform
@@ -86075,23 +86191,16 @@ entities:
       - 6537
       - 6504
       - 4984
-  - uid: 26265
+  - uid: 26333
     components:
     - type: Transform
       parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -96.5,-29.5
+      pos: -96.5,13.5
     - type: DeviceList
       devices:
-      - 18710
-      - 26268
-      - 23411
-      - 13606
-      - 26269
-      - 2281
-      - 16009
-      - 16948
-      - 16010
+      - 9166
+      - 9303
+      - 9356
   - uid: 27060
     components:
     - type: Transform
@@ -86101,6 +86210,58 @@ entities:
       devices:
       - 27058
       - 27059
+  - uid: 27140
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -101.5,-40.5
+    - type: DeviceList
+      devices:
+      - 27139
+      - 21953
+      - 21753
+      - 9109
+      - 9095
+      - 26266
+      - 26265
+      - 26417
+      - 27138
+      - 25590
+      - 25832
+  - uid: 27146
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -87.5,13.5
+    - type: DeviceList
+      devices:
+      - 19783
+      - 9166
+      - 25557
+      - 19787
+      - 27151
+  - uid: 27149
+    components:
+    - type: Transform
+      parent: 2
+      pos: -90.5,31.5
+    - type: DeviceList
+      devices:
+      - 27147
+      - 511
+      - 4433
+  - uid: 27150
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -89.5,28.5
+    - type: DeviceList
+      devices:
+      - 19787
+      - 19788
 - proto: FireAxeCabinetFilled
   entities:
   - uid: 7884
@@ -86213,7 +86374,7 @@ entities:
       pos: -97.5,-24.5
     - type: DeviceNetwork
       deviceLists:
-      - 26265
+      - 4005
   - uid: 2287
     components:
     - type: Transform
@@ -86270,12 +86431,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 7346
-  - uid: 4471
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -110.5,-57.5
   - uid: 5038
     components:
     - type: Transform
@@ -86392,6 +86547,12 @@ entities:
     - type: Transform
       parent: 2
       pos: -43.5,-10.5
+  - uid: 6666
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -110.5,-57.5
   - uid: 7046
     components:
     - type: Transform
@@ -86503,11 +86664,17 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -99.5,5.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 24626
   - uid: 9356
     components:
     - type: Transform
       parent: 2
       pos: -94.5,6.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 26333
   - uid: 9417
     components:
     - type: Transform
@@ -86646,6 +86813,9 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -107.5,-31.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 10175
   - uid: 11727
     components:
     - type: Transform
@@ -86676,6 +86846,9 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -73.5,-19.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 4471
   - uid: 13465
     components:
     - type: Transform
@@ -86825,6 +86998,9 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -108.5,-26.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 10175
   - uid: 16009
     components:
     - type: Transform
@@ -86832,7 +87008,7 @@ entities:
       pos: -96.5,-21.5
     - type: DeviceNetwork
       deviceLists:
-      - 26265
+      - 4005
   - uid: 16010
     components:
     - type: Transform
@@ -86840,7 +87016,7 @@ entities:
       pos: -94.5,-21.5
     - type: DeviceNetwork
       deviceLists:
-      - 26265
+      - 4005
   - uid: 16792
     components:
     - type: Transform
@@ -86859,7 +87035,7 @@ entities:
       pos: -95.5,-21.5
     - type: DeviceNetwork
       deviceLists:
-      - 26265
+      - 4005
   - uid: 17427
     components:
     - type: Transform
@@ -86948,6 +87124,9 @@ entities:
     - type: Transform
       parent: 2
       pos: -85.5,13.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 27146
   - uid: 19784
     components:
     - type: Transform
@@ -86959,11 +87138,18 @@ entities:
     - type: Transform
       parent: 2
       pos: -86.5,26.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 27146
+      - 27150
   - uid: 19788
     components:
     - type: Transform
       parent: 2
       pos: -87.5,32.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 27150
   - uid: 20417
     components:
     - type: Transform
@@ -87077,6 +87263,9 @@ entities:
     - type: Transform
       parent: 2
       pos: -85.5,-10.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 9680
   - uid: 22768
     components:
     - type: Transform
@@ -87091,7 +87280,7 @@ entities:
       pos: -89.5,-33.5
     - type: DeviceNetwork
       deviceLists:
-      - 26265
+      - 4005
   - uid: 23444
     components:
     - type: Transform
@@ -87266,6 +87455,9 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -108.5,-27.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 10175
   - uid: 25511
     components:
     - type: Transform
@@ -87309,6 +87501,9 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -104.5,15.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 24311
   - uid: 25584
     components:
     - type: Transform
@@ -87333,6 +87528,9 @@ entities:
     - type: Transform
       parent: 2
       pos: -104.5,-60.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 27140
   - uid: 25592
     components:
     - type: Transform
@@ -87365,6 +87563,15 @@ entities:
     - type: Transform
       parent: 2
       pos: -133.5,2.5
+  - uid: 25646
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -99.5,4.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 24626
   - uid: 25650
     components:
     - type: Transform
@@ -87374,6 +87581,24 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 25649
+  - uid: 25779
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -105.5,12.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 24626
+  - uid: 25832
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -107.5,-57.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 27140
   - uid: 25872
     components:
     - type: Transform
@@ -87551,6 +87776,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 18082
+      - 27140
   - uid: 26269
     components:
     - type: Transform
@@ -87559,7 +87785,7 @@ entities:
       pos: -96.5,-27.5
     - type: DeviceNetwork
       deviceLists:
-      - 26265
+      - 4005
   - uid: 27058
     components:
     - type: Transform
@@ -87577,6 +87803,24 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 27060
+  - uid: 27139
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -100.5,-41.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 27140
+  - uid: 27151
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -97.5,22.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 27146
 - proto: FirelockEdge
   entities:
   - uid: 1782
@@ -88137,6 +88381,7 @@ entities:
       deviceLists:
       - 12769
       - 17852
+      - 4471
   - uid: 507
     components:
     - type: Transform
@@ -88152,6 +88397,9 @@ entities:
     - type: Transform
       parent: 2
       pos: -94.5,31.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 27149
   - uid: 777
     components:
     - type: Transform
@@ -88168,6 +88416,7 @@ entities:
       deviceLists:
       - 24300
       - 12151
+      - 4471
   - uid: 1667
     components:
     - type: Transform
@@ -88192,6 +88441,9 @@ entities:
     - type: Transform
       parent: 2
       pos: -97.5,31.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 27149
   - uid: 4984
     components:
     - type: Transform
@@ -88287,11 +88539,19 @@ entities:
     - type: Transform
       parent: 2
       pos: -103.5,-21.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 9680
+      - 10175
   - uid: 6915
     components:
     - type: Transform
       parent: 2
       pos: -104.5,-21.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 9680
+      - 10175
   - uid: 6993
     components:
     - type: Transform
@@ -88636,6 +88896,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 17833
+      - 27140
   - uid: 9109
     components:
     - type: Transform
@@ -88645,17 +88906,26 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 17833
+      - 27140
   - uid: 9166
     components:
     - type: Transform
       parent: 2
       pos: -94.5,13.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 26333
+      - 27146
   - uid: 9303
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -97.5,7.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 24626
+      - 26333
   - uid: 9419
     components:
     - type: Transform
@@ -88789,18 +89059,27 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -76.5,-13.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 9680
   - uid: 12944
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -76.5,-14.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 9680
   - uid: 12947
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -76.5,-12.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 9680
   - uid: 12948
     components:
     - type: Transform
@@ -88936,6 +89215,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 19526
+      - 9680
   - uid: 13606
     components:
     - type: Transform
@@ -88944,7 +89224,7 @@ entities:
       pos: -89.5,-27.5
     - type: DeviceNetwork
       deviceLists:
-      - 26265
+      - 4005
   - uid: 13618
     components:
     - type: Transform
@@ -88994,6 +89274,9 @@ entities:
     - type: Transform
       parent: 2
       pos: -96.5,-16.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 9680
   - uid: 13847
     components:
     - type: Transform
@@ -89008,6 +89291,9 @@ entities:
     - type: Transform
       parent: 2
       pos: -94.5,-16.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 9680
   - uid: 13909
     components:
     - type: Transform
@@ -89083,6 +89369,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 19526
+      - 9680
   - uid: 14513
     components:
     - type: Transform
@@ -89092,6 +89379,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 19526
+      - 9680
   - uid: 14573
     components:
     - type: Transform
@@ -89253,6 +89541,10 @@ entities:
     - type: Transform
       parent: 2
       pos: -103.5,-0.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 9680
+      - 24626
   - uid: 14752
     components:
     - type: Transform
@@ -89394,16 +89686,28 @@ entities:
     - type: Transform
       parent: 2
       pos: -102.5,-0.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 9680
+      - 24626
   - uid: 21753
     components:
     - type: Transform
       parent: 2
       pos: -104.5,-36.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 10175
+      - 27140
   - uid: 21953
     components:
     - type: Transform
       parent: 2
       pos: -103.5,-36.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 10175
+      - 27140
   - uid: 22205
     components:
     - type: Transform
@@ -89445,6 +89749,10 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -97.5,15.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 24311
+      - 27146
   - uid: 25564
     components:
     - type: Transform
@@ -89568,6 +89876,15 @@ entities:
     - type: Transform
       parent: 2
       pos: -80.5,6.5
+  - uid: 26265
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -95.5,-55.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 27140
   - uid: 26268
     components:
     - type: Transform
@@ -89575,7 +89892,34 @@ entities:
       pos: -95.5,-35.5
     - type: DeviceNetwork
       deviceLists:
-      - 26265
+      - 4005
+  - uid: 26417
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -95.5,-56.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 27140
+  - uid: 27138
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -95.5,-57.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 27140
+  - uid: 27147
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: -94.5,26.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 27149
 - proto: Fireplace
   entities:
   - uid: 8655
@@ -90662,6 +91006,13 @@ entities:
     - type: Transform
       parent: 2
       pos: -24.391703,-70.56911
+- proto: FolderSpawner
+  entities:
+  - uid: 13864
+    components:
+    - type: Transform
+      parent: 2
+      pos: -62.216312,-2.4923801
 - proto: FoodBagel
   entities:
   - uid: 25685
@@ -127494,11 +127845,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -157.5,-42.5
-  - uid: 2297
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,-44.5
   - uid: 2306
     components:
     - type: Transform
@@ -127844,11 +128190,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -33.5,-16.5
-  - uid: 3951
-    components:
-    - type: Transform
-      parent: 2
-      pos: -72.5,-63.5
   - uid: 3955
     components:
     - type: Transform
@@ -128099,21 +128440,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -82.5,-6.5
-  - uid: 4491
-    components:
-    - type: Transform
-      parent: 2
-      pos: -87.5,4.5
-  - uid: 4493
-    components:
-    - type: Transform
-      parent: 2
-      pos: -85.5,4.5
-  - uid: 4497
-    components:
-    - type: Transform
-      parent: 2
-      pos: -84.5,4.5
   - uid: 4533
     components:
     - type: Transform
@@ -128954,11 +129280,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -151.5,26.5
-  - uid: 7525
-    components:
-    - type: Transform
-      parent: 2
-      pos: -127.5,-33.5
   - uid: 7567
     components:
     - type: Transform
@@ -129104,11 +129425,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -89.5,38.5
-  - uid: 8166
-    components:
-    - type: Transform
-      parent: 2
-      pos: -87.5,38.5
   - uid: 8169
     components:
     - type: Transform
@@ -129419,11 +129735,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -30.5,-61.5
-  - uid: 9084
-    components:
-    - type: Transform
-      parent: 2
-      pos: -90.5,38.5
   - uid: 9085
     components:
     - type: Transform
@@ -129624,11 +129935,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -51.5,5.5
-  - uid: 10581
-    components:
-    - type: Transform
-      parent: 2
-      pos: -43.5,5.5
   - uid: 10582
     components:
     - type: Transform
@@ -129714,11 +130020,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -66.5,10.5
-  - uid: 10603
-    components:
-    - type: Transform
-      parent: 2
-      pos: -68.5,10.5
   - uid: 10604
     components:
     - type: Transform
@@ -129859,11 +130160,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -97.5,11.5
-  - uid: 11879
-    components:
-    - type: Transform
-      parent: 2
-      pos: -143.5,27.5
   - uid: 12163
     components:
     - type: Transform
@@ -129909,11 +130205,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -92.5,-52.5
-  - uid: 12940
-    components:
-    - type: Transform
-      parent: 2
-      pos: -153.5,24.5
   - uid: 13263
     components:
     - type: Transform
@@ -129989,21 +130280,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -144.5,4.5
-  - uid: 13870
-    components:
-    - type: Transform
-      parent: 2
-      pos: -144.5,27.5
   - uid: 13876
     components:
     - type: Transform
       parent: 2
       pos: -137.5,21.5
-  - uid: 13883
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,-13.5
   - uid: 13886
     components:
     - type: Transform
@@ -130014,11 +130295,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -157.5,-11.5
-  - uid: 13889
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,-14.5
   - uid: 13890
     components:
     - type: Transform
@@ -130064,21 +130340,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -140.5,27.5
-  - uid: 13911
-    components:
-    - type: Transform
-      parent: 2
-      pos: -142.5,27.5
   - uid: 13925
     components:
     - type: Transform
       parent: 2
       pos: -157.5,-35.5
-  - uid: 13927
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,-46.5
   - uid: 13928
     components:
     - type: Transform
@@ -130094,11 +130360,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -157.5,-10.5
-  - uid: 13931
-    components:
-    - type: Transform
-      parent: 2
-      pos: -156.5,21.5
   - uid: 13932
     components:
     - type: Transform
@@ -130114,16 +130375,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -157.5,-47.5
-  - uid: 13935
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,-36.5
-  - uid: 13936
-    components:
-    - type: Transform
-      parent: 2
-      pos: -155.5,22.5
   - uid: 13938
     components:
     - type: Transform
@@ -130154,11 +130405,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -157.5,-24.5
-  - uid: 13944
-    components:
-    - type: Transform
-      parent: 2
-      pos: -152.5,25.5
   - uid: 13945
     components:
     - type: Transform
@@ -130239,16 +130485,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -67.5,-34.5
-  - uid: 15336
-    components:
-    - type: Transform
-      parent: 2
-      pos: -83.5,4.5
-  - uid: 15699
-    components:
-    - type: Transform
-      parent: 2
-      pos: -42.5,5.5
   - uid: 15927
     components:
     - type: Transform
@@ -130349,11 +130585,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -20.5,6.5
-  - uid: 17071
-    components:
-    - type: Transform
-      parent: 2
-      pos: -86.5,4.5
   - uid: 17077
     components:
     - type: Transform
@@ -130369,11 +130600,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -86.5,-6.5
-  - uid: 17158
-    components:
-    - type: Transform
-      parent: 2
-      pos: -80.5,-0.5
   - uid: 17162
     components:
     - type: Transform
@@ -130514,11 +130740,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -157.5,4.5
-  - uid: 17534
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,8.5
   - uid: 17579
     components:
     - type: Transform
@@ -130679,11 +130900,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -157.5,-49.5
-  - uid: 19459
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,-45.5
   - uid: 19460
     components:
     - type: Transform
@@ -130874,11 +131090,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -125.5,-77.5
-  - uid: 20426
-    components:
-    - type: Transform
-      parent: 2
-      pos: -104.5,23.5
   - uid: 20443
     components:
     - type: Transform
@@ -130949,11 +131160,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -2.5,24.5
-  - uid: 21317
-    components:
-    - type: Transform
-      parent: 2
-      pos: -1.5,24.5
   - uid: 21319
     components:
     - type: Transform
@@ -130969,11 +131175,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 2.5,24.5
-  - uid: 21324
-    components:
-    - type: Transform
-      parent: 2
-      pos: 2.5,2.5
   - uid: 21325
     components:
     - type: Transform
@@ -131029,11 +131230,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 2.5,21.5
-  - uid: 21339
-    components:
-    - type: Transform
-      parent: 2
-      pos: 2.5,15.5
   - uid: 21340
     components:
     - type: Transform
@@ -131074,11 +131270,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 2.5,5.5
-  - uid: 21349
-    components:
-    - type: Transform
-      parent: 2
-      pos: 2.5,4.5
   - uid: 21350
     components:
     - type: Transform
@@ -131134,26 +131325,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -140.5,-12.5
-  - uid: 22004
-    components:
-    - type: Transform
-      parent: 2
-      pos: -119.5,-34.5
-  - uid: 22005
-    components:
-    - type: Transform
-      parent: 2
-      pos: -119.5,-31.5
   - uid: 22163
     components:
     - type: Transform
       parent: 2
       pos: -67.5,-71.5
-  - uid: 22195
-    components:
-    - type: Transform
-      parent: 2
-      pos: -106.5,24.5
   - uid: 22226
     components:
     - type: Transform
@@ -131354,21 +131530,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -67.5,-17.5
-  - uid: 23375
-    components:
-    - type: Transform
-      parent: 2
-      pos: -78.5,-9.5
   - uid: 23382
     components:
     - type: Transform
       parent: 2
       pos: -84.5,8.5
-  - uid: 23384
-    components:
-    - type: Transform
-      parent: 2
-      pos: -80.5,3.5
   - uid: 23385
     components:
     - type: Transform
@@ -131384,16 +131550,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -70.5,1.5
-  - uid: 23420
-    components:
-    - type: Transform
-      parent: 2
-      pos: -117.5,24.5
-  - uid: 23421
-    components:
-    - type: Transform
-      parent: 2
-      pos: -121.5,24.5
   - uid: 23501
     components:
     - type: Transform
@@ -131484,11 +131640,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -39.5,-16.5
-  - uid: 24186
-    components:
-    - type: Transform
-      parent: 2
-      pos: -3.5,-33.5
   - uid: 24188
     components:
     - type: Transform
@@ -131514,11 +131665,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -2.5,-27.5
-  - uid: 24195
-    components:
-    - type: Transform
-      parent: 2
-      pos: -1.5,-26.5
   - uid: 24196
     components:
     - type: Transform
@@ -131539,11 +131685,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 0.5,-23.5
-  - uid: 24201
-    components:
-    - type: Transform
-      parent: 2
-      pos: 1.5,-23.5
   - uid: 24203
     components:
     - type: Transform
@@ -131554,16 +131695,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 2.5,-20.5
-  - uid: 24206
-    components:
-    - type: Transform
-      parent: 2
-      pos: 2.5,-12.5
-  - uid: 24207
-    components:
-    - type: Transform
-      parent: 2
-      pos: 2.5,-14.5
   - uid: 24208
     components:
     - type: Transform
@@ -132194,11 +132325,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -23.5,-91.5
-  - uid: 25721
-    components:
-    - type: Transform
-      parent: 2
-      pos: -23.5,-73.5
   - uid: 25723
     components:
     - type: Transform
@@ -132254,11 +132380,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -23.5,-88.5
-  - uid: 25738
-    components:
-    - type: Transform
-      parent: 2
-      pos: -23.5,-90.5
   - uid: 25739
     components:
     - type: Transform
@@ -132404,31 +132525,21 @@ entities:
     - type: Transform
       parent: 2
       pos: -7.5,-69.5
-  - uid: 25777
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-75.5
   - uid: 25778
     components:
     - type: Transform
       parent: 2
       pos: -7.5,-74.5
-  - uid: 25792
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-66.5
   - uid: 25793
     components:
     - type: Transform
       parent: 2
-      pos: -7.5,-65.5
+      pos: -144.5,27.5
   - uid: 25794
     components:
     - type: Transform
       parent: 2
-      pos: -7.5,-64.5
+      pos: -143.5,27.5
   - uid: 25795
     components:
     - type: Transform
@@ -132489,376 +132600,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -71.5,-6.5
-- proto: GrilleBroken
-  entities:
-  - uid: 2260
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,-22.5
-  - uid: 7460
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -146.5,27.5
-  - uid: 7463
-    components:
-    - type: Transform
-      parent: 2
-      pos: -141.5,27.5
-  - uid: 9044
-    components:
-    - type: Transform
-      parent: 2
-      pos: -88.5,38.5
-  - uid: 9048
-    components:
-    - type: Transform
-      parent: 2
-      pos: -91.5,38.5
-  - uid: 9689
-    components:
-    - type: Transform
-      parent: 2
-      pos: -149.5,27.5
-  - uid: 12883
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,20.5
-  - uid: 13813
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,-26.5
-  - uid: 13864
-    components:
-    - type: Transform
-      parent: 2
-      pos: -154.5,23.5
-  - uid: 13915
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -145.5,27.5
-  - uid: 13937
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,-27.5
-  - uid: 15051
-    components:
-    - type: Transform
-      parent: 2
-      pos: -81.5,29.5
-  - uid: 15688
-    components:
-    - type: Transform
-      parent: 2
-      pos: -81.5,34.5
-  - uid: 15689
-    components:
-    - type: Transform
-      parent: 2
-      pos: -81.5,38.5
-  - uid: 15690
-    components:
-    - type: Transform
-      parent: 2
-      pos: -71.5,8.5
-  - uid: 15691
-    components:
-    - type: Transform
-      parent: 2
-      pos: -67.5,10.5
-  - uid: 15693
-    components:
-    - type: Transform
-      parent: 2
-      pos: -63.5,11.5
-  - uid: 15695
-    components:
-    - type: Transform
-      parent: 2
-      pos: -47.5,5.5
-  - uid: 15701
-    components:
-    - type: Transform
-      parent: 2
-      pos: -58.5,11.5
-  - uid: 15845
-    components:
-    - type: Transform
-      parent: 2
-      pos: -71.5,5.5
-  - uid: 15882
-    components:
-    - type: Transform
-      parent: 2
-      pos: -51.5,6.5
-  - uid: 15893
-    components:
-    - type: Transform
-      parent: 2
-      pos: -54.5,10.5
-  - uid: 15894
-    components:
-    - type: Transform
-      parent: 2
-      pos: -44.5,5.5
-  - uid: 15895
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,1.5
-  - uid: 15896
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,-18.5
-  - uid: 16098
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,6.5
-  - uid: 16099
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,-12.5
-  - uid: 16155
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,9.5
-  - uid: 16177
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,14.5
-  - uid: 16221
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,16.5
-  - uid: 17454
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,-37.5
-  - uid: 17456
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,-32.5
-  - uid: 17723
-    components:
-    - type: Transform
-      parent: 2
-      pos: 2.5,-13.5
-  - uid: 17724
-    components:
-    - type: Transform
-      parent: 2
-      pos: -4.5,24.5
-  - uid: 17725
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,24.5
-  - uid: 17726
-    components:
-    - type: Transform
-      parent: 2
-      pos: 2.5,9.5
-  - uid: 17727
-    components:
-    - type: Transform
-      parent: 2
-      pos: 2.5,-0.5
-  - uid: 17728
-    components:
-    - type: Transform
-      parent: 2
-      pos: 2.5,7.5
-  - uid: 17729
-    components:
-    - type: Transform
-      parent: 2
-      pos: -0.5,24.5
-  - uid: 17730
-    components:
-    - type: Transform
-      parent: 2
-      pos: 2.5,20.5
-  - uid: 17731
-    components:
-    - type: Transform
-      parent: 2
-      pos: 2.5,16.5
-  - uid: 17732
-    components:
-    - type: Transform
-      parent: 2
-      pos: 2.5,3.5
-  - uid: 17733
-    components:
-    - type: Transform
-      parent: 2
-      pos: -2.5,-2.5
-  - uid: 17734
-    components:
-    - type: Transform
-      parent: 2
-      pos: -6.5,-2.5
-  - uid: 17735
-    components:
-    - type: Transform
-      parent: 2
-      pos: -3.5,-32.5
-  - uid: 17736
-    components:
-    - type: Transform
-      parent: 2
-      pos: -3.5,-29.5
-  - uid: 17737
-    components:
-    - type: Transform
-      parent: 2
-      pos: -2.5,-26.5
-  - uid: 17738
-    components:
-    - type: Transform
-      parent: 2
-      pos: -0.5,-25.5
-  - uid: 17739
-    components:
-    - type: Transform
-      parent: 2
-      pos: 1.5,-22.5
-  - uid: 17740
-    components:
-    - type: Transform
-      parent: 2
-      pos: 2.5,-5.5
-  - uid: 17741
-    components:
-    - type: Transform
-      parent: 2
-      pos: 0.5,-2.5
-  - uid: 17842
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,-15.5
-  - uid: 19400
-    components:
-    - type: Transform
-      parent: 2
-      pos: -86.5,38.5
-  - uid: 23005
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-63.5
-  - uid: 24946
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,-4.5
-  - uid: 25431
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,-9.5
-  - uid: 25432
-    components:
-    - type: Transform
-      parent: 2
-      pos: -157.5,-3.5
-  - uid: 25714
-    components:
-    - type: Transform
-      parent: 2
-      pos: -10.5,24.5
-  - uid: 25722
-    components:
-    - type: Transform
-      parent: 2
-      pos: -23.5,-74.5
-  - uid: 25726
-    components:
-    - type: Transform
-      parent: 2
-      pos: -23.5,-82.5
-  - uid: 25729
-    components:
-    - type: Transform
-      parent: 2
-      pos: -23.5,-79.5
-  - uid: 25733
-    components:
-    - type: Transform
-      parent: 2
-      pos: -23.5,-85.5
-  - uid: 25737
-    components:
-    - type: Transform
-      parent: 2
-      pos: -23.5,-89.5
-  - uid: 25743
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-90.5
-  - uid: 25750
-    components:
-    - type: Transform
-      parent: 2
-      pos: -19.5,-92.5
-  - uid: 25755
-    components:
-    - type: Transform
-      parent: 2
-      pos: -9.5,-92.5
-  - uid: 25757
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-84.5
-  - uid: 25760
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-86.5
-  - uid: 25762
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-72.5
-  - uid: 25766
-    components:
-    - type: Transform
-      parent: 2
-      pos: -13.5,-92.5
-  - uid: 25770
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-80.5
-  - uid: 25773
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-76.5
-  - uid: 25800
-    components:
-    - type: Transform
-      parent: 2
-      pos: -7.5,-67.5
 - proto: GrilleDiagonal
   entities:
   - uid: 6099
@@ -132895,6 +132636,618 @@ entities:
     - type: Transform
       parent: 2
       pos: -154.5,-42.5
+- proto: GrilleSpawner
+  entities:
+  - uid: 2260
+    components:
+    - type: Transform
+      parent: 2
+      pos: -72.5,-62.5
+  - uid: 3951
+    components:
+    - type: Transform
+      parent: 2
+      pos: -87.5,4.5
+  - uid: 4491
+    components:
+    - type: Transform
+      parent: 2
+      pos: -85.5,4.5
+  - uid: 4493
+    components:
+    - type: Transform
+      parent: 2
+      pos: -84.5,4.5
+  - uid: 4497
+    components:
+    - type: Transform
+      parent: 2
+      pos: -127.5,-33.5
+  - uid: 4714
+    components:
+    - type: Transform
+      parent: 2
+      pos: -153.5,24.5
+  - uid: 7460
+    components:
+    - type: Transform
+      parent: 2
+      pos: -87.5,38.5
+  - uid: 7525
+    components:
+    - type: Transform
+      parent: 2
+      pos: -91.5,38.5
+  - uid: 8166
+    components:
+    - type: Transform
+      parent: 2
+      pos: -44.5,5.5
+  - uid: 9044
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.5,24.5
+  - uid: 9048
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,-14.5
+  - uid: 9084
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,-15.5
+  - uid: 9689
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,-37.5
+  - uid: 9997
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,-46.5
+  - uid: 9998
+    components:
+    - type: Transform
+      parent: 2
+      pos: -83.5,4.5
+  - uid: 9999
+    components:
+    - type: Transform
+      parent: 2
+      pos: -155.5,22.5
+  - uid: 10003
+    components:
+    - type: Transform
+      parent: 2
+      pos: -47.5,5.5
+  - uid: 10581
+    components:
+    - type: Transform
+      parent: 2
+      pos: -86.5,4.5
+  - uid: 10603
+    components:
+    - type: Transform
+      parent: 2
+      pos: -80.5,-0.5
+  - uid: 11879
+    components:
+    - type: Transform
+      parent: 2
+      pos: -142.5,27.5
+  - uid: 12883
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,6.5
+  - uid: 12940
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,-44.5
+  - uid: 13813
+    components:
+    - type: Transform
+      parent: 2
+      pos: -104.5,23.5
+  - uid: 13870
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,-45.5
+  - uid: 13883
+    components:
+    - type: Transform
+      parent: 2
+      pos: -10.5,24.5
+  - uid: 13889
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,2.5
+  - uid: 13911
+    components:
+    - type: Transform
+      parent: 2
+      pos: -141.5,27.5
+  - uid: 13915
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,20.5
+  - uid: 13927
+    components:
+    - type: Transform
+      parent: 2
+      pos: -156.5,21.5
+  - uid: 13935
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,4.5
+  - uid: 13937
+    components:
+    - type: Transform
+      parent: 2
+      pos: -119.5,-34.5
+  - uid: 15051
+    components:
+    - type: Transform
+      parent: 2
+      pos: -72.5,-63.5
+  - uid: 15336
+    components:
+    - type: Transform
+      parent: 2
+      pos: -106.5,24.5
+  - uid: 15688
+    components:
+    - type: Transform
+      parent: 2
+      pos: -78.5,-9.5
+  - uid: 15689
+    components:
+    - type: Transform
+      parent: 2
+      pos: -80.5,3.5
+  - uid: 15690
+    components:
+    - type: Transform
+      parent: 2
+      pos: -117.5,24.5
+  - uid: 15691
+    components:
+    - type: Transform
+      parent: 2
+      pos: -121.5,24.5
+  - uid: 15693
+    components:
+    - type: Transform
+      parent: 2
+      pos: -3.5,-32.5
+  - uid: 15695
+    components:
+    - type: Transform
+      parent: 2
+      pos: -2.5,-26.5
+  - uid: 15699
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-23.5
+  - uid: 15701
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-13.5
+  - uid: 15845
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-12.5
+  - uid: 15882
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-80.5
+  - uid: 15893
+    components:
+    - type: Transform
+      parent: 2
+      pos: -23.5,-90.5
+  - uid: 15894
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-75.5
+  - uid: 15895
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-66.5
+  - uid: 15896
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-65.5
+  - uid: 16098
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-64.5
+  - uid: 16099
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,-18.5
+  - uid: 16155
+    components:
+    - type: Transform
+      parent: 2
+      pos: -146.5,27.5
+  - uid: 16177
+    components:
+    - type: Transform
+      parent: 2
+      pos: -86.5,38.5
+  - uid: 16221
+    components:
+    - type: Transform
+      parent: 2
+      pos: -90.5,38.5
+  - uid: 17071
+    components:
+    - type: Transform
+      parent: 2
+      pos: -149.5,27.5
+  - uid: 17158
+    components:
+    - type: Transform
+      parent: 2
+      pos: -81.5,29.5
+  - uid: 17454
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,-32.5
+  - uid: 17456
+    components:
+    - type: Transform
+      parent: 2
+      pos: -145.5,27.5
+  - uid: 17534
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,-27.5
+  - uid: 17723
+    components:
+    - type: Transform
+      parent: 2
+      pos: -81.5,34.5
+  - uid: 17724
+    components:
+    - type: Transform
+      parent: 2
+      pos: -67.5,10.5
+  - uid: 17725
+    components:
+    - type: Transform
+      parent: 2
+      pos: -81.5,38.5
+  - uid: 17726
+    components:
+    - type: Transform
+      parent: 2
+      pos: -71.5,5.5
+  - uid: 17727
+    components:
+    - type: Transform
+      parent: 2
+      pos: -63.5,11.5
+  - uid: 17728
+    components:
+    - type: Transform
+      parent: 2
+      pos: -68.5,10.5
+  - uid: 17729
+    components:
+    - type: Transform
+      parent: 2
+      pos: -42.5,5.5
+  - uid: 17730
+    components:
+    - type: Transform
+      parent: 2
+      pos: -58.5,11.5
+  - uid: 17731
+    components:
+    - type: Transform
+      parent: 2
+      pos: -71.5,8.5
+  - uid: 17732
+    components:
+    - type: Transform
+      parent: 2
+      pos: -51.5,6.5
+  - uid: 17733
+    components:
+    - type: Transform
+      parent: 2
+      pos: -54.5,10.5
+  - uid: 17734
+    components:
+    - type: Transform
+      parent: 2
+      pos: -43.5,5.5
+  - uid: 17735
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,1.5
+  - uid: 17736
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,-22.5
+  - uid: 17737
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,9.5
+  - uid: 17738
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,-13.5
+  - uid: 17739
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,8.5
+  - uid: 17740
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,16.5
+  - uid: 17741
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,14.5
+  - uid: 17842
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,-36.5
+  - uid: 19400
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,-26.5
+  - uid: 20426
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-14.5
+  - uid: 21317
+    components:
+    - type: Transform
+      parent: 2
+      pos: -4.5,24.5
+  - uid: 21324
+    components:
+    - type: Transform
+      parent: 2
+      pos: -119.5,-31.5
+  - uid: 21339
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,7.5
+  - uid: 21349
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,-2.5
+  - uid: 22004
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,9.5
+  - uid: 22005
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,24.5
+  - uid: 22031
+    components:
+    - type: Transform
+      parent: 2
+      pos: -154.5,23.5
+  - uid: 22195
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,15.5
+  - uid: 23005
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,16.5
+  - uid: 23375
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,3.5
+  - uid: 23384
+    components:
+    - type: Transform
+      parent: 2
+      pos: -6.5,-2.5
+  - uid: 23420
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-5.5
+  - uid: 23421
+    components:
+    - type: Transform
+      parent: 2
+      pos: -3.5,-33.5
+  - uid: 24186
+    components:
+    - type: Transform
+      parent: 2
+      pos: -0.5,-25.5
+  - uid: 24195
+    components:
+    - type: Transform
+      parent: 2
+      pos: -1.5,-26.5
+  - uid: 24201
+    components:
+    - type: Transform
+      parent: 2
+      pos: -3.5,-29.5
+  - uid: 24206
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-22.5
+  - uid: 24207
+    components:
+    - type: Transform
+      parent: 2
+      pos: -2.5,-2.5
+  - uid: 24946
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,-12.5
+  - uid: 25431
+    components:
+    - type: Transform
+      parent: 2
+      pos: -88.5,38.5
+  - uid: 25432
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-63.5
+  - uid: 25714
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,-4.5
+  - uid: 25721
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,-9.5
+  - uid: 25722
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,-3.5
+  - uid: 25726
+    components:
+    - type: Transform
+      parent: 2
+      pos: -1.5,24.5
+  - uid: 25729
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-84.5
+  - uid: 25733
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-90.5
+  - uid: 25737
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-86.5
+  - uid: 25738
+    components:
+    - type: Transform
+      parent: 2
+      pos: -0.5,24.5
+  - uid: 25743
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-0.5
+  - uid: 25750
+    components:
+    - type: Transform
+      parent: 2
+      pos: -23.5,-82.5
+  - uid: 25755
+    components:
+    - type: Transform
+      parent: 2
+      pos: -157.5,20.5
+  - uid: 25757
+    components:
+    - type: Transform
+      parent: 2
+      pos: -23.5,-89.5
+  - uid: 25760
+    components:
+    - type: Transform
+      parent: 2
+      pos: -23.5,-74.5
+  - uid: 25762
+    components:
+    - type: Transform
+      parent: 2
+      pos: -23.5,-79.5
+  - uid: 25766
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-72.5
+  - uid: 25770
+    components:
+    - type: Transform
+      parent: 2
+      pos: -19.5,-92.5
+  - uid: 25773
+    components:
+    - type: Transform
+      parent: 2
+      pos: -23.5,-73.5
+  - uid: 25777
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-76.5
+  - uid: 25792
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-67.5
+  - uid: 25800
+    components:
+    - type: Transform
+      parent: 2
+      pos: -23.5,-85.5
+  - uid: 27155
+    components:
+    - type: Transform
+      parent: 2
+      pos: -152.5,25.5
+  - uid: 27156
+    components:
+    - type: Transform
+      parent: 2
+      pos: -41.5,-64.5
 - proto: GunSafeDisabler
   entities:
   - uid: 19261
@@ -133130,7 +133483,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: -52.29675,-7.5648193
+      pos: -52.15886,-7.558217
   - uid: 22292
     components:
     - type: Transform
@@ -133180,7 +133533,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: -89.43579,-22.85111
+      pos: -91.393845,-17.546627
     - type: HandLabeler
       assignedLabel: Security Substation
 - proto: HeatExchanger
@@ -134273,12 +134626,12 @@ entities:
       pos: -132.5,-46.5
 - proto: IntercomSecurity
   entities:
-  - uid: 4087
+  - uid: 2647
     components:
     - type: Transform
       parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -91.5,-17.5
+      rot: 1.5707963267948966 rad
+      pos: -92.5,-19.5
   - uid: 16798
     components:
     - type: Transform
@@ -134688,7 +135041,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: -112.5,27.5
+      pos: -116.494,27.485348
 - proto: LedLightBulb
   entities:
   - uid: 22441
@@ -135348,7 +135701,7 @@ entities:
       pos: -88.5,35.5
 - proto: LockerResearchDirectorFilled
   entities:
-  - uid: 7613
+  - uid: 7610
     components:
     - type: Transform
       parent: 2
@@ -135598,7 +135951,7 @@ entities:
       pos: -82.5,18.5
       anchored: True
     - type: DeviceLinkSink
-      invokeCounter: 2
+      invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
         10565:
@@ -135759,11 +136112,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -92.5,4.5
-  - uid: 26333
-    components:
-    - type: Transform
-      parent: 2
-      pos: -93.5,4.5
 - proto: LootSpawnerMaterials
   entities:
   - uid: 6747
@@ -135837,11 +136185,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -83.5,-73.5
-  - uid: 26335
-    components:
-    - type: Transform
-      parent: 2
-      pos: -51.5,-40.5
 - proto: LootSpawnerMaterialsSurplus
   entities:
   - uid: 13221
@@ -136127,6 +136470,13 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: MailCart
+  entities:
+  - uid: 10564
+    components:
+    - type: Transform
+      parent: 2
+      pos: -101.5,16.5
 - proto: MailingUnit
   entities:
   - uid: 3012
@@ -136641,7 +136991,7 @@ entities:
       desc: The humble mining drill. This is an older model, but it should still work all the same.
     - type: Transform
       parent: 2
-      pos: -58.961426,-12.536688
+      pos: -58.629143,-12.5247
 - proto: Mirror
   entities:
   - uid: 3392
@@ -136708,6 +137058,33 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -69.5,-23.5
+- proto: MiscToySpawner90
+  entities:
+  - uid: 4704
+    components:
+    - type: Transform
+      parent: 2
+      pos: -66.5,-56.5
+  - uid: 13931
+    components:
+    - type: Transform
+      parent: 2
+      pos: -93.5,4.5
+  - uid: 14639
+    components:
+    - type: Transform
+      parent: 2
+      pos: -51.5,-40.5
+  - uid: 27145
+    components:
+    - type: Transform
+      parent: 2
+      pos: -48.5,-34.5
+  - uid: 27153
+    components:
+    - type: Transform
+      parent: 2
+      pos: -60.5,-54.5
 - proto: MopBucketFull
   entities:
   - uid: 15958
@@ -137707,6 +138084,12 @@ entities:
     - type: Transform
       parent: 2
       pos: -19.5,-18.5
+  - uid: 27141
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -132.5,-46.5
 - proto: PaperBin20
   entities:
   - uid: 4485
@@ -137958,7 +138341,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: -62.497215,-2.4129562
+      pos: -62.670322,-2.3410463
   - uid: 23950
     components:
     - type: Transform
@@ -139312,12 +139695,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -90.5,-24.5
-  - uid: 22276
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -88.5,-25.5
   - uid: 22991
     components:
     - type: Transform
@@ -139348,12 +139725,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -8.5,-18.5
-  - uid: 26417
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -89.5,-23.5
 - proto: PowerCellSmallPrinted
   entities:
   - uid: 23931
@@ -139595,6 +139966,11 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -116.5,-49.5
+  - uid: 4087
+    components:
+    - type: Transform
+      parent: 2
+      pos: -88.5,-20.5
   - uid: 4218
     components:
     - type: Transform
@@ -139653,12 +140029,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -31.5,21.5
-  - uid: 4799
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -45.5,-21.5
   - uid: 4800
     components:
     - type: Transform
@@ -139680,11 +140050,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -52.5,-3.5
-  - uid: 5329
-    components:
-    - type: Transform
-      parent: 2
-      pos: -89.5,-20.5
   - uid: 5561
     components:
     - type: Transform
@@ -139897,6 +140262,12 @@ entities:
     - type: Transform
       parent: 2
       pos: -65.5,-14.5
+  - uid: 9274
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -47.5,-22.5
   - uid: 9289
     components:
     - type: Transform
@@ -140791,6 +141162,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -144.5,-48.5
+  - uid: 17821
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -45.5,-18.5
   - uid: 17848
     components:
     - type: Transform
@@ -141172,6 +141549,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -102.5,-59.5
+  - uid: 4988
+    components:
+    - type: Transform
+      parent: 2
+      pos: -96.5,-9.5
   - uid: 7882
     components:
     - type: Transform
@@ -141212,11 +141594,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -56.5,-72.5
-  - uid: 14782
-    components:
-    - type: Transform
-      parent: 2
-      pos: -97.5,-8.5
   - uid: 16384
     components:
     - type: Transform
@@ -141402,12 +141779,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -146.5,2.5
-  - uid: 8150
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -88.5,-17.5
   - uid: 8572
     components:
     - type: Transform
@@ -141436,12 +141807,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -11.5,-39.5
-  - uid: 9274
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -74.5,-11.5
   - uid: 9319
     components:
     - type: Transform
@@ -141639,6 +142004,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -25.5,-56.5
+  - uid: 13944
+    components:
+    - type: Transform
+      parent: 2
+      pos: -96.5,30.5
   - uid: 14279
     components:
     - type: Transform
@@ -141900,24 +142270,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: -73.5,-58.5
-  - uid: 21487
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -73.5,-54.5
   - uid: 21494
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -39.5,-49.5
-  - uid: 22031
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -92.5,27.5
   - uid: 22034
     components:
     - type: Transform
@@ -142123,6 +142481,18 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: -114.5,-12.5
+  - uid: 27143
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -75.5,-11.5
+  - uid: 27148
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -90.5,27.5
 - proto: PoweredStrobeLightEmpty
   entities:
   - uid: 3985
@@ -143668,11 +144038,51 @@ entities:
     - type: Transform
       parent: 2
       pos: -39.5,-15.5
+  - uid: 8150
+    components:
+    - type: Transform
+      parent: 2
+      pos: -101.5,-58.5
+  - uid: 9287
+    components:
+    - type: Transform
+      parent: 2
+      pos: -101.5,-17.5
+  - uid: 12637
+    components:
+    - type: Transform
+      parent: 2
+      pos: -33.5,-11.5
   - uid: 13575
     components:
     - type: Transform
       parent: 2
       pos: -18.5,-15.5
+  - uid: 14782
+    components:
+    - type: Transform
+      parent: 2
+      pos: -97.5,-11.5
+  - uid: 19793
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.5,-46.5
+  - uid: 19970
+    components:
+    - type: Transform
+      parent: 2
+      pos: -25.5,-11.5
+  - uid: 22057
+    components:
+    - type: Transform
+      parent: 2
+      pos: -13.5,-53.5
+  - uid: 22122
+    components:
+    - type: Transform
+      parent: 2
+      pos: -16.5,-61.5
   - uid: 25659
     components:
     - type: Transform
@@ -153596,11 +154006,11 @@ entities:
       pos: -92.5,-18.5
 - proto: SpawnPointWardenWeapon
   entities:
-  - uid: 14639
+  - uid: 7613
     components:
     - type: Transform
       parent: 2
-      pos: -88.5,-20.5
+      pos: -90.5,-17.5
 - proto: SprayBottleSpaceCleaner
   entities:
   - uid: 6994
@@ -154489,7 +154899,7 @@ entities:
       pos: -76.5,-33.5
 - proto: SuitStorageRD
   entities:
-  - uid: 7610
+  - uid: 22276
     components:
     - type: Transform
       parent: 2
@@ -156833,11 +157243,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -97.5,-1.5
-  - uid: 2647
-    components:
-    - type: Transform
-      parent: 2
-      pos: -90.5,-17.5
   - uid: 2649
     components:
     - type: Transform
@@ -159545,6 +159950,11 @@ entities:
       pos: -81.561455,0.4129281
 - proto: ToolboxElectricalFilled
   entities:
+  - uid: 2108
+    components:
+    - type: Transform
+      parent: 2
+      pos: -86.52542,-18.503819
   - uid: 15315
     components:
     - type: Transform
@@ -159750,6 +160160,28 @@ entities:
     - type: Transform
       parent: 2
       pos: -42.5,-1.5
+- proto: ToySoundMakerSpawner90
+  entities:
+  - uid: 26335
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -55.5,-38.5
+- proto: ToySpawner90
+  entities:
+  - uid: 27152
+    components:
+    - type: Transform
+      parent: 2
+      pos: -51.5,-38.5
+- proto: ToyWeaponSpawner90
+  entities:
+  - uid: 27144
+    components:
+    - type: Transform
+      parent: 2
+      pos: -112.5,27.5
 - proto: TrainingBomb
   entities:
   - uid: 17799
@@ -159817,13 +160249,6 @@ entities:
       pos: -96.5,17.5
     - type: DeviceLinkSource
       linkedPorts:
-        6587:
-        - - Left
-          - Reverse
-        - - Right
-          - Forward
-        - - Middle
-          - Off
         18870:
         - - Left
           - Reverse
@@ -162231,6 +162656,12 @@ entities:
     - type: Transform
       parent: 2
       pos: -89.5,33.5
+  - uid: 1057
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -88.5,-17.5
   - uid: 1061
     components:
     - type: Transform
@@ -162676,11 +163107,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -123.5,-25.5
-  - uid: 2108
-    components:
-    - type: Transform
-      parent: 2
-      pos: -89.5,-19.5
   - uid: 2125
     components:
     - type: Transform
@@ -163301,6 +163727,12 @@ entities:
     - type: Transform
       parent: 2
       pos: -134.5,-42.5
+  - uid: 5329
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -88.5,-18.5
   - uid: 5395
     components:
     - type: Transform
@@ -165003,6 +165435,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -125.5,-31.5
+  - uid: 19459
+    components:
+    - type: Transform
+      parent: 2
+      pos: -88.5,32.5
   - uid: 19576
     components:
     - type: Transform
@@ -165133,6 +165570,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -108.5,-39.5
+  - uid: 21487
+    components:
+    - type: Transform
+      parent: 2
+      pos: -86.5,32.5
   - uid: 22229
     components:
     - type: Transform
@@ -167334,21 +167776,11 @@ entities:
     - type: Transform
       parent: 2
       pos: -97.5,-16.5
-  - uid: 1057
-    components:
-    - type: Transform
-      parent: 2
-      pos: -89.5,-17.5
   - uid: 1058
     components:
     - type: Transform
       parent: 2
       pos: -73.5,-8.5
-  - uid: 1059
-    components:
-    - type: Transform
-      parent: 2
-      pos: -89.5,-18.5
   - uid: 1060
     components:
     - type: Transform
@@ -172817,16 +173249,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -71.5,-31.5
-  - uid: 4704
-    components:
-    - type: Transform
-      parent: 2
-      pos: -88.5,32.5
-  - uid: 4714
-    components:
-    - type: Transform
-      parent: 2
-      pos: -86.5,32.5
   - uid: 4852
     components:
     - type: Transform
@@ -177302,17 +177724,16 @@ entities:
     - type: Transform
       parent: 2
       pos: -95.5,-38.5
-  - uid: 4005
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -88.5,-26.5
   - uid: 4277
     components:
     - type: Transform
       parent: 2
       pos: -111.5,-29.5
+  - uid: 6674
+    components:
+    - type: Transform
+      parent: 2
+      pos: -88.5,-25.5
   - uid: 6786
     components:
     - type: Transform
@@ -177839,7 +178260,7 @@ entities:
         DoorStatus: True
     - type: Door
       state: Opening
-      secondsUntilStateChange: -291218.3
+      secondsUntilStateChange: -301522.78
     - type: Airlock
       autoClose: False
   - uid: 23283
@@ -178734,73 +179155,12 @@ entities:
       pos: -20.5,-15.5
 - proto: WoodenSupport
   entities:
-  - uid: 4988
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -105.5,-2.5
-  - uid: 6553
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -102.5,-58.5
   - uid: 7487
     components:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
       pos: -75.5,-72.5
-  - uid: 9287
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: -105.5,-15.5
-  - uid: 9680
-    components:
-    - type: Transform
-      parent: 2
-      pos: -12.5,-48.5
-  - uid: 19793
-    components:
-    - type: Transform
-      parent: 2
-      pos: -41.5,-64.5
-  - uid: 19970
-    components:
-    - type: Transform
-      parent: 2
-      pos: -25.5,-11.5
-  - uid: 22122
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: -97.5,-11.5
-  - uid: 24626
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-46.5
-  - uid: 25646
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -33.5,-11.5
-  - uid: 25779
-    components:
-    - type: Transform
-      parent: 2
-      pos: -13.5,-53.5
-  - uid: 25832
-    components:
-    - type: Transform
-      parent: 2
-      pos: -16.5,-61.5
   - uid: 26151
     components:
     - type: Transform
diff --git a/Resources/Maps/snowball.yml b/Resources/Maps/snowball.yml
index c8e14094f8..33bb221e78 100644
--- a/Resources/Maps/snowball.yml
+++ b/Resources/Maps/snowball.yml
@@ -4,14 +4,15 @@ meta:
   engineVersion: 289.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/22/2026 19:17:59
-  entityCount: 19009
+  time: 09/10/2026 21:54:07
+  entityCount: 19008
 maps:
 - 1793
 grids:
 - 1
 orphans: []
 nullspace:
+- 8071
 - 17974
 - 17976
 - 17977
@@ -56,7 +57,6 @@ nullspace:
 - 19006
 - 19007
 - 19008
-- 19009
 tilemap:
   0: Space
   119: FloorAstroSnow
@@ -1754,6 +1754,7 @@ entities:
       chunkHistory: {}
     - type: ChunkContainer
       chunkEntities:
+      - 8071
       - 17974
       - 17976
       - 17977
@@ -1798,7 +1799,6 @@ entities:
       - 19006
       - 19007
       - 19008
-      - 19009
   - uid: 1793
     components:
     - type: MetaData
@@ -4293,12 +4293,26 @@ entities:
       parent: 1
       rot: 1.5707963267948966 rad
       pos: 94.5,87.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        7882:
+        - - DoorStatus
+          - DoorBolt
   - uid: 7817
     components:
     - type: Transform
       parent: 1
       rot: 1.5707963267948966 rad
       pos: 94.5,89.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        7883:
+        - - DoorStatus
+          - DoorBolt
   - uid: 9001
     components:
     - type: Transform
@@ -4477,6 +4491,34 @@ entities:
       pos: 0.5,74.5
     - type: DeviceLinkSink
       invokeCounter: 1
+- proto: AirlockExternalGlassShuttleCargo
+  entities:
+  - uid: 7882
+    components:
+    - type: Transform
+      parent: 1
+      rot: 1.5707963267948966 rad
+      pos: 99.5,87.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        7816:
+        - - DoorStatus
+          - DoorBolt
+    - type: DeviceLinkSink
+      invokeCounter: 1
+  - uid: 7883
+    components:
+    - type: Transform
+      parent: 1
+      rot: 1.5707963267948966 rad
+      pos: 99.5,89.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        7817:
+        - - DoorStatus
+          - DoorBolt
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: AirlockExternalGlassShuttleEmergencyLocked
   entities:
   - uid: 5
@@ -4511,20 +4553,6 @@ entities:
       pos: 102.5,72.5
     - type: DeviceLinkSink
       invokeCounter: 1
-- proto: AirlockExternalGlassShuttleLocked
-  entities:
-  - uid: 7882
-    components:
-    - type: Transform
-      parent: 1
-      rot: 1.5707963267948966 rad
-      pos: 99.5,87.5
-  - uid: 7883
-    components:
-    - type: Transform
-      parent: 1
-      rot: 1.5707963267948966 rad
-      pos: 99.5,89.5
 - proto: AirlockExternalLocked
   entities:
   - uid: 8625
@@ -7389,13 +7417,6 @@ entities:
     - type: Transform
       parent: 1
       pos: 58.507614,127.52353
-- proto: AsimovCircuitBoard
-  entities:
-  - uid: 11216
-    components:
-    - type: Transform
-      parent: 1
-      pos: 63.5,18.5
 - proto: AtmosDeviceFanDirectional
   entities:
   - uid: 2686
@@ -7404,18 +7425,6 @@ entities:
       parent: 1
       rot: 1.5707963267948966 rad
       pos: 40.5,79.5
-  - uid: 7884
-    components:
-    - type: Transform
-      parent: 1
-      rot: 1.5707963267948966 rad
-      pos: 99.5,87.5
-  - uid: 7885
-    components:
-    - type: Transform
-      parent: 1
-      rot: 1.5707963267948966 rad
-      pos: 99.5,89.5
 - proto: AtmosFixBlockerMarker
   entities:
   - uid: 119
@@ -36238,6 +36247,13 @@ entities:
     - type: Transform
       parent: 1
       pos: 80.5,79.5
+- proto: CargoTelepad
+  entities:
+  - uid: 7885
+    components:
+    - type: Transform
+      parent: 1
+      pos: 88.5,84.5
 - proto: Carpet
   entities:
   - uid: 9553
@@ -40733,7 +40749,7 @@ entities:
       pos: 55.5,64.5
 - proto: ChunkEntity
   entities:
-  - uid: 17974
+  - uid: 8071
     components:
     - type: ChunkEntity
       root: 1
@@ -40856,7 +40872,7 @@ entities:
             136: 59,102
             137: 59,103
             138: 59,104
-  - uid: 17976
+  - uid: 17974
     components:
     - type: ChunkEntity
       root: 1
@@ -41056,7 +41072,7 @@ entities:
             cleanable: True
           decals:
             3903: 63,82
-  - uid: 17977
+  - uid: 17976
     components:
     - type: ChunkEntity
       root: 1
@@ -41243,7 +41259,7 @@ entities:
             142: 66,101
             279: 70,105
             280: 71,105
-  - uid: 17979
+  - uid: 17977
     components:
     - type: ChunkEntity
       root: 1
@@ -41454,7 +41470,7 @@ entities:
             cleanable: True
           decals:
             3907: 66,83
-  - uid: 17983
+  - uid: 17979
     components:
     - type: ChunkEntity
       root: 1
@@ -41614,7 +41630,7 @@ entities:
           decals:
             4010: 34,71
             4028: 37,74
-  - uid: 17986
+  - uid: 17983
     components:
     - type: ChunkEntity
       root: 1
@@ -41722,7 +41738,7 @@ entities:
             4299: 49,21
             4326: 61,25
             4350: 50,30
-  - uid: 17988
+  - uid: 17986
     components:
     - type: ChunkEntity
       root: 1
@@ -41865,7 +41881,7 @@ entities:
             4374: 61.263626,61.66695
             4375: 61.076126,61.99009
             4376: 60.74279,62.136024
-  - uid: 17989
+  - uid: 17988
     components:
     - type: ChunkEntity
       root: 1
@@ -42067,7 +42083,7 @@ entities:
             4328: 57,36
             4340: 54,32
             4366: 50,45
-  - uid: 17993
+  - uid: 17989
     components:
     - type: ChunkEntity
       root: 1
@@ -42288,7 +42304,7 @@ entities:
             cleanable: True
           decals:
             797: 95,83
-  - uid: 18000
+  - uid: 17993
     components:
     - type: ChunkEntity
       root: 1
@@ -42475,7 +42491,7 @@ entities:
             cleanable: True
           decals:
             3858: 9,72
-  - uid: 18001
+  - uid: 18000
     components:
     - type: ChunkEntity
       root: 1
@@ -42658,7 +42674,7 @@ entities:
             angle: 1.5707963267948966 rad
           decals:
             4026: 31.960068,73.10345
-  - uid: 18005
+  - uid: 18001
     components:
     - type: ChunkEntity
       root: 1
@@ -42848,7 +42864,7 @@ entities:
           decals:
             4298: 43,22
             4329: 35,25
-  - uid: 18010
+  - uid: 18005
     components:
     - type: ChunkEntity
       root: 1
@@ -43100,7 +43116,7 @@ entities:
             cleanable: True
           decals:
             3856: 22,95
-  - uid: 18011
+  - uid: 18010
     components:
     - type: ChunkEntity
       root: 1
@@ -43454,7 +43470,7 @@ entities:
             cleanable: True
           decals:
             4030: 21,63
-  - uid: 18014
+  - uid: 18011
     components:
     - type: ChunkEntity
       root: 1
@@ -43688,7 +43704,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2050: 54,74
-  - uid: 18016
+  - uid: 18014
     components:
     - type: ChunkEntity
       root: 1
@@ -43926,7 +43942,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2851: 47,39
-  - uid: 18018
+  - uid: 18016
     components:
     - type: ChunkEntity
       root: 1
@@ -44180,7 +44196,7 @@ entities:
             cleanable: True
           decals:
             4373: 66,61
-  - uid: 18019
+  - uid: 18018
     components:
     - type: ChunkEntity
       root: 1
@@ -44408,7 +44424,7 @@ entities:
             1165: 79,42
             1166: 79,43
             1167: 79,44
-  - uid: 18020
+  - uid: 18019
     components:
     - type: ChunkEntity
       root: 1
@@ -44683,7 +44699,7 @@ entities:
             cleanable: True
           decals:
             4370: 47,54
-  - uid: 18022
+  - uid: 18020
     components:
     - type: ChunkEntity
       root: 1
@@ -44853,7 +44869,7 @@ entities:
             3904: 47,87
             3905: 43,89
             3906: 33,81
-  - uid: 18041
+  - uid: 18022
     components:
     - type: ChunkEntity
       root: 1
@@ -44900,7 +44916,7 @@ entities:
             color: '#EFB34196'
           decals:
             6192: 68,112
-  - uid: 18060
+  - uid: 18041
     components:
     - type: ChunkEntity
       root: 1
@@ -45124,7 +45140,7 @@ entities:
             3783: 40,107
             3785: 33,109
             3819: 37,105
-  - uid: 18062
+  - uid: 18060
     components:
     - type: ChunkEntity
       root: 1
@@ -45312,7 +45328,7 @@ entities:
             1298: 79.27742,28.883457
             1299: 79.52279,29.184593
             1308: 79.81342,28.966824
-  - uid: 18086
+  - uid: 18062
     components:
     - type: ChunkEntity
       root: 1
@@ -45447,7 +45463,7 @@ entities:
             cleanable: True
           decals:
             3908: 67,70
-  - uid: 18088
+  - uid: 18086
     components:
     - type: ChunkEntity
       root: 1
@@ -45690,7 +45706,7 @@ entities:
             cleanable: True
           decals:
             1178: 92,63
-  - uid: 18098
+  - uid: 18088
     components:
     - type: ChunkEntity
       root: 1
@@ -45934,7 +45950,7 @@ entities:
           decals:
             796: 83,71
             3787: 90,77
-  - uid: 18143
+  - uid: 18098
     components:
     - type: ChunkEntity
       root: 1
@@ -46247,7 +46263,7 @@ entities:
           decals:
             4029: 13,61
             4032: 5,52
-  - uid: 18144
+  - uid: 18143
     components:
     - type: ChunkEntity
       root: 1
@@ -46449,7 +46465,7 @@ entities:
             4232: 20.707903,33.27366
             4233: 20.367624,33.363937
             4234: 20.59679,32.856995
-  - uid: 18145
+  - uid: 18144
     components:
     - type: ChunkEntity
       root: 1
@@ -46654,7 +46670,7 @@ entities:
             cleanable: True
           decals:
             3859: 7,84
-  - uid: 18146
+  - uid: 18145
     components:
     - type: ChunkEntity
       root: 1
@@ -46779,7 +46795,7 @@ entities:
           decals:
             1751: 66,12
             1752: 67,12
-  - uid: 18147
+  - uid: 18146
     components:
     - type: ChunkEntity
       root: 1
@@ -46902,7 +46918,7 @@ entities:
             9: 53,122
             10: 54,122
             11: 55,122
-  - uid: 18148
+  - uid: 18147
     components:
     - type: ChunkEntity
       root: 1
@@ -47015,7 +47031,7 @@ entities:
             cleanable: True
           decals:
             3784: 38,114
-  - uid: 18997
+  - uid: 18148
     components:
     - type: ChunkEntity
       root: 1
@@ -47158,7 +47174,7 @@ entities:
             3786: 29,97
             3820: 23,100
             3822: 19,102
-  - uid: 18998
+  - uid: 18997
     components:
     - type: ChunkEntity
       root: 1
@@ -47188,7 +47204,7 @@ entities:
             7016: 55,129
             7017: 58,130
             7018: 60,129
-  - uid: 18999
+  - uid: 18998
     components:
     - type: ChunkEntity
       root: 1
@@ -47210,7 +47226,7 @@ entities:
             cleanable: True
           decals:
             7011: 47,129
-  - uid: 19000
+  - uid: 18999
     components:
     - type: ChunkEntity
       root: 1
@@ -47260,7 +47276,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1709: 63,5
-  - uid: 19001
+  - uid: 19000
     components:
     - type: ChunkEntity
       root: 1
@@ -47318,7 +47334,7 @@ entities:
             color: '#8D1C9996'
           decals:
             6094: 85,96
-  - uid: 19002
+  - uid: 19001
     components:
     - type: ChunkEntity
       root: 1
@@ -47395,7 +47411,7 @@ entities:
             941: 99,75
             942: 98,75
             943: 97,75
-  - uid: 19003
+  - uid: 19002
     components:
     - type: ChunkEntity
       root: 1
@@ -47497,7 +47513,7 @@ entities:
             1263: 86.8568,47.701492
             1265: 86.18318,47.562508
             1266: 86.4193,47.38878
-  - uid: 19004
+  - uid: 19003
     components:
     - type: ChunkEntity
       root: 1
@@ -47608,7 +47624,7 @@ entities:
             cleanable: True
           decals:
             4247: 21,29
-  - uid: 19005
+  - uid: 19004
     components:
     - type: ChunkEntity
       root: 1
@@ -47693,7 +47709,7 @@ entities:
             4127: 11,40
             4128: 11.999264,39.70429
             4129: 10.999714,39.70429
-  - uid: 19006
+  - uid: 19005
     components:
     - type: ChunkEntity
       root: 1
@@ -47765,7 +47781,7 @@ entities:
             cleanable: True
           decals:
             1177: 96,53
-  - uid: 19007
+  - uid: 19006
     components:
     - type: ChunkEntity
       root: 1
@@ -47782,7 +47798,7 @@ entities:
             cleanable: True
           decals:
             4662: 96,80
-  - uid: 19008
+  - uid: 19007
     components:
     - type: ChunkEntity
       root: 1
@@ -47821,7 +47837,7 @@ entities:
             3557: 8,101
             3558: 9,101
             3559: 10,101
-  - uid: 19009
+  - uid: 19008
     components:
     - type: ChunkEntity
       root: 1
@@ -49083,12 +49099,22 @@ entities:
     - type: Transform
       parent: 1
       pos: 80.5,91.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        7885:
+        - - OrderSender
+          - OrderReceiver
   - uid: 8083
     components:
     - type: Transform
       parent: 1
       rot: -1.5707963267948966 rad
       pos: 92.5,83.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        7885:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersEngineering
   entities:
   - uid: 6769
@@ -49097,6 +49123,11 @@ entities:
       parent: 1
       rot: 3.141592653589793 rad
       pos: 69.5,86.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        7885:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersMedical
   entities:
   - uid: 10800
@@ -49105,6 +49136,11 @@ entities:
       parent: 1
       rot: 3.141592653589793 rad
       pos: 54.5,52.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        7885:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersScience
   entities:
   - uid: 16043
@@ -49113,6 +49149,11 @@ entities:
       parent: 1
       rot: -1.5707963267948966 rad
       pos: 16.5,72.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        7885:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersSecurity
   entities:
   - uid: 14636
@@ -49121,6 +49162,11 @@ entities:
       parent: 1
       rot: 1.5707963267948966 rad
       pos: 48.5,35.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        7885:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersService
   entities:
   - uid: 12593
@@ -49129,6 +49175,11 @@ entities:
       parent: 1
       rot: 1.5707963267948966 rad
       pos: 55.5,77.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        7885:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerComms
   entities:
   - uid: 14971
@@ -49923,6 +49974,13 @@ entities:
     - type: Transform
       parent: 1
       pos: 11.5,84.5
+- proto: CrewsimovCircuitBoard
+  entities:
+  - uid: 11216
+    components:
+    - type: Transform
+      parent: 1
+      pos: 63.5,18.5
 - proto: Crowbar
   entities:
   - uid: 16100
@@ -90935,6 +90993,14 @@ entities:
     - type: Transform
       parent: 1
       pos: 80.50337,80.503456
+- proto: MailCart
+  entities:
+  - uid: 7884
+    components:
+    - type: Transform
+      parent: 1
+      rot: -1.5707963267948966 rad
+      pos: 82.5,82.5
 - proto: MailingUnit
   entities:
   - uid: 8101
@@ -94697,11 +94763,6 @@ entities:
     - type: Transform
       parent: 1
       pos: 13.5,72.5
-  - uid: 8071
-    components:
-    - type: Transform
-      parent: 1
-      pos: 82.5,82.5
   - uid: 8274
     components:
     - type: Transform
@@ -98318,8 +98379,7 @@ entities:
     components:
     - type: Transform
       parent: 1
-      rot: -6.283185307179586 rad
-      pos: 82.53075,82.528824
+      pos: 84.47835,88.97516
 - proto: SheetRGlass
   entities:
   - uid: 2213
diff --git a/Resources/Maps/sushi.yml b/Resources/Maps/sushi.yml
index adbb07bb8a..b618844dc0 100644
--- a/Resources/Maps/sushi.yml
+++ b/Resources/Maps/sushi.yml
@@ -1,73 +1,73 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 289.0.0
+  engineVersion: 289.0.3
   forkId: ""
   forkVersion: ""
-  time: 08/23/2026 14:49:52
-  entityCount: 25215
+  time: 09/15/2026 18:12:53
+  entityCount: 25496
 maps:
 - 1
 grids:
 - 2
 orphans: []
 nullspace:
-- 25160
-- 25161
-- 25162
-- 25163
-- 25164
-- 25165
-- 25166
-- 25167
-- 25168
-- 25169
-- 25170
-- 25171
-- 25172
-- 25173
-- 25174
-- 25175
-- 25176
-- 25177
-- 25178
-- 25179
-- 25180
-- 25181
-- 25182
-- 25183
-- 25184
-- 25185
-- 25186
-- 25187
-- 25188
-- 25189
-- 25190
-- 25191
-- 25192
-- 25193
-- 25194
-- 25195
-- 25196
-- 25197
-- 25198
-- 25199
-- 25200
-- 25201
-- 25202
-- 25203
-- 25204
-- 25205
-- 25206
-- 25207
-- 25208
-- 25209
-- 25210
-- 25211
-- 25212
-- 25213
-- 25214
-- 25215
+- 25441
+- 25442
+- 25443
+- 25444
+- 25445
+- 25446
+- 25447
+- 25448
+- 25449
+- 25450
+- 25451
+- 25452
+- 25453
+- 25454
+- 25455
+- 25456
+- 25457
+- 25458
+- 25459
+- 25460
+- 25461
+- 25462
+- 25463
+- 25464
+- 25465
+- 25466
+- 25467
+- 25468
+- 25469
+- 25470
+- 25471
+- 25472
+- 25473
+- 25474
+- 25475
+- 25476
+- 25477
+- 25478
+- 25479
+- 25480
+- 25481
+- 25482
+- 25483
+- 25484
+- 25485
+- 25486
+- 25487
+- 25488
+- 25489
+- 25490
+- 25491
+- 25492
+- 25493
+- 25494
+- 25495
+- 25496
 tilemap:
   0: Space
   18: FloorArcadeBlue
@@ -149,7 +149,7 @@ entities:
           version: 7
         0,1:
           ind: 0,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAIAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAQAAAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAIAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAABABQAAAAAAgAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAABQAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABQAAAAAAgAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAGwAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAIAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAQAAAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAIAAAAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAABABQAAAAAAgAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAABQAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABQAAAAAAgAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAGwAAAAAAAA==
           version: 7
         0,2:
           ind: 0,2
@@ -165,7 +165,7 @@ entities:
           version: 7
         1,1:
           ind: 1,1
-          tiles: GwAAAAAAABQAAAAAAgAUAAAAAAIAGwAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAgAUAAAAAAIAFAAAAAABABQAAAAAAAAbAAAAAAAAFAAAAAACABQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAACIAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAACABsAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAiAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAABQAAAAAAQAUAAAAAAAAGwAAAAAAABsAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAABABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAABABsAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAUAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAFAAAAAACABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABQAAAAAAgAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAA==
+          tiles: GwAAAAAAABQAAAAAAgAUAAAAAAIAGwAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAgAUAAAAAAIAFAAAAAABABQAAAAAAAAbAAAAAAAAFAAAAAACABQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAACIAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAACABsAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAiAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAiAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAABQAAAAAAQAUAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAAIgAAAAAAACIAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAABABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAABABsAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAUAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAFAAAAAACABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABQAAAAAAgAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAA==
           version: 7
         1,2:
           ind: 1,2
@@ -193,7 +193,7 @@ entities:
           version: 7
         2,1:
           ind: 2,1
-          tiles: GwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAABABQAAAAAAgAUAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgAUAAAAAAIAFAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAUAAAAAAIAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAABABsAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgAbAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAEAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAABsAAAAAAAAUAAAAAAAAGwAAAAAAAB4AAAAAAAAeAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAFAAAAAAAABQAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABQAAAAAAgAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAUAAAAAAEAFAAAAAACABQAAAAAAgAUAAAAAAEAFAAAAAACABQAAAAAAAAUAAAAAAIAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAAbAAAAAAAACwAAAAAAAAsAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAGwAAAAAAAA==
+          tiles: GwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAABABQAAAAAAgAUAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgAUAAAAAAIAFAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAUAAAAAAIAGwAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAABABsAAAAAAAAeAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgAbAAAAAAAAHgAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAEAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAABsAAAAAAAAUAAAAAAAAGwAAAAAAAB4AAAAAAAAeAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAFAAAAAAAABQAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABQAAAAAAgAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAUAAAAAAEAFAAAAAACABQAAAAAAgAUAAAAAAEAFAAAAAACABQAAAAAAAAUAAAAAAIAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAAbAAAAAAAACwAAAAAAAAsAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAGwAAAAAAAA==
           version: 7
         2,2:
           ind: 2,2
@@ -237,7 +237,7 @@ entities:
           version: 7
         3,5:
           ind: 3,5
-          tiles: BwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAQAAAAAAABYAAAAAAAAWAAAAAAAAFgAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAAAEAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAQAAAAAAAAbAAAAAAAABwAAAAAAAAEAAAAAAAABAAAAAAAABwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAEAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAcAAAAAAAAEAAAAAAAAAQAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAABAAAAAAAABAAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAAHAAAAAAAABAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAQAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABwAAAAAAAAEAAAAAAAABAAAAAAAABwAAAAAAAAQAAAAAAAABAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAEAAAAAAAAbAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAcAAAAAAAAEAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAAAYAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAAHAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABwAAAAAAAAEAAAAAAAABAAAAAAAABwAAAAAAAAIAAAAABAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAACwAAAAAAAAsAAAAAAAAEAAAAAAAABAAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAcAAAAAAAACAAAAAAIAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAsAAAAAAAALAAAAAAAABAAAAAAAAAQAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAAHAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAUAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAABwAAAAAAAAEAAAAAAAABAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAA==
+          tiles: BwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAQAAAAAAABYAAAAAAAAWAAAAAAAAFgAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAcAAAAAAAAEAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAAAEAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAAHAAAAAAAABAAAAAAAAAEAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAQAAAAAAAAbAAAAAAAABwAAAAAAAAEAAAAAAAABAAAAAAAABwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAEAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAABAAAAAAAABAAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAQAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABwAAAAAAAAEAAAAAAAABAAAAAAAABwAAAAAAAAEAAAAAAAABAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAEAAAAAAAAbAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAAAYAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAAHAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABwAAAAAAAAEAAAAAAAABAAAAAAAABwAAAAAAAAIAAAAABAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAACwAAAAAAAAsAAAAAAAAEAAAAAAAABAAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAcAAAAAAAACAAAAAAIAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAsAAAAAAAALAAAAAAAABAAAAAAAAAQAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAAHAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAUAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAABwAAAAAAAAEAAAAAAAABAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAA==
           version: 7
         3,6:
           ind: 3,6
@@ -249,11 +249,11 @@ entities:
           version: 7
         4,1:
           ind: 4,1
-          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAALAAAAAAAABsAAAAAAAALAAAAAAAALAAAAAADAAsAAAAAAAAsAAAAAAAAGwAAAAAAAAAAAAAAAAAUAAAAAAEAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAACwAAAAAAAAsAAAAAAAAbAAAAAAAAGwAAAAAAACwAAAAAAAALAAAAAAAALAAAAAACABsAAAAAAAAUAAAAAAIAFAAAAAACABQAAAAAAgAbAAAAAAAAGwAAAAAAAB4AAAAAAAAeAAAAAAAAGwAAAAAAAAsAAAAAAAAsAAAAAAAACwAAAAAAAAsAAAAAAAAsAAAAAAEAGwAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAALAAAAAAAALAAAAAAGAAsAAAAAAAALAAAAAAAACwAAAAAAABsAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAbAAAAAAAACwAAAAAAAAsAAAAAAAAsAAAAAAMALAAAAAAGACwAAAAAAgAbAAAAAAAAAQAAAAAAABsAAAAAAAAUAAAAAAIAAAAAAAAAAAAAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAHgAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAAAEAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAAAWAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAFgAAAAAAABYAAAAAAAAWAAAAAAAAFgAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAALAAAAAAAABsAAAAAAAALAAAAAAAALAAAAAADAAsAAAAAAAAsAAAAAAAAGwAAAAAAAAAAAAAAAAAUAAAAAAEAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAACwAAAAAAAAsAAAAAAAAbAAAAAAAAGwAAAAAAACwAAAAAAAALAAAAAAAALAAAAAACABsAAAAAAAAUAAAAAAIAFAAAAAACABQAAAAAAgAbAAAAAAAAGwAAAAAAAB4AAAAAAAAeAAAAAAAAGwAAAAAAAAsAAAAAAAAsAAAAAAAACwAAAAAAAAsAAAAAAAAsAAAAAAEAGwAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAALAAAAAAAALAAAAAAGAAsAAAAAAAALAAAAAAAACwAAAAAAABsAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAbAAAAAAAACwAAAAAAAAsAAAAAAAAsAAAAAAMALAAAAAAGACwAAAAAAgAbAAAAAAAAAQAAAAAAABsAAAAAAAAUAAAAAAIAAAAAAAAAAAAAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAHgAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAFgAAAAAAABYAAAAAAAAWAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAABYAAAAAAAAWAAAAAAAAFgAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
           version: 7
         4,2:
           ind: 4,2
-          tiles: HgAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAAABAAAAAAAAAQAAAAAAABYAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAAABAAAAAAAAAQAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAFgAAAAAAABYAAAAAAAAWAAAAAAAAAQAAAAAAAAEAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAAAWAAAAAAAAAQAAAAAAAAEAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAHgAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAABAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          tiles: HgAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAAABAAAAAAAAAQAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAEQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAFgAAAAAAABYAAAAAAAAWAAAAAAAAAQAAAAAAAAEAAAAAAAAeAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAHgAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAABAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
           version: 7
         4,3:
           ind: 4,3
@@ -265,7 +265,7 @@ entities:
           version: 7
         4,5:
           ind: 4,5
-          tiles: AQAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAABsAAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAbAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAABsAAAAAAAABAAAAAAAAJgAAAAAAACYAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAABsAAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAAbAAAAAAAAAQAAAAAAACYAAAAAAAAmAAAAAAAAAQAAAAAAAAQAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAbAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAAGwAAAAAAAAEAAAAAAAAmAAAAAAAAJgAAAAAAAAEAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABsAAAAAAAAGAAAAAAAAGwAAAAAAABsAAAAAAAANAAAAAAAADQAAAAAAABsAAAAAAAABAAAAAAAAJgAAAAAAACYAAAAAAAABAAAAAAAABAAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAACYAAAAAAAAmAAAAAAAAAQAAAAAAAAQAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAmAAAAAAAAJgAAAAAAAAEAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          tiles: AQAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAABsAAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAbAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAABsAAAAAAAABAAAAAAAAJgAAAAAAACYAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAABsAAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAAbAAAAAAAAAQAAAAAAACYAAAAAAAAmAAAAAAAAAQAAAAAAAAQAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAbAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAAGwAAAAAAAAEAAAAAAAAmAAAAAAAAJgAAAAAAAAEAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABsAAAAAAAAGAAAAAAAAGwAAAAAAABsAAAAAAAANAAAAAAAADQAAAAAAABsAAAAAAAABAAAAAAAAJgAAAAAAACYAAAAAAAABAAAAAAAABAAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAACYAAAAAAAAmAAAAAAAAAQAAAAAAAAQAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAmAAAAAAAAJgAAAAAAAAEAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
           version: 7
         4,6:
           ind: 4,6
@@ -281,15 +281,15 @@ entities:
           version: 7
         5,1:
           ind: 5,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAQAUAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABQAAAAAAAAUAAAAAAEAFAAAAAACABQAAAAAAQAbAAAAAAAAFAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAUAAAAAAEAGwAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAIAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAAAAAAAAAAAAUAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgAbAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAABAAAAAAAAAQAAAAAAAAWAAAAAAAABAAAAAAAAAEAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAABAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAQAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAABAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAB4AAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAiAAAAAAAAGwAAAAAAACIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACIAAAAAAAAiAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiAAAAAAAAHgAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAQAUAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABQAAAAAAAAUAAAAAAEAFAAAAAACAAAAAAAAAAAbAAAAAAAAFAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAUAAAAAAEAGwAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAIAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAAAAAAAAAAAAUAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgAbAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAABAAAAAAAAAQAAAAAAAAWAAAAAAAABAAAAAAAAAEAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAABAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAQAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAABAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAB4AAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAABAAAAAAAAGwAAAAAAACIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACIAAAAAAAAiAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiAAAAAAAAHgAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAA==
           version: 7
         5,2:
           ind: 5,2
-          tiles: IgAAAAAAABsAAAAAAAAiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiAAAAAAAAIgAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAB4AAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAEAAAAAAAAAQAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAABAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAQAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAEAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAACABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAQAUAAAAAAAAFAAAAAABABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAAA==
+          tiles: AQAAAAAAABsAAAAAAAAiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiAAAAAAAAIgAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAB4AAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAEAAAAAAAAAQAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAABAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAQAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAEAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAACABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAQAUAAAAAAAAFAAAAAABABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAAA==
           version: 7
         5,3:
           ind: 5,3
-          tiles: DAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAGwAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAAwAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAMAAAAAAAAIgAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAIgAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAACIAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAAAwAAAAAAAAMAAAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAIAAAAAAAAAAAAAAAAAAAAUAAAAAAIAGwAAAAAAABsAAAAAAAAMAAAAAAAADAAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABQAAAAAAAAbAAAAAAAADAAAAAAAAAwAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAwAAAAAAAAMAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAMAAAAAAAADAAAAAAAABsAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAADAAAAAAAAAwAAAAAAAAbAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAwAAAAAAAAMAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAIAAAAAAAACAAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAMAAAAAAAADAAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACAAAAAAAAAgAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAADAAAAAAAAAwAAAAAAAAbAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAwAAAAAAAAMAAAAAAAAGwAAAAAAAA==
+          tiles: DAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAGwAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAAwAAAAAAAAiAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAMAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAIgAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAACIAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAAAwAAAAAAAAMAAAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAIAAAAAAAAAAAAAAAAAAAAUAAAAAAIAGwAAAAAAABsAAAAAAAAMAAAAAAAADAAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABQAAAAAAAAbAAAAAAAADAAAAAAAAAwAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAwAAAAAAAAMAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAMAAAAAAAADAAAAAAAABsAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAADAAAAAAAAAwAAAAAAAAbAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAwAAAAAAAAMAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAIAAAAAAAACAAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAMAAAAAAAADAAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACAAAAAAAAAgAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAADAAAAAAAAAwAAAAAAAAbAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAwAAAAAAAAMAAAAAAAAGwAAAAAAAA==
           version: 7
         5,4:
           ind: 5,4
@@ -313,7 +313,7 @@ entities:
           version: 7
         6,1:
           ind: 6,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAFAAAAAACABQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAABQAAAAAAQAUAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABQAAAAAAQAUAAAAAAAAFAAAAAABABQAAAAAAAAUAAAAAAIAFAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAUAAAAAAEAFAAAAAACABQAAAAAAgAAAAAAAAAAFAAAAAABABQAAAAAAQAUAAAAAAAAFAAAAAAAABQAAAAAAQAUAAAAAAEAFAAAAAAAABQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAEAGwAAAAAAABsAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAUAAAAAAEAFAAAAAACABQAAAAAAAAUAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAABsAAAAAAAAuAAAAAAIAGwAAAAAAABQAAAAAAgAbAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAAFAAAAAAAABQAAAAAAQAUAAAAAAAAFAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAQAbAAAAAAAALgAAAAABABsAAAAAAAAbAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAABQAAAAAAAAUAAAAAAIAFAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAIAGwAAAAAAAC4AAAAAAwAuAAAAAAAALgAAAAACAC4AAAAAAgAEAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAACABQAAAAAAQAUAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABsAAAAAAAAxAAAAAAAAMQAAAAADADEAAAAAAAAxAAAAAAEABAAAAAAAAAQAAAAAAAAbAAAAAAAAIgAAAAAAABQAAAAAAAAUAAAAAAEAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAQAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAACIAAAAAAAAUAAAAAAAAFAAAAAACABQAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAIAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAEAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAABQAAAAAAQAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAAFAAAAAACABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAABQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAABQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAUAAAAAAAAGwAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAEAAAAAAAABAAAAAAAABsAAAAAAAAUAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAABQAAAAAAQAbAAAAAAAAIgAAAAAAACIAAAAAAAAiAAAAAAAAIgAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAACABQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAQAUAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABQAAAAAAQAUAAAAAAAAFAAAAAABABQAAAAAAAAUAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAUAAAAAAEAFAAAAAACABQAAAAAAgAAAAAAAAAAFAAAAAABABQAAAAAAQAUAAAAAAAAFAAAAAAAABQAAAAAAQAUAAAAAAEAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAEAGwAAAAAAABsAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAbAAAAAAAAGwAAAAAAABQAAAAAAAAUAAAAAAEAFAAAAAACABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAABsAAAAAAAAuAAAAAAIAGwAAAAAAABQAAAAAAgAbAAAAAAAABAAAAAAAAAQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAQAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAQAbAAAAAAAALgAAAAABABsAAAAAAAAbAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAIAFAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAIAGwAAAAAAAC4AAAAAAwAuAAAAAAAALgAAAAACAC4AAAAAAgAEAAAAAAAAGwAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAABsAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABsAAAAAAAAxAAAAAAAAMQAAAAADADEAAAAAAAAxAAAAAAEABAAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAQAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAIAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAEAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAAFAAAAAACABQAAAAAAAAUAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAABQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAABQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAEAAAAAAAABAAAAAAAABsAAAAAAAAUAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAABQAAAAAAQAbAAAAAAAAIgAAAAAAACIAAAAAAAAiAAAAAAAAIgAAAAAAAA==
           version: 7
         6,2:
           ind: 6,2
@@ -345,15 +345,15 @@ entities:
           version: 7
         7,1:
           ind: 7,1
-          tiles: AAAAAAAAABQAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAACwAAAAAAACwAAAAAAQALAAAAAAAALAAAAAABAAsAAAAAAAAsAAAAAAIACwAAAAAAACwAAAAAAAALAAAAAAAALAAAAAAFAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAACkAAAAAAwApAAAAAAEAKQAAAAAAACkAAAAAAgApAAAAAAQACwAAAAAAABsAAAAAAAAsAAAAAAIALAAAAAAGAAsAAAAAAAAAAAAAAAAAFAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAApAAAAAAIAKAAAAAACACkAAAAAAgApAAAAAAAAKQAAAAACAAsAAAAAAAAsAAAAAAEALAAAAAABAAsAAAAAAAAbAAAAAAAAFAAAAAABABQAAAAAAQAUAAAAAAIAFAAAAAABABQAAAAAAgAbAAAAAAAAKQAAAAABACkAAAAAAwApAAAAAAQAKAAAAAACACkAAAAAAAAbAAAAAAAALAAAAAACAAsAAAAAAAALAAAAAAAALAAAAAABABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAACkAAAAAAAAoAAAAAAMAKQAAAAADACkAAAAAAQApAAAAAAQALAAAAAACAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAALgAAAAABABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAC4AAAAAAQAbAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAxAAAAAAIAGwAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAABABQAAAAAAAAUAAAAAAAAFAAAAAABABQAAAAAAgAAAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAABsAAAAAAAAbAAAAAAAAHwAAAAAAAA8AAAAAAQAPAAAAAAAADwAAAAABAB8AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAbAAAAAAAAGwAAAAAAAA8AAAAAAAAiAAAAAAAAIgAAAAAAACIAAAAAAAAPAAAAAAEAGwAAAAAAAA==
+          tiles: AAAAAAAAABQAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAACwAAAAAAACwAAAAAAQALAAAAAAAALAAAAAABAAsAAAAAAAAsAAAAAAIACwAAAAAAACwAAAAAAAALAAAAAAAALAAAAAAFAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAACkAAAAAAwApAAAAAAEAKQAAAAAAACkAAAAAAgApAAAAAAQACwAAAAAAABsAAAAAAAAsAAAAAAIALAAAAAAGAAsAAAAAAAAAAAAAAAAAFAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAApAAAAAAIAKAAAAAACACkAAAAAAgApAAAAAAAAKQAAAAACAAsAAAAAAAAsAAAAAAEALAAAAAABAAsAAAAAAAAbAAAAAAAAFAAAAAABABQAAAAAAQAUAAAAAAIAFAAAAAABABQAAAAAAgAbAAAAAAAAKQAAAAABACkAAAAAAwApAAAAAAQAKAAAAAACACkAAAAAAAAbAAAAAAAALAAAAAACAAsAAAAAAAALAAAAAAAALAAAAAABABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAACkAAAAAAAAoAAAAAAMAKQAAAAADACkAAAAAAQApAAAAAAQALAAAAAACAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAALgAAAAABABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAC4AAAAAAQAbAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAxAAAAAAIAGwAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAAAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAAAAAAAAAABQAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAUAAAAAAAAGwAAAAAAABsAAAAAAAAPAAAAAAAAIgAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAACIAAAAAAAAPAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAAAAAAAAAAFAAAAAAAABsAAAAAAAAbAAAAAAAADwAAAAAAAA8AAAAAAAAiAAAAAAAAGwAAAAAAACIAAAAAAAAPAAAAAAAADwAAAAAAAA==
           version: 7
         7,2:
           ind: 7,2
-          tiles: GwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAbAAAAAAAAGwAAAAAAAA8AAAAAAQAiAAAAAAAAIgAAAAAAACIAAAAAAAAPAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAEAGwAAAAAAABsAAAAAAAAPAAAAAAAAIgAAAAAAACIAAAAAAAAiAAAAAAAADwAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAABABsAAAAAAAAbAAAAAAAAHwAAAAAAAA8AAAAAAQAPAAAAAAEADwAAAAAAAB8AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADwAAAAABABsAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAAAQAAAAAAACIAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAEAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAPAAAAAAAADwAAAAABAA8AAAAAAAAeAAAAAAAAHgAAAAAAAAEAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAbAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAAAsAAAAAAAAbAAAAAAAAGgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAALAAAAAAAAGwAAAAAAABoAAAAAAAAdAAAAAAAAHQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABsAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAACwAAAAAAABsAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAAbAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAAA==
+          tiles: GwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAAAAAAAAAAFAAAAAAAABsAAAAAAAAbAAAAAAAADwAAAAAAAA8AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAPAAAAAAAADwAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAAAAAAAAAABQAAAAAAAAbAAAAAAAAGwAAAAAAAA8AAAAAAAAPAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADwAAAAAAAA8AAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAPAAAAAAAAIgAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAACIAAAAAAAAPAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAABAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAAAQAAAAAAACIAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAEAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAEAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAPAAAAAAAADwAAAAABAA8AAAAAAAAeAAAAAAAAHgAAAAAAAAEAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAABAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAbAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAAAsAAAAAAAAbAAAAAAAAGgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAALAAAAAAAAGwAAAAAAABoAAAAAAAAdAAAAAAAAHQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABsAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAACwAAAAAAABsAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAAbAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAAA==
           version: 7
         7,3:
           ind: 7,3
-          tiles: GwAAAAAAABsAAAAAAAAbAAAAAAAAGgAAAAAAABsAAAAAAAAbAAAAAAAAEQAAAAAAABsAAAAAAAAbAAAAAAAAEQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAaAAAAAAAAGgAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAaAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABoAAAAAAAAXAAAAAAAAHQAAAAAAABcAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAbAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABsAAAAAAAAaAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABcAAAAAAAAdAAAAAAAAFwAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABsAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGwAAAAAAABoAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAbAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABsAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABoAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAeAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAEAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAAEAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAB4AAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAABAAAAAAAAA==
+          tiles: GwAAAAAAABsAAAAAAAAbAAAAAAAAGgAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAaAAAAAAAAGgAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAaAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABoAAAAAAAAXAAAAAAAAHQAAAAAAABcAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAbAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABsAAAAAAAAaAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABcAAAAAAAAdAAAAAAAAFwAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABsAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGwAAAAAAABoAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAbAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABsAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABoAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAQAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAeAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAEAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAAEAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAB4AAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAABAAAAAAAAA==
           version: 7
         7,4:
           ind: 7,4
@@ -377,11 +377,11 @@ entities:
           version: 7
         8,1:
           ind: 8,1
-          tiles: LAAAAAABACwAAAAAAAAsAAAAAAUAGwAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAQAsAAAAAAYACwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALAAAAAAAACwAAAAAAACwAAAAAAgAbAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAIAFAAAAAABABQAAAAAAAAUAAAAAAIAFAAAAAACABQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALAAAAAACAAsAAAAAAAAsAAAAAAIAGwAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAIAAAAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACAAAAAAAAAAAAAAAAAAAAFAAAAAACAAAAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAUAAAAAAIAFAAAAAABABQAAAAAAgAUAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABQAAAAAAgAUAAAAAAEAFAAAAAABABQAAAAAAAAbAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAAAsAAAAAAAAsAAAAAAAACwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABQAAAAAAgAAAAAAAAAAAAAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: LAAAAAABACwAAAAAAAAsAAAAAAUAGwAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAQAsAAAAAAYACwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALAAAAAAAACwAAAAAAACwAAAAAAgAbAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAIAFAAAAAABABQAAAAAAAAUAAAAAAIAFAAAAAACABQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALAAAAAACAAsAAAAAAAAsAAAAAAIAGwAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAIAAAAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAACAAAAAAAAAAAAAAAAAAAAFAAAAAACAAAAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAUAAAAAAIAFAAAAAABABQAAAAAAgAUAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAAAAAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABQAAAAAAgAUAAAAAAEAFAAAAAABABQAAAAAAAAbAAAAAAAAGwAAAAAAABQAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAAAsAAAAAAAAsAAAAAAAACwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAUAAAAAAAAAAAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         8,2:
           ind: 8,2
-          tiles: GwAAAAAAABQAAAAAAQAAAAAAAAAAAAAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAACIAAAAAAAA1AAAAAAAANQAAAAAAADUAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAUAAAAAAEAAAAAAAAAAAAAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAbAAAAAAAACwAAAAAAAAsAAAAAAAAsAAAAAAIAGwAAAAAAABQAAAAAAgAUAAAAAAAAFAAAAAABABQAAAAAAgAbAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAABsAAAAAAAAUAAAAAAEAFAAAAAAAABQAAAAAAQAAAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAABQAAAAAAgAUAAAAAAAAAAAAAAAAABsAAAAAAAAUAAAAAAEAFAAAAAAAABQAAAAAAQAbAAAAAAAAHgAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAAB4AAAAAAAAeAAAAAAAAGwAAAAAAABQAAAAAAgAUAAAAAAEAFAAAAAABAAAAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAgAAAAAAAAAAGwAAAAAAAB4AAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAUAAAAAAIAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAbAAAAAAAAFAAAAAACAAAAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAIQAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIQAAAAAAACEAAAAAAAAhAAAAAAAAIQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAALAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABQAAAAAAQAAAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAALAAAAAAEAAMAAAAAAAALAAAAAAAAAwAAAAAAACEAAAAAAAAhAAAAAAAAIQAAAAAAABsAAAAAAAAUAAAAAAAAAAAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAAAMAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAAhAAAAAAAAIQAAAAAAACEAAAAAAAAbAAAAAAAAFAAAAAACAAAAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAALAAAAAAAACwAAAAAAAAMAAAAAAAADAAAAAAAAIQAAAAAAACEAAAAAAAAhAAAAAAAAGwAAAAAAABQAAAAAAQAAAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAsAAAAAAEACwAAAAAAACEAAAAAAAAhAAAAAAAAIQAAAAAAABsAAAAAAAAUAAAAAAAAFAAAAAACAA==
+          tiles: GwAAAAAAABsAAAAAAAAUAAAAAAAAAAAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAACIAAAAAAAA1AAAAAAAANQAAAAAAADUAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAAAAAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAbAAAAAAAACwAAAAAAAAsAAAAAAAAsAAAAAAIAGwAAAAAAABQAAAAAAgAUAAAAAAAAFAAAAAABABQAAAAAAgAbAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAABsAAAAAAAAUAAAAAAEAFAAAAAAAABQAAAAAAQAAAAAAAAAAGwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAABQAAAAAAgAUAAAAAAAAAAAAAAAAABsAAAAAAAAUAAAAAAEAFAAAAAAAABQAAAAAAQAbAAAAAAAAHgAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAAB4AAAAAAAAeAAAAAAAAGwAAAAAAABQAAAAAAgAUAAAAAAEAFAAAAAABAAAAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAgAAAAAAAAAAGwAAAAAAAB4AAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAUAAAAAAIAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAbAAAAAAAAFAAAAAACAAAAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAIQAAAAAAABsAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIQAAAAAAACEAAAAAAAAhAAAAAAAAIQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAALAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABQAAAAAAQAAAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAALAAAAAAEAAMAAAAAAAALAAAAAAAAAwAAAAAAACEAAAAAAAAhAAAAAAAAIQAAAAAAABsAAAAAAAAUAAAAAAAAAAAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAAAMAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAAhAAAAAAAAIQAAAAAAACEAAAAAAAAbAAAAAAAAFAAAAAACAAAAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAALAAAAAAAACwAAAAAAAAMAAAAAAAADAAAAAAAAIQAAAAAAACEAAAAAAAAhAAAAAAAAGwAAAAAAABQAAAAAAQAAAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAsAAAAAAEACwAAAAAAACEAAAAAAAAhAAAAAAAAIQAAAAAAABsAAAAAAAAUAAAAAAAAFAAAAAACAA==
           version: 7
         8,3:
           ind: 8,3
@@ -389,7 +389,7 @@ entities:
           version: 7
         8,4:
           ind: 8,4
-          tiles: BAAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAEAAAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAABQAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAfAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAABQAAAAAAQAbAAAAAAAAGwAAAAAAABsAAAAAAAAUAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAHwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAfAAAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAUAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAHwAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgAUAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABQAAAAAAgAUAAAAAAAAFAAAAAABABQAAAAAAgAUAAAAAAEAFAAAAAABAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIQAAAAAAACEAAAAAAAAhAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAhAAAAAAAAIQAAAAAAACEAAAAAAAAhAAAAAAAAIQAAAAAAAA==
+          tiles: BAAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAGwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAEAAAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAACIAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAABQAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAfAAAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAABQAAAAAAQAbAAAAAAAAGwAAAAAAABsAAAAAAAAUAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAHwAAAAAAACIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAfAAAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAUAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAHwAAAAAAACIAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgAUAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABQAAAAAAgAUAAAAAAAAFAAAAAABABQAAAAAAgAUAAAAAAEAFAAAAAABAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAIgAAAAAAABsAAAAAAAAbAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAiAAAAAAAAGwAAAAAAABsAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAeAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAIQAAAAAAACEAAAAAAAAhAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGwAAAAAAAB4AAAAAAAAbAAAAAAAAHgAAAAAAABsAAAAAAAAhAAAAAAAAIQAAAAAAACEAAAAAAAAhAAAAAAAAIQAAAAAAAA==
           version: 7
         8,5:
           ind: 8,5
@@ -1250,7 +1250,7 @@ entities:
           14,3:
             2: 53520
           14,8:
-            2: 7629
+            2: 40397
           15,4:
             2: 48063
           15,5:
@@ -1293,7 +1293,7 @@ entities:
           15,12:
             2: 62383
           16,8:
-            2: 48059
+            2: 49083
           16,9:
             2: 48051
           16,10:
@@ -1456,9 +1456,9 @@ entities:
           18,6:
             2: 57565
           18,7:
-            2: 65262
+            2: 61166
           18,8:
-            2: 4095
+            2: 3839
           19,5:
             2: 65280
             0: 2
@@ -1486,7 +1486,7 @@ entities:
           17,9:
             2: 65526
           17,10:
-            2: 65295
+            2: 65287
           17,11:
             2: 48063
           18,9:
@@ -1542,7 +1542,7 @@ entities:
           19,16:
             2: 65295
           20,12:
-            2: 64432
+            2: 62448
           20,13:
             2: 255
           20,14:
@@ -1569,7 +1569,7 @@ entities:
             2: 127
             3: 28928
           19,17:
-            2: 61695
+            2: 62719
           19,18:
             2: 65535
           19,19:
@@ -1677,7 +1677,7 @@ entities:
           22,4:
             0: 34944
           23,4:
-            0: 35056
+            0: 34928
             1: 30208
           22,5:
             0: 8
@@ -1691,12 +1691,12 @@ entities:
           23,8:
             2: 63743
           24,4:
-            0: 61440
+            0: 65504
           24,5:
-            0: 34959
-            2: 13056
+            0: 52431
+            2: 4352
           24,6:
-            2: 8177
+            2: 8185
           24,7:
             2: 13107
             0: 34952
@@ -1719,7 +1719,7 @@ entities:
           23,10:
             2: 65455
           23,11:
-            2: 53007
+            2: 61199
           23,12:
             2: 65038
           24,8:
@@ -1905,16 +1905,17 @@ entities:
           24,32:
             0: 36744
           25,4:
-            0: 30576
+            0: 14192
           25,5:
-            0: 30583
+            0: 29491
           25,6:
-            0: 30583
+            2: 273
+            0: 17476
           25,7:
-            0: 1
+            0: 7
           26,7:
-            0: 25190
-            2: 1024
+            0: 25126
+            2: 1088
           26,4:
             0: 49152
           26,5:
@@ -2096,12 +2097,12 @@ entities:
             2: 57582
           26,28:
             2: 61166
+          27,25:
+            2: 64248
           27,26:
             2: 65320
           27,27:
             2: 61695
-          27,25:
-            2: 43688
           27,28:
             2: 65535
           28,24:
@@ -2174,26 +2175,26 @@ entities:
             0: 136
           29,5:
             2: 65292
+          29,7:
+            0: 17472
+          29,8:
+            0: 68
           30,5:
             2: 65295
-          29,7:
-            0: 34816
-          29,8:
-            0: 2184
           30,7:
-            2: 52224
-          30,6:
-            0: 49152
+            2: 61152
           30,8:
-            2: 3148
+            2: 3694
+          30,6:
+            0: 3072
           31,5:
             2: 65311
           31,6:
-            0: 28672
+            0: 1792
           31,7:
-            2: 30464
+            2: 65520
           31,8:
-            2: 1879
+            2: 8159
           32,4:
             2: 30583
           32,5:
@@ -2398,9 +2399,9 @@ entities:
           33,4:
             0: 19524
           32,7:
-            0: 8704
+            0: 17472
           32,8:
-            0: 546
+            0: 68
           33,5:
             2: 63232
             0: 4
@@ -2873,62 +2874,62 @@ entities:
     - type: GridSplitNode
     - type: ChunkContainer
       chunkEntities:
-      - 25160
-      - 25161
-      - 25162
-      - 25163
-      - 25164
-      - 25165
-      - 25166
-      - 25167
-      - 25168
-      - 25169
-      - 25170
-      - 25171
-      - 25172
-      - 25173
-      - 25174
-      - 25175
-      - 25176
-      - 25177
-      - 25178
-      - 25179
-      - 25180
-      - 25181
-      - 25182
-      - 25183
-      - 25184
-      - 25185
-      - 25186
-      - 25187
-      - 25188
-      - 25189
-      - 25190
-      - 25191
-      - 25192
-      - 25193
-      - 25194
-      - 25195
-      - 25196
-      - 25197
-      - 25198
-      - 25199
-      - 25200
-      - 25201
-      - 25202
-      - 25203
-      - 25204
-      - 25205
-      - 25206
-      - 25207
-      - 25208
-      - 25209
-      - 25210
-      - 25211
-      - 25212
-      - 25213
-      - 25214
-      - 25215
+      - 25441
+      - 25442
+      - 25443
+      - 25444
+      - 25445
+      - 25446
+      - 25447
+      - 25448
+      - 25449
+      - 25450
+      - 25451
+      - 25452
+      - 25453
+      - 25454
+      - 25455
+      - 25456
+      - 25457
+      - 25458
+      - 25459
+      - 25460
+      - 25461
+      - 25462
+      - 25463
+      - 25464
+      - 25465
+      - 25466
+      - 25467
+      - 25468
+      - 25469
+      - 25470
+      - 25471
+      - 25472
+      - 25473
+      - 25474
+      - 25475
+      - 25476
+      - 25477
+      - 25478
+      - 25479
+      - 25480
+      - 25481
+      - 25482
+      - 25483
+      - 25484
+      - 25485
+      - 25486
+      - 25487
+      - 25488
+      - 25489
+      - 25490
+      - 25491
+      - 25492
+      - 25493
+      - 25494
+      - 25495
+      - 25496
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 3
@@ -3200,21 +3201,6 @@ entities:
       - 11688
       - 11687
       - 11689
-  - uid: 20
-    components:
-    - type: MetaData
-      name: Air Alarm Tools
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 61.5,75.5
-    - type: DeviceList
-      devices:
-      - 15008
-      - 575
-      - 15184
-      - 11691
-      - 11690
   - uid: 21
     components:
     - type: MetaData
@@ -3362,22 +3348,6 @@ entities:
       - 613
       - 11524
       - 15123
-  - uid: 30
-    components:
-    - type: MetaData
-      name: Air Alarm Psychology
-    - type: Transform
-      parent: 2
-      pos: 110.5,48.5
-    - type: AccessReader
-      accessListsOriginal:
-      - - Atmospherics
-    - type: DeviceList
-      devices:
-      - 15210
-      - 605
-      - 15031
-      - 11548
   - uid: 31
     components:
     - type: MetaData
@@ -3413,22 +3383,6 @@ entities:
       - 15017
       - 589
       - 15193
-  - uid: 32
-    components:
-    - type: MetaData
-      name: Air Alarm Security Checkpoint
-    - type: Transform
-      parent: 2
-      pos: 69.5,48.5
-    - type: DeviceList
-      devices:
-      - 11541
-      - 11750
-      - 11748
-      - 11749
-      - 15015
-      - 591
-      - 15191
   - uid: 33
     components:
     - type: MetaData
@@ -3854,28 +3808,6 @@ entities:
       - 11788
       - 11787
       - 11786
-  - uid: 56
-    components:
-    - type: MetaData
-      name: Air Alarm East Dock
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 131.5,90.5
-    - type: AccessReader
-      accessListsOriginal:
-      - - Atmospherics
-    - type: DeviceList
-      devices:
-      - 14602
-      - 11791
-      - 11790
-      - 11786
-      - 11787
-      - 11788
-      - 11842
-      - 6802
-      - 17291
   - uid: 57
     components:
     - type: MetaData
@@ -4454,21 +4386,6 @@ entities:
       - 15276
       - 680
       - 15102
-  - uid: 87
-    components:
-    - type: MetaData
-      name: Air Alarm Botany Deliveries
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 65.5,81.5
-    - type: DeviceList
-      devices:
-      - 15283
-      - 15106
-      - 685
-      - 11675
-      - 11669
   - uid: 88
     components:
     - type: MetaData
@@ -4744,7 +4661,7 @@ entities:
       - 15120
       - 15294
       - 11579
-      - 11580
+      - 240
   - uid: 104
     components:
     - type: MetaData
@@ -5027,25 +4944,21 @@ entities:
   - uid: 123
     components:
     - type: MetaData
-      name: Air Alarm Cargo Bay
+      name: Air Alarm Cargo Telepad
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
       pos: 69.5,30.5
     - type: DeviceList
       devices:
+      - 9279
       - 11740
       - 11739
-      - 11737
-      - 11738
-      - 11742
-      - 15020
-      - 594
-      - 15196
-      - 15197
-      - 593
-      - 15021
       - 11741
+      - 25380
+      - 9615
+      - 25374
+      - 25381
   - uid: 124
     components:
     - type: MetaData
@@ -5213,21 +5126,24 @@ entities:
       - 15142
       - 717
       - 14967
-  - uid: 134
+  - uid: 527
     components:
     - type: MetaData
-      desc: Air Alarm Medical Deliveries
+      name: Air Alarm Cargo Bay
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
-      pos: 100.5,47.5
+      pos: 76.5,26.5
     - type: DeviceList
       devices:
-      - 600
-      - 15030
-      - 15207
-      - 11612
-      - 11578
+      - 11742
+      - 11738
+      - 11737
+      - 25383
+      - 17484
+      - 14911
+      - 25380
+      - 25381
   - uid: 9148
     components:
     - type: MetaData
@@ -5263,6 +5179,19 @@ entities:
       - 10264
       - 10262
       - 520
+  - uid: 11936
+    components:
+    - type: MetaData
+      name: Air Alarm Psychology
+    - type: Transform
+      parent: 2
+      pos: 109.5,48.5
+    - type: DeviceList
+      devices:
+      - 15210
+      - 605
+      - 15031
+      - 11548
   - uid: 17437
     components:
     - type: MetaData
@@ -5277,6 +5206,21 @@ entities:
       - 14964
       - 11555
       - 15309
+  - uid: 17654
+    components:
+    - type: MetaData
+      name: Air Alarm Botany Deliveries
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 63.5,76.5
+    - type: DeviceList
+      devices:
+      - 15283
+      - 15106
+      - 25402
+      - 11675
+      - 11669
   - uid: 17782
     components:
     - type: MetaData
@@ -5286,8 +5230,8 @@ entities:
       pos: 94.5,34.5
     - type: DeviceList
       devices:
-      - 11827
-      - 11631
+      - 871
+      - 872
       - 15200
       - 15024
       - 15025
@@ -5296,6 +5240,36 @@ entities:
       - 117
       - 24001
       - 23999
+  - uid: 17794
+    components:
+    - type: MetaData
+      name: Air Alarm Tools
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 61.5,74.5
+    - type: DeviceList
+      devices:
+      - 15008
+      - 575
+      - 15184
+      - 11691
+      - 11690
+  - uid: 20226
+    components:
+    - type: MetaData
+      name: Air Alarm Medical Deliveries
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 96.5,51.5
+    - type: DeviceList
+      devices:
+      - 600
+      - 15030
+      - 15207
+      - 11612
+      - 11578
   - uid: 20641
     components:
     - type: MetaData
@@ -5309,6 +5283,40 @@ entities:
       - 19394
       - 16830
       - 20717
+  - uid: 21851
+    components:
+    - type: MetaData
+      desc: Air Alarm Security Checkpoint
+    - type: Transform
+      parent: 2
+      pos: 66.5,48.5
+    - type: DeviceList
+      devices:
+      - 11541
+      - 11750
+      - 11748
+      - 11749
+      - 15015
+      - 591
+      - 15191
+  - uid: 25169
+    components:
+    - type: MetaData
+      desc: Air Alarm East Dock
+    - type: Transform
+      parent: 2
+      pos: 142.5,90.5
+    - type: DeviceList
+      devices:
+      - 14602
+      - 11791
+      - 11790
+      - 11786
+      - 11787
+      - 11788
+      - 11842
+      - 6802
+      - 17291
 - proto: AirAlarmElectronics
   entities:
   - uid: 135
@@ -5641,6 +5649,18 @@ entities:
     - type: Transform
       parent: 2
       pos: 70.5,30.5
+  - uid: 10302
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 72.5,33.5
+  - uid: 10320
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 72.5,32.5
 - proto: AirlockChapelLocked
   entities:
   - uid: 188
@@ -5941,11 +5961,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 110.5,26.5
-  - uid: 240
-    components:
-    - type: Transform
-      parent: 2
-      pos: 83.5,50.5
   - uid: 241
     components:
     - type: Transform
@@ -6006,6 +6021,12 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 106.5,125.5
+  - uid: 20414
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 82.5,49.5
 - proto: AirlockEVAGlassLocked
   entities:
   - uid: 251
@@ -6048,6 +6069,32 @@ entities:
         252:
         - - DoorStatus
           - DoorBolt
+- proto: AirlockExternalCargoLocked
+  entities:
+  - uid: 18829
+    components:
+    - type: Transform
+      parent: 2
+      pos: 99.5,24.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        25369:
+        - - DoorStatus
+          - InputB
+  - uid: 20617
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,24.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        25369:
+        - - DoorStatus
+          - InputB
 - proto: AirlockExternalEngineeringLocked
   entities:
   - uid: 254
@@ -6204,32 +6251,6 @@ entities:
           - DoorBolt
 - proto: AirlockExternalGlassCargoLocked
   entities:
-  - uid: 266
-    components:
-    - type: Transform
-      parent: 2
-      rot: 4.71238898038469 rad
-      pos: 99.5,26.5
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        524:
-        - - DoorStatus
-          - DoorBolt
-  - uid: 267
-    components:
-    - type: Transform
-      parent: 2
-      rot: 4.71238898038469 rad
-      pos: 99.5,25.5
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        524:
-        - - DoorStatus
-          - DoorBolt
   - uid: 269
     components:
     - type: Transform
@@ -6665,18 +6686,18 @@ entities:
       pos: 72.5,82.5
 - proto: AirlockGlass
   entities:
+  - uid: 134
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 51.5,67.5
   - uid: 310
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 104.5,87.5
-  - uid: 311
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 51.5,67.5
   - uid: 312
     components:
     - type: Transform
@@ -7029,18 +7050,18 @@ entities:
       pos: 94.5,111.5
 - proto: AirlockHydroGlassLocked
   entities:
+  - uid: 311
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 52.5,82.5
   - uid: 375
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 52.5,81.5
-  - uid: 376
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 52.5,82.5
   - uid: 377
     components:
     - type: Transform
@@ -7247,6 +7268,12 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 66.5,24.5
+  - uid: 21861
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 66.5,34.5
 - proto: AirlockMaintChapelLocked
   entities:
   - uid: 415
@@ -7781,11 +7808,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 115.5,54.5
-  - uid: 504
-    components:
-    - type: Transform
-      parent: 2
-      pos: 111.5,48.5
   - uid: 505
     components:
     - type: Transform
@@ -7835,10 +7857,14 @@ entities:
     components:
     - type: Transform
       parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 108.5,59.5
+      pos: 92.5,95.5
 - proto: AirlockMedicalLocked
   entities:
+  - uid: 376
+    components:
+    - type: Transform
+      parent: 2
+      pos: 111.5,48.5
   - uid: 513
     components:
     - type: Transform
@@ -7848,7 +7874,8 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 92.5,95.5
+      rot: 1.5707963267948966 rad
+      pos: 108.5,59.5
   - uid: 516
     components:
     - type: Transform
@@ -7904,7 +7931,25 @@ entities:
       pos: 123.5,81.5
 - proto: AirlockSalvageGlassLocked
   entities:
-  - uid: 524
+  - uid: 536
+    components:
+    - type: Transform
+      parent: 2
+      pos: 96.5,41.5
+  - uid: 11464
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 97.5,25.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        25370:
+        - - DoorStatus
+          - InputB
+  - uid: 11631
     components:
     - type: Transform
       parent: 2
@@ -7914,23 +7959,9 @@ entities:
       invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
-        266:
+        25370:
         - - DoorStatus
-          - DoorBolt
-        267:
-        - - DoorStatus
-          - DoorBolt
-  - uid: 525
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 97.5,25.5
-  - uid: 536
-    components:
-    - type: Transform
-      parent: 2
-      pos: 96.5,41.5
+          - InputA
   - uid: 17282
     components:
     - type: Transform
@@ -8304,8 +8335,8 @@ entities:
       pos: 56.5,73.5
     - type: DeviceNetwork
       deviceLists:
-      - 20
       - 11490
+      - 17794
   - uid: 576
     components:
     - type: Transform
@@ -8341,7 +8372,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 23
-      - 11463
+      - 10669
   - uid: 581
     components:
     - type: Transform
@@ -8435,7 +8466,7 @@ entities:
       pos: 66.5,46.5
     - type: DeviceNetwork
       deviceLists:
-      - 32
+      - 21851
   - uid: 592
     components:
     - type: Transform
@@ -8445,24 +8476,6 @@ entities:
       deviceLists:
       - 11487
       - 124
-  - uid: 593
-    components:
-    - type: Transform
-      parent: 2
-      pos: 68.5,33.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 11451
-      - 123
-  - uid: 594
-    components:
-    - type: Transform
-      parent: 2
-      pos: 75.5,28.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 11451
-      - 123
   - uid: 595
     components:
     - type: Transform
@@ -8515,7 +8528,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 11432
-      - 134
+      - 20226
   - uid: 601
     components:
     - type: Transform
@@ -8557,7 +8570,7 @@ entities:
       pos: 110.5,46.5
     - type: DeviceNetwork
       deviceLists:
-      - 30
+      - 11936
   - uid: 606
     components:
     - type: Transform
@@ -9156,14 +9169,6 @@ entities:
       deviceLists:
       - 88
       - 137
-  - uid: 685
-    components:
-    - type: Transform
-      parent: 2
-      pos: 64.5,81.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 87
   - uid: 686
     components:
     - type: Transform
@@ -9475,8 +9480,8 @@ entities:
       pos: 135.5,88.5
     - type: DeviceNetwork
       deviceLists:
-      - 56
-      - 11464
+      - 25169
+      - 25168
   - uid: 10264
     components:
     - type: Transform
@@ -9562,6 +9567,33 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 20641
+  - uid: 25374
+    components:
+    - type: Transform
+      parent: 2
+      pos: 67.5,33.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 11451
+      - 123
+  - uid: 25383
+    components:
+    - type: Transform
+      parent: 2
+      pos: 75.5,31.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 527
+      - 11451
+  - uid: 25402
+    components:
+    - type: Transform
+      parent: 2
+      pos: 60.5,80.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 11457
+      - 17654
 - proto: AirSensorFreezer
   entities:
   - uid: 723
@@ -9621,82 +9653,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 43.5,93.5
-- proto: AlwaysPoweredLightExterior
-  entities:
-  - uid: 730
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 116.5,134.5
-  - uid: 731
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 143.5,128.5
-  - uid: 732
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 145.5,42.5
-- proto: AlwaysPoweredlightGreen
-  entities:
-  - uid: 733
-    components:
-    - type: Transform
-      parent: 2
-      pos: 124.5,82.5
-- proto: AlwaysPoweredLightLED
-  entities:
-  - uid: 734
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 81.5,49.5
-  - uid: 735
-    components:
-    - type: Transform
-      parent: 2
-      pos: 74.5,47.5
-  - uid: 736
-    components:
-    - type: Transform
-      parent: 2
-      pos: 81.5,47.5
-  - uid: 737
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 74.5,49.5
-- proto: AlwaysPoweredlightPink
-  entities:
-  - uid: 738
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 130.5,74.5
-  - uid: 739
-    components:
-    - type: Transform
-      parent: 2
-      pos: 132.5,81.5
-  - uid: 740
-    components:
-    - type: Transform
-      parent: 2
-      pos: 128.5,81.5
-- proto: AlwaysPoweredlightRed
-  entities:
-  - uid: 18507
-    components:
-    - type: Transform
-      parent: 2
-      pos: 114.5,104.5
 - proto: AmeController
   entities:
   - uid: 742
@@ -9718,14 +9674,22 @@ entities:
       pos: 127.369,75.844246
 - proto: APCBasic
   entities:
-  - uid: 745
+  - uid: 658
     components:
     - type: MetaData
-      name: APC Comms
+      name: APC S.A.S.H.I.M.I. Engineering
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
-      pos: 43.5,43.5
+      pos: 62.5,50.5
+  - uid: 737
+    components:
+    - type: MetaData
+      name: APC S.A.S.H.I.M.I. Medical
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 92.5,50.5
   - uid: 746
     components:
     - type: MetaData
@@ -10158,22 +10122,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 39.5,107.5
-  - uid: 800
-    components:
-    - type: MetaData
-      name: APC S.A.S.H.I.M.I. Engineering
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 63.5,50.5
-  - uid: 801
-    components:
-    - type: MetaData
-      name: APC S.A.S.H.I.M.I. Medical
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 92.5,50.5
   - uid: 802
     components:
     - type: MetaData
@@ -10182,14 +10130,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 59.5,64.5
-  - uid: 803
-    components:
-    - type: MetaData
-      name: APC S.A.S.H.I.M.I. Entrance
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 73.5,50.5
   - uid: 804
     components:
     - type: MetaData
@@ -10226,13 +10166,6 @@ entities:
     - type: AccessReader
       accessListsOriginal:
       - - Engineering
-  - uid: 808
-    components:
-    - type: MetaData
-      name: APC Salvage Maints
-    - type: Transform
-      parent: 2
-      pos: 93.5,47.5
   - uid: 809
     components:
     - type: MetaData
@@ -10457,6 +10390,28 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 56.5,79.5
+  - uid: 19603
+    components:
+    - type: MetaData
+      name: APC S.A.S.H.I.M.I. Entrance
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 73.5,49.5
+  - uid: 24194
+    components:
+    - type: MetaData
+      name: APC Salvage Maints
+    - type: Transform
+      parent: 2
+      pos: 92.5,47.5
+  - uid: 25430
+    components:
+    - type: MetaData
+      name: APC Comms
+    - type: Transform
+      parent: 2
+      pos: 42.5,44.5
 - proto: APCElectronics
   entities:
   - uid: 832
@@ -10579,13 +10534,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 92.418915,104.72072
-- proto: AsimovCircuitBoard
-  entities:
-  - uid: 852
-    components:
-    - type: Transform
-      parent: 2
-      pos: 87.43229,72.23507
 - proto: AtmosDeviceFanDirectional
   entities:
   - uid: 853
@@ -10606,18 +10554,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 71.5,85.5
-  - uid: 856
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 99.5,26.5
-  - uid: 857
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 99.5,25.5
   - uid: 858
     components:
     - type: Transform
@@ -10695,18 +10631,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 6.5,70.5
-  - uid: 871
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 82.5,30.5
-  - uid: 872
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 82.5,32.5
   - uid: 873
     components:
     - type: Transform
@@ -13673,11 +13597,6 @@ entities:
       pos: 125.43439,56.56332
 - proto: BoxFolderYellow
   entities:
-  - uid: 1136
-    components:
-    - type: Transform
-      parent: 2
-      pos: 72.55572,41.411476
   - uid: 1137
     components:
     - type: Transform
@@ -13693,6 +13612,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 53.570915,35.361526
+  - uid: 18415
+    components:
+    - type: Transform
+      parent: 2
+      pos: 74.59004,40.555794
 - proto: BoxFolderYellowThreePapers
   entities:
   - uid: 11397
@@ -13870,6 +13794,12 @@ entities:
       pos: 73.5,84.5
 - proto: ButtonFrameCaution
   entities:
+  - uid: 808
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 107.5,29.5
   - uid: 1164
     components:
     - type: Transform
@@ -14024,12 +13954,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 74.5,97.5
-  - uid: 1193
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 108.5,47.5
   - uid: 1194
     components:
     - type: Transform
@@ -14046,12 +13970,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 107.5,37.5
-  - uid: 1197
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 112.5,28.5
   - uid: 1198
     components:
     - type: Transform
@@ -14080,6 +13998,12 @@ entities:
     - type: Transform
       parent: 2
       pos: 110.5,65.5
+  - uid: 19553
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 110.5,44.5
 - proto: ButtonFrameWhite
   entities:
   - uid: 1186
@@ -14134,11 +14058,26 @@ entities:
     - type: Transform
       parent: 2
       pos: 116.5,103.5
+  - uid: 800
+    components:
+    - type: Transform
+      parent: 2
+      pos: 62.5,51.5
+  - uid: 801
+    components:
+    - type: Transform
+      parent: 2
+      pos: 62.5,50.5
   - uid: 839
     components:
     - type: Transform
       parent: 2
       pos: 84.5,118.5
+  - uid: 1197
+    components:
+    - type: Transform
+      parent: 2
+      pos: 56.5,51.5
   - uid: 1201
     components:
     - type: Transform
@@ -14274,11 +14213,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 58.5,24.5
-  - uid: 1229
-    components:
-    - type: Transform
-      parent: 2
-      pos: 43.5,43.5
   - uid: 1230
     components:
     - type: Transform
@@ -14998,12 +14932,12 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 79.5,27.5
+      pos: 75.5,26.5
   - uid: 1377
     components:
     - type: Transform
       parent: 2
-      pos: 80.5,27.5
+      pos: 74.5,26.5
   - uid: 1378
     components:
     - type: Transform
@@ -15403,7 +15337,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 80.5,22.5
+      pos: 81.5,22.5
   - uid: 1461
     components:
     - type: Transform
@@ -15888,7 +15822,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 124.5,59.5
+      pos: 81.5,23.5
   - uid: 1558
     components:
     - type: Transform
@@ -15943,12 +15877,12 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 125.5,59.5
+      pos: 125.5,58.5
   - uid: 1569
     components:
     - type: Transform
       parent: 2
-      pos: 126.5,59.5
+      pos: 126.5,58.5
   - uid: 1570
     components:
     - type: Transform
@@ -16958,12 +16892,12 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 103.5,88.5
+      pos: 102.5,88.5
   - uid: 1772
     components:
     - type: Transform
       parent: 2
-      pos: 103.5,89.5
+      pos: 108.5,90.5
   - uid: 1773
     components:
     - type: Transform
@@ -17403,7 +17337,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 107.5,100.5
+      pos: 100.5,100.5
   - uid: 1861
     components:
     - type: Transform
@@ -17413,7 +17347,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 107.5,98.5
+      pos: 99.5,100.5
   - uid: 1863
     components:
     - type: Transform
@@ -17478,7 +17412,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 102.5,97.5
+      pos: 101.5,96.5
   - uid: 1876
     components:
     - type: Transform
@@ -17508,7 +17442,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 93.5,96.5
+      pos: 91.5,95.5
   - uid: 1882
     components:
     - type: Transform
@@ -18043,12 +17977,12 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 95.5,92.5
+      pos: 95.5,93.5
   - uid: 1989
     components:
     - type: Transform
       parent: 2
-      pos: 96.5,92.5
+      pos: 96.5,93.5
   - uid: 1990
     components:
     - type: Transform
@@ -18073,47 +18007,47 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 97.5,92.5
+      pos: 97.5,93.5
   - uid: 1995
     components:
     - type: Transform
       parent: 2
-      pos: 98.5,92.5
+      pos: 98.5,93.5
   - uid: 1996
     components:
     - type: Transform
       parent: 2
-      pos: 99.5,92.5
+      pos: 100.5,93.5
   - uid: 1997
     components:
     - type: Transform
       parent: 2
-      pos: 100.5,92.5
+      pos: 101.5,93.5
   - uid: 1998
     components:
     - type: Transform
       parent: 2
-      pos: 101.5,92.5
+      pos: 102.5,93.5
   - uid: 1999
     components:
     - type: Transform
       parent: 2
-      pos: 102.5,92.5
+      pos: 103.5,93.5
   - uid: 2000
     components:
     - type: Transform
       parent: 2
-      pos: 103.5,92.5
+      pos: 99.5,93.5
   - uid: 2001
     components:
     - type: Transform
       parent: 2
-      pos: 104.5,92.5
+      pos: 104.5,93.5
   - uid: 2002
     components:
     - type: Transform
       parent: 2
-      pos: 105.5,92.5
+      pos: 105.5,93.5
   - uid: 2003
     components:
     - type: Transform
@@ -18128,12 +18062,12 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 105.5,88.5
+      pos: 108.5,92.5
   - uid: 2006
     components:
     - type: Transform
       parent: 2
-      pos: 105.5,89.5
+      pos: 109.5,92.5
   - uid: 2007
     components:
     - type: Transform
@@ -18213,12 +18147,12 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 80.5,87.5
+      pos: 80.5,77.5
   - uid: 2032
     components:
     - type: Transform
       parent: 2
-      pos: 80.5,86.5
+      pos: 80.5,76.5
   - uid: 2033
     components:
     - type: Transform
@@ -20878,7 +20812,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 19.5,46.5
+      pos: 25.5,48.5
   - uid: 2565
     components:
     - type: Transform
@@ -20898,12 +20832,12 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 19.5,42.5
+      pos: 18.5,45.5
   - uid: 2569
     components:
     - type: Transform
       parent: 2
-      pos: 19.5,41.5
+      pos: 18.5,46.5
   - uid: 2570
     components:
     - type: Transform
@@ -22558,17 +22492,17 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 72.5,59.5
+      pos: 72.5,58.5
   - uid: 2904
     components:
     - type: Transform
       parent: 2
-      pos: 71.5,59.5
+      pos: 73.5,58.5
   - uid: 2905
     components:
     - type: Transform
       parent: 2
-      pos: 70.5,59.5
+      pos: 71.5,58.5
   - uid: 2906
     components:
     - type: Transform
@@ -22618,17 +22552,17 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 83.5,59.5
+      pos: 82.5,58.5
   - uid: 2916
     components:
     - type: Transform
       parent: 2
-      pos: 85.5,59.5
+      pos: 84.5,58.5
   - uid: 2917
     components:
     - type: Transform
       parent: 2
-      pos: 84.5,59.5
+      pos: 83.5,58.5
   - uid: 2918
     components:
     - type: Transform
@@ -23478,22 +23412,22 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 48.5,23.5
+      pos: 43.5,29.5
   - uid: 3088
     components:
     - type: Transform
       parent: 2
-      pos: 48.5,22.5
+      pos: 42.5,30.5
   - uid: 3089
     components:
     - type: Transform
       parent: 2
-      pos: 48.5,25.5
+      pos: 41.5,29.5
   - uid: 3090
     components:
     - type: Transform
       parent: 2
-      pos: 48.5,26.5
+      pos: 42.5,29.5
   - uid: 3091
     components:
     - type: Transform
@@ -23548,7 +23482,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 56.5,50.5
+      pos: 74.5,50.5
   - uid: 3102
     components:
     - type: Transform
@@ -24013,12 +23947,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 73.5,50.5
-  - uid: 3213
-    components:
-    - type: Transform
-      parent: 2
-      pos: 73.5,51.5
+      pos: 75.5,50.5
   - uid: 3214
     components:
     - type: Transform
@@ -24204,26 +24133,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 63.5,52.5
-  - uid: 3251
-    components:
-    - type: Transform
-      parent: 2
-      pos: 63.5,51.5
-  - uid: 3252
-    components:
-    - type: Transform
-      parent: 2
-      pos: 63.5,50.5
   - uid: 3253
     components:
     - type: Transform
       parent: 2
       pos: 62.5,52.5
-  - uid: 3254
-    components:
-    - type: Transform
-      parent: 2
-      pos: 61.5,52.5
   - uid: 3255
     components:
     - type: Transform
@@ -24233,17 +24147,17 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 61.5,50.5
+      pos: 60.5,51.5
   - uid: 3257
     components:
     - type: Transform
       parent: 2
-      pos: 60.5,50.5
+      pos: 57.5,51.5
   - uid: 3258
     components:
     - type: Transform
       parent: 2
-      pos: 57.5,50.5
+      pos: 53.5,51.5
   - uid: 3259
     components:
     - type: Transform
@@ -24454,11 +24368,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 97.5,50.5
-  - uid: 3301
-    components:
-    - type: Transform
-      parent: 2
-      pos: 58.5,50.5
   - uid: 3302
     components:
     - type: Transform
@@ -24916,11 +24825,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 93.5,46.5
-  - uid: 3393
-    components:
-    - type: Transform
-      parent: 2
-      pos: 93.5,47.5
   - uid: 3394
     components:
     - type: Transform
@@ -26340,12 +26244,12 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 87.5,59.5
+      pos: 85.5,58.5
   - uid: 3679
     components:
     - type: Transform
       parent: 2
-      pos: 86.5,59.5
+      pos: 86.5,58.5
   - uid: 3680
     components:
     - type: Transform
@@ -26355,7 +26259,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 69.5,59.5
+      pos: 70.5,58.5
   - uid: 3682
     components:
     - type: Transform
@@ -26380,12 +26284,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 69.5,64.5
-  - uid: 3687
-    components:
-    - type: Transform
-      parent: 2
-      pos: 86.5,64.5
+      pos: 69.5,58.5
   - uid: 3688
     components:
     - type: Transform
@@ -29836,6 +29735,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 56.5,80.5
+  - uid: 6619
+    components:
+    - type: Transform
+      parent: 2
+      pos: 74.5,49.5
   - uid: 6856
     components:
     - type: Transform
@@ -29901,6 +29805,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 87.5,87.5
+  - uid: 11396
+    components:
+    - type: Transform
+      parent: 2
+      pos: 73.5,49.5
   - uid: 11475
     components:
     - type: Transform
@@ -29936,6 +29845,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 88.5,88.5
+  - uid: 15480
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,24.5
   - uid: 15846
     components:
     - type: Transform
@@ -29966,6 +29880,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 126.5,110.5
+  - uid: 17532
+    components:
+    - type: Transform
+      parent: 2
+      pos: 132.5,35.5
   - uid: 17655
     components:
     - type: Transform
@@ -29986,6 +29905,31 @@ entities:
     - type: Transform
       parent: 2
       pos: 85.5,116.5
+  - uid: 17998
+    components:
+    - type: Transform
+      parent: 2
+      pos: 122.5,24.5
+  - uid: 17999
+    components:
+    - type: Transform
+      parent: 2
+      pos: 132.5,34.5
+  - uid: 18000
+    components:
+    - type: Transform
+      parent: 2
+      pos: 115.5,28.5
+  - uid: 18013
+    components:
+    - type: Transform
+      parent: 2
+      pos: 123.5,24.5
+  - uid: 18015
+    components:
+    - type: Transform
+      parent: 2
+      pos: 132.5,26.5
   - uid: 18018
     components:
     - type: Transform
@@ -30026,11 +29970,26 @@ entities:
     - type: Transform
       parent: 2
       pos: 19.5,35.5
+  - uid: 19534
+    components:
+    - type: Transform
+      parent: 2
+      pos: 116.5,35.5
+  - uid: 19563
+    components:
+    - type: Transform
+      parent: 2
+      pos: 92.5,47.5
   - uid: 19668
     components:
     - type: Transform
       parent: 2
       pos: 19.5,104.5
+  - uid: 19768
+    components:
+    - type: Transform
+      parent: 2
+      pos: 133.5,32.5
   - uid: 19817
     components:
     - type: Transform
@@ -30071,6 +30030,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 24.5,90.5
+  - uid: 20573
+    components:
+    - type: Transform
+      parent: 2
+      pos: 120.5,48.5
   - uid: 21406
     components:
     - type: Transform
@@ -30086,6 +30050,86 @@ entities:
     - type: Transform
       parent: 2
       pos: 122.5,106.5
+  - uid: 22566
+    components:
+    - type: Transform
+      parent: 2
+      pos: 128.5,24.5
+  - uid: 22567
+    components:
+    - type: Transform
+      parent: 2
+      pos: 127.5,24.5
+  - uid: 22568
+    components:
+    - type: Transform
+      parent: 2
+      pos: 126.5,24.5
+  - uid: 22569
+    components:
+    - type: Transform
+      parent: 2
+      pos: 125.5,24.5
+  - uid: 22570
+    components:
+    - type: Transform
+      parent: 2
+      pos: 118.5,24.5
+  - uid: 22574
+    components:
+    - type: Transform
+      parent: 2
+      pos: 119.5,24.5
+  - uid: 22578
+    components:
+    - type: Transform
+      parent: 2
+      pos: 120.5,24.5
+  - uid: 22580
+    components:
+    - type: Transform
+      parent: 2
+      pos: 121.5,24.5
+  - uid: 22587
+    components:
+    - type: Transform
+      parent: 2
+      pos: 132.5,33.5
+  - uid: 22591
+    components:
+    - type: Transform
+      parent: 2
+      pos: 132.5,32.5
+  - uid: 22595
+    components:
+    - type: Transform
+      parent: 2
+      pos: 132.5,31.5
+  - uid: 22596
+    components:
+    - type: Transform
+      parent: 2
+      pos: 129.5,24.5
+  - uid: 22597
+    components:
+    - type: Transform
+      parent: 2
+      pos: 130.5,24.5
+  - uid: 22598
+    components:
+    - type: Transform
+      parent: 2
+      pos: 132.5,27.5
+  - uid: 22599
+    components:
+    - type: Transform
+      parent: 2
+      pos: 132.5,28.5
+  - uid: 22600
+    components:
+    - type: Transform
+      parent: 2
+      pos: 132.5,29.5
   - uid: 22791
     components:
     - type: Transform
@@ -30146,6 +30190,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 100.5,81.5
+  - uid: 24740
+    components:
+    - type: Transform
+      parent: 2
+      pos: 133.5,28.5
   - uid: 24831
     components:
     - type: Transform
@@ -30221,8 +30270,803 @@ entities:
     - type: Transform
       parent: 2
       pos: 16.5,37.5
+  - uid: 25166
+    components:
+    - type: Transform
+      parent: 2
+      pos: 115.5,32.5
+  - uid: 25173
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,25.5
+  - uid: 25174
+    components:
+    - type: Transform
+      parent: 2
+      pos: 47.5,23.5
+  - uid: 25175
+    components:
+    - type: Transform
+      parent: 2
+      pos: 55.5,40.5
+  - uid: 25176
+    components:
+    - type: Transform
+      parent: 2
+      pos: 56.5,40.5
+  - uid: 25177
+    components:
+    - type: Transform
+      parent: 2
+      pos: 51.5,40.5
+  - uid: 25178
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,43.5
+  - uid: 25179
+    components:
+    - type: Transform
+      parent: 2
+      pos: 38.5,38.5
+  - uid: 25180
+    components:
+    - type: Transform
+      parent: 2
+      pos: 39.5,38.5
+  - uid: 25181
+    components:
+    - type: Transform
+      parent: 2
+      pos: 37.5,38.5
+  - uid: 25182
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,42.5
+  - uid: 25183
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,41.5
+  - uid: 25184
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,40.5
+  - uid: 25185
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,47.5
+  - uid: 25186
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,48.5
+  - uid: 25187
+    components:
+    - type: Transform
+      parent: 2
+      pos: 25.5,49.5
+  - uid: 25188
+    components:
+    - type: Transform
+      parent: 2
+      pos: 24.5,49.5
+  - uid: 25189
+    components:
+    - type: Transform
+      parent: 2
+      pos: 23.5,49.5
+  - uid: 25190
+    components:
+    - type: Transform
+      parent: 2
+      pos: 21.5,49.5
+  - uid: 25191
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,49.5
+  - uid: 25192
+    components:
+    - type: Transform
+      parent: 2
+      pos: 22.5,49.5
+  - uid: 25193
+    components:
+    - type: Transform
+      parent: 2
+      pos: 30.5,20.5
+  - uid: 25194
+    components:
+    - type: Transform
+      parent: 2
+      pos: 30.5,21.5
+  - uid: 25195
+    components:
+    - type: Transform
+      parent: 2
+      pos: 18.5,20.5
+  - uid: 25196
+    components:
+    - type: Transform
+      parent: 2
+      pos: 19.5,20.5
+  - uid: 25197
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,20.5
+  - uid: 25198
+    components:
+    - type: Transform
+      parent: 2
+      pos: 20.5,21.5
+  - uid: 25199
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,20.5
+  - uid: 25200
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,20.5
+  - uid: 25201
+    components:
+    - type: Transform
+      parent: 2
+      pos: 16.5,21.5
+  - uid: 25202
+    components:
+    - type: Transform
+      parent: 2
+      pos: 29.5,20.5
+  - uid: 25203
+    components:
+    - type: Transform
+      parent: 2
+      pos: 28.5,20.5
+  - uid: 25204
+    components:
+    - type: Transform
+      parent: 2
+      pos: 27.5,20.5
+  - uid: 25205
+    components:
+    - type: Transform
+      parent: 2
+      pos: 26.5,20.5
+  - uid: 25206
+    components:
+    - type: Transform
+      parent: 2
+      pos: 26.5,21.5
+  - uid: 25207
+    components:
+    - type: Transform
+      parent: 2
+      pos: 60.5,41.5
+  - uid: 25210
+    components:
+    - type: Transform
+      parent: 2
+      pos: 45.5,48.5
+  - uid: 25211
+    components:
+    - type: Transform
+      parent: 2
+      pos: 122.5,48.5
+  - uid: 25212
+    components:
+    - type: Transform
+      parent: 2
+      pos: 119.5,48.5
+  - uid: 25213
+    components:
+    - type: Transform
+      parent: 2
+      pos: 122.5,47.5
+  - uid: 25214
+    components:
+    - type: Transform
+      parent: 2
+      pos: 117.5,48.5
+  - uid: 25215
+    components:
+    - type: Transform
+      parent: 2
+      pos: 125.5,89.5
+  - uid: 25216
+    components:
+    - type: Transform
+      parent: 2
+      pos: 124.5,89.5
+  - uid: 25217
+    components:
+    - type: Transform
+      parent: 2
+      pos: 127.5,89.5
+  - uid: 25218
+    components:
+    - type: Transform
+      parent: 2
+      pos: 104.5,88.5
+  - uid: 25219
+    components:
+    - type: Transform
+      parent: 2
+      pos: 104.5,89.5
+  - uid: 25220
+    components:
+    - type: Transform
+      parent: 2
+      pos: 104.5,90.5
+  - uid: 25221
+    components:
+    - type: Transform
+      parent: 2
+      pos: 102.5,92.5
+  - uid: 25222
+    components:
+    - type: Transform
+      parent: 2
+      pos: 102.5,91.5
+  - uid: 25223
+    components:
+    - type: Transform
+      parent: 2
+      pos: 103.5,91.5
+  - uid: 25224
+    components:
+    - type: Transform
+      parent: 2
+      pos: 101.5,91.5
+  - uid: 25225
+    components:
+    - type: Transform
+      parent: 2
+      pos: 109.5,90.5
+  - uid: 25226
+    components:
+    - type: Transform
+      parent: 2
+      pos: 110.5,90.5
+  - uid: 25227
+    components:
+    - type: Transform
+      parent: 2
+      pos: 108.5,94.5
+  - uid: 25228
+    components:
+    - type: Transform
+      parent: 2
+      pos: 109.5,94.5
+  - uid: 25229
+    components:
+    - type: Transform
+      parent: 2
+      pos: 108.5,97.5
+  - uid: 25230
+    components:
+    - type: Transform
+      parent: 2
+      pos: 108.5,99.5
+  - uid: 25231
+    components:
+    - type: Transform
+      parent: 2
+      pos: 106.5,97.5
+  - uid: 25232
+    components:
+    - type: Transform
+      parent: 2
+      pos: 106.5,96.5
+  - uid: 25233
+    components:
+    - type: Transform
+      parent: 2
+      pos: 106.5,99.5
+  - uid: 25234
+    components:
+    - type: Transform
+      parent: 2
+      pos: 106.5,98.5
+  - uid: 25235
+    components:
+    - type: Transform
+      parent: 2
+      pos: 102.5,99.5
+  - uid: 25236
+    components:
+    - type: Transform
+      parent: 2
+      pos: 103.5,99.5
+  - uid: 25237
+    components:
+    - type: Transform
+      parent: 2
+      pos: 104.5,99.5
+  - uid: 25238
+    components:
+    - type: Transform
+      parent: 2
+      pos: 104.5,100.5
+  - uid: 25239
+    components:
+    - type: Transform
+      parent: 2
+      pos: 104.5,98.5
+  - uid: 25240
+    components:
+    - type: Transform
+      parent: 2
+      pos: 104.5,97.5
+  - uid: 25241
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,96.5
+  - uid: 25242
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,95.5
+  - uid: 25243
+    components:
+    - type: Transform
+      parent: 2
+      pos: 102.5,96.5
+  - uid: 25244
+    components:
+    - type: Transform
+      parent: 2
+      pos: 103.5,96.5
+  - uid: 25245
+    components:
+    - type: Transform
+      parent: 2
+      pos: 103.5,95.5
+  - uid: 25246
+    components:
+    - type: Transform
+      parent: 2
+      pos: 97.5,96.5
+  - uid: 25247
+    components:
+    - type: Transform
+      parent: 2
+      pos: 97.5,99.5
+  - uid: 25248
+    components:
+    - type: Transform
+      parent: 2
+      pos: 92.5,95.5
+  - uid: 25249
+    components:
+    - type: Transform
+      parent: 2
+      pos: 93.5,95.5
+  - uid: 25250
+    components:
+    - type: Transform
+      parent: 2
+      pos: 96.5,108.5
+  - uid: 25251
+    components:
+    - type: Transform
+      parent: 2
+      pos: 95.5,108.5
+  - uid: 25252
+    components:
+    - type: Transform
+      parent: 2
+      pos: 98.5,108.5
+  - uid: 25253
+    components:
+    - type: Transform
+      parent: 2
+      pos: 99.5,108.5
+  - uid: 25254
+    components:
+    - type: Transform
+      parent: 2
+      pos: 101.5,111.5
+  - uid: 25255
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,111.5
+  - uid: 25256
+    components:
+    - type: Transform
+      parent: 2
+      pos: 119.5,80.5
+  - uid: 25257
+    components:
+    - type: Transform
+      parent: 2
+      pos: 118.5,80.5
+  - uid: 25258
+    components:
+    - type: Transform
+      parent: 2
+      pos: 118.5,81.5
+  - uid: 25259
+    components:
+    - type: Transform
+      parent: 2
+      pos: 128.5,60.5
+  - uid: 25260
+    components:
+    - type: Transform
+      parent: 2
+      pos: 129.5,60.5
+  - uid: 25261
+    components:
+    - type: Transform
+      parent: 2
+      pos: 126.5,60.5
+  - uid: 25262
+    components:
+    - type: Transform
+      parent: 2
+      pos: 125.5,60.5
+  - uid: 25263
+    components:
+    - type: Transform
+      parent: 2
+      pos: 124.5,58.5
+  - uid: 25264
+    components:
+    - type: Transform
+      parent: 2
+      pos: 123.5,58.5
+  - uid: 25265
+    components:
+    - type: Transform
+      parent: 2
+      pos: 81.5,24.5
+  - uid: 25266
+    components:
+    - type: Transform
+      parent: 2
+      pos: 81.5,25.5
+  - uid: 25267
+    components:
+    - type: Transform
+      parent: 2
+      pos: 79.5,22.5
+  - uid: 25268
+    components:
+    - type: Transform
+      parent: 2
+      pos: 80.5,21.5
+  - uid: 25269
+    components:
+    - type: Transform
+      parent: 2
+      pos: 79.5,21.5
+  - uid: 25270
+    components:
+    - type: Transform
+      parent: 2
+      pos: 78.5,21.5
+  - uid: 25271
+    components:
+    - type: Transform
+      parent: 2
+      pos: 77.5,21.5
+  - uid: 25272
+    components:
+    - type: Transform
+      parent: 2
+      pos: 79.5,25.5
+  - uid: 25273
+    components:
+    - type: Transform
+      parent: 2
+      pos: 79.5,26.5
+  - uid: 25274
+    components:
+    - type: Transform
+      parent: 2
+      pos: 80.5,26.5
+  - uid: 25275
+    components:
+    - type: Transform
+      parent: 2
+      pos: 75.5,25.5
+  - uid: 25276
+    components:
+    - type: Transform
+      parent: 2
+      pos: 76.5,25.5
+  - uid: 25277
+    components:
+    - type: Transform
+      parent: 2
+      pos: 42.5,34.5
+  - uid: 25278
+    components:
+    - type: Transform
+      parent: 2
+      pos: 43.5,34.5
+  - uid: 25279
+    components:
+    - type: Transform
+      parent: 2
+      pos: 74.5,98.5
+  - uid: 25280
+    components:
+    - type: Transform
+      parent: 2
+      pos: 75.5,98.5
+  - uid: 25281
+    components:
+    - type: Transform
+      parent: 2
+      pos: 75.5,99.5
+  - uid: 25282
+    components:
+    - type: Transform
+      parent: 2
+      pos: 75.5,100.5
+  - uid: 25283
+    components:
+    - type: Transform
+      parent: 2
+      pos: 75.5,101.5
+  - uid: 25284
+    components:
+    - type: Transform
+      parent: 2
+      pos: 75.5,97.5
+  - uid: 25285
+    components:
+    - type: Transform
+      parent: 2
+      pos: 81.5,87.5
+  - uid: 25286
+    components:
+    - type: Transform
+      parent: 2
+      pos: 81.5,88.5
+  - uid: 25287
+    components:
+    - type: Transform
+      parent: 2
+      pos: 80.5,78.5
+  - uid: 25288
+    components:
+    - type: Transform
+      parent: 2
+      pos: 80.5,75.5
+  - uid: 25289
+    components:
+    - type: Transform
+      parent: 2
+      pos: 80.5,74.5
+  - uid: 25290
+    components:
+    - type: Transform
+      parent: 2
+      pos: 82.5,73.5
+  - uid: 25291
+    components:
+    - type: Transform
+      parent: 2
+      pos: 81.5,73.5
+  - uid: 25292
+    components:
+    - type: Transform
+      parent: 2
+      pos: 68.5,67.5
+  - uid: 25293
+    components:
+    - type: Transform
+      parent: 2
+      pos: 67.5,67.5
+  - uid: 25294
+    components:
+    - type: Transform
+      parent: 2
+      pos: 68.5,69.5
+  - uid: 25295
+    components:
+    - type: Transform
+      parent: 2
+      pos: 67.5,69.5
+  - uid: 25296
+    components:
+    - type: Transform
+      parent: 2
+      pos: 67.5,71.5
+  - uid: 25297
+    components:
+    - type: Transform
+      parent: 2
+      pos: 68.5,60.5
+  - uid: 25298
+    components:
+    - type: Transform
+      parent: 2
+      pos: 68.5,61.5
+  - uid: 25299
+    components:
+    - type: Transform
+      parent: 2
+      pos: 68.5,62.5
+  - uid: 25300
+    components:
+    - type: Transform
+      parent: 2
+      pos: 68.5,63.5
+  - uid: 25301
+    components:
+    - type: Transform
+      parent: 2
+      pos: 77.5,58.5
+  - uid: 25302
+    components:
+    - type: Transform
+      parent: 2
+      pos: 75.5,57.5
+  - uid: 25303
+    components:
+    - type: Transform
+      parent: 2
+      pos: 76.5,57.5
+  - uid: 25304
+    components:
+    - type: Transform
+      parent: 2
+      pos: 77.5,57.5
+  - uid: 25305
+    components:
+    - type: Transform
+      parent: 2
+      pos: 78.5,57.5
+  - uid: 25306
+    components:
+    - type: Transform
+      parent: 2
+      pos: 80.5,57.5
+  - uid: 25307
+    components:
+    - type: Transform
+      parent: 2
+      pos: 79.5,57.5
+  - uid: 25308
+    components:
+    - type: Transform
+      parent: 2
+      pos: 87.5,63.5
+  - uid: 25309
+    components:
+    - type: Transform
+      parent: 2
+      pos: 87.5,62.5
+  - uid: 25310
+    components:
+    - type: Transform
+      parent: 2
+      pos: 87.5,61.5
+  - uid: 25311
+    components:
+    - type: Transform
+      parent: 2
+      pos: 87.5,60.5
+  - uid: 25312
+    components:
+    - type: Transform
+      parent: 2
+      pos: 87.5,59.5
+  - uid: 25347
+    components:
+    - type: Transform
+      parent: 2
+      pos: 116.5,34.5
+  - uid: 25348
+    components:
+    - type: Transform
+      parent: 2
+      pos: 116.5,33.5
+  - uid: 25349
+    components:
+    - type: Transform
+      parent: 2
+      pos: 116.5,32.5
+  - uid: 25350
+    components:
+    - type: Transform
+      parent: 2
+      pos: 116.5,31.5
+  - uid: 25351
+    components:
+    - type: Transform
+      parent: 2
+      pos: 116.5,29.5
+  - uid: 25352
+    components:
+    - type: Transform
+      parent: 2
+      pos: 116.5,28.5
+  - uid: 25353
+    components:
+    - type: Transform
+      parent: 2
+      pos: 116.5,26.5
+  - uid: 25354
+    components:
+    - type: Transform
+      parent: 2
+      pos: 116.5,27.5
+  - uid: 25356
+    components:
+    - type: Transform
+      parent: 2
+      pos: 116.5,38.5
+  - uid: 25357
+    components:
+    - type: Transform
+      parent: 2
+      pos: 116.5,37.5
+  - uid: 25358
+    components:
+    - type: Transform
+      parent: 2
+      pos: 115.5,38.5
+  - uid: 25359
+    components:
+    - type: Transform
+      parent: 2
+      pos: 118.5,40.5
+  - uid: 25360
+    components:
+    - type: Transform
+      parent: 2
+      pos: 119.5,40.5
+  - uid: 25361
+    components:
+    - type: Transform
+      parent: 2
+      pos: 119.5,41.5
+  - uid: 25362
+    components:
+    - type: Transform
+      parent: 2
+      pos: 120.5,41.5
+  - uid: 25363
+    components:
+    - type: Transform
+      parent: 2
+      pos: 121.5,41.5
+  - uid: 25364
+    components:
+    - type: Transform
+      parent: 2
+      pos: 122.5,41.5
+  - uid: 25365
+    components:
+    - type: Transform
+      parent: 2
+      pos: 123.5,41.5
+  - uid: 25432
+    components:
+    - type: Transform
+      parent: 2
+      pos: 42.5,44.5
 - proto: CableApcExtensionUncuttable
   entities:
+  - uid: 525
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,25.5
   - uid: 4383
     components:
     - type: Transform
@@ -35837,6 +36681,16 @@ entities:
       pos: 20.54134,70.29931
 - proto: CableMV
   entities:
+  - uid: 734
+    components:
+    - type: Transform
+      parent: 2
+      pos: 74.5,50.5
+  - uid: 735
+    components:
+    - type: Transform
+      parent: 2
+      pos: 74.5,49.5
   - uid: 753
     components:
     - type: Transform
@@ -35847,6 +36701,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 52.5,27.5
+  - uid: 803
+    components:
+    - type: Transform
+      parent: 2
+      pos: 92.5,47.5
   - uid: 2016
     components:
     - type: Transform
@@ -36351,7 +37210,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 43.5,43.5
+      pos: 104.5,49.5
   - uid: 5609
     components:
     - type: Transform
@@ -41132,11 +41991,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 83.5,49.5
-  - uid: 6571
-    components:
-    - type: Transform
-      parent: 2
-      pos: 83.5,50.5
   - uid: 6572
     components:
     - type: Transform
@@ -41372,11 +42226,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 63.5,51.5
-  - uid: 6619
-    components:
-    - type: Transform
-      parent: 2
-      pos: 63.5,50.5
   - uid: 6620
     components:
     - type: Transform
@@ -41456,7 +42305,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 73.5,50.5
+      pos: 81.5,50.5
   - uid: 6636
     components:
     - type: Transform
@@ -41697,11 +42546,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 93.5,46.5
-  - uid: 6684
-    components:
-    - type: Transform
-      parent: 2
-      pos: 93.5,47.5
   - uid: 6685
     components:
     - type: Transform
@@ -42707,11 +43551,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 17.5,69.5
-  - uid: 6896
-    components:
-    - type: Transform
-      parent: 2
-      pos: 104.5,49.5
   - uid: 6897
     components:
     - type: Transform
@@ -42812,6 +43651,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 90.5,83.5
+  - uid: 16214
+    components:
+    - type: Transform
+      parent: 2
+      pos: 81.5,49.5
   - uid: 16904
     components:
     - type: Transform
@@ -42822,6 +43666,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 52.5,24.5
+  - uid: 18050
+    components:
+    - type: Transform
+      parent: 2
+      pos: 73.5,49.5
   - uid: 18104
     components:
     - type: Transform
@@ -42857,6 +43706,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 88.5,88.5
+  - uid: 21527
+    components:
+    - type: Transform
+      parent: 2
+      pos: 82.5,49.5
   - uid: 23988
     components:
     - type: Transform
@@ -42912,6 +43766,26 @@ entities:
     - type: Transform
       parent: 2
       pos: 88.5,86.5
+  - uid: 25163
+    components:
+    - type: Transform
+      parent: 2
+      pos: 62.5,50.5
+  - uid: 25208
+    components:
+    - type: Transform
+      parent: 2
+      pos: 60.5,35.5
+  - uid: 25209
+    components:
+    - type: Transform
+      parent: 2
+      pos: 58.5,35.5
+  - uid: 25431
+    components:
+    - type: Transform
+      parent: 2
+      pos: 42.5,44.5
 - proto: CableMVStack10
   entities:
   - uid: 6902
@@ -43156,6 +44030,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 74.5,36.5
+- proto: CargoTelepad
+  entities:
+  - uid: 17580
+    components:
+    - type: Transform
+      parent: 2
+      pos: 69.5,33.5
 - proto: Carpet
   entities:
   - uid: 6941
@@ -45190,11 +46071,11 @@ entities:
       pos: 73.284874,20.270233
 - proto: Catwalk
   entities:
-  - uid: 527
+  - uid: 524
     components:
     - type: Transform
       parent: 2
-      pos: 102.5,17.5
+      pos: 100.5,25.5
   - uid: 2698
     components:
     - type: Transform
@@ -45206,6 +46087,29 @@ entities:
     - type: Transform
       parent: 2
       pos: 83.5,118.5
+  - uid: 3213
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 92.5,46.5
+  - uid: 3251
+    components:
+    - type: Transform
+      parent: 2
+      pos: 133.5,60.5
+  - uid: 3252
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 96.5,46.5
+  - uid: 3254
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 95.5,46.5
   - uid: 4293
     components:
     - type: Transform
@@ -45222,6 +46126,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 122.5,104.5
+  - uid: 6571
+    components:
+    - type: Transform
+      parent: 2
+      pos: 133.5,63.5
   - uid: 6881
     components:
     - type: Transform
@@ -45467,17 +46376,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 80.5,32.5
-  - uid: 7388
-    components:
-    - type: Transform
-      parent: 2
-      pos: 82.5,30.5
-  - uid: 7389
-    components:
-    - type: Transform
-      parent: 2
-      pos: 82.5,32.5
+      pos: 99.5,20.5
   - uid: 7390
     components:
     - type: Transform
@@ -46391,66 +47290,41 @@ entities:
     - type: Transform
       parent: 2
       pos: 59.5,29.5
-  - uid: 7569
-    components:
-    - type: Transform
-      parent: 2
-      pos: 100.5,26.5
-  - uid: 7570
-    components:
-    - type: Transform
-      parent: 2
-      pos: 100.5,25.5
-  - uid: 7571
-    components:
-    - type: Transform
-      parent: 2
-      pos: 101.5,26.5
   - uid: 7572
     components:
     - type: Transform
       parent: 2
-      pos: 101.5,25.5
+      pos: 99.5,22.5
   - uid: 7573
     components:
     - type: Transform
       parent: 2
-      pos: 101.5,24.5
+      pos: 99.5,23.5
   - uid: 7574
     components:
     - type: Transform
       parent: 2
-      pos: 101.5,23.5
+      pos: 100.5,20.5
   - uid: 7575
     components:
     - type: Transform
       parent: 2
-      pos: 101.5,22.5
+      pos: 100.5,21.5
   - uid: 7576
     components:
     - type: Transform
       parent: 2
-      pos: 101.5,21.5
+      pos: 100.5,22.5
   - uid: 7577
     components:
     - type: Transform
       parent: 2
-      pos: 101.5,20.5
-  - uid: 7578
-    components:
-    - type: Transform
-      parent: 2
-      pos: 101.5,19.5
+      pos: 99.5,21.5
   - uid: 7579
     components:
     - type: Transform
       parent: 2
       pos: 100.5,17.5
-  - uid: 7580
-    components:
-    - type: Transform
-      parent: 2
-      pos: 101.5,18.5
   - uid: 7582
     components:
     - type: Transform
@@ -49903,11 +50777,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 81.5,30.5
-  - uid: 8193
-    components:
-    - type: Transform
-      parent: 2
-      pos: 80.5,30.5
   - uid: 8194
     components:
     - type: Transform
@@ -52029,6 +52898,17 @@ entities:
     - type: Transform
       parent: 2
       pos: 17.5,3.5
+  - uid: 9096
+    components:
+    - type: Transform
+      parent: 2
+      pos: 98.5,17.5
+  - uid: 11938
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 59.5,69.5
   - uid: 12424
     components:
     - type: Transform
@@ -52069,6 +52949,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 18.5,37.5
+  - uid: 15326
+    components:
+    - type: Transform
+      parent: 2
+      pos: 99.5,18.5
   - uid: 15866
     components:
     - type: Transform
@@ -52089,18 +52974,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 122.5,106.5
-  - uid: 18015
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 98.5,25.5
-  - uid: 18016
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 98.5,26.5
   - uid: 18024
     components:
     - type: Transform
@@ -52111,6 +52984,31 @@ entities:
     - type: Transform
       parent: 2
       pos: 54.5,6.5
+  - uid: 18416
+    components:
+    - type: Transform
+      parent: 2
+      pos: 99.5,19.5
+  - uid: 18507
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,23.5
+  - uid: 18639
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,19.5
+  - uid: 18827
+    components:
+    - type: Transform
+      parent: 2
+      pos: 99.5,17.5
+  - uid: 18828
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,18.5
   - uid: 19103
     components:
     - type: Transform
@@ -52147,6 +53045,21 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 102.5,120.5
+  - uid: 25366
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,26.5
+  - uid: 25367
+    components:
+    - type: Transform
+      parent: 2
+      pos: 99.5,25.5
+  - uid: 25368
+    components:
+    - type: Transform
+      parent: 2
+      pos: 99.5,26.5
 - proto: Cautery
   entities:
   - uid: 8574
@@ -53804,7 +54717,7 @@ entities:
       pos: 66.612854,88.45277
 - proto: ChunkEntity
   entities:
-  - uid: 25160
+  - uid: 25441
     components:
     - type: ChunkEntity
       root: 2
@@ -53900,7 +54813,7 @@ entities:
             190: 74,100
             191: 74,101
             192: 74,102
-  - uid: 25161
+  - uid: 25442
     components:
     - type: ChunkEntity
       root: 2
@@ -53935,89 +54848,88 @@ entities:
             id: BrickTileDarkInnerNe
             color: '#FFFFFFFF'
           decals:
-            1703: 53,85
-            1720: 53,83
-            3182: 53,81
+            90: 53,85
+            91: 53,83
+            92: 53,81
         - node:
             id: BrickTileDarkInnerNw
             color: '#FFFFFFFF'
           decals:
-            1704: 58,85
-            1721: 58,83
-            3181: 58,81
+            89: 58,85
+            93: 58,83
+            94: 58,81
         - node:
             id: BrickTileDarkInnerSe
             color: '#FFFFFFFF'
           decals:
             33: 61,91
-            1705: 53,87
-            1714: 53,85
-            1735: 53,83
-            3192: 52,81
+            88: 53,85
+            96: 53,83
+            97: 53,87
         - node:
             id: BrickTileDarkInnerSw
             color: '#FFFFFFFF'
           decals:
+            87: 58,85
+            95: 58,83
+            98: 58,87
             270: 60,92
-            1706: 58,87
-            1715: 58,85
-            1736: 58,83
         - node:
             id: BrickTileDarkLineE
             color: '#FFFFFFFF'
           decals:
             30: 61,90
             31: 61,89
-            1707: 53,86
-            1722: 53,84
-            1723: 53,82
+            80: 53,86
+            81: 53,82
+            82: 53,84
         - node:
             id: BrickTileDarkLineN
             color: '#FFFFFFFF'
           decals:
-            1695: 57,85
-            1696: 56,85
-            1697: 55,85
-            1698: 54,85
-            1716: 57,83
-            1717: 56,83
-            1718: 55,83
-            1719: 54,83
-            3177: 54,81
-            3178: 55,81
-            3179: 56,81
-            3188: 57,81
+            57: 54,83
+            58: 55,83
+            60: 56,83
+            61: 57,83
+            62: 57,85
+            64: 56,85
+            65: 55,85
+            66: 54,85
+            69: 54,81
+            70: 55,81
+            71: 56,81
+            72: 57,81
         - node:
             id: BrickTileDarkLineS
             color: '#FFFFFFFF'
           decals:
             28: 63,91
             29: 62,91
-            1699: 57,87
-            1700: 56,87
-            1701: 55,87
-            1702: 54,87
-            1710: 57,85
-            1711: 56,85
-            1712: 55,85
-            1713: 54,85
-            1728: 54,83
-            1729: 55,83
-            1730: 56,83
-            1731: 57,83
-            3183: 54,81
-            3184: 55,81
-            3185: 56,81
-            3187: 57,81
-            3189: 53,81
-            3190: 58,81
+            59: 54,87
+            63: 55,87
+            67: 56,87
+            68: 57,87
+            73: 54,83
+            74: 55,83
+            75: 56,83
+            76: 57,83
+            83: 54,85
+            84: 55,85
+            85: 56,85
+            86: 57,85
+            99: 53,81
+            100: 54,81
+            101: 55,81
+            102: 56,81
+            103: 58,81
+            104: 57,81
         - node:
             id: BrickTileDarkLineW
             color: '#FFFFFFFF'
           decals:
-            1708: 58,86
-            1709: 58,84
-            1732: 58,82
+            77: 58,82
+            78: 58,84
+            79: 58,86
         - node:
             id: Flowerspv1
             color: '#FFFFFFFF'
@@ -54033,6 +54945,44 @@ entities:
             color: '#FFFFFFFF'
           decals:
             15: 52,91
+        - node:
+            id: FullTileOverlayGreyscale
+            color: '#76A57A96'
+          decals:
+            0: 56,85
+            1: 55,85
+            2: 54,85
+            3: 53,85
+            4: 53,86
+            10: 53,87
+            11: 54,87
+            12: 55,87
+            13: 56,87
+            14: 57,87
+            18: 58,87
+            19: 58,86
+            20: 58,85
+            21: 57,85
+            22: 52,87
+            23: 52,86
+            24: 52,85
+            25: 52,84
+            26: 53,84
+            27: 53,83
+            32: 53,82
+            36: 53,81
+            40: 54,81
+            41: 55,81
+            42: 56,81
+            43: 57,81
+            44: 58,81
+            45: 58,82
+            47: 58,83
+            52: 58,84
+            53: 57,83
+            54: 56,83
+            55: 55,83
+            56: 54,83
         - node:
             id: HalfTileOverlayGreyscale270
             color: '#9FED5896'
@@ -54108,7 +55058,7 @@ entities:
             259: 61,92
             260: 62,92
             261: 63,92
-  - uid: 25162
+  - uid: 25443
     components:
     - type: ChunkEntity
       root: 2
@@ -54185,7 +55135,7 @@ entities:
             color: '#FFFF41FF'
           decals:
             4605: 14,84
-  - uid: 25163
+  - uid: 25444
     components:
     - type: ChunkEntity
       root: 2
@@ -54556,7 +55506,7 @@ entities:
           decals:
             1019: 127,62
             1026: 127,63
-  - uid: 25164
+  - uid: 25445
     components:
     - type: ChunkEntity
       root: 2
@@ -54806,7 +55756,7 @@ entities:
             1834: 98,87
             1835: 102,87
             5469: 103,87
-  - uid: 25165
+  - uid: 25446
     components:
     - type: ChunkEntity
       root: 2
@@ -55121,7 +56071,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1827: 97,111
-  - uid: 25166
+  - uid: 25447
     components:
     - type: ChunkEntity
       root: 2
@@ -55377,7 +56327,7 @@ entities:
           decals:
             5587: 125.88849,107.376595
             5588: 124.99786,105.532845
-  - uid: 25167
+  - uid: 25448
     components:
     - type: ChunkEntity
       root: 2
@@ -55476,7 +56426,7 @@ entities:
           decals:
             2549: 33,48
             2550: 34,48
-  - uid: 25168
+  - uid: 25449
     components:
     - type: ChunkEntity
       root: 2
@@ -55722,7 +56672,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3165: 123,81
-  - uid: 25169
+  - uid: 25450
     components:
     - type: ChunkEntity
       root: 2
@@ -55763,7 +56713,7 @@ entities:
             color: '#EFB34196'
           decals:
             2577: 31,48
-  - uid: 25170
+  - uid: 25451
     components:
     - type: ChunkEntity
       root: 2
@@ -56055,7 +57005,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1017: 127,64
-  - uid: 25171
+  - uid: 25452
     components:
     - type: ChunkEntity
       root: 2
@@ -56327,7 +57277,7 @@ entities:
             53: 69,67
             54: 70,67
             55: 71,67
-  - uid: 25172
+  - uid: 25453
     components:
     - type: ChunkEntity
       root: 2
@@ -56341,14 +57291,14 @@ entities:
             id: Bot
             color: '#FFFFFFFF'
           decals:
+            1: 76,28
+            2: 75,28
             521: 75,29
         - node:
             id: Bot
             color: '#FFFFFFFF'
             angle: 1.5707963267948966 rad
           decals:
-            382: 74,29
-            383: 74,30
             384: 75,30
             4820: 76,30
             4821: 76,29
@@ -56384,10 +57334,10 @@ entities:
         - node:
             id: Delivery
             color: '#FFFFFFFF'
-            angle: 1.5707963267948966 rad
           decals:
-            4816: 77,29
-            4817: 77,30
+            0: 77,28
+            5: 77,30
+            6: 77,29
         - node:
             id: FullTileOverlayGreyscale
             color: '#A4610696'
@@ -56418,12 +57368,11 @@ entities:
             514: 70,31
             515: 69,31
             4834: 79,27
-            5792: 72,31
-            5793: 71,31
         - node:
             id: HalfTileOverlayGreyscale270
             color: '#A4610696'
           decals:
+            7: 73,31
             470: 67,28
             471: 67,27
             472: 67,26
@@ -56446,17 +57395,17 @@ entities:
             color: '#FFFFFFFF'
             angle: 1.5707963267948966 rad
           decals:
-            4813: 78,29
-        - node:
-            id: QuarterTileOverlayGreyscale270
-            color: '#A4610696'
-          decals:
-            5791: 73,31
+            4: 78,29
         - node:
             id: QuarterTileOverlayGreyscale90
             color: '#A4610696'
           decals:
             485: 71,25
+        - node:
+            id: StandClear
+            color: '#FFFFFFFF'
+          decals:
+            8: 68.97406,31.508884
         - node:
             id: ThreeQuarterTileOverlayGreyscale
             color: '#A4610696'
@@ -56466,6 +57415,7 @@ entities:
             id: ThreeQuarterTileOverlayGreyscale180
             color: '#A4610696'
           decals:
+            3: 71,31
             481: 72,22
         - node:
             id: ThreeQuarterTileOverlayGreyscale270
@@ -56499,7 +57449,7 @@ entities:
             cleanable: True
           decals:
             3888: 71.988,20.082733
-  - uid: 25173
+  - uid: 25454
     components:
     - type: ChunkEntity
       root: 2
@@ -56826,7 +57776,7 @@ entities:
             cleanable: True
           decals:
             4132: 97.00392,57.905205
-  - uid: 25174
+  - uid: 25455
     components:
     - type: ChunkEntity
       root: 2
@@ -57182,7 +58132,7 @@ entities:
           decals:
             1504: 100,76
             5400: 98,76
-  - uid: 25175
+  - uid: 25456
     components:
     - type: ChunkEntity
       root: 2
@@ -57250,6 +58200,13 @@ entities:
             id: HalfTileOverlayGreyscale
             color: '#D4D4D496'
           decals:
+            18: 59,75
+            19: 58,75
+            20: 57,75
+            21: 56,75
+            22: 55,75
+            23: 54,75
+            24: 53,75
             1787: 53,69
             1788: 54,69
             1789: 55,69
@@ -57264,6 +58221,12 @@ entities:
             id: HalfTileOverlayGreyscale180
             color: '#D4D4D496'
           decals:
+            3: 53,71
+            4: 54,71
+            5: 55,71
+            6: 56,71
+            7: 57,71
+            8: 58,71
             1797: 56,65
             1798: 55,65
             1799: 54,65
@@ -57277,12 +58240,16 @@ entities:
             id: HalfTileOverlayGreyscale270
             color: '#D4D4D496'
           decals:
+            26: 52,73
             1802: 52,66
             1804: 52,68
         - node:
             id: HalfTileOverlayGreyscale90
             color: '#D4D4D496'
           decals:
+            10: 60,72
+            15: 60,73
+            16: 60,74
             1792: 57,68
             1795: 57,66
         - node:
@@ -57300,21 +58267,25 @@ entities:
             id: ThreeQuarterTileOverlayGreyscale
             color: '#D4D4D496'
           decals:
+            25: 52,75
             1806: 52,69
         - node:
             id: ThreeQuarterTileOverlayGreyscale180
             color: '#D4D4D496'
           decals:
+            9: 60,71
             1796: 57,65
         - node:
             id: ThreeQuarterTileOverlayGreyscale270
             color: '#D4D4D496'
           decals:
+            2: 52,71
             1801: 52,65
         - node:
             id: ThreeQuarterTileOverlayGreyscale90
             color: '#D4D4D496'
           decals:
+            17: 60,75
             1791: 57,69
         - node:
             id: WarnCornerSmallGreyscaleNE
@@ -57361,6 +58332,11 @@ entities:
             1809: 53,65
             1810: 54,65
             1811: 55,65
+        - node:
+            id: WarnLineGreyscaleS
+            color: '#E6E6E6FF'
+          decals:
+            27: 59,71
         - node:
             id: WarnLineGreyscaleS
             color: '#FFFFFFE6'
@@ -57368,6 +58344,12 @@ entities:
             1814: 55,69
             1815: 54,69
             1816: 53,69
+        - node:
+            id: WarnLineGreyscaleW
+            color: '#E6E6E6FF'
+          decals:
+            0: 52,72
+            1: 52,74
         - node:
             id: WarnLineGreyscaleW
             color: '#FFFFFFE6'
@@ -57452,7 +58434,7 @@ entities:
             angle: 0.3490658503988659 rad
           decals:
             1934: 53.860146,67.85053
-  - uid: 25176
+  - uid: 25457
     components:
     - type: ChunkEntity
       root: 2
@@ -57652,7 +58634,7 @@ entities:
             color: '#F9FFFEFF'
           decals:
             5046: 17,74
-  - uid: 25177
+  - uid: 25458
     components:
     - type: ChunkEntity
       root: 2
@@ -57857,7 +58839,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             5441: 24,42
-  - uid: 25178
+  - uid: 25459
     components:
     - type: ChunkEntity
       root: 2
@@ -58165,7 +59147,7 @@ entities:
             color: '#EFB34196'
           decals:
             2861: 44,42
-  - uid: 25179
+  - uid: 25460
     components:
     - type: ChunkEntity
       root: 2
@@ -58325,7 +59307,7 @@ entities:
             cleanable: True
           decals:
             8: 141.03253,79.7838
-  - uid: 25180
+  - uid: 25461
     components:
     - type: ChunkEntity
       root: 2
@@ -58484,7 +59466,7 @@ entities:
             5635: 87,90
             5636: 87,89
             5637: 87,88
-  - uid: 25181
+  - uid: 25462
     components:
     - type: ChunkEntity
       root: 2
@@ -58622,7 +59604,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             4064: 117,120
-  - uid: 25182
+  - uid: 25463
     components:
     - type: ChunkEntity
       root: 2
@@ -58764,7 +59746,7 @@ entities:
             color: '#FFFF41FF'
           decals:
             4606: 16,84
-  - uid: 25183
+  - uid: 25464
     components:
     - type: ChunkEntity
       root: 2
@@ -58960,7 +59942,7 @@ entities:
             5181: 52,51
             5204: 58,52
             5205: 58,50
-  - uid: 25184
+  - uid: 25465
     components:
     - type: ChunkEntity
       root: 2
@@ -59234,7 +60216,7 @@ entities:
           decals:
             2847: 48,36
             2865: 58,37
-  - uid: 25185
+  - uid: 25466
     components:
     - type: ChunkEntity
       root: 2
@@ -59249,31 +60231,13 @@ entities:
             color: '#FFFFFFFF'
             angle: 1.5707963267948966 rad
           decals:
-            377: 74,33
             393: 75,33
             396: 75,32
-            397: 74,32
             415: 74,41
             416: 75,41
             418: 76,41
             4818: 76,33
             4819: 76,32
-        - node:
-            id: Bot
-            color: '#FFFFFFFF'
-            angle: 4.71238898038469 rad
-          decals:
-            403: 70,32
-            404: 69,33
-            405: 71,33
-        - node:
-            id: BotLeft
-            color: '#FFFFFFFF'
-            angle: 4.71238898038469 rad
-          decals:
-            407: 70,33
-            408: 71,32
-            411: 69,32
         - node:
             id: Box
             color: '#FFFFFFFF'
@@ -59284,6 +60248,46 @@ entities:
             362: 78,45
             363: 79,45
             5517: 79,34
+        - node:
+            id: BrickTileDarkInnerNe
+            color: '#FFFFFFFF'
+          decals:
+            16: 68,32
+        - node:
+            id: BrickTileDarkInnerNw
+            color: '#FFFFFFFF'
+          decals:
+            15: 70,32
+        - node:
+            id: BrickTileDarkInnerSe
+            color: '#FFFFFFFF'
+          decals:
+            17: 68,34
+        - node:
+            id: BrickTileDarkInnerSw
+            color: '#FFFFFFFF'
+          decals:
+            18: 70,34
+        - node:
+            id: BrickTileDarkLineE
+            color: '#FFFFFFFF'
+          decals:
+            13: 68,33
+        - node:
+            id: BrickTileDarkLineN
+            color: '#FFFFFFFF'
+          decals:
+            14: 69,32
+        - node:
+            id: BrickTileDarkLineS
+            color: '#FFFFFFFF'
+          decals:
+            12: 69,34
+        - node:
+            id: BrickTileDarkLineW
+            color: '#FFFFFFFF'
+          decals:
+            11: 70,33
         - node:
             id: CheckerNWSE
             color: '#A4610696'
@@ -59294,14 +60298,18 @@ entities:
             565: 77,39
             566: 78,39
             567: 78,37
+        - node:
+            id: Delivery
+            color: '#FFFFFFFF'
+          decals:
+            1: 77,32
+            2: 77,33
         - node:
             id: Delivery
             color: '#FFFFFFFF'
             angle: 1.5707963267948966 rad
           decals:
             417: 73,41
-            4814: 77,33
-            4815: 77,32
         - node:
             id: FullTileOverlayGreyscale
             color: '#9FED5896'
@@ -59312,6 +60320,12 @@ entities:
             id: FullTileOverlayGreyscale
             color: '#A4610696'
           decals:
+            9: 72,33
+            10: 72,32
+            20: 72,40
+            21: 73,40
+            22: 74,40
+            31: 66,34
             3598: 69,36
             3599: 70,36
         - node:
@@ -59347,20 +60361,20 @@ entities:
             id: HalfTileOverlayGreyscale
             color: '#A4610696'
           decals:
+            26: 71,39
+            27: 72,39
+            28: 73,39
+            29: 74,39
             444: 79,35
             445: 78,35
             446: 77,35
             449: 70,35
             450: 69,35
             452: 68,35
-            455: 73,34
             456: 74,34
             540: 68,40
             541: 69,40
-            542: 70,40
-            543: 71,40
             5794: 75,34
-            5795: 72,34
         - node:
             id: HalfTileOverlayGreyscale
             color: '#D381C996'
@@ -59407,32 +60421,41 @@ entities:
             id: HalfTileOverlayGreyscale270
             color: '#A4610696'
           decals:
+            7: 73,33
+            8: 73,32
             509: 67,34
             510: 67,33
             511: 67,32
             537: 67,38
             538: 67,39
         - node:
-            id: LoadingArea
-            color: '#FFFFFFFF'
-            angle: -1.5707963267948966 rad
+            id: HalfTileOverlayGreyscale90
+            color: '#A4610696'
           decals:
-            4812: 78,33
+            0: 71,34
+            4: 71,33
+            5: 71,32
         - node:
             id: LoadingArea
             color: '#FFFFFFFF'
             angle: 3.141592653589793 rad
           decals:
             568: 76,39
+        - node:
+            id: LoadingArea
+            color: '#FFFFFFFF'
+            angle: 4.71238898038469 rad
+          decals:
+            3: 78,33
         - node:
             id: QuarterTileOverlayGreyscale
             color: '#A4610696'
           decals:
+            30: 75,39
             3592: 77,40
             3593: 78,40
             3594: 77,36
             3595: 78,36
-            5516: 72,40
             5798: 76,34
         - node:
             id: QuarterTileOverlayGreyscale180
@@ -59450,6 +60473,7 @@ entities:
             id: QuarterTileOverlayGreyscale270
             color: '#A4610696'
           decals:
+            23: 72,41
             425: 72,42
             426: 71,42
             427: 70,42
@@ -59462,12 +60486,11 @@ entities:
             5148: 73,45
             5149: 73,46
             5150: 73,47
-            5515: 72,41
         - node:
             id: QuarterTileOverlayGreyscale90
             color: '#A4610696'
           decals:
-            0: 71,34
+            25: 70,39
             5112: 64,44
             5140: 70,44
             5141: 72,44
@@ -59484,11 +60507,13 @@ entities:
             id: StandClear
             color: '#FFFFFFFF'
           decals:
+            19: 69.00531,34.49326
             419: 76,41
         - node:
             id: ThreeQuarterTileOverlayGreyscale
             color: '#A4610696'
           decals:
+            6: 73,34
             508: 67,35
             539: 67,40
             5799: 76,35
@@ -59522,6 +60547,7 @@ entities:
             id: ThreeQuarterTileOverlayGreyscale90
             color: '#A4610696'
           decals:
+            24: 70,40
             5796: 71,35
         - node:
             id: ThreeQuarterTileOverlayGreyscale90
@@ -59539,7 +60565,7 @@ entities:
           decals:
             356: 74,47
             357: 74,46
-  - uid: 25186
+  - uid: 25467
     components:
     - type: ChunkEntity
       root: 2
@@ -59758,7 +60784,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1824: 95,110
-  - uid: 25187
+  - uid: 25468
     components:
     - type: ChunkEntity
       root: 2
@@ -59799,7 +60825,7 @@ entities:
             id: BrickTileSteelLineW
             color: '#FFFFFFFF'
           decals:
-            5534: 95,22
+            0: 95,22
         - node:
             id: CheckerNESW
             color: '#8D1C9996'
@@ -59856,7 +60882,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             4833: 92,29
-  - uid: 25188
+  - uid: 25469
     components:
     - type: ChunkEntity
       root: 2
@@ -60029,7 +61055,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             5519: 92,33
-  - uid: 25189
+  - uid: 25470
     components:
     - type: ChunkEntity
       root: 2
@@ -60049,6 +61075,12 @@ entities:
             2810: 27,21
             2811: 28,21
             2812: 29,21
+        - node:
+            id: Caution
+            color: '#FFFFFFFF'
+          decals:
+            5: 22,27
+            6: 24,27
         - node:
             id: HalfTileOverlayGreyscale
             color: '#EFB34196'
@@ -60063,9 +61095,9 @@ entities:
             id: HalfTileOverlayGreyscale180
             color: '#EFB34196'
           decals:
+            0: 26,27
+            4: 20,27
             2777: 19,27
-            2778: 20,27
-            2779: 26,27
             2780: 27,27
         - node:
             id: HalfTileOverlayGreyscale270
@@ -60120,6 +61152,16 @@ entities:
             2783: 29,29
             2797: 29,25
             2800: 19,25
+        - node:
+            id: WarnCornerSmallSE
+            color: '#FFFFFFFF'
+          decals:
+            10: 20,27
+        - node:
+            id: WarnCornerSmallSW
+            color: '#FFFFFFFF'
+          decals:
+            9: 26,27
         - node:
             id: WarnFullGreyscale
             color: '#EFB34196'
@@ -60143,7 +61185,16 @@ entities:
           decals:
             5506: 18,27
             5507: 28,27
-  - uid: 25190
+        - node:
+            id: WarnLineN
+            color: '#FFFFFFFF'
+          decals:
+            1: 22,27
+            2: 23,27
+            3: 24,27
+            7: 21,27
+            8: 25,27
+  - uid: 25471
     components:
     - type: ChunkEntity
       root: 2
@@ -60180,33 +61231,44 @@ entities:
             angle: 4.71238898038469 rad
           decals:
             573: 97,28
-        - node:
-            id: QuarterTileOverlayGreyscale
-            color: '#8D1C9996'
-          decals:
-            714: 97,23
         - node:
             id: QuarterTileOverlayGreyscale180
             color: '#8D1C9996'
           decals:
-            710: 96,22
-            711: 97,22
-            712: 97,23
+            2: 96,23
+            3: 96,22
             715: 96,24
+        - node:
+            id: QuarterTileOverlayGreyscale270
+            color: '#8D1C9996'
+          decals:
+            5: 97,26
+            6: 98,25
+            15: 99,24
         - node:
             id: QuarterTileOverlayGreyscale270
             color: '#A4610696'
           decals:
-            689: 96,22
-            690: 97,22
+            8: 97,25
+            11: 98,26
+            12: 100,24
+        - node:
+            id: QuarterTileOverlayGreyscale90
+            color: '#8D1C9996'
+          decals:
+            4: 97,26
+            7: 98,25
+            14: 99,24
         - node:
             id: QuarterTileOverlayGreyscale90
             color: '#A4610696'
           decals:
-            691: 97,23
-            692: 96,23
+            0: 96,23
+            1: 96,22
+            9: 97,25
+            10: 98,26
+            13: 100,24
             693: 96,24
-            713: 97,22
         - node:
             id: WarnFull
             color: '#FFFFFFFF'
@@ -60215,7 +61277,7 @@ entities:
             576: 97,30
             577: 97,30
             578: 97,29
-  - uid: 25191
+  - uid: 25472
     components:
     - type: ChunkEntity
       root: 2
@@ -60286,7 +61348,7 @@ entities:
             2407: 82,59
             2408: 81,59
             2409: 80,59
-  - uid: 25192
+  - uid: 25473
     components:
     - type: ChunkEntity
       root: 2
@@ -60409,7 +61471,7 @@ entities:
             2422: 69,61
             2423: 69,62
             2424: 69,63
-  - uid: 25193
+  - uid: 25474
     components:
     - type: ChunkEntity
       root: 2
@@ -60570,7 +61632,7 @@ entities:
             267: 69,92
             268: 70,92
             269: 71,92
-  - uid: 25194
+  - uid: 25475
     components:
     - type: ChunkEntity
       root: 2
@@ -60596,7 +61658,7 @@ entities:
             color: '#52B4E950'
           decals:
             4378: 136,110
-  - uid: 25195
+  - uid: 25476
     components:
     - type: ChunkEntity
       root: 2
@@ -60689,7 +61751,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             4072: 100,117
-  - uid: 25196
+  - uid: 25477
     components:
     - type: ChunkEntity
       root: 2
@@ -60854,7 +61916,7 @@ entities:
             105: 85,74
             2008: 85,66
             2014: 86,66
-  - uid: 25197
+  - uid: 25478
     components:
     - type: ChunkEntity
       root: 2
@@ -61073,7 +62135,7 @@ entities:
           decals:
             4191: 109,46
             4192: 109,47
-  - uid: 25198
+  - uid: 25479
     components:
     - type: ChunkEntity
       root: 2
@@ -61250,7 +62312,7 @@ entities:
             1217: 119,45
             1218: 118,45
             1219: 117,45
-  - uid: 25199
+  - uid: 25480
     components:
     - type: ChunkEntity
       root: 2
@@ -61311,7 +62373,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3272: 63,99
-  - uid: 25200
+  - uid: 25481
     components:
     - type: ChunkEntity
       root: 2
@@ -61398,7 +62460,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             321: 39,87
-  - uid: 25201
+  - uid: 25482
     components:
     - type: ChunkEntity
       root: 2
@@ -61494,7 +62556,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             786: 46,76
-  - uid: 25202
+  - uid: 25483
     components:
     - type: ChunkEntity
       root: 2
@@ -61762,7 +62824,7 @@ entities:
             4530: 12,75
             4531: 12,76
             4532: 12,77
-  - uid: 25203
+  - uid: 25484
     components:
     - type: ChunkEntity
       root: 2
@@ -61841,7 +62903,7 @@ entities:
             color: '#FF0000FF'
           decals:
             4183: 146,81
-  - uid: 25204
+  - uid: 25485
     components:
     - type: ChunkEntity
       root: 2
@@ -61865,7 +62927,7 @@ entities:
             4754: 15,62
             4755: 13,62
             4756: 13,63
-  - uid: 25205
+  - uid: 25486
     components:
     - type: ChunkEntity
       root: 2
@@ -62082,7 +63144,7 @@ entities:
             cleanable: True
           decals:
             3237: 52.997345,24.430504
-  - uid: 25206
+  - uid: 25487
     components:
     - type: ChunkEntity
       root: 2
@@ -62133,7 +63195,7 @@ entities:
             3877: 54,13
             3878: 55,13
             3879: 56,13
-  - uid: 25207
+  - uid: 25488
     components:
     - type: ChunkEntity
       root: 2
@@ -62212,7 +63274,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             4683: 15,107
-  - uid: 25208
+  - uid: 25489
     components:
     - type: ChunkEntity
       root: 2
@@ -62428,7 +63490,7 @@ entities:
             24: 142.17316,81.00255
             25: 141.00128,82.12755
             26: 139.9544,81.04942
-  - uid: 25209
+  - uid: 25490
     components:
     - type: ChunkEntity
       root: 2
@@ -62635,7 +63697,7 @@ entities:
           decals:
             3973: 140.60794,54.072556
             3974: 139.76419,54.33818
-  - uid: 25210
+  - uid: 25491
     components:
     - type: ChunkEntity
       root: 2
@@ -62726,7 +63788,7 @@ entities:
             color: '#79150096'
           decals:
             4587: 29.500965,97.07767
-  - uid: 25211
+  - uid: 25492
     components:
     - type: ChunkEntity
       root: 2
@@ -62761,7 +63823,7 @@ entities:
             color: '#FF0000FF'
           decals:
             4171: 145,79
-  - uid: 25212
+  - uid: 25493
     components:
     - type: ChunkEntity
       root: 2
@@ -62871,7 +63933,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             4699: 138,33
-  - uid: 25213
+  - uid: 25494
     components:
     - type: ChunkEntity
       root: 2
@@ -62911,7 +63973,7 @@ entities:
             color: '#EFB34196'
           decals:
             2754: 33,29
-  - uid: 25214
+  - uid: 25495
     components:
     - type: ChunkEntity
       root: 2
@@ -62937,7 +63999,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             4698: 138,31
-  - uid: 25215
+  - uid: 25496
     components:
     - type: ChunkEntity
       root: 2
@@ -63520,11 +64582,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 24.5,59.5
-  - uid: 8954
-    components:
-    - type: Transform
-      parent: 2
-      pos: 54.5,49.5
   - uid: 12008
     components:
     - type: Transform
@@ -63537,6 +64594,11 @@ entities:
       pos: 85.5,126.5
 - proto: ClosetFireFilled
   entities:
+  - uid: 6896
+    components:
+    - type: Transform
+      parent: 2
+      pos: 54.5,49.5
   - uid: 8955
     components:
     - type: Transform
@@ -63657,11 +64719,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 112.5,129.5
-  - uid: 8983
-    components:
-    - type: Transform
-      parent: 2
-      pos: 52.5,49.5
   - uid: 8984
     components:
     - type: Transform
@@ -63782,11 +64839,6 @@ entities:
       parent: 2
       pos: 108.5,32.5
   - uid: 9000
-    components:
-    - type: Transform
-      parent: 2
-      pos: 52.5,65.5
-  - uid: 9001
     components:
     - type: Transform
       parent: 2
@@ -64140,8 +65192,8 @@ entities:
     components:
     - type: Transform
       parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 75.5,67.5
+      rot: 1.5707963267948966 rad
+      pos: 72.5,68.5
 - proto: ClothingBackpackDuffelSurgeryFilled
   entities:
   - uid: 9071
@@ -64163,6 +65215,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 109.89116,53.646126
+- proto: ClothingBeltSecurity
+  entities:
+  - uid: 17007
+    components:
+    - type: Transform
+      parent: 16219
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 16219
 - proto: ClothingBeltSecurityWebbingFilled
   entities:
   - uid: 9074
@@ -64286,11 +65348,11 @@ entities:
       pos: 54.535355,40.589188
 - proto: ClothingHandsGlovesFingerless
   entities:
-  - uid: 9096
+  - uid: 8193
     components:
     - type: Transform
       parent: 2
-      pos: 69.58265,22.53532
+      pos: 69.573074,22.5472
 - proto: ClothingHandsGlovesFingerlessInsulated
   entities:
   - uid: 9097
@@ -64347,6 +65409,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 139.5206,75.471
+- proto: ClothingHeadHatBeretSecurity
+  entities:
+  - uid: 17222
+    components:
+    - type: Transform
+      parent: 16219
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 16219
 - proto: ClothingHeadHatCardborg
   entities:
   - uid: 9105
@@ -64531,11 +65603,11 @@ entities:
       pos: 117.42139,103.67886
 - proto: ClothingHeadsetMining
   entities:
-  - uid: 9135
+  - uid: 18016
     components:
     - type: Transform
       parent: 2
-      pos: 99.61422,23.001423
+      pos: 98.41654,23.419724
 - proto: ClothingMaskBandBlack
   entities:
   - uid: 9136
@@ -64847,6 +65919,16 @@ entities:
       parent: 9177
     - type: Physics
       canCollide: False
+- proto: ClothingShoesBootsJack
+  entities:
+  - uid: 16229
+    components:
+    - type: Transform
+      parent: 16219
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 16219
 - proto: ClothingShoesBootsMag
   entities:
   - uid: 9179
@@ -64971,6 +66053,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 61.675667,26.389153
+- proto: ClothingUniformJumpskirtSecGrey
+  entities:
+  - uid: 16697
+    components:
+    - type: Transform
+      parent: 16219
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 16219
 - proto: ClothingUniformJumpsuitAncient
   entities:
   - uid: 9196
@@ -65034,6 +66126,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 89.29202,85.59994
+- proto: ClothingUniformJumpsuitSecGrey
+  entities:
+  - uid: 16650
+    components:
+    - type: Transform
+      parent: 16219
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 16219
 - proto: Cobweb1
   entities:
   - uid: 8692
@@ -65310,12 +66412,12 @@ entities:
       pos: 121.5,121.5
 - proto: ComputerCargoBounty
   entities:
-  - uid: 9249
+  - uid: 12983
     components:
     - type: Transform
       parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 80.5,38.5
+      rot: 1.5707963267948966 rad
+      pos: 73.5,30.5
 - proto: ComputerCargoOrders
   entities:
   - uid: 9250
@@ -65324,6 +66426,11 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 74.5,61.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        17580:
+        - - OrderSender
+          - OrderReceiver
     - type: AccessReader
       accessListsOriginal:
       - - Cargo
@@ -65333,11 +66440,32 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 72.5,39.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        17580:
+        - - OrderSender
+          - OrderReceiver
   - uid: 9252
     components:
     - type: Transform
       parent: 2
       pos: 79.5,25.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        17580:
+        - - OrderSender
+          - OrderReceiver
+  - uid: 21326
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 72.5,41.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        17580:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersEngineering
   entities:
   - uid: 9253
@@ -65345,6 +66473,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 53.5,53.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        17580:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersMedical
   entities:
   - uid: 9254
@@ -65353,6 +66486,11 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 103.5,48.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        17580:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersScience
   entities:
   - uid: 9255
@@ -65360,6 +66498,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 103.5,72.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        17580:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersSecurity
   entities:
   - uid: 9256
@@ -65367,6 +66510,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 96.5,88.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        17580:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersService
   entities:
   - uid: 9257
@@ -65374,6 +66522,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 60.5,81.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        17580:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerComms
   entities:
   - uid: 9258
@@ -65517,12 +66670,12 @@ entities:
       pos: 56.5,39.5
 - proto: ComputerRadar
   entities:
-  - uid: 9279
+  - uid: 9135
     components:
     - type: Transform
       parent: 2
-      rot: 3.141592653589793 rad
-      pos: 73.5,27.5
+      rot: -1.5707963267948966 rad
+      pos: 80.5,38.5
   - uid: 9280
     components:
     - type: Transform
@@ -67440,21 +68593,21 @@ entities:
     - type: Transform
       parent: 2
       pos: 20.5,86.5
-  - uid: 9602
+  - uid: 9616
     components:
     - type: Transform
       parent: 2
-      pos: 69.5,33.5
-  - uid: 9603
+      pos: 75.5,29.5
+  - uid: 9617
     components:
     - type: Transform
       parent: 2
-      pos: 74.5,30.5
-  - uid: 9604
+      pos: 75.5,33.5
+  - uid: 12976
     components:
     - type: Transform
       parent: 2
-      pos: 74.5,33.5
+      pos: 76.5,30.5
 - proto: CrateEngineeringAMEJar
   entities:
   - uid: 9605
@@ -67518,36 +68671,26 @@ entities:
       pos: 56.5,52.5
 - proto: CrateFilledSpawner
   entities:
-  - uid: 9614
+  - uid: 9602
     components:
     - type: Transform
       parent: 2
-      pos: 76.5,32.5
-  - uid: 9615
+      pos: 77.5,28.5
+  - uid: 9603
     components:
     - type: Transform
       parent: 2
-      pos: 69.5,32.5
-  - uid: 9616
-    components:
-    - type: Transform
-      parent: 2
-      pos: 70.5,33.5
-  - uid: 9617
-    components:
-    - type: Transform
-      parent: 2
-      pos: 75.5,29.5
-  - uid: 9618
-    components:
-    - type: Transform
-      parent: 2
-      pos: 74.5,29.5
+      pos: 75.5,32.5
   - uid: 9619
     components:
     - type: Transform
       parent: 2
       pos: 21.5,85.5
+  - uid: 12995
+    components:
+    - type: Transform
+      parent: 2
+      pos: 77.5,32.5
 - proto: CrateFreezer
   entities:
   - uid: 9621
@@ -67893,6 +69036,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 125.5,82.5
+- proto: CrewsimovCircuitBoard
+  entities:
+  - uid: 852
+    components:
+    - type: Transform
+      parent: 2
+      pos: 87.43229,72.23507
 - proto: Crowbar
   entities:
   - uid: 9664
@@ -67905,11 +69055,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 55.624393,71.43817
-  - uid: 9666
+  - uid: 17736
     components:
     - type: Transform
       parent: 2
-      pos: 67.5,32.5
+      pos: 73.51293,29.444313
 - proto: CrowbarRed
   entities:
   - uid: 9667
@@ -69114,6 +70264,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 53.67598,40.620438
+  - uid: 25167
+    components:
+    - type: Transform
+      parent: 2
+      pos: 52.465767,84.551834
 - proto: DiceBag
   entities:
   - uid: 9845
@@ -69710,16 +70865,23 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 12.5,72.5
-  - uid: 9951
-    components:
-    - type: Transform
-      parent: 2
-      pos: 79.5,88.5
   - uid: 9983
     components:
     - type: Transform
       parent: 2
       pos: 34.5,88.5
+  - uid: 10318
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 71.5,31.5
+  - uid: 10319
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 70.5,31.5
   - uid: 10340
     components:
     - type: Transform
@@ -69750,12 +70912,74 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 95.5,33.5
+  - uid: 19363
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 73.5,34.5
+  - uid: 19403
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 73.5,33.5
   - uid: 25148
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 17.5,35.5
+  - uid: 25385
+    components:
+    - type: Transform
+      parent: 2
+      pos: 101.5,48.5
+  - uid: 25390
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 100.5,66.5
+  - uid: 25401
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 94.5,88.5
+  - uid: 25407
+    components:
+    - type: Transform
+      parent: 2
+      pos: 52.5,67.5
+  - uid: 25409
+    components:
+    - type: Transform
+      parent: 2
+      pos: 52.5,51.5
+  - uid: 25417
+    components:
+    - type: Transform
+      parent: 2
+      pos: 68.5,40.5
+  - uid: 25418
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 68.5,38.5
+  - uid: 25419
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 78.5,38.5
+  - uid: 25434
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 73.5,91.5
 - proto: DisposalJunction
   entities:
   - uid: 9953
@@ -69810,12 +71034,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 77.5,43.5
-  - uid: 9962
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 70.5,31.5
   - uid: 9963
     components:
     - type: Transform
@@ -69908,12 +71126,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 81.5,43.5
-  - uid: 9980
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 77.5,88.5
   - uid: 9982
     components:
     - type: Transform
@@ -69930,6 +71142,18 @@ entities:
     - type: Transform
       parent: 2
       pos: 34.5,84.5
+  - uid: 10767
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 79.5,93.5
+  - uid: 11014
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 73.5,93.5
 - proto: DisposalJunctionFlipped
   entities:
   - uid: 9952
@@ -69986,7 +71210,7 @@ entities:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
-      pos: 77.5,31.5
+      pos: 77.5,35.5
   - uid: 9994
     components:
     - type: Transform
@@ -70097,6 +71321,18 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 49.5,41.5
+  - uid: 10301
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 77.5,34.5
+  - uid: 10425
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 77.5,91.5
 - proto: DisposalMachineFrame
   entities:
   - uid: 10011
@@ -70130,6 +71366,12 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 67.5,86.5
+  - uid: 9001
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 79.5,90.5
   - uid: 9124
     components:
     - type: Transform
@@ -70165,6 +71407,12 @@ entities:
     - type: Transform
       parent: 2
       pos: 17.5,34.5
+  - uid: 9666
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 72.5,33.5
   - uid: 9699
     components:
     - type: Transform
@@ -70188,6 +71436,23 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 49.5,40.5
+  - uid: 9951
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 79.5,88.5
+  - uid: 9962
+    components:
+    - type: Transform
+      parent: 2
+      pos: 77.5,31.5
+  - uid: 9980
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 79.5,92.5
   - uid: 9981
     components:
     - type: Transform
@@ -70313,13 +71578,13 @@ entities:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
-      pos: 73.5,91.5
+      pos: 77.5,88.5
   - uid: 10034
     components:
     - type: Transform
       parent: 2
-      rot: 3.141592653589793 rad
-      pos: 73.5,92.5
+      rot: 1.5707963267948966 rad
+      pos: 78.5,43.5
   - uid: 10035
     components:
     - type: Transform
@@ -71768,12 +73033,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 79.5,43.5
-  - uid: 10294
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 78.5,43.5
   - uid: 10295
     components:
     - type: Transform
@@ -71804,16 +73063,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 77.5,36.5
-  - uid: 10301
-    components:
-    - type: Transform
-      parent: 2
-      pos: 77.5,35.5
-  - uid: 10302
-    components:
-    - type: Transform
-      parent: 2
-      pos: 77.5,34.5
   - uid: 10303
     components:
     - type: Transform
@@ -71864,54 +73113,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 70.5,30.5
-  - uid: 10313
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 69.5,31.5
-  - uid: 10314
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 68.5,31.5
   - uid: 10315
     components:
     - type: Transform
       parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 71.5,31.5
-  - uid: 10316
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 72.5,31.5
+      pos: 71.5,34.5
   - uid: 10317
     components:
     - type: Transform
       parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 73.5,31.5
-  - uid: 10318
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 74.5,31.5
-  - uid: 10319
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 75.5,31.5
-  - uid: 10320
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 76.5,31.5
+      pos: 71.5,32.5
   - uid: 10321
     components:
     - type: Transform
@@ -72497,11 +73708,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 49.5,68.5
-  - uid: 10425
-    components:
-    - type: Transform
-      parent: 2
-      pos: 49.5,67.5
   - uid: 10426
     components:
     - type: Transform
@@ -73068,12 +74274,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 77.5,92.5
   - uid: 10525
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 77.5,91.5
-  - uid: 10526
     components:
     - type: Transform
       parent: 2
@@ -73492,12 +74692,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 105.5,65.5
-  - uid: 10597
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 105.5,66.5
   - uid: 10598
     components:
     - type: Transform
@@ -73913,12 +75107,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 95.5,92.5
-  - uid: 10669
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 94.5,92.5
   - uid: 10670
     components:
     - type: Transform
@@ -74137,11 +75325,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 50.5,68.5
-  - uid: 10710
-    components:
-    - type: Transform
-      parent: 2
-      pos: 50.5,67.5
   - uid: 10711
     components:
     - type: Transform
@@ -74207,11 +75390,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 50.5,53.5
-  - uid: 10724
-    components:
-    - type: Transform
-      parent: 2
-      pos: 50.5,51.5
   - uid: 10725
     components:
     - type: Transform
@@ -74419,12 +75597,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 77.5,44.5
-  - uid: 10761
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 78.5,44.5
   - uid: 10762
     components:
     - type: Transform
@@ -74455,12 +75627,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 100.5,44.5
-  - uid: 10767
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 101.5,44.5
   - uid: 10768
     components:
     - type: Transform
@@ -74766,8 +75932,8 @@ entities:
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 79.5,93.5
+      rot: 3.141592653589793 rad
+      pos: 79.5,89.5
   - uid: 10822
     components:
     - type: Transform
@@ -74964,8 +76130,8 @@ entities:
     components:
     - type: Transform
       parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 78.5,88.5
+      rot: 3.141592653589793 rad
+      pos: 79.5,91.5
   - uid: 10859
     components:
     - type: Transform
@@ -75815,6 +76981,12 @@ entities:
     - type: Transform
       parent: 2
       pos: 29.5,37.5
+  - uid: 11312
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 51.5,51.5
   - uid: 11319
     components:
     - type: Transform
@@ -75850,12 +77022,27 @@ entities:
     - type: Transform
       parent: 2
       pos: 96.5,92.5
+  - uid: 20225
+    components:
+    - type: Transform
+      parent: 2
+      pos: 101.5,45.5
   - uid: 24583
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 33.5,88.5
+  - uid: 24585
+    components:
+    - type: Transform
+      parent: 2
+      pos: 101.5,46.5
+  - uid: 24714
+    components:
+    - type: Transform
+      parent: 2
+      pos: 101.5,47.5
   - uid: 24851
     components:
     - type: Transform
@@ -75954,6 +77141,217 @@ entities:
     - type: Transform
       parent: 2
       pos: 17.5,33.5
+  - uid: 25375
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 74.5,34.5
+  - uid: 25376
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 75.5,34.5
+  - uid: 25377
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 76.5,34.5
+  - uid: 25386
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 104.5,66.5
+  - uid: 25387
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 103.5,66.5
+  - uid: 25388
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 102.5,66.5
+  - uid: 25389
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 101.5,66.5
+  - uid: 25391
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,67.5
+  - uid: 25392
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,68.5
+  - uid: 25393
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,69.5
+  - uid: 25394
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,70.5
+  - uid: 25395
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,71.5
+  - uid: 25397
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 94.5,91.5
+  - uid: 25398
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 94.5,90.5
+  - uid: 25399
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 94.5,89.5
+  - uid: 25403
+    components:
+    - type: Transform
+      parent: 2
+      pos: 49.5,67.5
+  - uid: 25404
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 51.5,67.5
+  - uid: 25405
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 52.5,66.5
+  - uid: 25408
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 52.5,50.5
+  - uid: 25411
+    components:
+    - type: Transform
+      parent: 2
+      pos: 78.5,43.5
+  - uid: 25412
+    components:
+    - type: Transform
+      parent: 2
+      pos: 78.5,42.5
+  - uid: 25413
+    components:
+    - type: Transform
+      parent: 2
+      pos: 78.5,41.5
+  - uid: 25414
+    components:
+    - type: Transform
+      parent: 2
+      pos: 78.5,40.5
+  - uid: 25415
+    components:
+    - type: Transform
+      parent: 2
+      pos: 78.5,39.5
+  - uid: 25420
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 77.5,38.5
+  - uid: 25421
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 76.5,38.5
+  - uid: 25422
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 75.5,38.5
+  - uid: 25423
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 74.5,38.5
+  - uid: 25424
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 73.5,38.5
+  - uid: 25425
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 72.5,38.5
+  - uid: 25426
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 71.5,38.5
+  - uid: 25427
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 70.5,38.5
+  - uid: 25428
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 69.5,38.5
+  - uid: 25429
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 68.5,39.5
+  - uid: 25436
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 76.5,91.5
+  - uid: 25437
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 75.5,91.5
+  - uid: 25438
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 74.5,91.5
 - proto: DisposalPipeBroken
   entities:
   - uid: 11006
@@ -75964,6 +77362,15 @@ entities:
       pos: 129.5,122.5
 - proto: DisposalRouter
   entities:
+  - uid: 10724
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 78.5,44.5
+    - type: DisposalRouter
+      tags:
+      - Cargo
   - uid: 11007
     components:
     - type: Transform
@@ -75975,6 +77382,49 @@ entities:
       - Chemistry
 - proto: DisposalRouterFlipped
   entities:
+  - uid: 10294
+    components:
+    - type: Transform
+      parent: 2
+      pos: 50.5,67.5
+    - type: DisposalRouter
+      tags:
+      - Tider
+  - uid: 10526
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 105.5,66.5
+    - type: DisposalRouter
+      tags:
+      - Science
+  - uid: 10597
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 94.5,92.5
+    - type: DisposalRouter
+      tags:
+      - Security
+  - uid: 10710
+    components:
+    - type: Transform
+      parent: 2
+      pos: 50.5,51.5
+    - type: DisposalRouter
+      tags:
+      - Engineering
+  - uid: 10761
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 101.5,44.5
+    - type: DisposalRouter
+      tags:
+      - Medical
   - uid: 11008
     components:
     - type: Transform
@@ -76003,6 +77453,17 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 83.5,109.5
+  - uid: 10313
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 76.5,35.5
+  - uid: 10316
+    components:
+    - type: Transform
+      parent: 2
+      pos: 71.5,35.5
   - uid: 10918
     components:
     - type: Transform
@@ -76032,12 +77493,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 28.5,83.5
-  - uid: 11014
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 73.5,90.5
   - uid: 11016
     components:
     - type: Transform
@@ -76164,12 +77619,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 69.5,29.5
-  - uid: 11040
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 67.5,31.5
   - uid: 11041
     components:
     - type: Transform
@@ -76431,6 +77880,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 138.5,92.5
+  - uid: 24716
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 100.5,48.5
   - uid: 24855
     components:
     - type: Transform
@@ -76455,8 +77910,48 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 17.5,31.5
+  - uid: 25396
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,72.5
+  - uid: 25400
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 93.5,88.5
+  - uid: 25406
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 52.5,65.5
+  - uid: 25410
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 52.5,49.5
+  - uid: 25416
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 67.5,40.5
+  - uid: 25435
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 73.5,90.5
 - proto: DisposalUnit
   entities:
+  - uid: 1136
+    components:
+    - type: Transform
+      parent: 2
+      pos: 71.5,35.5
   - uid: 8937
     components:
     - type: Transform
@@ -76537,11 +78032,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 80.5,39.5
-  - uid: 11109
-    components:
-    - type: Transform
-      parent: 2
-      pos: 67.5,31.5
   - uid: 11110
     components:
     - type: Transform
@@ -76797,6 +78287,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 96.5,91.5
+  - uid: 20870
+    components:
+    - type: Transform
+      parent: 2
+      pos: 76.5,35.5
   - uid: 24007
     components:
     - type: Transform
@@ -76835,12 +78330,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 106.5,87.5
-  - uid: 11166
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 73.5,93.5
   - uid: 11167
     components:
     - type: Transform
@@ -76848,6 +78337,12 @@ entities:
       pos: 106.5,70.5
 - proto: DisposalYJunction
   entities:
+  - uid: 10314
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 71.5,33.5
   - uid: 11168
     components:
     - type: Transform
@@ -77647,33 +79142,17 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 21.5,80.5
-  - uid: 11300
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 30.5,35.5
   - uid: 11301
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 44.5,38.5
+      rot: -1.5707963267948966 rad
+      pos: 46.5,38.5
   - uid: 11302
     components:
     - type: Transform
       parent: 2
       pos: 20.5,29.5
-  - uid: 11306
-    components:
-    - type: Transform
-      parent: 2
-      pos: 73.5,47.5
-  - uid: 11307
-    components:
-    - type: Transform
-      parent: 2
-      pos: 82.5,47.5
   - uid: 11308
     components:
     - type: Transform
@@ -77684,24 +79163,12 @@ entities:
     - type: Transform
       parent: 2
       pos: 95.5,44.5
-  - uid: 11310
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 107.5,44.5
   - uid: 11311
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 107.5,53.5
-  - uid: 11312
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 114.5,49.5
   - uid: 11313
     components:
     - type: Transform
@@ -77732,12 +79199,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 130.5,86.5
-  - uid: 11320
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 73.5,95.5
   - uid: 11321
     components:
     - type: Transform
@@ -77945,23 +79406,12 @@ entities:
     - type: Transform
       parent: 2
       pos: 144.5,89.5
-  - uid: 11363
-    components:
-    - type: Transform
-      parent: 2
-      pos: 12.5,81.5
   - uid: 11364
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 18.5,72.5
-  - uid: 11365
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 24.5,40.5
   - uid: 11366
     components:
     - type: Transform
@@ -77986,12 +79436,41 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 114.5,97.5
+  - uid: 17681
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 75.5,90.5
   - uid: 17738
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 105.5,81.5
+  - uid: 17836
+    components:
+    - type: Transform
+      parent: 2
+      pos: 17.5,81.5
+  - uid: 17837
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 29.5,35.5
+  - uid: 17868
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 107.5,46.5
+  - uid: 17895
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 22.5,40.5
   - uid: 17973
     components:
     - type: Transform
@@ -78014,12 +79493,23 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 58.5,42.5
+  - uid: 20196
+    components:
+    - type: Transform
+      parent: 2
+      pos: 110.5,51.5
   - uid: 21366
     components:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
       pos: 89.5,92.5
+  - uid: 25382
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 73.5,30.5
 - proto: EmergencyMedipen
   entities:
   - uid: 11369
@@ -78242,12 +79732,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 108.5,67.5
-  - uid: 11396
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 67.5,41.5
   - uid: 15847
     components:
     - type: Transform
@@ -78266,6 +79750,12 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 59.5,109.5
+  - uid: 17860
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 66.5,41.5
   - uid: 19125
     components:
     - type: Transform
@@ -78411,6 +79901,13 @@ entities:
       pos: 119.5,81.5
     - type: FaxMachine
       name: RD's Office
+  - uid: 11932
+    components:
+    - type: Transform
+      parent: 2
+      pos: 64.5,78.5
+    - type: FaxMachine
+      name: Botany/Kitchen
 - proto: FaxMachineCaptain
   entities:
   - uid: 11416
@@ -78563,6 +80060,17 @@ entities:
       - 20718
       - 20719
       - 20976
+  - uid: 10669
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 51.5,69.5
+    - type: DeviceList
+      devices:
+      - 580
+      - 15005
+      - 15181
   - uid: 11386
     components:
     - type: Transform
@@ -79007,7 +80515,6 @@ entities:
       - 15035
       - 599
       - 15213
-      - 11551
       - 11760
       - 11764
       - 15214
@@ -79039,13 +80546,15 @@ entities:
       - 11737
       - 11738
       - 11742
-      - 15020
-      - 594
-      - 15196
-      - 15197
-      - 593
-      - 15021
+      - 9279
+      - 25381
+      - 25380
+      - 14911
+      - 17484
+      - 25383
       - 11741
+      - 25374
+      - 9615
   - uid: 11452
     components:
     - type: Transform
@@ -79062,8 +80571,6 @@ entities:
       - 15025
       - 585
       - 15201
-      - 11827
-      - 11631
       - 23999
   - uid: 11453
     components:
@@ -79143,6 +80650,7 @@ entities:
       - 11815
       - 11814
       - 11813
+      - 25402
   - uid: 11458
     components:
     - type: Transform
@@ -79202,34 +80710,6 @@ entities:
       - 15224
       - 11763
       - 11760
-  - uid: 11463
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 53.5,64.5
-    - type: DeviceList
-      devices:
-      - 580
-      - 15005
-      - 15181
-  - uid: 11464
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 138.5,85.5
-    - type: DeviceList
-      devices:
-      - 11786
-      - 11787
-      - 11788
-      - 11790
-      - 11791
-      - 14602
-      - 11842
-      - 6802
-      - 17291
   - uid: 11465
     components:
     - type: Transform
@@ -79538,7 +81018,6 @@ entities:
       pos: 131.5,46.5
     - type: DeviceList
       devices:
-      - 11551
       - 11550
       - 15221
       - 616
@@ -79556,6 +81035,8 @@ entities:
       - 15202
       - 587
       - 14985
+      - 872
+      - 871
   - uid: 11487
     components:
     - type: Transform
@@ -79698,7 +81179,6 @@ entities:
       - 15120
       - 15294
       - 11579
-      - 11580
   - uid: 11497
     components:
     - type: Transform
@@ -79861,6 +81341,23 @@ entities:
       - 618
       - 15052
       - 11555
+  - uid: 25168
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 131.5,85.5
+    - type: DeviceList
+      devices:
+      - 11786
+      - 11787
+      - 11788
+      - 11790
+      - 11791
+      - 14602
+      - 11842
+      - 6802
+      - 17291
 - proto: FireAlarmAssembly
   entities:
   - uid: 11506
@@ -79891,6 +81388,15 @@ entities:
       pos: 50.487995,17.561714
 - proto: Firelock
   entities:
+  - uid: 240
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 82.5,49.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 103
   - uid: 520
     components:
     - type: Transform
@@ -80154,7 +81660,7 @@ entities:
       deviceLists:
       - 31
       - 11443
-      - 32
+      - 21851
   - uid: 11544
     components:
     - type: Transform
@@ -80204,9 +81710,9 @@ entities:
       pos: 111.5,48.5
     - type: DeviceNetwork
       deviceLists:
-      - 30
       - 38
       - 11484
+      - 11936
   - uid: 11549
     components:
     - type: Transform
@@ -80230,17 +81736,6 @@ entities:
       - 11455
       - 11485
       - 127
-  - uid: 11551
-    components:
-    - type: Transform
-      parent: 2
-      pos: 127.5,48.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 41
-      - 11449
-      - 11485
-      - 127
   - uid: 11552
     components:
     - type: Transform
@@ -80501,7 +81996,7 @@ entities:
       - 36
       - 11431
       - 11432
-      - 134
+      - 20226
   - uid: 11579
     components:
     - type: Transform
@@ -80512,15 +82007,6 @@ entities:
       deviceLists:
       - 103
       - 11496
-  - uid: 11580
-    components:
-    - type: Transform
-      parent: 2
-      pos: 83.5,50.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 103
-      - 11496
   - uid: 11581
     components:
     - type: Transform
@@ -80774,6 +82260,26 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 44
+  - uid: 871
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 97.5,26.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 17782
+      - 11486
+  - uid: 872
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 97.5,25.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 17782
+      - 11486
   - uid: 8899
     components:
     - type: Transform
@@ -80785,6 +82291,15 @@ entities:
       - 11386
       - 84
       - 67
+  - uid: 11551
+    components:
+    - type: Transform
+      parent: 2
+      pos: 127.5,48.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 127
+      - 41
   - uid: 11607
     components:
     - type: Transform
@@ -80833,7 +82348,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 39
-      - 134
+      - 20226
   - uid: 11613
     components:
     - type: Transform
@@ -81010,16 +82525,6 @@ entities:
       - 11431
       - 39
       - 11444
-  - uid: 11631
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 97.5,26.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 11452
-      - 17782
   - uid: 11632
     components:
     - type: Transform
@@ -81422,9 +82927,9 @@ entities:
       pos: 59.5,80.5
     - type: DeviceNetwork
       deviceLists:
-      - 87
       - 89
       - 11457
+      - 17654
   - uid: 11670
     components:
     - type: Transform
@@ -81485,8 +82990,8 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 88
-      - 87
       - 137
+      - 17654
   - uid: 11676
     components:
     - type: Transform
@@ -81649,8 +83154,8 @@ entities:
       deviceLists:
       - 19
       - 11442
-      - 20
       - 11490
+      - 17794
   - uid: 11691
     components:
     - type: Transform
@@ -81661,8 +83166,8 @@ entities:
       deviceLists:
       - 19
       - 11442
-      - 20
       - 11490
+      - 17794
   - uid: 11692
     components:
     - type: Transform
@@ -82118,7 +83623,7 @@ entities:
       deviceLists:
       - 11487
       - 11451
-      - 123
+      - 527
       - 124
   - uid: 11738
     components:
@@ -82129,7 +83634,7 @@ entities:
       deviceLists:
       - 11487
       - 11451
-      - 123
+      - 527
       - 124
   - uid: 11739
     components:
@@ -82174,7 +83679,7 @@ entities:
       - 33
       - 11451
       - 11488
-      - 123
+      - 527
   - uid: 11743
     components:
     - type: Transform
@@ -82242,7 +83747,7 @@ entities:
       deviceLists:
       - 31
       - 11443
-      - 32
+      - 21851
   - uid: 11749
     components:
     - type: Transform
@@ -82252,7 +83757,7 @@ entities:
       deviceLists:
       - 31
       - 11443
-      - 32
+      - 21851
   - uid: 11750
     components:
     - type: Transform
@@ -82262,7 +83767,7 @@ entities:
       deviceLists:
       - 31
       - 11443
-      - 32
+      - 21851
   - uid: 11751
     components:
     - type: Transform
@@ -82646,10 +84151,10 @@ entities:
       pos: 128.5,88.5
     - type: DeviceNetwork
       deviceLists:
-      - 56
       - 55
       - 11446
-      - 11464
+      - 25169
+      - 25168
   - uid: 11787
     components:
     - type: Transform
@@ -82658,10 +84163,10 @@ entities:
       pos: 128.5,87.5
     - type: DeviceNetwork
       deviceLists:
-      - 56
       - 55
       - 11446
-      - 11464
+      - 25169
+      - 25168
   - uid: 11788
     components:
     - type: Transform
@@ -82670,10 +84175,10 @@ entities:
       pos: 128.5,86.5
     - type: DeviceNetwork
       deviceLists:
-      - 56
       - 55
       - 11446
-      - 11464
+      - 25169
+      - 25168
   - uid: 11789
     components:
     - type: Transform
@@ -82692,9 +84197,9 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 54
-      - 56
-      - 11464
       - 11480
+      - 25169
+      - 25168
   - uid: 11791
     components:
     - type: Transform
@@ -82703,9 +84208,9 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 54
-      - 56
-      - 11464
       - 11480
+      - 25169
+      - 25168
   - uid: 11792
     components:
     - type: Transform
@@ -83080,16 +84585,6 @@ entities:
       deviceLists:
       - 10
       - 9030
-  - uid: 11827
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 97.5,25.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 11452
-      - 17782
   - uid: 11828
     components:
     - type: Transform
@@ -83237,8 +84732,8 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 120
-      - 11464
-      - 56
+      - 25169
+      - 25168
   - uid: 19453
     components:
     - type: Transform
@@ -83287,6 +84782,28 @@ entities:
       deviceLists:
       - 9030
       - 10
+  - uid: 25380
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 72.5,33.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 11451
+      - 123
+      - 527
+  - uid: 25381
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 72.5,32.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 11451
+      - 123
+      - 527
 - proto: Fireplace
   entities:
   - uid: 11843
@@ -83360,6 +84877,14 @@ entities:
     - type: Transform
       parent: 2
       pos: 96.4969,83.56804
+  - uid: 17221
+    components:
+    - type: Transform
+      parent: 16219
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 16219
 - proto: FlippoLighter
   entities:
   - uid: 1246
@@ -83858,16 +85383,16 @@ entities:
       pos: 144.55678,98.73146
 - proto: FoodPoppy
   entities:
-  - uid: 11932
-    components:
-    - type: Transform
-      parent: 2
-      pos: 64.43483,77.69029
   - uid: 11933
     components:
     - type: Transform
       parent: 2
       pos: 53.485634,55.629414
+  - uid: 20521
+    components:
+    - type: Transform
+      parent: 2
+      pos: 60.53769,77.37803
 - proto: FoodRiceBoiled
   entities:
   - uid: 11934
@@ -83884,11 +85409,11 @@ entities:
       pos: 18.871925,94.69462
 - proto: FoodShakerPepper
   entities:
-  - uid: 11936
+  - uid: 11463
     components:
     - type: Transform
       parent: 2
-      pos: 64.387955,78.59654
+      pos: 64.3606,77.61761
   - uid: 11937
     components:
     - type: Transform
@@ -83896,11 +85421,6 @@ entities:
       pos: 136.76108,64.35375
 - proto: FoodShakerSalt
   entities:
-  - uid: 11938
-    components:
-    - type: Transform
-      parent: 2
-      pos: 64.62233,78.36217
   - uid: 11939
     components:
     - type: Transform
@@ -83911,6 +85431,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 136.5892,64.65063
+  - uid: 21931
+    components:
+    - type: Transform
+      parent: 2
+      pos: 64.621025,77.36761
 - proto: FoodSnackPopcorn
   entities:
   - uid: 11941
@@ -85012,14 +86537,6 @@ entities:
       pos: 73.5,39.5
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 12085
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 74.5,29.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 12086
     components:
     - type: Transform
@@ -86024,14 +87541,6 @@ entities:
       pos: 60.5,63.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 12223
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 83.5,49.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 12224
     components:
     - type: Transform
@@ -86331,8 +87840,8 @@ entities:
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 83.5,52.5
+      rot: 3.141592653589793 rad
+      pos: 81.5,49.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 12263
@@ -86790,6 +88299,14 @@ entities:
       pos: 84.5,116.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 14239
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 81.5,52.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 14401
     components:
     - type: Transform
@@ -86876,6 +88393,21 @@ entities:
       pos: 110.5,56.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 25372
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 71.5,33.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 25373
+    components:
+    - type: Transform
+      parent: 2
+      pos: 71.5,34.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPipeBendAlt1
   entities:
   - uid: 12314
@@ -87251,6 +88783,14 @@ entities:
       color: '#990000FF'
 - proto: GasPipeStraight
   entities:
+  - uid: 593
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 69.5,34.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 612
     components:
     - type: Transform
@@ -87345,6 +88885,13 @@ entities:
       pos: 85.5,111.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 3393
+    components:
+    - type: Transform
+      parent: 2
+      pos: 81.5,51.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 9162
     components:
     - type: Transform
@@ -87361,6 +88908,22 @@ entities:
       pos: 113.5,101.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 9614
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 71.5,32.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 11310
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 83.5,49.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 11637
     components:
     - type: Transform
@@ -87377,6 +88940,14 @@ entities:
       pos: 21.5,32.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 11827
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 68.5,32.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 11964
     components:
     - type: Transform
@@ -87409,6 +88980,14 @@ entities:
       pos: 83.5,109.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 12223
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 82.5,52.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 12268
     components:
     - type: Transform
@@ -91939,14 +93518,6 @@ entities:
       pos: 78.5,34.5
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 12961
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 77.5,33.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 12962
     components:
     - type: Transform
@@ -92035,14 +93606,6 @@ entities:
       pos: 75.5,27.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 12973
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 74.5,27.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 12974
     components:
     - type: Transform
@@ -92059,28 +93622,12 @@ entities:
       pos: 72.5,27.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 12976
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 77.5,29.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 12977
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 76.5,29.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 12978
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 75.5,29.5
+      rot: -1.5707963267948966 rad
+      pos: 69.5,32.5
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 12979
@@ -92107,30 +93654,6 @@ entities:
       pos: 70.5,30.5
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 12982
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 70.5,31.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 12983
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 69.5,32.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 12984
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 71.5,32.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 12985
     components:
     - type: Transform
@@ -92152,9 +93675,9 @@ entities:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
-      pos: 74.5,32.5
+      pos: 76.5,33.5
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
   - uid: 12988
     components:
     - type: Transform
@@ -92184,7 +93707,7 @@ entities:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
-      pos: 76.5,34.5
+      pos: 75.5,33.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 12992
@@ -92192,7 +93715,7 @@ entities:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
-      pos: 75.5,34.5
+      pos: 74.5,33.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 12993
@@ -92200,49 +93723,25 @@ entities:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
-      pos: 74.5,34.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 12994
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 73.5,34.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 12995
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 72.5,34.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 12996
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 71.5,34.5
+      pos: 73.5,33.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 12997
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 70.5,34.5
+      rot: 3.141592653589793 rad
+      pos: 77.5,34.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 12998
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 69.5,34.5
+      rot: 3.141592653589793 rad
+      pos: 78.5,29.5
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 12999
     components:
     - type: Transform
@@ -101519,20 +103018,12 @@ entities:
       pos: 92.5,52.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 14239
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 83.5,51.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 14240
     components:
     - type: Transform
       parent: 2
-      rot: 3.141592653589793 rad
-      pos: 83.5,50.5
+      rot: 1.5707963267948966 rad
+      pos: 83.5,52.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 14241
@@ -104336,6 +105827,22 @@ entities:
       pos: 86.5,94.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 14744
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 77.5,28.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 14746
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 70.5,34.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 14805
     components:
     - type: Transform
@@ -104368,6 +105875,14 @@ entities:
       pos: 68.5,113.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 15020
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 68.5,34.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 15039
     components:
     - type: Transform
@@ -104391,6 +105906,13 @@ entities:
       pos: 18.5,35.5
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 17441
+    components:
+    - type: Transform
+      parent: 2
+      pos: 70.5,31.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 17546
     components:
     - type: Transform
@@ -104406,6 +105928,21 @@ entities:
       pos: 90.5,91.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 17777
+    components:
+    - type: Transform
+      parent: 2
+      pos: 81.5,50.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 19358
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 82.5,49.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 19392
     components:
     - type: Transform
@@ -104422,6 +105959,14 @@ entities:
       pos: 18.5,33.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 20651
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 72.5,33.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 21283
     components:
     - type: Transform
@@ -104488,6 +106033,14 @@ entities:
       pos: 121.5,77.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 12085
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 77.5,33.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 12165
     components:
     - type: Transform
@@ -104517,6 +106070,29 @@ entities:
       pos: 136.5,89.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 12961
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 74.5,27.5
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 12978
+    components:
+    - type: Transform
+      parent: 2
+      pos: 70.5,32.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 12984
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 74.5,32.5
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 13203
     components:
     - type: Transform
@@ -105591,14 +107167,6 @@ entities:
       pos: 77.5,42.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 14742
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 77.5,34.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 14743
     components:
     - type: Transform
@@ -105607,14 +107175,6 @@ entities:
       pos: 77.5,38.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 14744
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 77.5,28.5
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 14745
     components:
     - type: Transform
@@ -105623,13 +107183,6 @@ entities:
       pos: 77.5,27.5
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 14746
-    components:
-    - type: Transform
-      parent: 2
-      pos: 70.5,32.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 14747
     components:
     - type: Transform
@@ -106849,14 +108402,6 @@ entities:
       pos: 14.5,64.5
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 14911
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 78.5,29.5
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 14912
     components:
     - type: Transform
@@ -107218,6 +108763,18 @@ entities:
       open: False
 - proto: GasVentPump
   entities:
+  - uid: 9279
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 67.5,34.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 11451
+      - 123
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 12158
     components:
     - type: Transform
@@ -107285,8 +108842,8 @@ entities:
       pos: 136.5,88.5
     - type: DeviceNetwork
       deviceLists:
-      - 56
-      - 11464
+      - 25169
+      - 25168
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 14962
@@ -107744,7 +109301,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 23
-      - 11463
+      - 10669
   - uid: 15006
     components:
     - type: Transform
@@ -107778,8 +109335,8 @@ entities:
       color: '#0055CCFF'
     - type: DeviceNetwork
       deviceLists:
-      - 20
       - 11490
+      - 17794
   - uid: 15009
     components:
     - type: Transform
@@ -107849,7 +109406,7 @@ entities:
       pos: 67.5,46.5
     - type: DeviceNetwork
       deviceLists:
-      - 32
+      - 21851
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 15016
@@ -107897,30 +109454,6 @@ entities:
       - 124
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 15020
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 76.5,28.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 11451
-      - 123
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 15021
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 68.5,34.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 11451
-      - 123
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 15022
     components:
     - type: Transform
@@ -108023,7 +109556,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 11432
-      - 134
+      - 20226
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 15031
@@ -108034,7 +109567,7 @@ entities:
       pos: 111.5,46.5
     - type: DeviceNetwork
       deviceLists:
-      - 30
+      - 11936
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 15032
@@ -108820,7 +110353,7 @@ entities:
       pos: 61.5,79.5
     - type: DeviceNetwork
       deviceLists:
-      - 87
+      - 17654
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 15107
@@ -109146,6 +110679,17 @@ entities:
       - 115
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 17484
+    components:
+    - type: Transform
+      parent: 2
+      pos: 74.5,28.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 11451
+      - 527
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 17590
     components:
     - type: Transform
@@ -109228,6 +110772,18 @@ entities:
       - 57
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 9615
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 67.5,32.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 11451
+      - 123
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 10262
     components:
     - type: Transform
@@ -109285,6 +110841,17 @@ entities:
       - 11386
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 14911
+    components:
+    - type: Transform
+      parent: 2
+      pos: 74.5,33.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 11451
+      - 527
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 15139
     components:
     - type: Transform
@@ -109701,7 +111268,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 23
-      - 11463
+      - 10669
   - uid: 15182
     components:
     - type: Transform
@@ -109736,8 +111303,8 @@ entities:
       color: '#990000FF'
     - type: DeviceNetwork
       deviceLists:
-      - 20
       - 11490
+      - 17794
   - uid: 15185
     components:
     - type: Transform
@@ -109810,7 +111377,7 @@ entities:
       pos: 65.5,46.5
     - type: DeviceNetwork
       deviceLists:
-      - 32
+      - 21851
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 15192
@@ -109861,30 +111428,6 @@ entities:
       - 124
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 15196
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 74.5,28.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 11451
-      - 123
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 15197
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 68.5,32.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 11451
-      - 123
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 15198
     components:
     - type: Transform
@@ -110000,7 +111543,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 11432
-      - 134
+      - 20226
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 15208
@@ -110033,7 +111576,7 @@ entities:
       pos: 109.5,46.5
     - type: DeviceNetwork
       deviceLists:
-      - 30
+      - 11936
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 15211
@@ -110827,7 +112370,7 @@ entities:
       pos: 63.5,79.5
     - type: DeviceNetwork
       deviceLists:
-      - 87
+      - 17654
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 15284
@@ -111151,8 +112694,8 @@ entities:
       pos: 134.5,88.5
     - type: DeviceNetwork
       deviceLists:
-      - 56
-      - 11464
+      - 25169
+      - 25168
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 24856
@@ -111276,6 +112819,11 @@ entities:
       pos: 127.49127,108.51109
 - proto: Girder
   entities:
+  - uid: 15196
+    components:
+    - type: Transform
+      parent: 2
+      pos: 134.5,117.5
   - uid: 15323
     components:
     - type: Transform
@@ -111291,12 +112839,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 113.5,129.5
-  - uid: 15326
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 134.5,117.5
   - uid: 15327
     components:
     - type: Transform
@@ -111363,6 +112905,11 @@ entities:
       pos: 92.5594,83.521164
 - proto: Grille
   entities:
+  - uid: 267
+    components:
+    - type: Transform
+      parent: 2
+      pos: 101.5,25.5
   - uid: 838
     components:
     - type: Transform
@@ -111398,6 +112945,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 83.5,114.5
+  - uid: 7569
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,27.5
+  - uid: 7578
+    components:
+    - type: Transform
+      parent: 2
+      pos: 101.5,26.5
   - uid: 8572
     components:
     - type: Transform
@@ -111438,6 +112995,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 67.5,131.5
+  - uid: 11580
+    components:
+    - type: Transform
+      parent: 2
+      pos: 83.5,50.5
   - uid: 15340
     components:
     - type: Transform
@@ -112108,21 +113670,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 68.5,30.5
-  - uid: 15478
-    components:
-    - type: Transform
-      parent: 2
-      pos: 98.5,23.5
   - uid: 15479
     components:
     - type: Transform
       parent: 2
-      pos: 98.5,22.5
-  - uid: 15480
-    components:
-    - type: Transform
-      parent: 2
-      pos: 97.5,21.5
+      pos: 71.5,40.5
   - uid: 15481
     components:
     - type: Transform
@@ -112173,11 +113725,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 92.5,17.5
-  - uid: 15493
-    components:
-    - type: Transform
-      parent: 2
-      pos: 71.5,41.5
   - uid: 15494
     components:
     - type: Transform
@@ -115513,11 +117060,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 13.5,29.5
-  - uid: 16214
-    components:
-    - type: Transform
-      parent: 2
-      pos: 13.5,28.5
   - uid: 16216
     components:
     - type: Transform
@@ -117223,11 +118765,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 107.5,32.5
-  - uid: 16582
-    components:
-    - type: Transform
-      parent: 2
-      pos: 107.5,29.5
   - uid: 16583
     components:
     - type: Transform
@@ -117288,6 +118825,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 118.5,89.5
+  - uid: 17382
+    components:
+    - type: Transform
+      parent: 2
+      pos: 97.5,23.5
+  - uid: 17411
+    components:
+    - type: Transform
+      parent: 2
+      pos: 97.5,22.5
   - uid: 17716
     components:
     - type: Transform
@@ -117318,6 +118865,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 93.5,17.5
+  - uid: 18417
+    components:
+    - type: Transform
+      parent: 2
+      pos: 96.5,18.5
   - uid: 18508
     components:
     - type: Transform
@@ -117393,6 +118945,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 119.5,102.5
+  - uid: 21853
+    components:
+    - type: Transform
+      parent: 2
+      pos: 99.5,27.5
   - uid: 22465
     components:
     - type: Transform
@@ -117433,6 +118990,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 67.5,122.5
+  - uid: 24741
+    components:
+    - type: Transform
+      parent: 2
+      pos: 71.5,41.5
   - uid: 24773
     components:
     - type: Transform
@@ -117475,6 +119037,11 @@ entities:
       pos: 95.5,19.5
 - proto: GrilleSpawner
   entities:
+  - uid: 15449
+    components:
+    - type: Transform
+      parent: 2
+      pos: 13.5,28.5
   - uid: 16248
     components:
     - type: Transform
@@ -117640,21 +119207,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 78.5,17.5
-  - uid: 16650
-    components:
-    - type: Transform
-      parent: 2
-      pos: 77.5,17.5
   - uid: 16651
     components:
     - type: Transform
       parent: 2
       pos: 35.5,6.5
-  - uid: 16653
-    components:
-    - type: Transform
-      parent: 2
-      pos: 13.5,27.5
   - uid: 16654
     components:
     - type: Transform
@@ -117885,6 +119442,11 @@ entities:
       pos: 76.5,66.5
 - proto: HandLabeler
   entities:
+  - uid: 12982
+    components:
+    - type: Transform
+      parent: 2
+      pos: 73.533295,28.449364
   - uid: 16694
     components:
     - type: Transform
@@ -117900,11 +119462,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 74.30597,100.47675
-  - uid: 16697
-    components:
-    - type: Transform
-      parent: 2
-      pos: 68.49819,40.54989
 - proto: HappyHonk
   entities:
   - uid: 16698
@@ -118868,12 +120425,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 69.5,65.5
-  - uid: 16851
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 85.5,76.5
   - uid: 16852
     components:
     - type: Transform
@@ -118896,6 +120447,12 @@ entities:
     - type: Transform
       parent: 2
       pos: 129.5,65.5
+  - uid: 25439
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 85.5,76.5
 - proto: IntercomCommon
   entities:
   - uid: 9134
@@ -119413,6 +120970,14 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 123.5,52.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        519:
+        - - Pressed
+          - Open
+        517:
+        - - Pressed
+          - Open
 - proto: LockableButtonSecurity
   entities:
   - uid: 16938
@@ -119894,13 +121459,31 @@ entities:
     - type: Transform
       parent: 2
       pos: 115.5,69.5
-- proto: LockerSecurityFilled
+- proto: LockerSecurity
   entities:
-  - uid: 17007
+  - uid: 16219
     components:
     - type: Transform
       parent: 2
-      pos: 66.5,47.5
+      pos: 67.5,47.5
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          ents:
+          - 17221
+          - 17007
+          - 16697
+          - 16650
+          - 16229
+          - 17222
+          showEnts: False
+          occludes: True
+        paper_label: !type:ContainerSlot
+          ent: null
+          showEnts: False
+          occludes: True
+- proto: LockerSecurityFilled
+  entities:
   - uid: 17008
     components:
     - type: Transform
@@ -120026,6 +121609,38 @@ entities:
     - type: Transform
       parent: 2
       pos: 93.5,48.5
+- proto: LogicGateOr
+  entities:
+  - uid: 25369
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,26.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        11631:
+        - - Output
+          - DoorBolt
+        11464:
+        - - Output
+          - DoorBolt
+  - uid: 25370
+    components:
+    - type: Transform
+      parent: 2
+      pos: 99.5,26.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        18829:
+        - - Output
+          - DoorBolt
+        20617:
+        - - Output
+          - DoorBolt
 - proto: LootSpawnerMaterials
   entities:
   - uid: 17026
@@ -120165,6 +121780,46 @@ entities:
       pos: 80.5,37.5
 - proto: MailingUnit
   entities:
+  - uid: 87
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,48.5
+    - type: MailingUnit
+      tag: Medical
+    - type: Configuration
+      config:
+        tag: Medical
+  - uid: 8954
+    components:
+    - type: Transform
+      parent: 2
+      pos: 52.5,49.5
+    - type: MailingUnit
+      tag: Engineering
+    - type: Configuration
+      config:
+        tag: Engineering
+  - uid: 8983
+    components:
+    - type: Transform
+      parent: 2
+      pos: 52.5,65.5
+    - type: MailingUnit
+      tag: Tider
+    - type: Configuration
+      config:
+        tag: Tider
+  - uid: 11166
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,72.5
+    - type: MailingUnit
+      tag: Science
+    - type: Configuration
+      config:
+        tag: Science
   - uid: 17052
     components:
     - type: Transform
@@ -120185,6 +121840,26 @@ entities:
     - type: Configuration
       config:
         tag: Chemistry
+  - uid: 17428
+    components:
+    - type: Transform
+      parent: 2
+      pos: 67.5,40.5
+    - type: MailingUnit
+      tag: Cargo
+    - type: Configuration
+      config:
+        tag: Cargo
+  - uid: 17827
+    components:
+    - type: Transform
+      parent: 2
+      pos: 93.5,88.5
+    - type: MailingUnit
+      tag: Security
+    - type: Configuration
+      config:
+        tag: Security
 - proto: MaintenanceFluffSpawner
   entities:
   - uid: 9183
@@ -121153,18 +122828,6 @@ entities:
       pos: 97.5,81.5
 - proto: OreBox
   entities:
-  - uid: 17221
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 97.5,22.5
-  - uid: 17222
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 97.5,23.5
   - uid: 17223
     components:
     - type: Transform
@@ -121176,6 +122839,12 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 56.5,14.5
+  - uid: 22565
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 96.5,23.5
 - proto: OreProcessor
   entities:
   - uid: 17225
@@ -122292,11 +123961,11 @@ entities:
       pos: 121.52171,53.530815
 - proto: PlushieLizardMirrored
   entities:
-  - uid: 17382
+  - uid: 19419
     components:
     - type: Transform
       parent: 2
-      pos: 67.5,33.5
+      pos: 67.46388,29.44096
 - proto: PlushieNuke
   entities:
   - uid: 9084
@@ -122594,11 +124263,11 @@ entities:
       pos: 59.5,82.5
 - proto: PosterContrabandMissingGloves
   entities:
-  - uid: 17428
+  - uid: 25440
     components:
     - type: Transform
       parent: 2
-      pos: 61.5,74.5
+      pos: 57.5,76.5
 - proto: PosterContrabandMissingSpacepen
   entities:
   - uid: 17429
@@ -122685,11 +124354,11 @@ entities:
       pos: 55.5,70.5
 - proto: PosterContrabandWehWatches
   entities:
-  - uid: 17441
+  - uid: 25165
     components:
     - type: Transform
       parent: 2
-      pos: 66.5,33.5
+      pos: 66.5,29.5
 - proto: PosterLegit50thAnniversaryVintageReprint
   entities:
   - uid: 17442
@@ -122970,11 +124639,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 100.5,89.5
-  - uid: 17484
+  - uid: 19769
     components:
     - type: Transform
       parent: 2
-      pos: 124.5,29.5
+      pos: 124.5,28.5
 - proto: PosterLegitVacation
   entities:
   - uid: 17485
@@ -122989,6 +124658,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 34.5,38.5
+- proto: PotatoAI
+  entities:
+  - uid: 17986
+    components:
+    - type: Transform
+      parent: 2
+      pos: 129.43063,36.40957
 - proto: PottedPlant10
   entities:
   - uid: 17487
@@ -123226,16 +124902,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 72.5,22.5
-  - uid: 17531
-    components:
-    - type: Transform
-      parent: 2
-      pos: 67.5,40.5
-  - uid: 17532
-    components:
-    - type: Transform
-      parent: 2
-      pos: 67.5,35.5
   - uid: 17533
     components:
     - type: Transform
@@ -123434,6 +125100,11 @@ entities:
       pos: 60.6492,72.8797
 - proto: PowerCellRecharger
   entities:
+  - uid: 14742
+    components:
+    - type: Transform
+      parent: 2
+      pos: 73.5,27.5
   - uid: 17574
     components:
     - type: Transform
@@ -123466,11 +125137,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 67.5,28.5
-  - uid: 17580
-    components:
-    - type: Transform
-      parent: 2
-      pos: 67.5,34.5
   - uid: 17581
     components:
     - type: Transform
@@ -123548,6 +125214,11 @@ entities:
       pos: 122.43808,80.57616
 - proto: PoweredDimSmallLight
   entities:
+  - uid: 3301
+    components:
+    - type: Transform
+      parent: 2
+      pos: 95.5,48.5
   - uid: 17595
     components:
     - type: Transform
@@ -123737,12 +125408,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 63.5,19.5
-  - uid: 17629
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 94.5,47.5
   - uid: 17630
     components:
     - type: Transform
@@ -123784,6 +125449,24 @@ entities:
       pos: 143.5,118.5
 - proto: Poweredlight
   entities:
+  - uid: 20
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 112.5,49.5
+  - uid: 56
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 107.5,106.5
+  - uid: 504
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 61.5,77.5
   - uid: 637
     components:
     - type: Transform
@@ -123817,18 +125500,54 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 114.5,100.5
+  - uid: 11040
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 71.5,34.5
   - uid: 11058
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 84.5,88.5
+  - uid: 11109
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 136.5,86.5
+  - uid: 11300
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 39.5,35.5
+  - uid: 11320
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 73.5,95.5
   - uid: 11345
     components:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
       pos: 97.5,92.5
+  - uid: 11365
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 24.5,40.5
+  - uid: 12973
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 73.5,31.5
   - uid: 13778
     components:
     - type: Transform
@@ -123846,12 +125565,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 83.5,126.5
-  - uid: 15449
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 79.5,100.5
   - uid: 15838
     components:
     - type: Transform
@@ -123875,23 +125588,17 @@ entities:
     - type: Transform
       parent: 2
       pos: 71.5,29.5
-  - uid: 16218
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 105.5,48.5
-  - uid: 16229
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 73.5,30.5
   - uid: 16266
     components:
     - type: Transform
       parent: 2
       pos: 103.5,79.5
+  - uid: 16489
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 105.5,49.5
   - uid: 16502
     components:
     - type: Transform
@@ -123910,11 +125617,29 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 138.5,94.5
+  - uid: 16582
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 79.5,98.5
   - uid: 16652
     components:
     - type: Transform
       parent: 2
       pos: 96.5,81.5
+  - uid: 16653
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 73.5,69.5
+  - uid: 16851
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 60.5,75.5
   - uid: 16858
     components:
     - type: Transform
@@ -123951,11 +125676,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 86.5,64.5
-  - uid: 17411
-    components:
-    - type: Transform
-      parent: 2
-      pos: 72.5,34.5
   - uid: 17444
     components:
     - type: Transform
@@ -124063,11 +125783,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 124.5,47.5
-  - uid: 17651
-    components:
-    - type: Transform
-      parent: 2
-      pos: 111.5,51.5
   - uid: 17652
     components:
     - type: Transform
@@ -124080,11 +125795,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 112.5,58.5
-  - uid: 17654
-    components:
-    - type: Transform
-      parent: 2
-      pos: 104.5,79.5
   - uid: 17656
     components:
     - type: Transform
@@ -124107,8 +125817,8 @@ entities:
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 76.5,102.5
+      rot: -1.5707963267948966 rad
+      pos: 79.5,101.5
   - uid: 17660
     components:
     - type: Transform
@@ -124160,7 +125870,7 @@ entities:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
-      pos: 81.5,69.5
+      pos: 70.5,99.5
   - uid: 17669
     components:
     - type: Transform
@@ -124231,18 +125941,12 @@ entities:
     - type: Transform
       parent: 2
       pos: 130.5,56.5
-  - uid: 17681
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 48.5,88.5
   - uid: 17683
     components:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
-      pos: 95.5,90.5
+      pos: 93.5,90.5
   - uid: 17684
     components:
     - type: Transform
@@ -124348,12 +126052,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 94.5,96.5
-  - uid: 17705
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 75.5,37.5
   - uid: 17708
     components:
     - type: Transform
@@ -124570,14 +126268,14 @@ entities:
     components:
     - type: Transform
       parent: 2
-      rot: 3.141592653589793 rad
-      pos: 111.5,106.5
+      rot: 1.5707963267948966 rad
+      pos: 73.5,34.5
   - uid: 17764
     components:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
-      pos: 107.5,106.5
+      pos: 75.5,37.5
   - uid: 17765
     components:
     - type: Transform
@@ -124611,13 +126309,8 @@ entities:
     components:
     - type: Transform
       parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 74.5,102.5
-  - uid: 17777
-    components:
-    - type: Transform
-      parent: 2
-      pos: 71.5,99.5
+      rot: 3.141592653589793 rad
+      pos: 67.5,83.5
   - uid: 17778
     components:
     - type: Transform
@@ -124628,7 +126321,8 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 76.5,95.5
+      rot: -1.5707963267948966 rad
+      pos: 35.5,69.5
   - uid: 17780
     components:
     - type: Transform
@@ -124638,19 +126332,14 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 95.5,94.5
+      rot: 1.5707963267948966 rad
+      pos: 37.5,69.5
   - uid: 17784
     components:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
       pos: 84.5,96.5
-  - uid: 17785
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 66.5,83.5
   - uid: 17786
     components:
     - type: Transform
@@ -124675,23 +126364,11 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 28.5,86.5
-  - uid: 17794
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 63.5,77.5
   - uid: 17795
     components:
     - type: Transform
       parent: 2
       pos: 56.5,75.5
-  - uid: 17796
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 60.5,74.5
   - uid: 17797
     components:
     - type: Transform
@@ -124703,7 +126380,7 @@ entities:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
-      pos: 52.5,73.5
+      pos: 44.5,39.5
   - uid: 17799
     components:
     - type: Transform
@@ -124860,11 +126537,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 43.5,79.5
-  - uid: 17827
-    components:
-    - type: Transform
-      parent: 2
-      pos: 39.5,79.5
   - uid: 17828
     components:
     - type: Transform
@@ -124899,18 +126571,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 41.5,70.5
-  - uid: 17836
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 37.5,71.5
-  - uid: 17837
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 35.5,71.5
   - uid: 17838
     components:
     - type: Transform
@@ -124926,8 +126586,8 @@ entities:
     components:
     - type: Transform
       parent: 2
-      rot: 3.141592653589793 rad
-      pos: 26.5,40.5
+      rot: -1.5707963267948966 rad
+      pos: 82.5,69.5
   - uid: 17841
     components:
     - type: Transform
@@ -125038,11 +126698,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 56.5,26.5
-  - uid: 17860
-    components:
-    - type: Transform
-      parent: 2
-      pos: 44.5,39.5
   - uid: 17861
     components:
     - type: Transform
@@ -125084,12 +126739,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 38.5,31.5
-  - uid: 17868
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 38.5,35.5
   - uid: 17869
     components:
     - type: Transform
@@ -125100,7 +126749,8 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 30.5,37.5
+      rot: 3.141592653589793 rad
+      pos: 67.5,42.5
   - uid: 17871
     components:
     - type: Transform
@@ -125221,12 +126871,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 73.5,66.5
-  - uid: 17895
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 74.5,69.5
   - uid: 17896
     components:
     - type: Transform
@@ -125279,12 +126923,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 66.5,44.5
-  - uid: 17905
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 66.5,42.5
   - uid: 17907
     components:
     - type: Transform
@@ -125353,7 +126991,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 130.5,88.5
+      pos: 109.5,109.5
   - uid: 17919
     components:
     - type: Transform
@@ -125510,11 +127148,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 114.5,115.5
-  - uid: 17961
-    components:
-    - type: Transform
-      parent: 2
-      pos: 110.5,43.5
   - uid: 17962
     components:
     - type: Transform
@@ -125620,6 +127253,18 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 114.5,86.5
+  - uid: 17984
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 109.5,105.5
+  - uid: 17985
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 129.5,86.5
   - uid: 17995
     components:
     - type: Transform
@@ -125638,12 +127283,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 43.5,98.5
-  - uid: 18050
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 73.5,46.5
   - uid: 18054
     components:
     - type: Transform
@@ -125679,6 +127318,11 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 71.5,126.5
+  - uid: 18677
+    components:
+    - type: Transform
+      parent: 2
+      pos: 110.5,43.5
   - uid: 18795
     components:
     - type: Transform
@@ -125696,12 +127340,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 92.5,38.5
-  - uid: 19358
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 22.5,40.5
   - uid: 19493
     components:
     - type: Transform
@@ -125718,6 +127356,12 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 61.5,36.5
+  - uid: 20216
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 64.5,81.5
   - uid: 20512
     components:
     - type: Transform
@@ -125759,6 +127403,34 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 84.5,100.5
+  - uid: 25343
+    components:
+    - type: Transform
+      parent: 2
+      pos: 122.5,26.5
+  - uid: 25344
+    components:
+    - type: Transform
+      parent: 2
+      pos: 126.5,26.5
+  - uid: 25346
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 118.5,31.5
+  - uid: 25355
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 130.5,31.5
+  - uid: 25371
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 99.5,28.5
 - proto: PoweredlightBlue
   entities:
   - uid: 11315
@@ -125779,24 +127451,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 11.5,66.5
-  - uid: 17984
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 126.5,32.5
-  - uid: 17985
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 122.5,32.5
-  - uid: 17986
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 124.5,30.5
   - uid: 17988
     components:
     - type: Transform
@@ -125821,6 +127475,18 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 41.5,79.5
+  - uid: 19770
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 121.5,32.5
+  - uid: 20547
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 127.5,32.5
 - proto: PoweredlightEmpty
   entities:
   - uid: 16921
@@ -125871,6 +127537,24 @@ entities:
       isDamageActive: False
 - proto: PoweredlightExterior
   entities:
+  - uid: 594
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 116.5,134.5
+  - uid: 730
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 143.5,128.5
+  - uid: 731
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 145.5,42.5
   - uid: 17700
     components:
     - type: Transform
@@ -125899,23 +127583,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 99.5,35.5
-  - uid: 17998
-    components:
-    - type: Transform
-      parent: 2
-      pos: 124.5,27.5
-  - uid: 17999
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 119.5,32.5
-  - uid: 18000
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 129.5,32.5
   - uid: 18003
     components:
     - type: Transform
@@ -125946,12 +127613,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 11.5,10.5
-  - uid: 18013
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 99.5,21.5
   - uid: 18014
     components:
     - type: Transform
@@ -126092,8 +127753,19 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 15.5,40.5
+  - uid: 21852
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 98.5,21.5
 - proto: PoweredlightGreen
   entities:
+  - uid: 732
+    components:
+    - type: Transform
+      parent: 2
+      pos: 124.5,82.5
   - uid: 16485
     components:
     - type: Transform
@@ -126102,12 +127774,23 @@ entities:
       pos: 37.5,79.5
 - proto: PoweredlightLED
   entities:
-  - uid: 658
+  - uid: 736
     components:
     - type: Transform
       parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 73.5,90.5
+      rot: 3.141592653589793 rad
+      pos: 74.5,49.5
+  - uid: 11306
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 81.5,49.5
+  - uid: 11307
+    components:
+    - type: Transform
+      parent: 2
+      pos: 73.5,47.5
   - uid: 16512
     components:
     - type: Transform
@@ -126126,6 +127809,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 71.5,89.5
+  - uid: 17905
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 73.5,90.5
   - uid: 18051
     components:
     - type: Transform
@@ -126160,13 +127849,31 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 27.5,59.5
-- proto: PoweredLightPostSmall
-  entities:
-  - uid: 17736
+  - uid: 25161
     components:
     - type: Transform
       parent: 2
-      pos: 23.5,25.5
+      pos: 82.5,47.5
+- proto: PoweredlightPink
+  entities:
+  - uid: 733
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 130.5,74.5
+  - uid: 738
+    components:
+    - type: Transform
+      parent: 2
+      pos: 132.5,81.5
+  - uid: 739
+    components:
+    - type: Transform
+      parent: 2
+      pos: 128.5,81.5
+- proto: PoweredLightPostSmall
+  entities:
   - uid: 18059
     components:
     - type: Transform
@@ -126194,6 +127901,18 @@ entities:
     - type: Transform
       parent: 2
       pos: 52.5,91.5
+  - uid: 25170
+    components:
+    - type: Transform
+      parent: 2
+      pos: 23.5,20.5
+- proto: PoweredlightRed
+  entities:
+  - uid: 740
+    components:
+    - type: Transform
+      parent: 2
+      pos: 114.5,104.5
 - proto: PoweredlightSodium
   entities:
   - uid: 18063
@@ -126473,16 +128192,12 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 59.5,69.5
-  - uid: 18105
-    components:
-    - type: Transform
-      parent: 2
-      pos: 44.5,71.5
   - uid: 18106
     components:
     - type: Transform
       parent: 2
-      pos: 44.5,69.5
+      rot: -1.5707963267948966 rad
+      pos: 44.5,71.5
   - uid: 18107
     components:
     - type: Transform
@@ -126833,6 +128548,12 @@ entities:
     - type: Transform
       parent: 2
       pos: 12.5,97.5
+  - uid: 18186
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 44.5,69.5
   - uid: 18634
     components:
     - type: Transform
@@ -126933,12 +128654,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 99.5,118.5
-  - uid: 18186
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 138.5,25.5
   - uid: 18187
     components:
     - type: Transform
@@ -126975,6 +128690,12 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 86.5,84.5
+  - uid: 18241
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 137.5,22.5
   - uid: 19338
     components:
     - type: Transform
@@ -126986,6 +128707,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 106.5,122.5
+  - uid: 25172
+    components:
+    - type: Transform
+      parent: 2
+      pos: 137.5,28.5
 - proto: Protolathe
   entities:
   - uid: 18194
@@ -127105,6 +128831,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 86.5,107.5
+  - uid: 15493
+    components:
+    - type: Transform
+      parent: 2
+      pos: 68.5,40.5
   - uid: 17634
     components:
     - type: Transform
@@ -127266,11 +128997,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 70.5,40.5
-  - uid: 18241
-    components:
-    - type: Transform
-      parent: 2
-      pos: 71.5,40.5
   - uid: 18242
     components:
     - type: Transform
@@ -127732,6 +129458,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 99.5,83.5
+  - uid: 25378
+    components:
+    - type: Transform
+      parent: 2
+      pos: 67.5,31.5
 - proto: RadiationCollectorFullTank
   entities:
   - uid: 18332
@@ -128197,21 +129928,6 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 78.5,59.5
-  - uid: 18415
-    components:
-    - type: Transform
-      parent: 2
-      pos: 96.5,19.5
-  - uid: 18416
-    components:
-    - type: Transform
-      parent: 2
-      pos: 97.5,19.5
-  - uid: 18417
-    components:
-    - type: Transform
-      parent: 2
-      pos: 98.5,19.5
   - uid: 18418
     components:
     - type: Transform
@@ -128454,11 +130170,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 97.5,33.5
-  - uid: 18639
-    components:
-    - type: Transform
-      parent: 2
-      pos: 99.5,19.5
   - uid: 21365
     components:
     - type: Transform
@@ -129626,6 +131337,16 @@ entities:
       pos: 23.5,51.5
 - proto: ReinforcedWindow
   entities:
+  - uid: 856
+    components:
+    - type: Transform
+      parent: 2
+      pos: 101.5,25.5
+  - uid: 857
+    components:
+    - type: Transform
+      parent: 2
+      pos: 101.5,26.5
   - uid: 3138
     components:
     - type: Transform
@@ -129646,6 +131367,26 @@ entities:
     - type: Transform
       parent: 2
       pos: 83.5,115.5
+  - uid: 7388
+    components:
+    - type: Transform
+      parent: 2
+      pos: 100.5,27.5
+  - uid: 7389
+    components:
+    - type: Transform
+      parent: 2
+      pos: 99.5,27.5
+  - uid: 7570
+    components:
+    - type: Transform
+      parent: 2
+      pos: 97.5,23.5
+  - uid: 7571
+    components:
+    - type: Transform
+      parent: 2
+      pos: 97.5,22.5
   - uid: 11533
     components:
     - type: Transform
@@ -129701,11 +131442,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 33.5,27.5
-  - uid: 18677
-    components:
-    - type: Transform
-      parent: 2
-      pos: 107.5,29.5
   - uid: 18678
     components:
     - type: Transform
@@ -130390,7 +132126,7 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 71.5,41.5
+      pos: 71.5,40.5
   - uid: 18819
     components:
     - type: Transform
@@ -130426,21 +132162,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 96.5,21.5
-  - uid: 18827
-    components:
-    - type: Transform
-      parent: 2
-      pos: 97.5,21.5
-  - uid: 18828
-    components:
-    - type: Transform
-      parent: 2
-      pos: 98.5,22.5
-  - uid: 18829
-    components:
-    - type: Transform
-      parent: 2
-      pos: 98.5,23.5
   - uid: 18832
     components:
     - type: Transform
@@ -132641,6 +134362,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 20.5,49.5
+  - uid: 19360
+    components:
+    - type: Transform
+      parent: 2
+      pos: 83.5,50.5
   - uid: 19671
     components:
     - type: Transform
@@ -132686,6 +134412,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 71.5,121.5
+  - uid: 24816
+    components:
+    - type: Transform
+      parent: 2
+      pos: 71.5,41.5
   - uid: 25083
     components:
     - type: Transform
@@ -132929,12 +134660,12 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 80.5,83.5
-  - uid: 16489
+  - uid: 17629
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
-      pos: 104.5,49.5
+      pos: 104.5,48.5
   - uid: 17721
     components:
     - type: Transform
@@ -133068,21 +134799,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 96.5,45.5
-  - uid: 19360
-    components:
-    - type: Transform
-      parent: 2
-      pos: 110.5,44.5
   - uid: 19361
     components:
     - type: Transform
       parent: 2
       pos: 104.5,95.5
-  - uid: 19363
-    components:
-    - type: Transform
-      parent: 2
-      pos: 76.5,26.5
   - uid: 19494
     components:
     - type: Transform
@@ -133099,6 +134820,11 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 131.5,55.5
+  - uid: 19767
+    components:
+    - type: Transform
+      parent: 2
+      pos: 75.5,35.5
   - uid: 20312
     components:
     - type: Transform
@@ -133365,11 +135091,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 36.421917,50.617348
-  - uid: 19403
+  - uid: 20621
     components:
     - type: Transform
       parent: 2
-      pos: 71.5,40.5
+      pos: 68.52327,40.50892
   - uid: 25126
     components:
     - type: Transform
@@ -133454,11 +135180,6 @@ entities:
       pos: 119.5,124.5
 - proto: Shovel
   entities:
-  - uid: 19419
-    components:
-    - type: Transform
-      parent: 2
-      pos: 67.52015,29.488445
   - uid: 19420
     components:
     - type: Transform
@@ -133469,6 +135190,12 @@ entities:
     - type: Transform
       parent: 2
       pos: 92.635864,22.509472
+  - uid: 25379
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 67.5262,31.45219
 - proto: ShowcaseRobotAntique
   entities:
   - uid: 19422
@@ -134102,16 +135829,16 @@ entities:
       pos: 58.512253,39.42638
 - proto: SignAi
   entities:
-  - uid: 19534
-    components:
-    - type: Transform
-      parent: 2
-      pos: 124.5,28.5
   - uid: 19535
     components:
     - type: Transform
       parent: 2
       pos: 123.5,40.5
+  - uid: 25345
+    components:
+    - type: Transform
+      parent: 2
+      pos: 124.5,27.5
 - proto: SignAiUpload
   entities:
   - uid: 1225
@@ -134476,20 +136203,6 @@ entities:
         1064:
         - - Pressed
           - Toggle
-  - uid: 19553
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 108.5,47.5
-    - type: DeviceLinkSource
-      linkedPorts:
-        19492:
-        - - Pressed
-          - Toggle
-        19491:
-        - - Pressed
-          - Toggle
   - uid: 19554
     components:
     - type: Transform
@@ -134591,6 +136304,20 @@ entities:
         19429:
         - - Pressed
           - Toggle
+  - uid: 24443
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 110.5,44.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        19492:
+        - - Pressed
+          - Toggle
+        19491:
+        - - Pressed
+          - Toggle
 - proto: SignalButtonDirectional
   entities:
   - uid: 17622
@@ -134612,6 +136339,17 @@ entities:
         19465:
         - - Pressed
           - Toggle
+  - uid: 17961
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 107.5,29.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        1058:
+        - - Pressed
+          - Toggle
   - uid: 19558
     components:
     - type: Transform
@@ -134690,17 +136428,6 @@ entities:
         19717:
         - - Pressed
           - Toggle
-  - uid: 19563
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 112.5,28.5
-    - type: DeviceLinkSource
-      linkedPorts:
-        1058:
-        - - Pressed
-          - Toggle
   - uid: 19564
     components:
     - type: Transform
@@ -135111,12 +136838,6 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 59.5,62.5
-  - uid: 19603
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 82.5,49.5
 - proto: SignDirectionalBar
   entities:
   - uid: 19604
@@ -135302,6 +137023,17 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 141.5,111.5
+  - uid: 25162
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 130.5,125.5
+  - uid: 25164
+    components:
+    - type: Transform
+      parent: 2
+      pos: 141.5,123.5
 - proto: SignDirectionalEvac
   entities:
   - uid: 19630
@@ -135944,11 +137676,11 @@ entities:
       pos: 94.5,21.5
 - proto: SignMail
   entities:
-  - uid: 16219
+  - uid: 15021
     components:
     - type: Transform
       parent: 2
-      pos: 75.5,35.5
+      pos: 72.5,35.5
 - proto: SignMaterials
   entities:
   - uid: 22243
@@ -136003,11 +137735,11 @@ entities:
       pos: 29.5,39.5
 - proto: SignPsychology
   entities:
-  - uid: 19742
+  - uid: 20187
     components:
     - type: Transform
       parent: 2
-      pos: 112.5,48.5
+      pos: 110.5,48.5
 - proto: SignRadiationMed
   entities:
   - uid: 19743
@@ -136148,32 +137880,32 @@ entities:
     - type: Transform
       parent: 2
       pos: 86.5,73.5
-  - uid: 19767
-    components:
-    - type: Transform
-      parent: 2
-      pos: 128.5,28.5
-  - uid: 19768
-    components:
-    - type: Transform
-      parent: 2
-      pos: 120.5,28.5
-  - uid: 19769
-    components:
-    - type: Transform
-      parent: 2
-      pos: 120.5,35.5
-  - uid: 19770
-    components:
-    - type: Transform
-      parent: 2
-      pos: 128.5,35.5
   - uid: 19771
     components:
     - type: Transform
       parent: 2
       rot: 3.141592653589793 rad
       pos: 24.5,92.5
+  - uid: 25339
+    components:
+    - type: Transform
+      parent: 2
+      pos: 119.5,35.5
+  - uid: 25340
+    components:
+    - type: Transform
+      parent: 2
+      pos: 119.5,27.5
+  - uid: 25341
+    components:
+    - type: Transform
+      parent: 2
+      pos: 129.5,27.5
+  - uid: 25342
+    components:
+    - type: Transform
+      parent: 2
+      pos: 129.5,35.5
 - proto: SignSecureMedRed
   entities:
   - uid: 19772
@@ -136390,12 +138122,12 @@ entities:
       pos: 112.5,60.5
 - proto: SignTelecomms
   entities:
-  - uid: 19807
+  - uid: 1193
     components:
     - type: Transform
       parent: 2
       rot: -1.5707963267948966 rad
-      pos: 43.5,41.5
+      pos: 43.5,43.5
 - proto: SignTheater
   entities:
   - uid: 17771
@@ -138189,6 +139921,13 @@ entities:
     - type: Transform
       parent: 2
       pos: 103.5,100.5
+- proto: SpawnMobMonkeyPunpun
+  entities:
+  - uid: 25160
+    components:
+    - type: Transform
+      parent: 2
+      pos: 58.5,98.5
 - proto: SpawnMobMouse
   entities:
   - uid: 20116
@@ -138596,26 +140335,6 @@ entities:
       pos: 119.5,55.5
 - proto: SpawnPointPassenger
   entities:
-  - uid: 20184
-    components:
-    - type: Transform
-      parent: 2
-      pos: 53.5,57.5
-  - uid: 20185
-    components:
-    - type: Transform
-      parent: 2
-      pos: 56.5,58.5
-  - uid: 20186
-    components:
-    - type: Transform
-      parent: 2
-      pos: 53.5,58.5
-  - uid: 20187
-    components:
-    - type: Transform
-      parent: 2
-      pos: 56.5,57.5
   - uid: 20188
     components:
     - type: Transform
@@ -138656,11 +140375,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 58.5,74.5
-  - uid: 20196
-    components:
-    - type: Transform
-      parent: 2
-      pos: 39.5,70.5
   - uid: 20198
     components:
     - type: Transform
@@ -138762,11 +140476,6 @@ entities:
       pos: 115.5,70.5
 - proto: SpawnPointSecurityCadet
   entities:
-  - uid: 20216
-    components:
-    - type: Transform
-      parent: 2
-      pos: 110.5,108.5
   - uid: 20217
     components:
     - type: Transform
@@ -138784,6 +140493,11 @@ entities:
       pos: 110.5,106.5
 - proto: SpawnPointSecurityOfficer
   entities:
+  - uid: 20184
+    components:
+    - type: Transform
+      parent: 2
+      pos: 113.5,108.5
   - uid: 20220
     components:
     - type: Transform
@@ -138811,16 +140525,16 @@ entities:
       pos: 112.5,108.5
 - proto: SpawnPointServiceWorker
   entities:
-  - uid: 20225
+  - uid: 19807
     components:
     - type: Transform
       parent: 2
-      pos: 26.5,84.5
-  - uid: 20226
+      pos: 27.5,84.5
+  - uid: 20185
     components:
     - type: Transform
       parent: 2
-      pos: 62.5,80.5
+      pos: 25.5,84.5
 - proto: SpawnPointStationEngineer
   entities:
   - uid: 19339
@@ -139939,6 +141653,17 @@ entities:
       pos: 113.5,104.5
 - proto: SurveillanceCameraCommand
   entities:
+  - uid: 6684
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 70.5,75.5
+    - type: SurveillanceCamera
+      nameSet: True
+      id: Captain's Bedroom
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
   - uid: 19332
     components:
     - type: Transform
@@ -139961,17 +141686,6 @@ entities:
       id: Bridge West
       setupAvailableNetworks:
       - SurveillanceCameraCommand
-  - uid: 20414
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 69.5,75.5
-    - type: SurveillanceCamera
-      nameSet: True
-      id: Captain's Bedroom
-      setupAvailableNetworks:
-      - SurveillanceCameraCommand
   - uid: 20417
     components:
     - type: Transform
@@ -140605,6 +142319,17 @@ entities:
       id: Arrivals Northeast
       setupAvailableNetworks:
       - SurveillanceCameraGeneral
+  - uid: 17796
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 40.5,79.5
+    - type: SurveillanceCamera
+      nameSet: True
+      id: Dormroom Large
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
   - uid: 18830
     components:
     - type: Transform
@@ -140805,16 +142530,6 @@ entities:
       id: Hallway Dorms East
       setupAvailableNetworks:
       - SurveillanceCameraGeneral
-  - uid: 20493
-    components:
-    - type: Transform
-      parent: 2
-      pos: 40.5,77.5
-    - type: SurveillanceCamera
-      nameSet: True
-      id: Dormroom Large
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
   - uid: 20494
     components:
     - type: Transform
@@ -141028,6 +142743,16 @@ entities:
       - SurveillanceCameraGeneral
 - proto: SurveillanceCameraMedical
   entities:
+  - uid: 17531
+    components:
+    - type: Transform
+      parent: 2
+      pos: 109.5,45.5
+    - type: SurveillanceCamera
+      nameSet: True
+      id: Psychology
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
   - uid: 20516
     components:
     - type: Transform
@@ -141080,17 +142805,6 @@ entities:
       id: Cryo Pods
       setupAvailableNetworks:
       - SurveillanceCameraMedical
-  - uid: 20521
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 110.5,47.5
-    - type: SurveillanceCamera
-      nameSet: True
-      id: Psychology
-      setupAvailableNetworks:
-      - SurveillanceCameraMedical
   - uid: 20522
     components:
     - type: Transform
@@ -141303,6 +143017,17 @@ entities:
       - SurveillanceCameraScience
 - proto: SurveillanceCameraSecurity
   entities:
+  - uid: 32
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 69.5,47.5
+    - type: SurveillanceCamera
+      nameSet: True
+      id: Security Checkpoint Cargo
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
   - uid: 17958
     components:
     - type: Transform
@@ -141336,17 +143061,6 @@ entities:
       id: Entrance Security
       setupAvailableNetworks:
       - SurveillanceCameraSecurity
-  - uid: 20547
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 66.5,47.5
-    - type: SurveillanceCamera
-      nameSet: True
-      id: Security Checkpoint Cargo
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
   - uid: 20548
     components:
     - type: Transform
@@ -141611,6 +143325,17 @@ entities:
       id: Salvage North
       setupAvailableNetworks:
       - SurveillanceCameraSupply
+  - uid: 15197
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 102.5,24.5
+    - type: SurveillanceCamera
+      nameSet: True
+      id: Salvage Outside
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
   - uid: 20570
     components:
     - type: Transform
@@ -141640,17 +143365,6 @@ entities:
       pos: 96.5,27.5
     - type: SurveillanceCamera
       id: Salvage South
-  - uid: 20573
-    components:
-    - type: Transform
-      parent: 2
-      rot: 3.141592653589793 rad
-      pos: 99.5,23.5
-    - type: SurveillanceCamera
-      nameSet: True
-      id: Salvage Outside
-      setupAvailableNetworks:
-      - SurveillanceCameraSupply
   - uid: 20576
     components:
     - type: Transform
@@ -141661,6 +143375,16 @@ entities:
       id: Breakroom Cargo
       setupAvailableNetworks:
       - SurveillanceCameraSupply
+  - uid: 20650
+    components:
+    - type: Transform
+      parent: 2
+      pos: 67.5,31.5
+    - type: SurveillanceCamera
+      nameSet: True
+      id: Cargo Telepad
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
 - proto: SurveillanceCameraWirelessRouterEntertainment
   entities:
   - uid: 17712
@@ -141769,6 +143493,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 127.5,108.5
+  - uid: 9249
+    components:
+    - type: Transform
+      parent: 2
+      pos: 73.5,27.5
   - uid: 9568
     components:
     - type: Transform
@@ -141784,6 +143513,16 @@ entities:
     - type: Transform
       parent: 2
       pos: 19.5,32.5
+  - uid: 9604
+    components:
+    - type: Transform
+      parent: 2
+      pos: 73.5,28.5
+  - uid: 12994
+    components:
+    - type: Transform
+      parent: 2
+      pos: 73.5,29.5
   - uid: 15850
     components:
     - type: Transform
@@ -141939,11 +143678,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 73.5,36.5
-  - uid: 20617
-    components:
-    - type: Transform
-      parent: 2
-      pos: 68.5,40.5
   - uid: 20618
     components:
     - type: Transform
@@ -141959,11 +143693,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 97.5,72.5
-  - uid: 20621
-    components:
-    - type: Transform
-      parent: 2
-      pos: 67.5,32.5
   - uid: 20622
     components:
     - type: Transform
@@ -142099,16 +143828,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 72.5,23.5
-  - uid: 20650
-    components:
-    - type: Transform
-      parent: 2
-      pos: 67.5,33.5
-  - uid: 20651
-    components:
-    - type: Transform
-      parent: 2
-      pos: 67.5,34.5
   - uid: 20652
     components:
     - type: Transform
@@ -143218,11 +144937,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 72.5,40.5
-  - uid: 20870
-    components:
-    - type: Transform
-      parent: 2
-      pos: 72.5,41.5
   - uid: 20871
     components:
     - type: Transform
@@ -147604,11 +149318,6 @@ entities:
       pos: 109.5,105.5
 - proto: VendingMachineSecDrobe
   entities:
-  - uid: 21326
-    components:
-    - type: Transform
-      parent: 2
-      pos: 67.5,47.5
   - uid: 21327
     components:
     - type: Transform
@@ -147782,16 +149491,31 @@ entities:
     - type: Transform
       parent: 2
       pos: 19.5,36.5
+  - uid: 266
+    components:
+    - type: Transform
+      parent: 2
+      pos: 101.5,24.5
   - uid: 493
     components:
     - type: Transform
       parent: 2
       pos: 99.5,82.5
+  - uid: 745
+    components:
+    - type: Transform
+      parent: 2
+      pos: 108.5,47.5
   - uid: 3137
     components:
     - type: Transform
       parent: 2
       pos: 83.5,119.5
+  - uid: 3687
+    components:
+    - type: Transform
+      parent: 2
+      pos: 129.5,35.5
   - uid: 4247
     components:
     - type: Transform
@@ -147837,6 +149561,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 101.5,82.5
+  - uid: 7580
+    components:
+    - type: Transform
+      parent: 2
+      pos: 101.5,27.5
   - uid: 8200
     components:
     - type: Transform
@@ -147911,7 +149640,12 @@ entities:
     components:
     - type: Transform
       parent: 2
-      pos: 80.5,100.5
+      pos: 107.5,29.5
+  - uid: 15478
+    components:
+    - type: Transform
+      parent: 2
+      pos: 97.5,21.5
   - uid: 15486
     components:
     - type: Transform
@@ -147977,6 +149711,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 15.5,30.5
+  - uid: 16218
+    components:
+    - type: Transform
+      parent: 2
+      pos: 80.5,100.5
   - uid: 16591
     components:
     - type: Transform
@@ -149052,11 +150791,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 95.5,89.5
-  - uid: 21527
-    components:
-    - type: Transform
-      parent: 2
-      pos: 82.5,49.5
   - uid: 21528
     components:
     - type: Transform
@@ -150662,21 +152396,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 98.5,24.5
-  - uid: 21851
-    components:
-    - type: Transform
-      parent: 2
-      pos: 98.5,21.5
-  - uid: 21852
-    components:
-    - type: Transform
-      parent: 2
-      pos: 99.5,27.5
-  - uid: 21853
-    components:
-    - type: Transform
-      parent: 2
-      pos: 99.5,24.5
   - uid: 21854
     components:
     - type: Transform
@@ -150712,11 +152431,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 66.5,35.5
-  - uid: 21861
-    components:
-    - type: Transform
-      parent: 2
-      pos: 66.5,34.5
   - uid: 21862
     components:
     - type: Transform
@@ -151062,11 +152776,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 108.5,48.5
-  - uid: 21931
-    components:
-    - type: Transform
-      parent: 2
-      pos: 108.5,47.5
   - uid: 21932
     components:
     - type: Transform
@@ -154157,36 +155866,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 121.5,35.5
-  - uid: 22565
-    components:
-    - type: Transform
-      parent: 2
-      pos: 121.5,34.5
-  - uid: 22566
-    components:
-    - type: Transform
-      parent: 2
-      pos: 121.5,33.5
-  - uid: 22567
-    components:
-    - type: Transform
-      parent: 2
-      pos: 121.5,32.5
-  - uid: 22568
-    components:
-    - type: Transform
-      parent: 2
-      pos: 121.5,31.5
-  - uid: 22569
-    components:
-    - type: Transform
-      parent: 2
-      pos: 121.5,30.5
-  - uid: 22570
-    components:
-    - type: Transform
-      parent: 2
-      pos: 121.5,29.5
   - uid: 22571
     components:
     - type: Transform
@@ -154202,11 +155881,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 122.5,35.5
-  - uid: 22574
-    components:
-    - type: Transform
-      parent: 2
-      pos: 122.5,29.5
   - uid: 22575
     components:
     - type: Transform
@@ -154222,21 +155896,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 123.5,35.5
-  - uid: 22578
-    components:
-    - type: Transform
-      parent: 2
-      pos: 123.5,29.5
   - uid: 22579
     components:
     - type: Transform
       parent: 2
       pos: 123.5,28.5
-  - uid: 22580
-    components:
-    - type: Transform
-      parent: 2
-      pos: 124.5,29.5
   - uid: 22581
     components:
     - type: Transform
@@ -154267,11 +155931,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 125.5,35.5
-  - uid: 22587
-    components:
-    - type: Transform
-      parent: 2
-      pos: 125.5,29.5
   - uid: 22588
     components:
     - type: Transform
@@ -154287,11 +155946,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 126.5,35.5
-  - uid: 22591
-    components:
-    - type: Transform
-      parent: 2
-      pos: 126.5,29.5
   - uid: 22592
     components:
     - type: Transform
@@ -154307,36 +155961,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 127.5,35.5
-  - uid: 22595
-    components:
-    - type: Transform
-      parent: 2
-      pos: 127.5,34.5
-  - uid: 22596
-    components:
-    - type: Transform
-      parent: 2
-      pos: 127.5,33.5
-  - uid: 22597
-    components:
-    - type: Transform
-      parent: 2
-      pos: 127.5,32.5
-  - uid: 22598
-    components:
-    - type: Transform
-      parent: 2
-      pos: 127.5,31.5
-  - uid: 22599
-    components:
-    - type: Transform
-      parent: 2
-      pos: 127.5,30.5
-  - uid: 22600
-    components:
-    - type: Transform
-      parent: 2
-      pos: 127.5,29.5
   - uid: 22601
     components:
     - type: Transform
@@ -157752,6 +159376,136 @@ entities:
     - type: Transform
       parent: 2
       pos: 48.5,40.5
+  - uid: 25313
+    components:
+    - type: Transform
+      parent: 2
+      pos: 129.5,34.5
+  - uid: 25314
+    components:
+    - type: Transform
+      parent: 2
+      pos: 129.5,33.5
+  - uid: 25315
+    components:
+    - type: Transform
+      parent: 2
+      pos: 129.5,31.5
+  - uid: 25316
+    components:
+    - type: Transform
+      parent: 2
+      pos: 129.5,30.5
+  - uid: 25317
+    components:
+    - type: Transform
+      parent: 2
+      pos: 129.5,29.5
+  - uid: 25318
+    components:
+    - type: Transform
+      parent: 2
+      pos: 129.5,28.5
+  - uid: 25319
+    components:
+    - type: Transform
+      parent: 2
+      pos: 129.5,32.5
+  - uid: 25320
+    components:
+    - type: Transform
+      parent: 2
+      pos: 129.5,27.5
+  - uid: 25321
+    components:
+    - type: Transform
+      parent: 2
+      pos: 128.5,27.5
+  - uid: 25322
+    components:
+    - type: Transform
+      parent: 2
+      pos: 127.5,27.5
+  - uid: 25323
+    components:
+    - type: Transform
+      parent: 2
+      pos: 126.5,27.5
+  - uid: 25324
+    components:
+    - type: Transform
+      parent: 2
+      pos: 125.5,27.5
+  - uid: 25325
+    components:
+    - type: Transform
+      parent: 2
+      pos: 124.5,27.5
+  - uid: 25326
+    components:
+    - type: Transform
+      parent: 2
+      pos: 123.5,27.5
+  - uid: 25327
+    components:
+    - type: Transform
+      parent: 2
+      pos: 122.5,27.5
+  - uid: 25328
+    components:
+    - type: Transform
+      parent: 2
+      pos: 121.5,27.5
+  - uid: 25329
+    components:
+    - type: Transform
+      parent: 2
+      pos: 120.5,27.5
+  - uid: 25330
+    components:
+    - type: Transform
+      parent: 2
+      pos: 119.5,27.5
+  - uid: 25331
+    components:
+    - type: Transform
+      parent: 2
+      pos: 119.5,28.5
+  - uid: 25332
+    components:
+    - type: Transform
+      parent: 2
+      pos: 119.5,29.5
+  - uid: 25333
+    components:
+    - type: Transform
+      parent: 2
+      pos: 119.5,30.5
+  - uid: 25334
+    components:
+    - type: Transform
+      parent: 2
+      pos: 119.5,31.5
+  - uid: 25335
+    components:
+    - type: Transform
+      parent: 2
+      pos: 119.5,32.5
+  - uid: 25336
+    components:
+    - type: Transform
+      parent: 2
+      pos: 119.5,33.5
+  - uid: 25337
+    components:
+    - type: Transform
+      parent: 2
+      pos: 119.5,35.5
+  - uid: 25338
+    components:
+    - type: Transform
+      parent: 2
+      pos: 119.5,34.5
 - proto: WallSolid
   entities:
   - uid: 467
@@ -157824,6 +159578,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 123.5,106.5
+  - uid: 9618
+    components:
+    - type: Transform
+      parent: 2
+      pos: 72.5,31.5
   - uid: 11070
     components:
     - type: Transform
@@ -157894,6 +159653,11 @@ entities:
     - type: Transform
       parent: 2
       pos: 87.5,118.5
+  - uid: 17705
+    components:
+    - type: Transform
+      parent: 2
+      pos: 72.5,34.5
   - uid: 17935
     components:
     - type: Transform
@@ -162164,11 +163928,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 92.5,47.5
-  - uid: 24194
-    components:
-    - type: Transform
-      parent: 2
-      pos: 93.5,47.5
   - uid: 24196
     components:
     - type: Transform
@@ -163365,11 +165124,11 @@ entities:
       pos: 40.5,79.5
 - proto: WardrobeBotanist
   entities:
-  - uid: 24443
+  - uid: 30
     components:
     - type: Transform
       parent: 2
-      pos: 64.5,79.5
+      pos: 64.5,81.5
 - proto: WardrobeCargoFilled
   entities:
   - uid: 24444
@@ -164270,10 +166029,17 @@ entities:
       pos: 59.5,84.5
 - proto: WindoorMedicalLocked
   entities:
-  - uid: 24585
+  - uid: 17651
     components:
     - type: Transform
       parent: 2
+      rot: 3.141592653589793 rad
+      pos: 103.5,51.5
+  - uid: 20186
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
       pos: 102.5,51.5
   - uid: 24586
     components:
@@ -164902,11 +166668,40 @@ entities:
       pos: 15.5,65.5
 - proto: WindowDirectionalCorner
   entities:
+  - uid: 685
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 19.5,95.5
+  - uid: 1229
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 21.5,95.5
+  - uid: 11363
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 104.5,45.5
   - uid: 17991
     components:
     - type: Transform
       parent: 2
       pos: 136.5,47.5
+  - uid: 19742
+    components:
+    - type: Transform
+      parent: 2
+      pos: 21.5,97.5
+  - uid: 25433
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 19.5,97.5
 - proto: WindowFrostedDirectional
   entities:
   - uid: 24702
@@ -165023,23 +166818,12 @@ entities:
       parent: 2
       rot: 3.141592653589793 rad
       pos: 138.5,96.5
-  - uid: 24714
-    components:
-    - type: Transform
-      parent: 2
-      pos: 103.5,51.5
   - uid: 24715
     components:
     - type: Transform
       parent: 2
       rot: 1.5707963267948966 rad
       pos: 101.5,52.5
-  - uid: 24716
-    components:
-    - type: Transform
-      parent: 2
-      rot: 1.5707963267948966 rad
-      pos: 101.5,51.5
   - uid: 24719
     components:
     - type: Transform
@@ -165151,18 +166935,6 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 77.5,101.5
-  - uid: 24740
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 72.5,40.5
-  - uid: 24741
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: 72.5,41.5
   - uid: 24742
     components:
     - type: Transform
@@ -165327,6 +167099,37 @@ entities:
       parent: 2
       rot: -1.5707963267948966 rad
       pos: 99.5,80.5
+- proto: WindowReinforcedDirectionalCorner
+  entities:
+  - uid: 17785
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 99.5,79.5
+  - uid: 18105
+    components:
+    - type: Transform
+      parent: 2
+      pos: 102.5,60.5
+  - uid: 20493
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 101.5,51.5
+  - uid: 25171
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 100.5,58.5
+  - uid: 25384
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 95.5,87.5
 - proto: Wirecutter
   entities:
   - uid: 24771
@@ -165579,6 +167382,11 @@ entities:
       pos: 20.5,92.5
 - proto: Wrench
   entities:
+  - uid: 12996
+    components:
+    - type: Transform
+      parent: 2
+      pos: 73.49731,29.491188
   - uid: 24812
     components:
     - type: Transform
@@ -165599,11 +167407,6 @@ entities:
     - type: Transform
       parent: 2
       pos: 55.578796,71.53778
-  - uid: 24816
-    components:
-    - type: Transform
-      parent: 2
-      pos: 67.5,32.5
   - uid: 24817
     components:
     - type: Transform
diff --git a/Resources/Maps/tram2.yml b/Resources/Maps/tram2.yml
index 9bc6742dcc..a96b04442b 100644
--- a/Resources/Maps/tram2.yml
+++ b/Resources/Maps/tram2.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 289.0.0
+  engineVersion: 289.0.3
   forkId: ""
   forkVersion: ""
-  time: 08/23/2026 15:24:31
-  entityCount: 26285
+  time: 09/14/2026 21:21:02
+  entityCount: 26325
 maps:
 - 1
 grids:
@@ -13,69 +13,69 @@ grids:
 - 17588
 orphans: []
 nullspace:
-- 26223
-- 26224
-- 26225
-- 26226
-- 26227
-- 26228
-- 26229
-- 26230
-- 26231
-- 26232
-- 26233
-- 26234
-- 26235
-- 26236
-- 26237
-- 26238
-- 26239
-- 26240
-- 26241
-- 26242
-- 26243
-- 26244
-- 26245
-- 26246
-- 26247
-- 26248
-- 26249
-- 26250
-- 26251
-- 26252
-- 26253
-- 26254
-- 26255
-- 26256
-- 26257
-- 26258
-- 26259
-- 26260
-- 26261
-- 26262
-- 26263
-- 26264
-- 26265
-- 26266
-- 26267
-- 26268
-- 26269
-- 26270
-- 26271
-- 26272
-- 26273
-- 26274
-- 26275
-- 26276
-- 26277
-- 26278
-- 26279
-- 26280
+- 10661
+- 11020
+- 15761
+- 16486
+- 17595
+- 17598
+- 17669
+- 17670
+- 17672
+- 17674
+- 18823
+- 18824
+- 22077
+- 23938
+- 24017
+- 24018
+- 24019
+- 25261
 - 26281
 - 26282
 - 26283
 - 26284
 - 26285
+- 26286
+- 26287
+- 26288
+- 26289
+- 26290
+- 26291
+- 26292
+- 26293
+- 26294
+- 26295
+- 26296
+- 26297
+- 26298
+- 26299
+- 26300
+- 26301
+- 26302
+- 26303
+- 26304
+- 26305
+- 26306
+- 26307
+- 26308
+- 26309
+- 26310
+- 26311
+- 26312
+- 26313
+- 26314
+- 26315
+- 26316
+- 26317
+- 26318
+- 26319
+- 26320
+- 26321
+- 26322
+- 26323
+- 26324
+- 26325
 tilemap:
   0: Space
   44: FloorArcadeBlue
@@ -172,11 +172,11 @@ entities:
       chunks:
         -1,-1:
           ind: -1,-1
-          tiles: CgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABMAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAAAoAAAAAAAATAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAEAAAAAAAABAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAEwAAAAAAABAAAAAAAAAQAAAAAAAACgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAIAAAAAAIACAAAAAAAAAoAAAAAAAATAAAAAAAACgAAAAAAAAoAAAAAAAAQAAAAAAAAEAAAAAAAAAoAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAACAAAAAACAAAAAAAAAAAKAAAAAAAAEwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAgAAAAAAgAIAAAAAAIACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAIAAAAAAAAUAAAAAAAAAgAAAAAAAAIAAAAAAAAUAAAAAAAAAgAAAAAAAAIAAAAAAAAUAAAAAAAAFAAAAAAAAAAAAAAAAAAIAAAAAAIACAAAAAACAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAACAAAAAAAAFAAAAAAAAAIAAAAAAAACAAAAAAAAFAAAAAAAAAIAAAAAAAACAAAAAAAAFAAAAAAAAAIAAAAAAAAAAAAAAAAACAAAAAAAAAoAAAAAAAAKAAAAAAAAEwAAAAAAAAoAAAAAAAAKAAAAAAAAAgAAAAAAABQAAAAAAAACAAAAAAAAAgAAAAAAABQAAAAAAAACAAAAAAAAAgAAAAAAABQAAAAAAAACAAAAAAAAAAAAAAAAAAgAAAAAAgAKAAAAAAAAEwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAAgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABMAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAUAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAIAAAAAAAAHAAAAAAAABwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAIAAAAAAAACAAAAAAAAFAAAAAAAABQAAAAAAAACAAAAAAAABwAAAAAAAAcAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAAgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAFAAAAAAAAAIAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABMAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAA==
+          tiles: CgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABMAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAAAoAAAAAAAATAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAEAAAAAAAABAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACgAAAAAAAAoAAAAAAAAUAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAEwAAAAAAABAAAAAAAAAQAAAAAAAACgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAIAAAAAAIACAAAAAAAAAoAAAAAAAATAAAAAAAACgAAAAAAAAoAAAAAAAAQAAAAAAAAEAAAAAAAAAoAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAACAAAAAACAAAAAAAAAAAKAAAAAAAAEwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAgAAAAAAgAIAAAAAAIACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAIAAAAAAAAUAAAAAAAAAgAAAAAAAAIAAAAAAAAUAAAAAAAAAgAAAAAAAAIAAAAAAAAUAAAAAAAAFAAAAAAAAAAAAAAAAAAIAAAAAAIACAAAAAACAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAACAAAAAAAAFAAAAAAAAAIAAAAAAAACAAAAAAAAFAAAAAAAAAIAAAAAAAACAAAAAAAAFAAAAAAAAAIAAAAAAAAAAAAAAAAACAAAAAAAAAoAAAAAAAAKAAAAAAAAEwAAAAAAAAoAAAAAAAAKAAAAAAAAAgAAAAAAABQAAAAAAAACAAAAAAAAAgAAAAAAABQAAAAAAAACAAAAAAAAAgAAAAAAABQAAAAAAAACAAAAAAAAAAAAAAAAAAgAAAAAAgAKAAAAAAAAEwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAAgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABMAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAUAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAIAAAAAAAAHAAAAAAAABwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAIAAAAAAAACAAAAAAAAFAAAAAAAABQAAAAAAAACAAAAAAAABwAAAAAAAAcAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAAgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAFAAAAAAAAAIAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABMAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAA==
           version: 7
         0,0:
           ind: 0,0
-          tiles: CgAAAAAAAAoAAAAAAAAKAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAAoAAAAAAAAFAAAAAAAABQAAAAAAAAoAAAAAAAAVAAAAAAAAFQAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAKAAAAAAAABQAAAAAAAAUAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAACgAAAAAAAAUAAAAAAAAFAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAFQAAAAAAABUAAAAAAAAKAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAAoAAAAAAAAFAAAAAAAABQAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABUAAAAAAAAVAAAAAAAACgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAAoAAAAAAAAKAAAAAAAABQAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAVAAAAAAAAFQAAAAAAAAoAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAACgAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAAoAAAAAAAAFAAAAAAAABQAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABMAAAAAAAAIAAAAAAAAAAAAAAAAAAoAAAAAAAALAAAAAAIACwAAAAAFAAsAAAAAAQALAAAAAAMACwAAAAADAAsAAAAAAwAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAACgAAAAAAAAgAAAAAAgAKAAAAAAAACwAAAAAFAAsAAAAAAwALAAAAAAUACwAAAAADAAsAAAAAAwALAAAAAAMACgAAAAAAADwAAAAAAAA8AAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAACgAAAAAAAAgAAAAAAAAAAAAAAAAACgAAAAAAAAsAAAAAAgALAAAAAAIACwAAAAACAAsAAAAABAALAAAAAAAACwAAAAAEAAoAAAAAAAA8AAAAAAMAPAAAAAACAAoAAAAAAAAKAAAAAAAAEwAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAAKAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAAEwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAABFAAAAAAAARQAAAAABAEYAAAAAAwAKAAAAAAAACAAAAAACAAgAAAAAAQAKAAAAAAAACgAAAAAAAAoAAAAAAAAIAAAAAAEACAAAAAAAAA==
+          tiles: CgAAAAAAAAoAAAAAAAAKAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAAoAAAAAAAAFAAAAAAAABQAAAAAAAAoAAAAAAAAVAAAAAAAAFQAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAKAAAAAAAABQAAAAAAAAUAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAVAAAAAAAAFQAAAAAAABUAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAACgAAAAAAAAUAAAAAAAAFAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAFQAAAAAAABUAAAAAAAAKAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAAoAAAAAAAAFAAAAAAAABQAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABUAAAAAAAAVAAAAAAAACgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAAoAAAAAAAAKAAAAAAAABQAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAVAAAAAAAAFQAAAAAAAAoAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAACgAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAAoAAAAAAAAFAAAAAAAABQAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABMAAAAAAAAIAAAAAAAAAAAAAAAAAAoAAAAAAAALAAAAAAIACwAAAAAFAAsAAAAAAQALAAAAAAMACwAAAAADAAsAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAACgAAAAAAAAgAAAAAAgAKAAAAAAAACwAAAAAFAAsAAAAAAwALAAAAAAUACwAAAAADAAsAAAAAAwALAAAAAAAACgAAAAAAADwAAAAAAAA8AAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAACgAAAAAAAAgAAAAAAAAAAAAAAAAACgAAAAAAAAsAAAAAAgALAAAAAAIACwAAAAACAAsAAAAABAALAAAAAAAAHgAAAAAAAAoAAAAAAAA8AAAAAAMAPAAAAAACAAoAAAAAAAAKAAAAAAAAEwAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAAKAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAAEwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAABFAAAAAAAARQAAAAABAEYAAAAAAwAKAAAAAAAACAAAAAACAAgAAAAAAQAKAAAAAAAACgAAAAAAAAoAAAAAAAAIAAAAAAEACAAAAAAAAA==
           version: 7
         -1,0:
           ind: -1,0
@@ -184,7 +184,7 @@ entities:
           version: 7
         -1,-2:
           ind: -1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAIACAAAAAAAAAgAAAAAAAAIAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAEwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAFAAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAASQAAAAAAAEkAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAAEwAAAAAAAAoAAAAAAAATAAAAAAAAEwAAAAAAAAoAAAAAAABJAAAAAAAACAAAAAABAAgAAAAAAAAIAAAAAAEACAAAAAABAAgAAAAAAgAIAAAAAAEACAAAAAAAAAgAAAAAAgAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAgAAAAAAAAIAAAAAAIACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAACgAAAAAAABMAAAAAAAATAAAAAAAACgAAAAAAABMAAAAAAAATAAAAAAAACgAAAAAAAEkAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAAEkAAAAAAABJAAAAAAAACgAAAAAAAAgAAAAAAgAIAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAEwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAFAAAAAAAAA==
+          tiles: AAAAAAAAAAgAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAIAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAACAAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAIACAAAAAAAAAgAAAAAAAAIAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAEwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAFAAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAASQAAAAAAAEkAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAAEwAAAAAAAAoAAAAAAAATAAAAAAAAEwAAAAAAAAoAAAAAAABJAAAAAAAACAAAAAABAAgAAAAAAAAIAAAAAAEACAAAAAABAAgAAAAAAgAIAAAAAAEACAAAAAAAAAgAAAAAAgAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAgAAAAAAAAIAAAAAAIACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAADEAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAACgAAAAAAABMAAAAAAAATAAAAAAAACgAAAAAAABMAAAAAAAATAAAAAAAACgAAAAAAAEkAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAAEkAAAAAAABJAAAAAAAACgAAAAAAAAgAAAAAAgAIAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAEwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAFAAAAAAAAA==
           version: 7
         0,-1:
           ind: 0,-1
@@ -252,7 +252,7 @@ entities:
           version: 7
         -2,-2:
           ind: -2,-2
-          tiles: FAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAoAAAAAAAAIAAAAAAIACAAAAAAAAAgAAAAAAgAIAAAAAAAACAAAAAACAAgAAAAAAQAIAAAAAAAACAAAAAABAAgAAAAAAgAIAAAAAAIACAAAAAAAAAgAAAAAAgAIAAAAAAAACAAAAAACABMAAAAAAAATAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAEwAAAAAAAAoAAAAAAAAIAAAAAAIACAAAAAAAAAgAAAAAAAAIAAAAAAEACAAAAAAAAAgAAAAAAgAIAAAAAAAACAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAIACAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAIAAAAAAAACAAAAAACAAgAAAAAAgAIAAAAAAEACgAAAAAAADUAAAAAAAA1AAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAANQAAAAAAABMAAAAAAAAKAAAAAAAAEwAAAAAAABMAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAEwAAAAAAAAoAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAEACgAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAAA==
+          tiles: FAAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAoAAAAAAAAIAAAAAAIACAAAAAAAAAgAAAAAAgAIAAAAAAAACAAAAAACAAgAAAAAAQAIAAAAAAAACAAAAAABAAgAAAAAAgAIAAAAAAIACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAABMAAAAAAAATAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAATAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAEwAAAAAAAAoAAAAAAAAIAAAAAAIACAAAAAAAAAgAAAAAAAAIAAAAAAEACAAAAAAAAAgAAAAAAgAIAAAAAAAACAAAAAABAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAIACAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAIAAAAAAAACAAAAAACAAgAAAAAAgAIAAAAAAEACgAAAAAAADUAAAAAAAA1AAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAANQAAAAAAABMAAAAAAAAKAAAAAAAAEwAAAAAAABMAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAEwAAAAAAAAoAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAEACgAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAAA==
           version: 7
         -2,-3:
           ind: -2,-3
@@ -344,7 +344,7 @@ entities:
           version: 7
         -3,0:
           ind: -3,0
-          tiles: BwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAcAAAAAAAAHAAAAAAAAAQAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABMAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAACgAAAAAAABQAAAAAAAAKAAAAAAAAFAAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAbAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAGwAAAAAAABsAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAoAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAAAoAAAAAAAAUAAAAAAAACgAAAAAAABQAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAGwAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAACAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAAAoAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAACgAAAAAAAA==
+          tiles: BwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAcAAAAAAAAHAAAAAAAAAQAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABMAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAACgAAAAAAABQAAAAAAAAKAAAAAAAAFAAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAbAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAGwAAAAAAABsAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAoAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAFAAAAAAAAAoAAAAAAAAUAAAAAAAACgAAAAAAABQAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAGwAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAACAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAAAoAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAATAAAAAAAACgAAAAAAAA==
           version: 7
         -3,-3:
           ind: -3,-3
@@ -396,7 +396,7 @@ entities:
           version: 7
         -3,1:
           ind: -3,1
-          tiles: GwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAACAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAACgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAgAAAAAAAAIAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAoAAAAAAAACAAAAAAAAAgAAAAAAABsAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAACgAAAAAAAAoAAAAAAAACAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAA8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAPAAAAAAAADwAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAAgAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAIAAAAAAAACAAAAAAAADwAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAIAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAACAAAAAAAAAgAAAAAAAA8AAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAACAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAAgAAAAAAAAIAAAAAAAAPAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAFAAAAAAAAAoAAAAAAAAPAAAAAAAAAgAAAAAAAA8AAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAADwAAAAAAAAIAAAAAAAAPAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAACgAAAAAAAA8AAAAAAAACAAAAAAAADwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAACAAAAAAAAAAAAAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAA==
+          tiles: GwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAACAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAATAAAAAAAACgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAAgAAAAAAAAIAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAEwAAAAAAAAoAAAAAAAACAAAAAAAAAgAAAAAAABsAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAACgAAAAAAAAoAAAAAAAACAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAA8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAPAAAAAAAADwAAAAAAAAoAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAAgAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAIAAAAAAAACAAAAAAAADwAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAIAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAACAAAAAAAAAgAAAAAAAA8AAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAACAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAAgAAAAAAAAIAAAAAAAAPAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAABQAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAFAAAAAAAAAoAAAAAAAAPAAAAAAAAAgAAAAAAAA8AAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAKAAAAAAAAFAAAAAAAABQAAAAAAAAKAAAAAAAADwAAAAAAAAIAAAAAAAAPAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACgAAAAAAABQAAAAAAAAUAAAAAAAACgAAAAAAAA8AAAAAAAACAAAAAAAADwAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAACAAAAAAAAAAAAAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAA==
           version: 7
         -4,0:
           ind: -4,0
@@ -583,6 +583,9 @@ entities:
         - temperature: 293.15
           volume: 2500
           moles: {}
+        - temperature: 147.92499
+          volume: 2500
+          moles: {}
         - temperature: 293.15
           volume: 2500
           moles:
@@ -597,7 +600,7 @@ entities:
             Nitrogen: 6666.982
         tiles:
           -4,-4:
-            0: 1888
+            0: 20320
           -5,-4:
             0: 4081
           -4,-2:
@@ -686,7 +689,7 @@ entities:
           1,1:
             0: 53247
           1,2:
-            0: 20479
+            0: 4095
           1,3:
             0: 58623
           1,-1:
@@ -698,7 +701,7 @@ entities:
           2,1:
             0: 56825
           2,2:
-            0: 3537
+            0: 7633
           2,3:
             0: 255
             1: 24576
@@ -765,7 +768,7 @@ entities:
           -1,4:
             0: 48059
           -4,-8:
-            1: 61440
+            1: 61986
             0: 136
           -4,-7:
             0: 15
@@ -899,7 +902,7 @@ entities:
           7,-4:
             0: 32256
           7,-3:
-            0: 59255
+            0: 59391
           8,-3:
             0: 26231
           8,-2:
@@ -957,7 +960,7 @@ entities:
           8,-5:
             1: 15
             3: 240
-            0: 3840
+            0: 12032
           5,1:
             0: 65524
           5,2:
@@ -999,7 +1002,7 @@ entities:
             1: 1365
             3: 64170
           8,-4:
-            0: 24678
+            0: 25702
           9,-2:
             3: 32
             0: 34952
@@ -1415,10 +1418,11 @@ entities:
           12,-13:
             0: 61167
           -8,-8:
-            3: 273
-            1: 49154
+            3: 279
+            1: 49152
           -9,-8:
-            3: 2184
+            3: 136
+            4: 2048
             0: 819
           -8,-7:
             0: 287
@@ -1433,7 +1437,7 @@ entities:
           -8,-4:
             0: 64443
           -7,-8:
-            1: 61440
+            1: 63624
           -7,-7:
             0: 15
             3: 240
@@ -1446,7 +1450,7 @@ entities:
             1: 6
             0: 47872
           -6,-8:
-            1: 61440
+            1: 62259
           -6,-7:
             0: 15
             3: 240
@@ -1541,7 +1545,7 @@ entities:
           -6,-16:
             0: 4369
             1: 57344
-            4: 204
+            5: 204
           -6,-15:
             0: 65281
             1: 14
@@ -1549,13 +1553,13 @@ entities:
             0: 65535
           -6,-17:
             0: 4369
-            4: 49152
+            5: 49152
             1: 224
           -5,-16:
-            4: 17
+            5: 17
             1: 29764
           -5,-17:
-            4: 4096
+            5: 4096
             1: 17520
           -19,-17:
             1: 13294
@@ -1696,7 +1700,7 @@ entities:
             0: 45329
             1: 196
           16,-16:
-            0: 61695
+            0: 63743
           16,-15:
             0: 65103
           16,-13:
@@ -2059,7 +2063,7 @@ entities:
           -5,4:
             0: 43775
           -12,-8:
-            0: 1279
+            0: 17663
           -12,-9:
             0: 65280
             1: 15
@@ -2137,11 +2141,11 @@ entities:
           -13,2:
             0: 3549
           -12,3:
-            0: 3838
+            0: 20222
           -13,3:
             0: 3838
           -12,4:
-            0: 4095
+            0: 20479
           -11,1:
             0: 61567
           -11,2:
@@ -2306,7 +2310,7 @@ entities:
           -20,-7:
             0: 4095
           -21,-7:
-            0: 24575
+            0: 8191
           -20,-6:
             1: 34975
           -20,-8:
@@ -2343,7 +2347,7 @@ entities:
             1: 15
             0: 65280
           -21,-3:
-            0: 65365
+            0: 65301
           -20,-2:
             0: 65407
           -21,-2:
@@ -2386,7 +2390,7 @@ entities:
             1: 61713
           -23,-7:
             1: 4353
-            0: 36044
+            0: 3276
           -23,-6:
             1: 48
             0: 136
@@ -2424,7 +2428,7 @@ entities:
             1: 12288
             0: 32768
           -23,-3:
-            0: 64904
+            0: 64776
           -23,-2:
             0: 13
             1: 20224
@@ -2868,20 +2872,20 @@ entities:
           -9,-19:
             1: 15
             3: 13056
-            5: 34816
+            6: 34816
           -9,-18:
             3: 3
             0: 3840
-            5: 8
+            6: 8
           -9,-21:
             1: 61440
           -8,-20:
             1: 19535
           -8,-19:
             1: 17487
-            5: 4352
+            6: 4352
           -8,-18:
-            5: 1
+            6: 1
             0: 3840
             1: 68
           -8,-21:
@@ -2890,9 +2894,9 @@ entities:
             1: 53184
           -7,-19:
             1: 15
-            6: 30464
+            7: 30464
           -7,-18:
-            6: 7
+            7: 7
             0: 3840
           -6,-20:
             1: 24404
@@ -2947,7 +2951,7 @@ entities:
             1: 65280
           16,-18:
             1: 8464
-            0: 32972
+            0: 35020
           4,6:
             3: 15
             1: 62528
@@ -3260,7 +3264,7 @@ entities:
           17,-19:
             0: 13104
           17,-18:
-            0: 4147
+            0: 4403
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -3272,68 +3276,69 @@ entities:
     - type: ExplosionAirtightGrid
     - type: ChunkContainer
       chunkEntities:
-      - 26223
-      - 26224
-      - 26225
-      - 26226
-      - 26227
-      - 26228
-      - 26229
-      - 26230
-      - 26231
-      - 26232
-      - 26233
-      - 26234
-      - 26235
-      - 26236
-      - 26237
-      - 26238
-      - 26239
-      - 26240
-      - 26241
-      - 26242
-      - 26243
-      - 26244
-      - 26245
-      - 26246
-      - 26247
-      - 26248
-      - 26249
-      - 26250
-      - 26251
-      - 26252
-      - 26253
-      - 26254
-      - 26255
-      - 26256
-      - 26257
-      - 26258
-      - 26259
-      - 26260
-      - 26261
-      - 26262
-      - 26263
-      - 26264
-      - 26265
-      - 26266
-      - 26267
-      - 26268
-      - 26269
-      - 26270
-      - 26271
-      - 26272
-      - 26273
-      - 26274
-      - 26275
-      - 26276
-      - 26277
-      - 26278
-      - 26279
-      - 26280
+      - 10661
+      - 11020
+      - 15761
+      - 16486
+      - 17595
+      - 17598
+      - 17669
+      - 17670
+      - 17672
+      - 17674
+      - 18823
+      - 18824
+      - 22077
+      - 23938
+      - 24017
+      - 24018
+      - 24019
+      - 25261
       - 26281
       - 26282
       - 26283
       - 26284
+      - 26285
+      - 26286
+      - 26287
+      - 26288
+      - 26289
+      - 26290
+      - 26291
+      - 26292
+      - 26293
+      - 26294
+      - 26295
+      - 26296
+      - 26297
+      - 26298
+      - 26299
+      - 26300
+      - 26301
+      - 26302
+      - 26303
+      - 26304
+      - 26305
+      - 26306
+      - 26307
+      - 26308
+      - 26309
+      - 26310
+      - 26311
+      - 26312
+      - 26313
+      - 26314
+      - 26315
+      - 26316
+      - 26317
+      - 26318
+      - 26319
+      - 26320
+      - 26321
+      - 26322
+      - 26323
+      - 26324
+    - type: GridSplitNode
   - uid: 17588
     components:
     - type: MetaData
@@ -3415,7 +3420,8 @@ entities:
     - type: ExplosionAirtightGrid
     - type: ChunkContainer
       chunkEntities:
-      - 26285
+      - 26325
+    - type: GridSplitNode
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 10751
@@ -3505,21 +3511,21 @@ entities:
       pos: 71.5,-15.5
     - type: DeviceList
       devices:
-      - 18945
-      - 18944
+      - 18957
+      - 3718
+      - 20716
+      - 20715
       - 20544
       - 20714
       - 6228
-      - 20715
-      - 20716
-      - 18934
-      - 18933
-      - 19132
-      - 20724
-      - 20721
       - 20720
-      - 18957
-      - 5873
+      - 20721
+      - 20724
+      - 19132
+      - 18933
+      - 5993
+      - 18934
+      - 18942
   - uid: 2531
     components:
     - type: Transform
@@ -4143,16 +4149,18 @@ entities:
       pos: 73.5,-20.5
     - type: DeviceList
       devices:
-      - 19654
-      - 19536
-      - 18941
       - 18940
-      - 18929
-      - 14535
+      - 18941
+      - 19536
+      - 19654
       - 18930
-      - 18934
-      - 5873
+      - 18929
       - 18933
+      - 18934
+      - 5993
+      - 3719
+      - 18939
+      - 18938
   - uid: 20726
     components:
     - type: Transform
@@ -4180,6 +4188,10 @@ entities:
     - type: Transform
       parent: 15
       pos: 19.5,-49.5
+    - type: DeviceList
+      devices:
+      - 15844
+      - 15845
   - uid: 21302
     components:
     - type: Transform
@@ -4379,6 +4391,13 @@ entities:
       parent: 15
       rot: -1.5707963267948966 rad
       pos: 15.5,-28.5
+    - type: DeviceList
+      devices:
+      - 1088
+      - 18877
+      - 4725
+      - 4728
+      - 4726
   - uid: 21649
     components:
     - type: Transform
@@ -4486,17 +4505,16 @@ entities:
       pos: 80.5,-29.5
     - type: DeviceList
       devices:
-      - 14461
-      - 19652
       - 22752
       - 22753
       - 22754
-      - 18927
-      - 18926
-      - 20708
-      - 18930
+      - 14461
+      - 19652
       - 18929
-      - 22842
+      - 3719
+      - 18930
+      - 18926
+      - 18927
   - uid: 22750
     components:
     - type: Transform
@@ -4549,6 +4567,16 @@ entities:
     - type: Transform
       parent: 15
       pos: 52.5,-16.5
+    - type: DeviceList
+      devices:
+      - 18953
+      - 18952
+      - 24969
+      - 1144
+      - 20716
+      - 20715
+      - 20722
+      - 20723
   - uid: 24105
     components:
     - type: Transform
@@ -4597,6 +4625,14 @@ entities:
     - type: Transform
       parent: 15
       pos: -51.5,11.5
+    - type: DeviceList
+      devices:
+      - 25360
+      - 25120
+      - 25538
+      - 25537
+      - 10055
+      - 25539
   - uid: 25368
     components:
     - type: Transform
@@ -4757,13 +4793,6 @@ entities:
       parent: 15
       rot: 1.5707963267948966 rad
       pos: -37.5,-55.5
-- proto: AirlockAtmosphericsLocked
-  entities:
-  - uid: 844
-    components:
-    - type: Transform
-      parent: 15
-      pos: 27.5,-45.5
 - proto: AirlockBarGlassLocked
   entities:
   - uid: 35
@@ -4787,6 +4816,16 @@ entities:
       parent: 15
       rot: 4.71238898038469 rad
       pos: -51.5,13.5
+  - uid: 11271
+    components:
+    - type: Transform
+      parent: 15
+      pos: -37.5,9.5
+  - uid: 12474
+    components:
+    - type: Transform
+      parent: 15
+      pos: -39.5,9.5
 - proto: AirlockCaptainLocked
   entities:
   - uid: 282
@@ -5028,13 +5067,6 @@ entities:
       parent: 15
       rot: 1.5707963267948966 rad
       pos: -56.5,-42.5
-- proto: AirlockEngineering
-  entities:
-  - uid: 12870
-    components:
-    - type: Transform
-      parent: 15
-      pos: 26.5,-43.5
 - proto: AirlockEngineeringGlassLocked
   entities:
   - uid: 66
@@ -5071,12 +5103,6 @@ entities:
     - type: Transform
       parent: 15
       pos: -52.5,-47.5
-  - uid: 5826
-    components:
-    - type: Transform
-      parent: 15
-      rot: 1.5707963267948966 rad
-      pos: -15.5,-18.5
   - uid: 7280
     components:
     - type: Transform
@@ -5125,14 +5151,11 @@ entities:
       pos: -30.5,-52.5
 - proto: AirlockEngineeringLocked
   entities:
-  - uid: 872
+  - uid: 1204
     components:
     - type: Transform
       parent: 15
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-17.5
-    - type: DeviceLinkSink
-      invokeCounter: 1
+      pos: 26.5,-43.5
   - uid: 3985
     components:
     - type: Transform
@@ -5226,6 +5249,9 @@ entities:
         890:
         - - DoorStatus
           - DoorBolt
+        872:
+        - - DoorStatus
+          - Close
   - uid: 879
     components:
     - type: Transform
@@ -5238,7 +5264,7 @@ entities:
       linkedPorts:
         4007:
         - - DoorStatus
-          - DoorBolt
+          - Close
   - uid: 880
     components:
     - type: Transform
@@ -5251,7 +5277,10 @@ entities:
       linkedPorts:
         4007:
         - - DoorStatus
-          - DoorBolt
+          - Close
+        879:
+        - - DoorStatus
+          - Close
   - uid: 924
     components:
     - type: Transform
@@ -5264,7 +5293,10 @@ entities:
       linkedPorts:
         8514:
         - - DoorStatus
-          - DoorBolt
+          - Close
+        925:
+        - - DoorStatus
+          - Close
   - uid: 925
     components:
     - type: Transform
@@ -5278,6 +5310,9 @@ entities:
         8514:
         - - DoorStatus
           - DoorBolt
+        924:
+        - - DoorStatus
+          - Close
   - uid: 926
     components:
     - type: Transform
@@ -5290,7 +5325,10 @@ entities:
       linkedPorts:
         4690:
         - - DoorStatus
-          - DoorBolt
+          - Close
+        927:
+        - - DoorStatus
+          - Close
   - uid: 927
     components:
     - type: Transform
@@ -5303,7 +5341,7 @@ entities:
       linkedPorts:
         4690:
         - - DoorStatus
-          - DoorBolt
+          - Close
   - uid: 963
     components:
     - type: Transform
@@ -5316,7 +5354,7 @@ entities:
       linkedPorts:
         2526:
         - - DoorStatus
-          - DoorBolt
+          - Close
   - uid: 986
     components:
     - type: Transform
@@ -5329,7 +5367,10 @@ entities:
       linkedPorts:
         2606:
         - - DoorStatus
-          - DoorBolt
+          - Close
+        1010:
+        - - DoorStatus
+          - Close
   - uid: 1010
     components:
     - type: Transform
@@ -5342,7 +5383,10 @@ entities:
       linkedPorts:
         2606:
         - - DoorStatus
-          - DoorBolt
+          - Close
+        986:
+        - - DoorStatus
+          - Close
   - uid: 1030
     components:
     - type: Transform
@@ -5355,7 +5399,10 @@ entities:
       linkedPorts:
         2526:
         - - DoorStatus
-          - DoorBolt
+          - Close
+        963:
+        - - DoorStatus
+          - Close
   - uid: 1826
     components:
     - type: Transform
@@ -5368,7 +5415,10 @@ entities:
       linkedPorts:
         3174:
         - - DoorStatus
-          - DoorBolt
+          - Close
+        1868:
+        - - DoorStatus
+          - Close
   - uid: 1827
     components:
     - type: Transform
@@ -5381,7 +5431,10 @@ entities:
       linkedPorts:
         3881:
         - - DoorStatus
-          - DoorBolt
+          - Close
+        1869:
+        - - DoorStatus
+          - Close
   - uid: 1868
     components:
     - type: Transform
@@ -5394,7 +5447,10 @@ entities:
       linkedPorts:
         3174:
         - - DoorStatus
-          - DoorBolt
+          - Close
+        1826:
+        - - DoorStatus
+          - Close
   - uid: 1869
     components:
     - type: Transform
@@ -5407,7 +5463,7 @@ entities:
       linkedPorts:
         3881:
         - - DoorStatus
-          - DoorBolt
+          - Close
   - uid: 23452
     components:
     - type: Transform
@@ -5458,11 +5514,40 @@ entities:
     - type: Transform
       parent: 15
       pos: 33.5,19.5
+  - uid: 872
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-17.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        2702:
+        - - DoorStatus
+          - Close
+        890:
+        - - DoorStatus
+          - Close
   - uid: 2665
     components:
     - type: Transform
       parent: 15
       pos: -6.5,20.5
+  - uid: 2702
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-18.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        24306:
+        - - DoorStatus
+          - Close
   - uid: 3127
     components:
     - type: Transform
@@ -5752,6 +5837,13 @@ entities:
     - type: Transform
       parent: 15
       pos: -10.5,-19.5
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        872:
+        - - DoorStatus
+          - Close
   - uid: 24566
     components:
     - type: Transform
@@ -5788,12 +5880,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -6.5,-19.5
     - type: DeviceLinkSink
-      invokeCounter: 3
+      invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
         873:
         - - DoorStatus
-          - DoorBolt
+          - Close
         2425:
         - - DoorStatus
           - DoorBolt
@@ -5803,7 +5895,7 @@ entities:
       parent: 15
       pos: 46.5,-25.5
     - type: DeviceLinkSink
-      invokeCounter: 2
+      invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
         1030:
@@ -5818,22 +5910,22 @@ entities:
       parent: 15
       pos: 46.5,-19.5
     - type: DeviceLinkSink
-      invokeCounter: 2
+      invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
         1010:
         - - DoorStatus
-          - DoorBolt
+          - Close
         986:
         - - DoorStatus
-          - DoorBolt
+          - Close
   - uid: 3174
     components:
     - type: Transform
       parent: 15
       pos: -31.5,-19.5
     - type: DeviceLinkSink
-      invokeCounter: 2
+      invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
         1868:
@@ -5848,15 +5940,15 @@ entities:
       parent: 15
       pos: -31.5,-25.5
     - type: DeviceLinkSink
-      invokeCounter: 2
+      invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
         1869:
         - - DoorStatus
-          - DoorBolt
+          - Close
         1827:
         - - DoorStatus
-          - DoorBolt
+          - Close
   - uid: 4007
     components:
     - type: Transform
@@ -5864,7 +5956,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: -6.5,-25.5
     - type: DeviceLinkSink
-      invokeCounter: 3
+      invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
         879:
@@ -5883,7 +5975,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 21.5,-25.5
     - type: DeviceLinkSink
-      invokeCounter: 2
+      invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
         927:
@@ -5899,15 +5991,15 @@ entities:
       rot: 3.141592653589793 rad
       pos: 21.5,-19.5
     - type: DeviceLinkSink
-      invokeCounter: 3
+      invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
         924:
         - - DoorStatus
-          - DoorBolt
+          - Close
         925:
         - - DoorStatus
-          - DoorBolt
+          - Close
   - uid: 11675
     components:
     - type: Transform
@@ -6093,6 +6185,30 @@ entities:
       parent: 15
       rot: -1.5707963267948966 rad
       pos: 6.5,-73.5
+- proto: AirlockExternalGlassShuttleLocked
+  entities:
+  - uid: 1983
+    components:
+    - type: Transform
+      parent: 15
+      pos: 78.5,-61.5
+  - uid: 2441
+    components:
+    - type: Transform
+      parent: 15
+      rot: 1.5707963267948966 rad
+      pos: 81.5,-59.5
+  - uid: 2947
+    components:
+    - type: Transform
+      parent: 15
+      pos: 80.5,-61.5
+  - uid: 4563
+    components:
+    - type: Transform
+      parent: 15
+      rot: 1.5707963267948966 rad
+      pos: 81.5,-57.5
 - proto: AirlockFreezer
   entities:
   - uid: 3444
@@ -6106,6 +6222,12 @@ entities:
       parent: 15
       rot: 1.5707963267948966 rad
       pos: -15.5,-13.5
+  - uid: 14327
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-13.5
 - proto: AirlockFreezerKitchenHydroLocked
   entities:
   - uid: 183
@@ -6513,34 +6635,12 @@ entities:
       parent: 15
       rot: -1.5707963267948966 rad
       pos: -91.5,-38.5
-  - uid: 18677
-    components:
-    - type: Transform
-      parent: 15
-      pos: 80.5,-61.5
-  - uid: 22245
-    components:
-    - type: Transform
-      parent: 15
-      rot: 1.5707963267948966 rad
-      pos: 81.5,-57.5
   - uid: 22918
     components:
     - type: Transform
       parent: 15
       rot: 3.141592653589793 rad
       pos: 93.5,-0.5
-  - uid: 24383
-    components:
-    - type: Transform
-      parent: 15
-      pos: 78.5,-61.5
-  - uid: 24386
-    components:
-    - type: Transform
-      parent: 15
-      rot: 1.5707963267948966 rad
-      pos: 81.5,-59.5
   - uid: 24396
     components:
     - type: Transform
@@ -6746,11 +6846,11 @@ entities:
       pos: 19.5,-14.5
 - proto: AirlockMaintKitchenLocked
   entities:
-  - uid: 15771
+  - uid: 20303
     components:
     - type: Transform
       parent: 15
-      pos: 6.5,11.5
+      pos: 8.5,11.5
 - proto: AirlockMaintLocked
   entities:
   - uid: 149
@@ -6799,6 +6899,11 @@ entities:
       parent: 15
       rot: 1.5707963267948966 rad
       pos: -9.5,3.5
+  - uid: 844
+    components:
+    - type: Transform
+      parent: 15
+      pos: 27.5,-45.5
   - uid: 866
     components:
     - type: Transform
@@ -7620,24 +7725,12 @@ entities:
     - type: Transform
       parent: 15
       pos: 86.5,-18.5
-  - uid: 1983
-    components:
-    - type: Transform
-      parent: 15
-      rot: 3.141592653589793 rad
-      pos: -39.5,9.5
   - uid: 4559
     components:
     - type: Transform
       parent: 15
       rot: 1.5707963267948966 rad
       pos: -36.5,7.5
-  - uid: 4563
-    components:
-    - type: Transform
-      parent: 15
-      rot: 3.141592653589793 rad
-      pos: -37.5,9.5
   - uid: 7424
     components:
     - type: Transform
@@ -8094,9 +8187,6 @@ entities:
     - type: Transform
       parent: 15
       pos: 81.5,-35.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 22749
   - uid: 22844
     components:
     - type: Transform
@@ -8758,14 +8848,6 @@ entities:
     - type: Transform
       parent: 15
       pos: -31.669796,-14.109636
-- proto: AsimovCircuitBoard
-  entities:
-  - uid: 8009
-    components:
-    - type: Transform
-      parent: 15
-      rot: 3.141592653589793 rad
-      pos: 28.580853,-10.85622
 - proto: AtmosDeviceFanDirectional
   entities:
   - uid: 162
@@ -11320,6 +11402,16 @@ entities:
     - type: Transform
       parent: 15
       pos: 71.5,-22.5
+  - uid: 26252
+    components:
+    - type: Transform
+      parent: 15
+      pos: -29.5,-31.5
+  - uid: 26253
+    components:
+    - type: Transform
+      parent: 15
+      pos: -30.5,-31.5
 - proto: AtmosFixFreezerMarker
   entities:
   - uid: 14
@@ -12225,16 +12317,22 @@ entities:
       pos: 17.5,10.5
 - proto: BibleCommunistManifesto
   entities:
-  - uid: 20301
+  - uid: 26241
     components:
     - type: Transform
       parent: 15
-      pos: -8.520068,7.600655
-  - uid: 20303
+      pos: -9.498705,7.522795
+    missingComponents:
+    - Bible
+    - StealTarget
+  - uid: 26242
     components:
     - type: Transform
       parent: 15
-      pos: -9.520068,7.600655
+      pos: -8.498705,7.4915233
+    missingComponents:
+    - Bible
+    - StealTarget
 - proto: Biogenerator
   entities:
   - uid: 2251
@@ -13767,6 +13865,11 @@ entities:
     - type: Transform
       parent: 15
       pos: -51.5,-75.5
+  - uid: 3721
+    components:
+    - type: Transform
+      parent: 15
+      pos: -13.5,-13.5
   - uid: 3732
     components:
     - type: Transform
@@ -13877,6 +13980,11 @@ entities:
     - type: Transform
       parent: 15
       pos: 79.5,-7.5
+  - uid: 4557
+    components:
+    - type: Transform
+      parent: 15
+      pos: -10.5,-10.5
   - uid: 4581
     components:
     - type: Transform
@@ -13902,6 +14010,11 @@ entities:
     - type: Transform
       parent: 15
       pos: 63.5,-6.5
+  - uid: 4829
+    components:
+    - type: Transform
+      parent: 15
+      pos: -10.5,-11.5
   - uid: 4849
     components:
     - type: Transform
@@ -17612,6 +17725,11 @@ entities:
     - type: Transform
       parent: 15
       pos: 80.5,-14.5
+  - uid: 14535
+    components:
+    - type: Transform
+      parent: 15
+      pos: -10.5,-12.5
   - uid: 14622
     components:
     - type: Transform
@@ -19057,26 +19175,21 @@ entities:
     - type: Transform
       parent: 15
       pos: -31.5,13.5
-  - uid: 15798
+  - uid: 15805
     components:
     - type: Transform
       parent: 15
-      pos: -42.5,-32.5
-  - uid: 15807
-    components:
-    - type: Transform
-      parent: 15
-      pos: -43.5,-32.5
+      pos: -43.5,-31.5
   - uid: 15808
     components:
     - type: Transform
       parent: 15
-      pos: -45.5,-32.5
+      pos: -44.5,-31.5
   - uid: 15809
     components:
     - type: Transform
       parent: 15
-      pos: -44.5,-32.5
+      pos: -42.5,-31.5
   - uid: 15810
     components:
     - type: Transform
@@ -27392,6 +27505,61 @@ entities:
     - type: Transform
       parent: 15
       pos: -46.5,1.5
+  - uid: 26245
+    components:
+    - type: Transform
+      parent: 15
+      pos: -17.5,2.5
+  - uid: 26254
+    components:
+    - type: Transform
+      parent: 15
+      pos: -10.5,-14.5
+  - uid: 26255
+    components:
+    - type: Transform
+      parent: 15
+      pos: -10.5,-13.5
+  - uid: 26256
+    components:
+    - type: Transform
+      parent: 15
+      pos: -10.5,-15.5
+  - uid: 26257
+    components:
+    - type: Transform
+      parent: 15
+      pos: -11.5,2.5
+  - uid: 26258
+    components:
+    - type: Transform
+      parent: 15
+      pos: -11.5,1.5
+  - uid: 26259
+    components:
+    - type: Transform
+      parent: 15
+      pos: -11.5,0.5
+  - uid: 26260
+    components:
+    - type: Transform
+      parent: 15
+      pos: -11.5,-0.5
+  - uid: 26261
+    components:
+    - type: Transform
+      parent: 15
+      pos: -34.5,1.5
+  - uid: 26262
+    components:
+    - type: Transform
+      parent: 15
+      pos: -35.5,1.5
+  - uid: 26263
+    components:
+    - type: Transform
+      parent: 15
+      pos: -36.5,1.5
 - proto: CableApcStack
   entities:
   - uid: 4902
@@ -36851,11 +37019,6 @@ entities:
     - type: Transform
       parent: 15
       pos: -40.5,-28.5
-  - uid: 2441
-    components:
-    - type: Transform
-      parent: 15
-      pos: -42.5,-32.5
   - uid: 2498
     components:
     - type: Transform
@@ -36926,11 +37089,6 @@ entities:
     - type: Transform
       parent: 15
       pos: 17.5,-13.5
-  - uid: 2947
-    components:
-    - type: Transform
-      parent: 15
-      pos: -43.5,-32.5
   - uid: 2954
     components:
     - type: Transform
@@ -42086,6 +42244,11 @@ entities:
     - type: Transform
       parent: 15
       pos: -29.5,4.5
+  - uid: 15798
+    components:
+    - type: Transform
+      parent: 15
+      pos: -44.5,-31.5
   - uid: 15799
     components:
     - type: Transform
@@ -42115,12 +42278,7 @@ entities:
     components:
     - type: Transform
       parent: 15
-      pos: -44.5,-32.5
-  - uid: 15805
-    components:
-    - type: Transform
-      parent: 15
-      pos: -45.5,-32.5
+      pos: -42.5,-31.5
   - uid: 15866
     components:
     - type: Transform
@@ -42421,6 +42579,11 @@ entities:
     - type: Transform
       parent: 15
       pos: 15.5,-13.5
+  - uid: 16649
+    components:
+    - type: Transform
+      parent: 15
+      pos: -43.5,-31.5
   - uid: 16805
     components:
     - type: Transform
@@ -44990,6 +45153,13 @@ entities:
     - type: Transform
       parent: 15
       pos: 55.5,-14.5
+- proto: CargoTelepad
+  entities:
+  - uid: 5095
+    components:
+    - type: Transform
+      parent: 15
+      pos: 60.5,-3.5
 - proto: Carpet
   entities:
   - uid: 260
@@ -53534,7 +53704,7 @@ entities:
       pos: 38.601997,5.28884
 - proto: ChunkEntity
   entities:
-  - uid: 26223
+  - uid: 10661
     components:
     - type: ChunkEntity
       root: 15
@@ -53566,7 +53736,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2858: -1,14
-  - uid: 26224
+  - uid: 11020
     components:
     - type: ChunkEntity
       root: 15
@@ -53601,7 +53771,7 @@ entities:
             1752: -49,22
             1799: -50,23
             1800: -50,22
-  - uid: 26225
+  - uid: 15761
     components:
     - type: ChunkEntity
       root: 15
@@ -53689,7 +53859,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2774: -49,0
-  - uid: 26226
+  - uid: 16486
     components:
     - type: ChunkEntity
       root: 15
@@ -53787,7 +53957,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1575: -54,-30
-  - uid: 26227
+  - uid: 17595
     components:
     - type: ChunkEntity
       root: 15
@@ -53854,7 +54024,7 @@ entities:
             cleanable: True
           decals:
             2182: 50.945747,3.0388398
-  - uid: 26228
+  - uid: 17598
     components:
     - type: ChunkEntity
       root: 15
@@ -53905,7 +54075,7 @@ entities:
             color: '#A4610696'
           decals:
             1470: 70,2
-  - uid: 26229
+  - uid: 17669
     components:
     - type: ChunkEntity
       root: 15
@@ -54031,7 +54201,7 @@ entities:
             color: '#765428CC'
           decals:
             2196: 76,-4
-  - uid: 26230
+  - uid: 17670
     components:
     - type: ChunkEntity
       root: 15
@@ -54171,7 +54341,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3040: 52.340275,-13.14076
-  - uid: 26231
+  - uid: 17672
     components:
     - type: ChunkEntity
       root: 15
@@ -54188,7 +54358,7 @@ entities:
             3253: -65,-55
             3254: -65,-56
             3255: -65,-57
-  - uid: 26232
+  - uid: 17674
     components:
     - type: ChunkEntity
       root: 15
@@ -54379,7 +54549,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3037: -55,-53
-  - uid: 26233
+  - uid: 18823
     components:
     - type: ChunkEntity
       root: 15
@@ -54400,7 +54570,7 @@ entities:
             color: '#FFA500FF'
           decals:
             3100: -28,-47
-  - uid: 26234
+  - uid: 18824
     components:
     - type: ChunkEntity
       root: 15
@@ -54534,7 +54704,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2766: -49,-1
-  - uid: 26235
+  - uid: 22077
     components:
     - type: ChunkEntity
       root: 15
@@ -54718,7 +54888,7 @@ entities:
           decals:
             2776: -44,1
             2777: -43,0
-  - uid: 26236
+  - uid: 23938
     components:
     - type: ChunkEntity
       root: 15
@@ -54843,7 +55013,7 @@ entities:
             1612: 14,-8
             1613: 14,-9
             1614: 14,-10
-  - uid: 26237
+  - uid: 24017
     components:
     - type: ChunkEntity
       root: 15
@@ -54932,7 +55102,7 @@ entities:
             2531: -75,-12
             2532: -75,-14
             2533: -75,-16
-  - uid: 26238
+  - uid: 24018
     components:
     - type: ChunkEntity
       root: 15
@@ -55037,7 +55207,7 @@ entities:
             2124: -47,-26
             2125: -46,-26
             2126: -42,-26
-  - uid: 26239
+  - uid: 24019
     components:
     - type: ChunkEntity
       root: 15
@@ -55224,7 +55394,7 @@ entities:
             1664: 57.004997,-29.166441
             1665: 56.973747,-31.978941
             1666: 61.801872,-30.010191
-  - uid: 26240
+  - uid: 25261
     components:
     - type: ChunkEntity
       root: 15
@@ -55360,7 +55530,7 @@ entities:
             2115: 9,-26
             2116: 5,-26
             2117: 4,-26
-  - uid: 26241
+  - uid: 26281
     components:
     - type: ChunkEntity
       root: 15
@@ -55658,7 +55828,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2765: -43,-1
-  - uid: 26242
+  - uid: 26282
     components:
     - type: ChunkEntity
       root: 15
@@ -55710,7 +55880,7 @@ entities:
             color: '#52B4E996'
           decals:
             600: 17,-36
-  - uid: 26243
+  - uid: 26283
     components:
     - type: ChunkEntity
       root: 15
@@ -55994,7 +56164,7 @@ entities:
           decals:
             331: 13,-44
             332: 3,-44
-  - uid: 26244
+  - uid: 26284
     components:
     - type: ChunkEntity
       root: 15
@@ -56142,7 +56312,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2083: 14.168513,-63.990208
-  - uid: 26245
+  - uid: 26285
     components:
     - type: ChunkEntity
       root: 15
@@ -56293,7 +56463,7 @@ entities:
             604: -1,-43
             605: -1,-47
             2882: -10,-39
-  - uid: 26246
+  - uid: 26286
     components:
     - type: ChunkEntity
       root: 15
@@ -56366,7 +56536,7 @@ entities:
             color: '#DE3A3A96'
           decals:
             1141: -31,22
-  - uid: 26247
+  - uid: 26287
     components:
     - type: ChunkEntity
       root: 15
@@ -56566,7 +56736,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1580: -42,-38
-  - uid: 26248
+  - uid: 26288
     components:
     - type: ChunkEntity
       root: 15
@@ -56650,7 +56820,7 @@ entities:
             color: '#EFB34196'
           decals:
             1289: -27,-53
-  - uid: 26249
+  - uid: 26289
     components:
     - type: ChunkEntity
       root: 15
@@ -56863,7 +57033,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2927: -45.017906,-62.950806
-  - uid: 26250
+  - uid: 26290
     components:
     - type: ChunkEntity
       root: 15
@@ -57080,7 +57250,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1579: -50,-38
-  - uid: 26251
+  - uid: 26291
     components:
     - type: ChunkEntity
       root: 15
@@ -57153,7 +57323,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2566: -7,-27
-  - uid: 26252
+  - uid: 26292
     components:
     - type: ChunkEntity
       root: 15
@@ -57330,7 +57500,7 @@ entities:
             1755: -47,21
             1756: -46,21
             1757: -45,21
-  - uid: 26253
+  - uid: 26293
     components:
     - type: ChunkEntity
       root: 15
@@ -57389,7 +57559,7 @@ entities:
           decals:
             1927: -65,-37
             1928: -65,-39
-  - uid: 26254
+  - uid: 26294
     components:
     - type: ChunkEntity
       root: 15
@@ -57416,7 +57586,7 @@ entities:
             cleanable: True
           decals:
             2032: -7.02964,-56.865158
-  - uid: 26255
+  - uid: 26295
     components:
     - type: ChunkEntity
       root: 15
@@ -57502,7 +57672,7 @@ entities:
             cleanable: True
           decals:
             2181: 39.039497,3.3669648
-  - uid: 26256
+  - uid: 26296
     components:
     - type: ChunkEntity
       root: 15
@@ -57664,7 +57834,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1663: 65.89562,-31.682066
-  - uid: 26257
+  - uid: 26297
     components:
     - type: ChunkEntity
       root: 15
@@ -57708,7 +57878,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2565: -32,-27
-  - uid: 26258
+  - uid: 26298
     components:
     - type: ChunkEntity
       root: 15
@@ -57734,7 +57904,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2570: 21,-27
-  - uid: 26259
+  - uid: 26299
     components:
     - type: ChunkEntity
       root: 15
@@ -57765,7 +57935,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2571: 46,-27
-  - uid: 26260
+  - uid: 26300
     components:
     - type: ChunkEntity
       root: 15
@@ -57878,7 +58048,7 @@ entities:
             91: 52,-40
             196: 51,-36
             211: 63,-36
-  - uid: 26261
+  - uid: 26301
     components:
     - type: ChunkEntity
       root: 15
@@ -57964,7 +58134,7 @@ entities:
             color: '#DE3A3A96'
           decals:
             2372: 85,-18
-  - uid: 26262
+  - uid: 26302
     components:
     - type: ChunkEntity
       root: 15
@@ -57992,7 +58162,7 @@ entities:
             2522: -86,-9
             2523: -88,-9
             2524: -90,-9
-  - uid: 26263
+  - uid: 26303
     components:
     - type: ChunkEntity
       root: 15
@@ -58029,7 +58199,7 @@ entities:
             color: '#D4D4D496'
           decals:
             2564: -75,-18
-  - uid: 26264
+  - uid: 26304
     components:
     - type: ChunkEntity
       root: 15
@@ -58057,7 +58227,7 @@ entities:
             2547: -85,-27
             2548: -87,-27
             2549: -89,-27
-  - uid: 26265
+  - uid: 26305
     components:
     - type: ChunkEntity
       root: 15
@@ -58079,7 +58249,7 @@ entities:
             angle: 3.141592653589793 rad
           decals:
             3248: 35,-6
-  - uid: 26266
+  - uid: 26306
     components:
     - type: ChunkEntity
       root: 15
@@ -58127,7 +58297,7 @@ entities:
             color: '#334E6DC8'
           decals:
             2282: 33,28
-  - uid: 26267
+  - uid: 26307
     components:
     - type: ChunkEntity
       root: 15
@@ -58158,7 +58328,7 @@ entities:
             color: '#334E6DC8'
           decals:
             2296: 31,26
-  - uid: 26268
+  - uid: 26308
     components:
     - type: ChunkEntity
       root: 15
@@ -58228,7 +58398,7 @@ entities:
             cleanable: True
           decals:
             2338: 5,15
-  - uid: 26269
+  - uid: 26309
     components:
     - type: ChunkEntity
       root: 15
@@ -58279,7 +58449,7 @@ entities:
           decals:
             2853: 44,-58
             2854: 47,-60
-  - uid: 26270
+  - uid: 26310
     components:
     - type: ChunkEntity
       root: 15
@@ -58346,7 +58516,7 @@ entities:
             3154: 20,-50
             3155: 20,-51
             3156: 20,-52
-  - uid: 26271
+  - uid: 26311
     components:
     - type: ChunkEntity
       root: 15
@@ -58432,7 +58602,7 @@ entities:
           decals:
             2039: 74,-49
             2040: 75,-49
-  - uid: 26272
+  - uid: 26312
     components:
     - type: ChunkEntity
       root: 15
@@ -58518,7 +58688,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2855: 61,-59
-  - uid: 26273
+  - uid: 26313
     components:
     - type: ChunkEntity
       root: 15
@@ -58544,7 +58714,7 @@ entities:
             color: '#DE3A3A96'
           decals:
             2374: 88,-16
-  - uid: 26274
+  - uid: 26314
     components:
     - type: ChunkEntity
       root: 15
@@ -58624,7 +58794,7 @@ entities:
             cleanable: True
           decals:
             2358: 38.163574,-46.221375
-  - uid: 26275
+  - uid: 26315
     components:
     - type: ChunkEntity
       root: 15
@@ -58699,7 +58869,7 @@ entities:
           decals:
             1947: 76,-40
             1948: 76,-41
-  - uid: 26276
+  - uid: 26316
     components:
     - type: ChunkEntity
       root: 15
@@ -58721,7 +58891,7 @@ entities:
             color: '#334E6DC8'
           decals:
             2285: 31,33
-  - uid: 26277
+  - uid: 26317
     components:
     - type: ChunkEntity
       root: 15
@@ -58743,7 +58913,7 @@ entities:
             color: '#334E6DC8'
           decals:
             2284: 35,33
-  - uid: 26278
+  - uid: 26318
     components:
     - type: ChunkEntity
       root: 15
@@ -58849,7 +59019,7 @@ entities:
             2335: -25,13
             2336: -25,12
             2337: -25,11
-  - uid: 26279
+  - uid: 26319
     components:
     - type: ChunkEntity
       root: 15
@@ -58874,7 +59044,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             723: -65,3
-  - uid: 26280
+  - uid: 26320
     components:
     - type: ChunkEntity
       root: 15
@@ -58894,7 +59064,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2848: -66,20
-  - uid: 26281
+  - uid: 26321
     components:
     - type: ChunkEntity
       root: 15
@@ -58914,7 +59084,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3250: 25,1
-  - uid: 26282
+  - uid: 26322
     components:
     - type: ChunkEntity
       root: 15
@@ -58943,7 +59113,7 @@ entities:
             1606: 16,-8
             1607: 16,-7
             1608: 16,-6
-  - uid: 26283
+  - uid: 26323
     components:
     - type: ChunkEntity
       root: 15
@@ -58961,7 +59131,7 @@ entities:
             2339: 7,16
             2341: 5,17
             2342: 7,17
-  - uid: 26284
+  - uid: 26324
     components:
     - type: ChunkEntity
       root: 15
@@ -58997,7 +59167,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2081: 14.231013,-64.95896
-  - uid: 26285
+  - uid: 26325
     components:
     - type: ChunkEntity
       root: 17588
@@ -59268,11 +59438,6 @@ entities:
     - type: Transform
       parent: 15
       pos: 62.5,-49.5
-  - uid: 16649
-    components:
-    - type: Transform
-      parent: 15
-      pos: 49.5,-27.5
   - uid: 18675
     components:
     - type: Transform
@@ -59717,6 +59882,32 @@ entities:
     - type: Transform
       parent: 15
       pos: 28.5,-42.5
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape: !type:PolygonShape
+            vertices:
+            - -0.25,-0.48
+            - 0.25,-0.48
+            - 0.25,0.48
+            - -0.25,0.48
+            radius: 0.01
+          restitution: 0
+          hard: True
+          friction: 0.4
+          density: 75
+          mask:
+          - Impassable
+          - TableLayer
+          - LowImpassable
+          layer:
+          - BulletImpassable
+          - Opaque
+    - type: EntityStorage
+      removedMasks: 20
+      open: True
+    - type: PlaceableSurface
+      isPlaceable: True
   - uid: 15951
     components:
     - type: Transform
@@ -60364,62 +60555,6 @@ entities:
     - type: Transform
       parent: 15
       pos: 40.68025,-13.846975
-- proto: ClothingNeckCloakAce
-  entities:
-  - uid: 24017
-    components:
-    - type: Transform
-      parent: 15
-      pos: -69.6096,-30.921928
-- proto: ClothingNeckCloakAro
-  entities:
-  - uid: 10661
-    components:
-    - type: Transform
-      parent: 15
-      pos: -69.43772,-31.375053
-- proto: ClothingNeckCloakBi
-  entities:
-  - uid: 17669
-    components:
-    - type: Transform
-      parent: 15
-      pos: -67.21897,-30.328178
-- proto: ClothingNeckCloakEnby
-  entities:
-  - uid: 17670
-    components:
-    - type: Transform
-      parent: 15
-      pos: -68.65647,-30.390678
-- proto: ClothingNeckCloakGay
-  entities:
-  - uid: 24018
-    components:
-    - type: Transform
-      parent: 15
-      pos: -66.5471,-30.421928
-- proto: ClothingNeckCloakLesbian
-  entities:
-  - uid: 17674
-    components:
-    - type: Transform
-      parent: 15
-      pos: -67.95335,-30.312553
-- proto: ClothingNeckCloakPan
-  entities:
-  - uid: 24019
-    components:
-    - type: Transform
-      parent: 15
-      pos: -69.18772,-30.375053
-- proto: ClothingNeckCloakTrans
-  entities:
-  - uid: 17672
-    components:
-    - type: Transform
-      parent: 15
-      pos: -69.56272,-30.453178
 - proto: ClothingNeckScarfStripedPurple
   entities:
   - uid: 21910
@@ -61093,12 +61228,22 @@ entities:
       parent: 15
       rot: 1.5707963267948966 rad
       pos: 61.5,-10.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        5095:
+        - - OrderSender
+          - OrderReceiver
   - uid: 3612
     components:
     - type: Transform
       parent: 15
       rot: -1.5707963267948966 rad
       pos: 63.5,-12.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        5095:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersEngineering
   entities:
   - uid: 24126
@@ -61114,6 +61259,11 @@ entities:
     - type: Transform
       parent: 15
       pos: 13.5,-34.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        5095:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersScience
   entities:
   - uid: 24129
@@ -61122,6 +61272,24 @@ entities:
       parent: 15
       rot: 1.5707963267948966 rad
       pos: 46.5,-40.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        5095:
+        - - OrderSender
+          - OrderReceiver
+- proto: ComputerCargoOrdersSecurity
+  entities:
+  - uid: 5400
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: -33.5,16.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        5095:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerCargoOrdersService
   entities:
   - uid: 25297
@@ -61130,6 +61298,11 @@ entities:
       parent: 15
       rot: -1.5707963267948966 rad
       pos: 12.5,6.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        5095:
+        - - OrderSender
+          - OrderReceiver
 - proto: ComputerComms
   entities:
   - uid: 3991
@@ -62026,13 +62199,6 @@ entities:
     - type: Transform
       parent: 15
       pos: 45.5,-12.5
-- proto: CrateFunToyBox
-  entities:
-  - uid: 4251
-    components:
-    - type: Transform
-      parent: 15
-      pos: -68.5,-33.5
 - proto: CrateGenericSteel
   entities:
   - uid: 25489
@@ -62135,11 +62301,11 @@ entities:
       pos: -4.5,-47.5
 - proto: CrateNPCChicken
   entities:
-  - uid: 12474
+  - uid: 19150
     components:
     - type: Transform
       parent: 15
-      pos: 8.5,10.5
+      pos: 3.5,8.5
 - proto: CrateSecurityRiot
   entities:
   - uid: 2468
@@ -62225,6 +62391,14 @@ entities:
     - type: Transform
       parent: 15
       pos: 71.5,-48.5
+- proto: CrewsimovCircuitBoard
+  entities:
+  - uid: 8009
+    components:
+    - type: Transform
+      parent: 15
+      rot: 3.141592653589793 rad
+      pos: 28.580853,-10.85622
 - proto: Crowbar
   entities:
   - uid: 7326
@@ -62435,7 +62609,7 @@ entities:
       pos: -78.5,-6.5
     - type: Door
       state: Opening
-      secondsUntilStateChange: -510952.34
+      secondsUntilStateChange: -517363.22
 - proto: CurtainsPurpleOpen
   entities:
   - uid: 2426
@@ -74175,18 +74349,6 @@ entities:
       parent: 15
       rot: -1.5707963267948966 rad
       pos: 13.5,2.5
-  - uid: 5095
-    components:
-    - type: Transform
-      parent: 15
-      rot: -1.5707963267948966 rad
-      pos: -32.5,16.5
-  - uid: 16362
-    components:
-    - type: Transform
-      parent: 15
-      rot: -1.5707963267948966 rad
-      pos: 20.5,-38.5
   - uid: 17102
     components:
     - type: Transform
@@ -74276,6 +74438,12 @@ entities:
       parent: 15
       rot: 1.5707963267948966 rad
       pos: -49.5,-42.5
+  - uid: 26248
+    components:
+    - type: Transform
+      parent: 15
+      rot: 3.141592653589793 rad
+      pos: 16.5,-40.5
 - proto: FancyTableSpawner
   entities:
   - uid: 22528
@@ -74298,7 +74466,7 @@ entities:
       parent: 15
       pos: 54.5,-12.5
     - type: FaxMachine
-      name: Mail Room
+      name: Mailroom
   - uid: 1706
     components:
     - type: Transform
@@ -74323,6 +74491,8 @@ entities:
     - type: Transform
       parent: 15
       pos: -55.5,-16.5
+    - type: FaxMachine
+      name: HoP
   - uid: 5098
     components:
     - type: Transform
@@ -74335,6 +74505,8 @@ entities:
     - type: Transform
       parent: 15
       pos: 1.5,-14.5
+    - type: FaxMachine
+      name: Library
   - uid: 5877
     components:
     - type: Transform
@@ -74347,6 +74519,8 @@ entities:
     - type: Transform
       parent: 15
       pos: -35.5,18.5
+    - type: FaxMachine
+      name: Security
   - uid: 10100
     components:
     - type: Transform
@@ -74358,7 +74532,7 @@ entities:
       parent: 15
       pos: 18.5,-43.5
     - type: FaxMachine
-      name: Psychologist
+      name: Psych
   - uid: 16417
     components:
     - type: Transform
@@ -74394,13 +74568,6 @@ entities:
       pos: 81.5,-15.5
     - type: FaxMachine
       name: Reporter
-  - uid: 21991
-    components:
-    - type: Transform
-      parent: 15
-      pos: 11.5,-37.5
-    - type: FaxMachine
-      name: Medical
   - uid: 24180
     components:
     - type: Transform
@@ -74498,18 +74665,21 @@ entities:
       - 4728
       - 4725
       - 839
-  - uid: 2158
-    components:
-    - type: Transform
-      parent: 15
-      rot: -1.5707963267948966 rad
-      pos: -49.5,-8.5
   - uid: 3382
     components:
     - type: Transform
       parent: 15
       rot: -1.5707963267948966 rad
       pos: -32.5,17.5
+    - type: DeviceList
+      devices:
+      - 20659
+      - 20658
+      - 21305
+      - 20620
+      - 20619
+      - 3139
+      - 2168
   - uid: 18327
     components:
     - type: Transform
@@ -74538,11 +74708,15 @@ entities:
     components:
     - type: Transform
       parent: 15
-      pos: -35.5,14.5
+      rot: 1.5707963267948966 rad
+      pos: -49.5,-8.5
     - type: DeviceList
       devices:
-      - 20619
-      - 20620
+      - 21320
+      - 21319
+      - 21314
+      - 21315
+      - 21316
   - uid: 21343
     components:
     - type: Transform
@@ -74659,11 +74833,22 @@ entities:
     - type: Transform
       parent: 15
       pos: 52.5,-38.5
+    - type: DeviceList
+      devices:
+      - 7567
+      - 7568
+      - 2158
+      - 18919
+      - 18905
   - uid: 21616
     components:
     - type: Transform
       parent: 15
       pos: 68.5,-51.5
+    - type: DeviceList
+      devices:
+      - 18904
+      - 18903
   - uid: 21617
     components:
     - type: Transform
@@ -74743,12 +74928,28 @@ entities:
       parent: 15
       rot: 3.141592653589793 rad
       pos: 12.5,-12.5
+    - type: DeviceList
+      devices:
+      - 20644
+      - 4412
+      - 4410
+      - 160
+      - 159
+      - 158
+      - 157
+      - 20646
+      - 21765
   - uid: 21626
     components:
     - type: Transform
       parent: 15
       rot: 1.5707963267948966 rad
       pos: -9.5,-5.5
+    - type: DeviceList
+      devices:
+      - 20653
+      - 20646
+      - 21765
   - uid: 21627
     components:
     - type: Transform
@@ -74820,6 +75021,19 @@ entities:
       - 20253
       - 20250
       - 20251
+  - uid: 26264
+    components:
+    - type: Transform
+      parent: 15
+      pos: -42.5,15.5
+    - type: DeviceList
+      devices:
+      - 20619
+      - 20620
+      - 595
+      - 1149
+      - 20116
+      - 25540
 - proto: FireAxeCabinetFilled
   entities:
   - uid: 1608
@@ -74846,29 +75060,12 @@ entities:
       pos: 69.64084,-9.615127
 - proto: Firelock
   entities:
-  - uid: 5873
-    components:
-    - type: Transform
-      parent: 15
-      pos: 75.5,-16.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 598
-      - 20626
   - uid: 6928
     components:
     - type: Transform
       parent: 15
       rot: 1.5707963267948966 rad
       pos: -65.5,20.5
-  - uid: 14535
-    components:
-    - type: Transform
-      parent: 15
-      pos: 75.5,-28.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 20626
   - uid: 16669
     components:
     - type: Transform
@@ -75051,6 +75248,7 @@ entities:
       deviceLists:
       - 20024
       - 24105
+      - 21625
   - uid: 158
     components:
     - type: Transform
@@ -75061,6 +75259,7 @@ entities:
       deviceLists:
       - 20024
       - 24105
+      - 21625
   - uid: 159
     components:
     - type: Transform
@@ -75071,6 +75270,7 @@ entities:
       deviceLists:
       - 20024
       - 24105
+      - 21625
   - uid: 160
     components:
     - type: Transform
@@ -75081,6 +75281,7 @@ entities:
       deviceLists:
       - 20024
       - 24105
+      - 21625
   - uid: 2691
     components:
     - type: Transform
@@ -75121,6 +75322,7 @@ entities:
       deviceLists:
       - 308
       - 24105
+      - 21625
   - uid: 4412
     components:
     - type: Transform
@@ -75131,12 +75333,16 @@ entities:
       deviceLists:
       - 308
       - 24105
+      - 21625
   - uid: 10055
     components:
     - type: Transform
       parent: 15
       rot: 3.141592653589793 rad
       pos: -54.5,14.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 25367
   - uid: 18938
     components:
     - type: Transform
@@ -75148,6 +75354,7 @@ entities:
       - 20726
       - 21621
       - 21622
+      - 20626
   - uid: 18939
     components:
     - type: Transform
@@ -75159,6 +75366,7 @@ entities:
       - 20726
       - 21621
       - 21622
+      - 20626
   - uid: 18940
     components:
     - type: Transform
@@ -75234,12 +75442,54 @@ entities:
       parent: 15
       rot: 3.141592653589793 rad
       pos: -52.5,14.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 25367
   - uid: 25538
     components:
     - type: Transform
       parent: 15
       rot: 3.141592653589793 rad
       pos: -53.5,4.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 25367
+  - uid: 26266
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: -29.5,-27.5
+  - uid: 26270
+    components:
+    - type: Transform
+      parent: 15
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-27.5
+  - uid: 26277
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-17.5
+  - uid: 26278
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-27.5
+  - uid: 26279
+    components:
+    - type: Transform
+      parent: 15
+      rot: 1.5707963267948966 rad
+      pos: 44.5,-27.5
+  - uid: 26280
+    components:
+    - type: Transform
+      parent: 15
+      rot: 1.5707963267948966 rad
+      pos: 44.5,-17.5
 - proto: FirelockGlass
   entities:
   - uid: 65
@@ -75262,6 +75512,9 @@ entities:
     - type: Transform
       parent: 15
       pos: -37.5,9.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 26264
   - uid: 803
     components:
     - type: Transform
@@ -75306,11 +75559,15 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 15202
+      - 23372
   - uid: 1149
     components:
     - type: Transform
       parent: 15
       pos: -39.5,9.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 26264
   - uid: 1150
     components:
     - type: Transform
@@ -75322,6 +75579,14 @@ entities:
       - 21509
       - 21513
       - 21507
+  - uid: 2158
+    components:
+    - type: Transform
+      parent: 15
+      pos: 54.5,-38.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 21615
   - uid: 2168
     components:
     - type: Transform
@@ -75332,6 +75597,7 @@ entities:
       deviceLists:
       - 21302
       - 7130
+      - 3382
   - uid: 2188
     components:
     - type: Transform
@@ -75390,11 +75656,29 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 21302
+      - 3382
   - uid: 3352
     components:
     - type: Transform
       parent: 15
       pos: 11.5,-34.5
+  - uid: 3718
+    components:
+    - type: Transform
+      parent: 15
+      pos: 66.5,-11.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 598
+  - uid: 3719
+    components:
+    - type: Transform
+      parent: 15
+      pos: 75.5,-28.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 20626
+      - 22749
   - uid: 4487
     components:
     - type: Transform
@@ -75411,6 +75695,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 56
+      - 21636
   - uid: 4726
     components:
     - type: Transform
@@ -75419,6 +75704,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 56
+      - 21636
   - uid: 4727
     components:
     - type: Transform
@@ -75437,6 +75723,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 56
+      - 21636
   - uid: 4732
     components:
     - type: Transform
@@ -75468,6 +75755,15 @@ entities:
       - 447
       - 21627
       - 18860
+  - uid: 5993
+    components:
+    - type: Transform
+      parent: 15
+      pos: 75.5,-16.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 20626
+      - 598
   - uid: 6228
     components:
     - type: Transform
@@ -75525,6 +75821,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 6331
+      - 21615
   - uid: 7568
     components:
     - type: Transform
@@ -75534,6 +75831,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 6331
+      - 21615
   - uid: 7636
     components:
     - type: Transform
@@ -75773,6 +76071,9 @@ entities:
       parent: 15
       rot: 1.5707963267948966 rad
       pos: 64.5,-56.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 21616
   - uid: 18904
     components:
     - type: Transform
@@ -75781,6 +76082,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 7574
+      - 21616
   - uid: 18905
     components:
     - type: Transform
@@ -75793,6 +76095,7 @@ entities:
       - 21617
       - 6330
       - 21729
+      - 21615
   - uid: 18909
     components:
     - type: Transform
@@ -75829,6 +76132,7 @@ entities:
       deviceLists:
       - 6331
       - 7571
+      - 21615
   - uid: 18920
     components:
     - type: Transform
@@ -75916,6 +76220,9 @@ entities:
     - type: Transform
       parent: 15
       pos: 76.5,-12.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 598
   - uid: 18943
     components:
     - type: Transform
@@ -75934,7 +76241,6 @@ entities:
       deviceLists:
       - 20510
       - 20513
-      - 598
   - uid: 18945
     components:
     - type: Transform
@@ -75946,7 +76252,6 @@ entities:
       - 21620
       - 20566
       - 20513
-      - 598
   - uid: 18946
     components:
     - type: Transform
@@ -75999,6 +76304,7 @@ entities:
       deviceLists:
       - 21619
       - 20568
+      - 23372
   - uid: 18953
     components:
     - type: Transform
@@ -76008,6 +76314,7 @@ entities:
       deviceLists:
       - 21619
       - 20568
+      - 23372
   - uid: 18957
     components:
     - type: Transform
@@ -76099,6 +76406,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 20113
+      - 26264
   - uid: 20250
     components:
     - type: Transform
@@ -76396,7 +76704,8 @@ entities:
       deviceLists:
       - 7130
       - 21312
-      - 21336
+      - 26264
+      - 3382
   - uid: 20620
     components:
     - type: Transform
@@ -76406,7 +76715,8 @@ entities:
       deviceLists:
       - 7130
       - 21312
-      - 21336
+      - 26264
+      - 3382
   - uid: 20630
     components:
     - type: Transform
@@ -76467,6 +76777,9 @@ entities:
     - type: Transform
       parent: 15
       pos: 11.5,-0.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 21625
   - uid: 20646
     components:
     - type: Transform
@@ -76477,6 +76790,8 @@ entities:
       deviceLists:
       - 24105
       - 10873
+      - 21625
+      - 21626
   - uid: 20647
     components:
     - type: Transform
@@ -76522,6 +76837,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 10873
+      - 21626
   - uid: 20657
     components:
     - type: Transform
@@ -76539,6 +76855,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 7130
+      - 3382
   - uid: 20659
     components:
     - type: Transform
@@ -76547,6 +76864,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 7130
+      - 3382
   - uid: 20660
     components:
     - type: Transform
@@ -76738,9 +77056,6 @@ entities:
     - type: Transform
       parent: 15
       pos: 73.5,-34.5
-    - type: DeviceNetwork
-      deviceLists:
-      - 22749
   - uid: 20709
     components:
     - type: Transform
@@ -76787,6 +77102,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 598
+      - 23372
   - uid: 20716
     components:
     - type: Transform
@@ -76796,6 +77112,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 598
+      - 23372
   - uid: 20718
     components:
     - type: Transform
@@ -76944,6 +77261,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 7130
+      - 3382
   - uid: 21314
     components:
     - type: Transform
@@ -76954,6 +77272,7 @@ entities:
       - 7572
       - 18806
       - 19159
+      - 21336
   - uid: 21315
     components:
     - type: Transform
@@ -76963,6 +77282,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 18806
+      - 21336
   - uid: 21316
     components:
     - type: Transform
@@ -76972,6 +77292,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 18806
+      - 21336
   - uid: 21317
     components:
     - type: Transform
@@ -76993,6 +77314,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 18806
+      - 21336
   - uid: 21320
     components:
     - type: Transform
@@ -77002,6 +77324,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 18806
+      - 21336
   - uid: 21321
     components:
     - type: Transform
@@ -77185,6 +77508,8 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 10873
+      - 21625
+      - 21626
   - uid: 22752
     components:
     - type: Transform
@@ -77267,6 +77592,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 15202
+      - 23372
   - uid: 25180
     components:
     - type: Transform
@@ -77279,12 +77605,72 @@ entities:
       parent: 15
       rot: 1.5707963267948966 rad
       pos: -51.5,13.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 25367
   - uid: 25540
     components:
     - type: Transform
       parent: 15
       rot: 1.5707963267948966 rad
       pos: -47.5,13.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 26264
+  - uid: 26267
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: -30.5,-27.5
+  - uid: 26268
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-18.5
+  - uid: 26269
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-17.5
+  - uid: 26271
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-27.5
+  - uid: 26272
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: -36.5,-18.5
+  - uid: 26273
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-17.5
+  - uid: 26274
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-17.5
+  - uid: 26275
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-27.5
+  - uid: 26276
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: -36.5,-26.5
 - proto: Fireplace
   entities:
   - uid: 10022
@@ -77396,6 +77782,13 @@ entities:
       pos: 14.5,-14.5
     - type: Fixtures
       fixtures: {}
+  - uid: 4823
+    components:
+    - type: Transform
+      parent: 15
+      pos: -13.5,-12.5
+    - type: Fixtures
+      fixtures: {}
   - uid: 4840
     components:
     - type: Transform
@@ -77478,13 +77871,6 @@ entities:
       pos: 71.5,-17.5
     - type: Fixtures
       fixtures: {}
-  - uid: 14327
-    components:
-    - type: Transform
-      parent: 15
-      pos: -13.5,-13.5
-    - type: Fixtures
-      fixtures: {}
   - uid: 17483
     components:
     - type: Transform
@@ -104572,6 +104958,9 @@ entities:
       parent: 15
       rot: 3.141592653589793 rad
       pos: 21.5,-54.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 21223
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 16104
@@ -104756,6 +105145,9 @@ entities:
       parent: 15
       rot: 3.141592653589793 rad
       pos: 1.5,-27.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 21636
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 18883
@@ -105217,6 +105609,9 @@ entities:
     - type: Transform
       parent: 15
       pos: 54.5,-17.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 23372
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 20724
@@ -105413,6 +105808,9 @@ entities:
       parent: 15
       rot: 1.5707963267948966 rad
       pos: -53.5,6.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 25367
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 25241
@@ -105472,6 +105870,9 @@ entities:
     - type: Transform
       parent: 15
       pos: 13.5,-26.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 21636
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2152
@@ -105966,6 +106367,9 @@ entities:
       parent: 15
       rot: 1.5707963267948966 rad
       pos: 17.5,-51.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 21223
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 18164
@@ -106522,6 +106926,9 @@ entities:
       parent: 15
       rot: 3.141592653589793 rad
       pos: 61.5,-18.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 23372
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 20913
@@ -106709,6 +107116,9 @@ entities:
     - type: Transform
       parent: 15
       pos: -53.5,13.5
+    - type: DeviceNetwork
+      deviceLists:
+      - 25367
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasVolumePump
@@ -113881,6 +114291,13 @@ entities:
     - type: Transform
       parent: 15
       pos: -49.5,22.5
+- proto: Gyroscope
+  entities:
+  - uid: 9604
+    components:
+    - type: Transform
+      parent: 17588
+      pos: -38.5,-23.5
 - proto: GyroscopeMachineCircuitboard
   entities:
   - uid: 16478
@@ -114497,6 +114914,11 @@ entities:
       pos: 17.293848,-13.2417755
 - proto: HospitalCurtainsOpen
   entities:
+  - uid: 5551
+    components:
+    - type: Transform
+      parent: 15
+      pos: -13.5,-12.5
   - uid: 6734
     components:
     - type: Transform
@@ -114518,11 +114940,6 @@ entities:
     - type: Transform
       parent: 15
       pos: 17.5,-50.5
-  - uid: 9816
-    components:
-    - type: Transform
-      parent: 15
-      pos: -13.5,-13.5
   - uid: 11512
     components:
     - type: Transform
@@ -115528,9 +115945,6 @@ entities:
         21834:
         - - Pressed
           - Toggle
-        1204:
-        - - Pressed
-          - DoorBolt
 - proto: LockableButtonJanitor
   entities:
   - uid: 14811
@@ -115947,6 +116361,11 @@ entities:
     - type: Transform
       parent: 15
       pos: -8.5,-36.5
+  - uid: 7964
+    components:
+    - type: Transform
+      parent: 15
+      pos: 5.5,-39.5
 - proto: LockerMedicineFilled
   entities:
   - uid: 4795
@@ -115978,6 +116397,11 @@ entities:
     - type: Transform
       parent: 15
       pos: 19.5,-38.5
+  - uid: 8021
+    components:
+    - type: Transform
+      parent: 15
+      pos: 18.5,-37.5
 - proto: LockerPrisoner
   entities:
   - uid: 2310
@@ -116133,9 +116557,9 @@ entities:
     - type: Transform
       parent: 15
       pos: -25.5,22.5
-- proto: LockerSyndicatePersonal
+- proto: LockerSyndicate
   entities:
-  - uid: 7964
+  - uid: 5826
     components:
     - type: Transform
       parent: 15
@@ -116147,16 +116571,6 @@ entities:
     - type: Transform
       parent: 15
       pos: -35.5,9.5
-  - uid: 18823
-    components:
-    - type: Transform
-      parent: 15
-      pos: 3.5,-39.5
-  - uid: 18824
-    components:
-    - type: Transform
-      parent: 15
-      pos: 11.5,-39.5
 - proto: LockerWardenFilled
   entities:
   - uid: 2520
@@ -116400,6 +116814,13 @@ entities:
     - type: Transform
       parent: 15
       pos: 51.36493,-15.482473
+- proto: MailCart
+  entities:
+  - uid: 4251
+    components:
+    - type: Transform
+      parent: 15
+      pos: 53.5,-14.5
 - proto: MailingUnit
   entities:
   - uid: 82
@@ -117279,11 +117700,11 @@ entities:
       pos: 13.5,-14.5
 - proto: MopBucketFull
   entities:
-  - uid: 5993
+  - uid: 5873
     components:
     - type: Transform
       parent: 15
-      pos: -13.5,-13.5
+      pos: -13.5,-12.5
 - proto: MopItem
   entities:
   - uid: 12342
@@ -117492,6 +117913,11 @@ entities:
     - type: Transform
       parent: 15
       pos: 83.5,-1.5
+  - uid: 15807
+    components:
+    - type: Transform
+      parent: 15
+      pos: -28.5,-53.5
   - uid: 15842
     components:
     - type: Transform
@@ -117527,6 +117953,41 @@ entities:
     - type: Transform
       parent: 15
       pos: -30.5,-61.5
+  - uid: 26223
+    components:
+    - type: Transform
+      parent: 15
+      pos: -67.5,-43.5
+  - uid: 26227
+    components:
+    - type: Transform
+      parent: 15
+      pos: -3.5,-26.5
+  - uid: 26228
+    components:
+    - type: Transform
+      parent: 15
+      pos: 18.5,-18.5
+  - uid: 26231
+    components:
+    - type: Transform
+      parent: 15
+      pos: 49.5,-27.5
+  - uid: 26233
+    components:
+    - type: Transform
+      parent: 15
+      pos: 57.5,-60.5
+  - uid: 26234
+    components:
+    - type: Transform
+      parent: 15
+      pos: -34.5,-17.5
+  - uid: 26238
+    components:
+    - type: Transform
+      parent: 15
+      pos: -11.5,-40.5
 - proto: NitrousOxideCanister
   entities:
   - uid: 14539
@@ -117648,6 +118109,16 @@ entities:
     - type: Transform
       parent: 15
       pos: 28.5,-32.5
+  - uid: 24383
+    components:
+    - type: Transform
+      parent: 15
+      pos: -71.5,-40.5
+  - uid: 24741
+    components:
+    - type: Transform
+      parent: 15
+      pos: -3.5,-18.5
   - uid: 24753
     components:
     - type: Transform
@@ -117658,6 +118129,41 @@ entities:
     - type: Transform
       parent: 15
       pos: -32.5,-61.5
+  - uid: 26224
+    components:
+    - type: Transform
+      parent: 15
+      pos: -29.5,-53.5
+  - uid: 26225
+    components:
+    - type: Transform
+      parent: 15
+      pos: -11.5,-44.5
+  - uid: 26226
+    components:
+    - type: Transform
+      parent: 15
+      pos: 44.5,-44.5
+  - uid: 26229
+    components:
+    - type: Transform
+      parent: 15
+      pos: 18.5,-26.5
+  - uid: 26230
+    components:
+    - type: Transform
+      parent: 15
+      pos: 50.5,-17.5
+  - uid: 26232
+    components:
+    - type: Transform
+      parent: 15
+      pos: 58.5,-60.5
+  - uid: 26235
+    components:
+    - type: Transform
+      parent: 15
+      pos: -34.5,-27.5
 - proto: PaintingAmogusTriptych
   entities:
   - uid: 23962
@@ -118094,20 +118600,20 @@ entities:
     components:
     - type: Transform
       parent: 17588
-      pos: -38.082043,-23.591156
+      pos: -38.96964,-23.506098
 - proto: PetCarrier
   entities:
+  - uid: 13899
+    components:
+    - type: Transform
+      parent: 15
+      rot: 3.141592653589793 rad
+      pos: 3.5,10.5
   - uid: 21843
     components:
     - type: Transform
       parent: 15
       pos: 26.5,-56.5
-  - uid: 22319
-    components:
-    - type: Transform
-      parent: 15
-      rot: 3.141592653589793 rad
-      pos: 7.5,10.5
   - uid: 22320
     components:
     - type: Transform
@@ -118497,11 +119003,6 @@ entities:
       pos: 72.5,-29.5
 - proto: PortableGeneratorPacman
   entities:
-  - uid: 5400
-    components:
-    - type: Transform
-      parent: 15
-      pos: -10.5,-17.5
   - uid: 10964
     components:
     - type: Transform
@@ -119040,12 +119541,12 @@ entities:
     - type: Transform
       parent: 15
       pos: 74.5,-35.5
-  - uid: 4829
+  - uid: 3717
     components:
     - type: Transform
       parent: 15
       rot: -1.5707963267948966 rad
-      pos: 18.5,-37.5
+      pos: 17.5,-37.5
   - uid: 4860
     components:
     - type: Transform
@@ -119197,6 +119698,11 @@ entities:
       parent: 15
       rot: -1.5707963267948966 rad
       pos: 46.5,-55.5
+  - uid: 9816
+    components:
+    - type: Transform
+      parent: 15
+      pos: -13.5,-12.5
   - uid: 10255
     components:
     - type: Transform
@@ -119215,11 +119721,6 @@ entities:
       parent: 15
       rot: 3.141592653589793 rad
       pos: -32.5,-35.5
-  - uid: 15747
-    components:
-    - type: Transform
-      parent: 15
-      pos: -13.5,-13.5
   - uid: 20926
     components:
     - type: Transform
@@ -119460,6 +119961,12 @@ entities:
       parent: 15
       rot: -1.5707963267948966 rad
       pos: -40.5,-2.5
+  - uid: 3720
+    components:
+    - type: Transform
+      parent: 15
+      rot: 1.5707963267948966 rad
+      pos: 85.5,-17.5
   - uid: 3962
     components:
     - type: Transform
@@ -119719,6 +120226,12 @@ entities:
     - type: Transform
       parent: 15
       pos: -2.5,-11.5
+  - uid: 7980
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: -66.5,-14.5
   - uid: 8020
     components:
     - type: Transform
@@ -121319,12 +121832,6 @@ entities:
       parent: 15
       rot: 3.141592653589793 rad
       pos: 16.5,-56.5
-  - uid: 19150
-    components:
-    - type: Transform
-      parent: 15
-      rot: -1.5707963267948966 rad
-      pos: -51.5,2.5
   - uid: 19162
     components:
     - type: Transform
@@ -121733,6 +122240,22 @@ entities:
     - type: Transform
       parent: 15
       pos: 3.5,-29.5
+  - uid: 26244
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: -16.5,3.5
+  - uid: 26246
+    components:
+    - type: Transform
+      parent: 15
+      pos: 3.5,-51.5
+  - uid: 26265
+    components:
+    - type: Transform
+      parent: 15
+      pos: -33.5,-1.5
 - proto: PoweredlightExterior
   entities:
   - uid: 24723
@@ -122647,6 +123170,12 @@ entities:
       parent: 15
       rot: 1.5707963267948966 rad
       pos: -57.5,-76.5
+  - uid: 26247
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-57.5
 - proto: Protolathe
   entities:
   - uid: 4617
@@ -122843,11 +123372,6 @@ entities:
     - type: Transform
       parent: 15
       pos: 42.5,-11.5
-  - uid: 8067
-    components:
-    - type: Transform
-      parent: 15
-      pos: -12.5,-17.5
   - uid: 8734
     components:
     - type: Transform
@@ -122942,11 +123466,6 @@ entities:
     - type: Transform
       parent: 15
       pos: -44.5,28.5
-  - uid: 15761
-    components:
-    - type: Transform
-      parent: 15
-      pos: -14.5,-17.5
   - uid: 16477
     components:
     - type: Transform
@@ -122957,11 +123476,6 @@ entities:
     - type: Transform
       parent: 15
       pos: -70.5,-45.5
-  - uid: 17595
-    components:
-    - type: Transform
-      parent: 15
-      pos: -11.5,-17.5
   - uid: 18012
     components:
     - type: Transform
@@ -122978,12 +123492,6 @@ entities:
       parent: 15
       rot: -1.5707963267948966 rad
       pos: 61.5,-64.5
-  - uid: 22077
-    components:
-    - type: Transform
-      parent: 15
-      rot: 3.141592653589793 rad
-      pos: -13.5,-17.5
   - uid: 23406
     components:
     - type: Transform
@@ -123550,6 +124058,12 @@ entities:
       parent: 15
       rot: -1.5707963267948966 rad
       pos: 32.5,36.5
+  - uid: 12870
+    components:
+    - type: Transform
+      parent: 15
+      rot: 1.5707963267948966 rad
+      pos: 7.5,10.5
   - uid: 13487
     components:
     - type: Transform
@@ -123795,11 +124309,6 @@ entities:
     - type: Transform
       parent: 15
       pos: 6.5,8.5
-  - uid: 13899
-    components:
-    - type: Transform
-      parent: 15
-      pos: 8.5,8.5
   - uid: 14358
     components:
     - type: Transform
@@ -123811,11 +124320,27 @@ entities:
     - type: Transform
       parent: 15
       pos: -65.5,-36.5
+  - uid: 17310
+    components:
+    - type: Transform
+      parent: 15
+      rot: 3.141592653589793 rad
+      pos: 8.5,9.5
+  - uid: 20301
+    components:
+    - type: Transform
+      parent: 15
+      pos: 7.5,8.5
   - uid: 22531
     components:
     - type: Transform
       parent: 15
       pos: -57.5,-34.5
+  - uid: 24386
+    components:
+    - type: Transform
+      parent: 15
+      pos: 8.5,8.5
   - uid: 24656
     components:
     - type: Transform
@@ -124073,6 +124598,12 @@ entities:
       parent: 15
       rot: 3.141592653589793 rad
       pos: 5.5,8.5
+  - uid: 26236
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: 7.5,9.5
 - proto: RandomArtifactSpawner
   entities:
   - uid: 1743
@@ -124773,11 +125304,6 @@ entities:
     - type: Transform
       parent: 15
       pos: -36.5,-29.5
-  - uid: 8021
-    components:
-    - type: Transform
-      parent: 15
-      pos: -13.5,-13.5
   - uid: 8789
     components:
     - type: Transform
@@ -124793,6 +125319,11 @@ entities:
     - type: Transform
       parent: 15
       pos: 51.5,-60.5
+  - uid: 26249
+    components:
+    - type: Transform
+      parent: 15
+      pos: -13.5,-12.5
 - proto: RandomSpawner
   entities:
   - uid: 240
@@ -125455,6 +125986,11 @@ entities:
     - type: Transform
       parent: 15
       pos: -45.5,13.5
+  - uid: 26237
+    components:
+    - type: Transform
+      parent: 15
+      pos: 11.5,6.5
 - proto: RandomSpawner100
   entities:
   - uid: 4124
@@ -125467,11 +126003,6 @@ entities:
     - type: Transform
       parent: 15
       pos: -23.5,-42.5
-  - uid: 4557
-    components:
-    - type: Transform
-      parent: 15
-      pos: 71.5,-22.5
   - uid: 9998
     components:
     - type: Transform
@@ -129593,11 +130124,6 @@ entities:
     - type: Transform
       parent: 15
       pos: -45.543613,-44.05848
-  - uid: 23938
-    components:
-    - type: Transform
-      parent: 15
-      pos: -12.474271,-17.527378
   - uid: 24308
     components:
     - type: Transform
@@ -129635,11 +130161,6 @@ entities:
     - type: Transform
       parent: 15
       pos: 72.4559,-24.307135
-  - uid: 11020
-    components:
-    - type: Transform
-      parent: 15
-      pos: -13.598716,-17.543377
   - uid: 23348
     components:
     - type: Transform
@@ -129674,11 +130195,6 @@ entities:
     - type: Transform
       parent: 15
       pos: 72.50799,-25.485035
-  - uid: 9604
-    components:
-    - type: Transform
-      parent: 15
-      pos: -14.4633,-17.52253
   - uid: 9897
     components:
     - type: Transform
@@ -130417,6 +130933,23 @@ entities:
       parent: 15
       rot: 3.141592653589793 rad
       pos: 31.5,19.5
+    - type: DeviceLinkSource
+      linkedPorts:
+        7651:
+        - - Pressed
+          - Toggle
+        11656:
+        - - Pressed
+          - Toggle
+        3864:
+        - - Pressed
+          - Toggle
+        7701:
+        - - Pressed
+          - Toggle
+        11303:
+        - - Pressed
+          - Toggle
   - uid: 21655
     components:
     - type: Transform
@@ -133349,6 +133882,14 @@ entities:
     - type: Transform
       parent: 15
       pos: 53.5,-5.5
+- proto: SpawnMobSheep
+  entities:
+  - uid: 18677
+    components:
+    - type: Transform
+      parent: 15
+      rot: 3.141592653589793 rad
+      pos: 4.5,8.5
 - proto: SpawnMobShiva
   entities:
   - uid: 23096
@@ -134169,11 +134710,6 @@ entities:
     - type: Transform
       parent: 15
       pos: -75.5,-6.5
-  - uid: 19026
-    components:
-    - type: Transform
-      parent: 15
-      pos: -58.5,-38.5
   - uid: 19028
     components:
     - type: Transform
@@ -134214,6 +134750,12 @@ entities:
       parent: 15
       rot: 1.5707963267948966 rad
       pos: 51.5,-30.5
+  - uid: 26243
+    components:
+    - type: Transform
+      parent: 15
+      rot: -1.5707963267948966 rad
+      pos: -58.5,-38.5
 - proto: StationMapBroken
   entities:
   - uid: 23253
@@ -134602,11 +135144,6 @@ entities:
     - type: Transform
       parent: 15
       pos: -59.5,-61.5
-  - uid: 25261
-    components:
-    - type: Transform
-      parent: 15
-      pos: -8.5,-18.5
 - proto: SuitStorageEVA
   entities:
   - uid: 1303
@@ -137331,11 +137868,6 @@ entities:
     - type: Transform
       parent: 15
       pos: 16.5,-37.5
-  - uid: 4823
-    components:
-    - type: Transform
-      parent: 15
-      pos: 18.5,-37.5
   - uid: 4836
     components:
     - type: Transform
@@ -139895,21 +140427,8 @@ entities:
       pos: -49.5,-24.5
     missingComponents:
     - Damageable
-- proto: ThrusterFlatpack
-  entities:
-  - uid: 17598
-    components:
-    - type: Transform
-      parent: 15
-      pos: -11.603366,-17.270796
 - proto: ThrusterMachineCircuitboard
   entities:
-  - uid: 2702
-    components:
-    - type: Transform
-      parent: 15
-      rot: 3.141592653589793 rad
-      pos: -11.492543,-17.483688
   - uid: 21803
     components:
     - type: Transform
@@ -140850,6 +141369,13 @@ entities:
     - type: Transform
       parent: 15
       pos: -3.5,-2.5
+- proto: VendingMachinePride
+  entities:
+  - uid: 8067
+    components:
+    - type: Transform
+      parent: 15
+      pos: -71.5,-34.5
 - proto: VendingMachineRoboDrobe
   entities:
   - uid: 1126
@@ -140969,13 +141495,6 @@ entities:
     - type: Transform
       parent: 15
       pos: 72.5,-6.5
-- proto: VendingMachineTheater
-  entities:
-  - uid: 16486
-    components:
-    - type: Transform
-      parent: 15
-      pos: -71.5,-34.5
 - proto: VendingMachineVendomat
   entities:
   - uid: 881
@@ -146483,11 +147002,6 @@ entities:
     - type: Transform
       parent: 15
       pos: 38.5,-1.5
-  - uid: 7980
-    components:
-    - type: Transform
-      parent: 15
-      pos: -13.5,-12.5
   - uid: 8004
     components:
     - type: Transform
@@ -152252,6 +152766,16 @@ entities:
     - type: Transform
       parent: 15
       pos: 14.5,-69.5
+  - uid: 26250
+    components:
+    - type: Transform
+      parent: 15
+      pos: -13.5,-11.5
+  - uid: 26251
+    components:
+    - type: Transform
+      parent: 15
+      pos: -14.5,-11.5
 - proto: WallShuttle
   entities:
   - uid: 17596
@@ -155706,11 +156230,6 @@ entities:
     - type: Transform
       parent: 15
       pos: 48.5,-37.5
-  - uid: 5551
-    components:
-    - type: Transform
-      parent: 15
-      pos: -12.5,-13.5
   - uid: 5554
     components:
     - type: Transform
@@ -156380,7 +156899,7 @@ entities:
     components:
     - type: Transform
       parent: 15
-      pos: 8.5,11.5
+      pos: 6.5,11.5
   - uid: 9670
     components:
     - type: Transform
@@ -156646,11 +157165,6 @@ entities:
     - type: Transform
       parent: 15
       pos: 10.5,11.5
-  - uid: 11271
-    components:
-    - type: Transform
-      parent: 15
-      pos: 11.5,11.5
   - uid: 11272
     components:
     - type: Transform
@@ -158960,6 +159474,13 @@ entities:
     - type: Transform
       parent: 15
       pos: -29.551102,11.458996
+- proto: WeaponEnergyShotgun
+  entities:
+  - uid: 26239
+    components:
+    - type: Transform
+      parent: 15
+      pos: -43.536354,10.4568
 - proto: WeaponEnergyTurretAI
   entities:
   - uid: 11942
@@ -159320,11 +159841,6 @@ entities:
       parent: 15
       rot: 1.5707963267948966 rad
       pos: 2.5,-31.5
-  - uid: 17310
-    components:
-    - type: Transform
-      parent: 15
-      pos: -56.5,-19.5
   - uid: 17671
     components:
     - type: Transform
@@ -159360,6 +159876,11 @@ entities:
       parent: 15
       rot: -1.5707963267948966 rad
       pos: 36.5,24.5
+  - uid: 22319
+    components:
+    - type: Transform
+      parent: 15
+      pos: -56.5,-19.5
   - uid: 23133
     components:
     - type: Transform
@@ -159497,12 +160018,12 @@ entities:
       pos: -50.5,-40.5
 - proto: WindoorHeadOfPersonnelLocked
   entities:
-  - uid: 1204
+  - uid: 15771
     components:
     - type: Transform
       parent: 15
       rot: 3.141592653589793 rad
-      pos: -55.5,-19.5
+      pos: -56.5,-19.5
 - proto: WindoorHydroponicsLocked
   entities:
   - uid: 3298
@@ -159517,13 +160038,6 @@ entities:
       parent: 15
       rot: 1.5707963267948966 rad
       pos: -0.5,-6.5
-- proto: WindoorKitchenHydroponicsLocked
-  entities:
-  - uid: 24741
-    components:
-    - type: Transform
-      parent: 15
-      pos: 7.5,8.5
 - proto: WindoorMedicalLocked
   entities:
   - uid: 4819
@@ -160101,6 +160615,11 @@ entities:
     - type: Transform
       parent: 15
       pos: -71.5,-23.5
+  - uid: 22245
+    components:
+    - type: Transform
+      parent: 15
+      pos: 11.5,11.5
   - uid: 22309
     components:
     - type: Transform
@@ -160780,36 +161299,6 @@ entities:
       parent: 15
       rot: 3.141592653589793 rad
       pos: -20.5,-28.5
-  - uid: 3717
-    components:
-    - type: Transform
-      parent: 15
-      rot: 3.141592653589793 rad
-      pos: -19.5,-28.5
-  - uid: 3718
-    components:
-    - type: Transform
-      parent: 15
-      rot: 3.141592653589793 rad
-      pos: -18.5,-28.5
-  - uid: 3719
-    components:
-    - type: Transform
-      parent: 15
-      rot: 3.141592653589793 rad
-      pos: -16.5,-28.5
-  - uid: 3720
-    components:
-    - type: Transform
-      parent: 15
-      rot: 3.141592653589793 rad
-      pos: -17.5,-28.5
-  - uid: 3721
-    components:
-    - type: Transform
-      parent: 15
-      rot: 3.141592653589793 rad
-      pos: -15.5,-28.5
   - uid: 3722
     components:
     - type: Transform
@@ -161623,12 +162112,24 @@ entities:
       parent: 15
       rot: 3.141592653589793 rad
       pos: 17.5,10.5
+  - uid: 15747
+    components:
+    - type: Transform
+      parent: 15
+      rot: 3.141592653589793 rad
+      pos: -15.5,-28.5
   - uid: 15759
     components:
     - type: Transform
       parent: 15
       rot: 3.141592653589793 rad
       pos: -13.5,-17.5
+  - uid: 16362
+    components:
+    - type: Transform
+      parent: 15
+      rot: 3.141592653589793 rad
+      pos: -17.5,-28.5
   - uid: 16437
     components:
     - type: Transform
@@ -161681,12 +162182,24 @@ entities:
       parent: 15
       rot: 1.5707963267948966 rad
       pos: -51.5,-20.5
+  - uid: 19026
+    components:
+    - type: Transform
+      parent: 15
+      rot: 3.141592653589793 rad
+      pos: -16.5,-28.5
   - uid: 20073
     components:
     - type: Transform
       parent: 15
       rot: 1.5707963267948966 rad
       pos: -51.5,-24.5
+  - uid: 21991
+    components:
+    - type: Transform
+      parent: 15
+      rot: 3.141592653589793 rad
+      pos: -18.5,-28.5
   - uid: 23034
     components:
     - type: Transform
@@ -161747,6 +162260,12 @@ entities:
       parent: 17588
       rot: 1.5707963267948966 rad
       pos: -40.5,-23.5
+  - uid: 26240
+    components:
+    - type: Transform
+      parent: 15
+      rot: 3.141592653589793 rad
+      pos: -19.5,-28.5
 - proto: Wirecutter
   entities:
   - uid: 4969
diff --git a/Resources/Prototypes/Accents/full_replacements.yml b/Resources/Prototypes/Accents/full_replacements.yml
index 737739ba9d..cfc6f68b4d 100644
--- a/Resources/Prototypes/Accents/full_replacements.yml
+++ b/Resources/Prototypes/Accents/full_replacements.yml
@@ -1,4 +1,4 @@
-# Accents that work off of full replacements rather than word replacements.
+# Accents that work off of full replacements rather than word replacements.
 
 - type: accent
   id: cat
@@ -9,7 +9,6 @@
   - accent-words-cat-4
   - accent-words-cat-5
   - accent-words-cat-6
-  - accent-words-cat-7
 
 - type: accent
   id: dog
@@ -19,6 +18,7 @@
   - accent-words-dog-3
   - accent-words-dog-4
   - accent-words-dog-5
+  defaultPunctuation: '!'
 
 - type: accent
   id: mouse
@@ -30,6 +30,7 @@
   - accent-words-mouse-5
   - accent-words-mouse-6
   - accent-words-mouse-7
+  defaultPunctuation: '!'
 
 - type: accent
   id: mothroach
@@ -39,6 +40,7 @@
   - accent-words-mouse-2
   - accent-words-mouse-3
   - accent-words-mouse-4
+  defaultPunctuation: '!'
 
 - type: accent
   id: mumble
@@ -46,6 +48,7 @@
   - accent-words-mumble-1
   - accent-words-mumble-2
   - accent-words-mumble-3
+  defaultPunctuation: '!'
 
 - type: accent
   id: silicon
@@ -76,6 +79,7 @@
   - accent-words-zombie-8
   - accent-words-zombie-9
   - accent-words-zombie-10
+  defaultPunctuation: '...'
 
 - type: accent
   id: zombieMoth
@@ -94,6 +98,7 @@
   - accent-words-zombie-8
   - accent-words-zombie-9
   - accent-words-zombie-10
+  defaultPunctuation: '...'
 
 - type: accent
   id: genericAggressive
@@ -101,7 +106,7 @@
   - accent-words-generic-aggressive-1
   - accent-words-generic-aggressive-2
   - accent-words-generic-aggressive-3
-  - accent-words-generic-aggressive-4
+  defaultPunctuation: '!'
 
 - type: accent
   id: duck
@@ -109,7 +114,6 @@
   - accent-words-duck-1
   - accent-words-duck-2
   - accent-words-duck-3
-  - accent-words-duck-4
 
 - type: accent
   id: chicken
@@ -117,7 +121,6 @@
   - accent-words-chicken-1
   - accent-words-chicken-2
   - accent-words-chicken-3
-  - accent-words-chicken-4
 
 - type: accent
   id: pig
@@ -125,7 +128,6 @@
   - accent-words-pig-1
   - accent-words-pig-2
   - accent-words-pig-3
-  - accent-words-pig-4
 
 - type: accent
   id: kangaroo
@@ -134,6 +136,7 @@
   - accent-words-kangaroo-2
   - accent-words-kangaroo-3
   - accent-words-kangaroo-4
+  defaultPunctuation: '!'
 
 - type: accent
   id: slimes
@@ -165,7 +168,6 @@
   - accent-words-kobold-6
   - accent-words-kobold-7
   - accent-words-kobold-8
-  - accent-words-kobold-9
 
 - type: accent
   id: nymph
@@ -192,18 +194,3 @@
   - accent-words-scurret-3
   - accent-words-scurret-4
   - accent-words-scurret-5
-  - accent-words-scurret-6
-  - accent-words-scurret-7
-  - accent-words-scurret-8
-  - accent-words-scurret-9
-  - accent-words-scurret-10
-  - accent-words-scurret-11
-  - accent-words-scurret-12
-  - accent-words-scurret-13
-  - accent-words-scurret-14
-  - accent-words-scurret-15
-  - accent-words-scurret-16
-  - accent-words-scurret-17
-  - accent-words-scurret-18
-  - accent-words-scurret-19
-  - accent-words-scurret-20
diff --git a/Resources/Prototypes/Access/silicon.yml b/Resources/Prototypes/Access/silicon.yml
index a8f91982f3..db9d449677 100644
--- a/Resources/Prototypes/Access/silicon.yml
+++ b/Resources/Prototypes/Access/silicon.yml
@@ -1,4 +1,4 @@
-- type: accessLevel
+- type: accessLevel
   id: Borg
   name: id-card-access-level-borg
   canAddToIdCard: false
diff --git a/Resources/Prototypes/Access/wizard.yml b/Resources/Prototypes/Access/wizard.yml
index cacb889936..f8b312b8fb 100644
--- a/Resources/Prototypes/Access/wizard.yml
+++ b/Resources/Prototypes/Access/wizard.yml
@@ -1,3 +1,3 @@
-- type: accessLevel
+- type: accessLevel
   id: Wizard
   name: id-card-access-level-wizard
diff --git a/Resources/Prototypes/Access/xenoborg.yml b/Resources/Prototypes/Access/xenoborg.yml
index 7436e4ec55..f9838b1940 100644
--- a/Resources/Prototypes/Access/xenoborg.yml
+++ b/Resources/Prototypes/Access/xenoborg.yml
@@ -1,4 +1,4 @@
 - type: accessLevel
   id: Xenoborg
   name: id-card-access-level-basic-xenoborg
-  canAddToIdCard: false
\ No newline at end of file
+  canAddToIdCard: false
diff --git a/Resources/Prototypes/Actions/changeling.yml b/Resources/Prototypes/Actions/changeling.yml
index 18b24e141e..b3c1bafb7b 100644
--- a/Resources/Prototypes/Actions/changeling.yml
+++ b/Resources/Prototypes/Actions/changeling.yml
@@ -1,8 +1,8 @@
 - type: entity
   parent: BaseAction
-  id: ActionRetractableItemArmBlade
-  name: Arm Blade
-  description: Shed your flesh and reform it into a fleshy blade.
+  id: ActionRetractableItemArmblade
+  name: Armblade
+  description: Shed your flesh and reform it into a fleshy blade. Can be toggled when unconscious.
   components:
   - type: Action
     useDelay: 2
@@ -15,7 +15,7 @@
   - type: InstantAction
     event: !type:OnRetractableItemActionEvent
   - type: RetractableItemAction
-    spawnedPrototype: ArmBlade
+    spawnedPrototype: Armblade
     summonSounds:
       collection: gib # Placeholder
     retractSounds:
@@ -35,10 +35,19 @@
     sprite: Interface/Actions/changeling2.rsi
     layers:
     - state: biodegrade
-  - type: ActionRequireSatiation
-    satiation: Chemicals
-    amount: 20
-    failReason: changeling-not-enough-chemicals
+  - type: ActionRequirements
+    failPopup: changeling-not-enough-chemicals
+    failPopupType: SmallCaution
+    conditions:
+      Performer:
+      - !type:SatiationCondition
+        satiationType: Chemicals
+        min: 20
+    effects:
+      Performer:
+      - !type:Satiate
+        satiationType: Chemicals
+        factor: -20
   - type: InstantAction
     event: !type:ChangelingBiodegradeActionEvent
   - type: ChangelingBiodegradeAbility
@@ -59,7 +68,10 @@
     - state: "devour_on"
       map: ["enum.ActionVisuals.IconToggled"]
       visible: false
-  - type: ActionRequireMouthUncovered
+  - type: ActionRequirements
+    conditions:
+      Performer:
+      - !type:MouthUncoveredCondition
   - type: TargetAction
   - type: EntityTargetAction
     event: !type:ChangelingDevourActionEvent
@@ -111,9 +123,9 @@
   id: ActionChangelingStasisWeak
   components:
   - type: RegenerativeStasisAction
-    bonusCooldownPerDamage: 1.2 # 50 damage should bring you to 120
+    bonusCooldownPerDamage: 2.4 # 50 damage should bring you to 180
     minStasisCooldown: 60
-    maxStasisCooldown: 120
+    maxStasisCooldown: 180
 
 - type: entity
   parent: ActionIntrinsicStore
@@ -161,10 +173,17 @@
     - state: "extract_dna_on"
       map: ["enum.ActionVisuals.IconToggled"]
       visible: false
-  - type: ActionRequireSatiation
-    satiation: Chemicals
-    amount: 50
-    failReason: changeling-not-enough-chemicals
+  - type: ActionRequirements
+    conditions:
+      Performer:
+      - !type:SatiationCondition
+        satiationType: Chemicals
+        min: 50
+    effects:
+      Performer:
+      - !type:Satiate
+        satiationType: Chemicals
+        factor: -50
   - type: TargetAction
   - type: EntityTargetAction
     canTargetSelf: false
@@ -188,10 +207,19 @@
       components:
       - Bloodstream
     event: !type:EntityEffectActionEvent
-  - type: ActionRequireSatiation
-    satiation: Chemicals
-    amount: 30
-    failReason: changeling-not-enough-chemicals
+  - type: ActionRequirements
+    failPopup: changeling-not-enough-chemicals
+    failPopupType: SmallCaution
+    conditions:
+      Performer:
+      - !type:SatiationCondition
+        satiationType: Chemicals
+        min: 30
+    effects:
+      Performer:
+      - !type:Satiate
+        satiationType: Chemicals
+        factor: -30
   - type: PopupOnAction
     popupType: Medium
     selfMessage: changeling-sting-success
@@ -250,8 +278,17 @@
     sprite: Interface/Actions/changeling2.rsi
     layers:
     - state: lethal_sting
-  - type: ActionRequireSatiation
-    amount: 50
+  - type: ActionRequirements
+    conditions:
+      Performer:
+      - !type:SatiationCondition
+        satiationType: Chemicals
+        min: 50
+    effects:
+      Performer:
+      - !type:Satiate
+        satiationType: Chemicals
+        factor: -50
   - type: EntityEffectAction
     effects:
     - !type:AddReagentToBloodstream
@@ -301,6 +338,50 @@
       reagent: TaciticAcid
       quantity: 5 # 50s of imperceptible mute
 
+- type: entity
+  parent: BaseActionChangelingSting
+  id: ActionChangelingStingArmblade
+  name: Armblade Sting
+  description: "Silently sting a target and cause them to grow a dull armblade after a lengthy delay. \n\nRequires 50 Chemicals."
+  components:
+  - type: Action
+    useDelay: 30
+    raiseOnAction: true
+    itemIconStyle: BigAction
+  - type: Sprite
+    sprite: Interface/Actions/changeling2.rsi
+    layers:
+    - state: armblade_sting
+  - type: ActionRequirements
+    conditions:
+      Performer:
+      - !type:SatiationCondition
+        satiationType: Chemicals
+        min: 50
+    effects:
+      Performer:
+      - !type:Satiate
+        satiationType: Chemicals
+        factor: -50
+  - type: EntityEffectAction
+    effects:
+    - !type:ModifyStatusEffect
+      conditions:
+      - !type:MobStateCondition # Only do the delay on living targets
+        mobstate: Alive
+      effectProto: StatusEffectForcedItemArmblade
+      type: Update
+      time: 90 # Takes 100s to regain the chemicals, so spam-use is a nat negative.
+      delay: 30 # No using it for easy combat!
+    - !type:ModifyStatusEffect
+      conditions:
+      - !type:MobStateCondition
+        mobstate: Alive
+        inverted: true # Not alive!
+      effectProto: StatusEffectForcedItemArmblade
+      type: Update
+      time: 120 # On dead/crit, transfer the 30s to the duration instead. Means you can also maintain it "permanently" on corpses as long as youre around + want to spend fuck ton of chemicals.
+
 - type: entity
   parent: BaseAction
   id: ActionChangelingLastResort
diff --git a/Resources/Prototypes/Admin/Verbs/categories.yml b/Resources/Prototypes/Admin/Verbs/categories.yml
new file mode 100644
index 0000000000..f90cac2b3b
--- /dev/null
+++ b/Resources/Prototypes/Admin/Verbs/categories.yml
@@ -0,0 +1,12 @@
+- type: adminVerbCategory
+  id: Smite
+  name: verb-categories-smite
+  requiredFlags: Fun
+  impact: Extreme
+  icon: /Textures/Interface/VerbIcons/smite.svg.192dpi.png
+  iconsOnly: true
+  columns: 6
+  blacklist:
+    components:
+    - Map
+    - MapGrid
diff --git a/Resources/Prototypes/Admin/Verbs/smites.yml b/Resources/Prototypes/Admin/Verbs/smites.yml
new file mode 100644
index 0000000000..ce1776959d
--- /dev/null
+++ b/Resources/Prototypes/Admin/Verbs/smites.yml
@@ -0,0 +1,815 @@
+- type: adminVerb
+  id: AdminSmiteSuperBonkLite
+  categoryPrototype: Smite
+  name: admin-smite-super-bonk-lite-name
+  description: admin-smite-super-bonk-lite-description
+  icon:
+    sprite: Structures/Furniture/Tables/glass.rsi
+    state: full
+  effects:
+  - !type:AddComponents
+    components:
+    - type: SuperBonk
+      stopWhenDead: true
+
+- type: adminVerb
+  id: AdminSmiteSuperBonk
+  categoryPrototype: Smite
+  name: admin-smite-super-bonk-name
+  description: admin-smite-super-bonk-description
+  icon:
+    sprite: Structures/Furniture/Tables/generic.rsi
+    state: full
+  effects:
+  - !type:AddComponents
+    components:
+    - type: SuperBonk
+      stopWhenDead: false
+
+- type: adminVerb
+  id: AdminSmiteNyanify
+  categoryPrototype: Smite
+  name: admin-smite-nyanify-name
+  description: admin-smite-nyanify-description
+  icon:
+    sprite: Clothing/Head/Hats/catears.rsi
+    state: icon
+  whitelist:
+    components:
+    - Inventory
+  effects:
+  - !type:ModifyStatusEffect
+    effectProto: StatusEffectForcedItemCatEars
+    time: null
+    type: Set
+
+- type: adminVerb
+  id: AdminSmiteMaid
+  categoryPrototype: Smite
+  name: admin-smite-maid-name
+  description: admin-smite-maid-description
+  icon:
+    sprite: Clothing/Uniforms/Jumpskirts/Service/janimaid.rsi
+    state: icon
+  whitelist:
+    components:
+    - Inventory
+  effects:
+  - !type:ModifyStatusEffect
+    effectProto: StatusEffectForcedItemMaid
+    time: null
+    type: Set
+  - !type:ModifyStatusEffect
+    effectProto: StatusEffectClumsyMaid
+    time: null
+    type: Set
+
+- type: adminVerb
+  id: AdminSmiteExplode
+  categoryPrototype: Smite
+  name: admin-smite-explode-name
+  description: admin-smite-explode-description
+  icon: Interface/VerbIcons/smite.svg.192dpi.png
+  effects:
+  - !type:AddComponents
+    replaceExisting: true
+    components:
+    - type: Explosive
+      explosionType: Default
+      totalIntensity: 800
+      intensitySlope: 800
+      maxIntensity: 800
+      maxTileBreak: 0
+      canCreateVacuum: false
+  - !type:Explode
+    delete: false
+
+- type: adminVerb
+  id: AdminSmiteElectrocute
+  categoryPrototype: Smite
+  name: admin-smite-electrocute-name
+  description: admin-smite-electrocute-description
+  icon:
+    sprite: Clothing/Hands/Gloves/Color/yellow.rsi
+    state: icon
+  whitelist:
+    requireAll: true
+    components:
+    - Damageable
+    - MobState
+  effects:
+  - !type:Electrocute
+    shockDamage: 100
+    electrocuteTime: 30
+    refresh: true
+    bypassInsulation: true
+
+- type: adminVerb
+  id: AdminSmiteHeartAttack
+  categoryPrototype: Smite
+  name: admin-smite-heartattack-name
+  description: admin-smite-heartattack-description
+  icon:
+    sprite: Interface/Alerts/human_crew_monitoring.rsi
+    state: dead
+  whitelist:
+    components:
+    - Damageable
+  effects:
+  - !type:LethalDamage
+    damageType: Asphyxiation
+
+- type: adminVerb
+  id: AdminSmiteZoomIn
+  categoryPrototype: Smite
+  name: admin-smite-zoom-in-name
+  description: admin-smite-zoom-in-description
+  icon: Interface/AdminActions/zoom.png
+  effects:
+  - !type:ScaleEyeZoom
+    factor: 0.2
+
+# BROKEN: Negative eye zoom crashes viewport rendering.
+#- type: adminVerb
+#  id: AdminSmiteFlipEye
+#  categoryPrototype: Smite
+#  name: admin-smite-flip-eye-name
+#  description: admin-smite-flip-eye-description
+#  icon: Interface/AdminActions/flip.png
+#  effects:
+#  - !type:ScaleEyeZoom
+#    factor: -1
+
+- type: adminVerb
+  id: AdminSmiteSuperSpeed
+  categoryPrototype: Smite
+  name: admin-smite-super-speed-name
+  description: admin-smite-super-speed-description
+  icon: Interface/AdminActions/super_speed.png
+  effects:
+  - !type:AddComponents
+    replaceExisting: true
+    components:
+    - type: MovementSpeedModifier
+      baseWalkSpeed: 400
+      baseSprintSpeed: 8000
+      baseAcceleration: 40
+  - !type:PopupMessage
+    messages: [ admin-smite-super-speed-prompt ]
+    type: Local
+    method: PopupEntity
+    visualType: LargeCaution
+
+- type: adminVerb
+  id: AdminSmiteSetAlight
+  categoryPrototype: Smite
+  name: admin-smite-set-alight-name
+  description: admin-smite-set-alight-description
+  icon: Interface/Alerts/Fire/fire.png
+  whitelist:
+    components:
+    - Flammable
+  effects:
+  - !type:Flammable
+    multiplier: 1000
+  - !type:Ignite
+  - !type:PopupMessage
+    messages: [ admin-smite-set-alight-self ]
+    type: Local
+    method: PopupEntity
+    visualType: LargeCaution
+  - !type:PopupMessage
+    messages: [ admin-smite-set-alight-others ]
+    type: PvsExceptTarget
+    method: PopupCoordinates
+    visualType: MediumCaution
+
+- type: adminVerb
+  id: AdminSmiteOmniAccent
+  categoryPrototype: Smite
+  name: admin-smite-omni-accent-name
+  description: admin-smite-omni-accent-description
+  icon:
+    sprite: Interface/Actions/voice-mask.rsi
+    state: icon
+  effects:
+  - !type:AddComponents
+    components:
+    - type: BarkAccent
+    - type: BleatingAccent
+    - type: FrenchAccent
+    - type: GermanAccent
+    - type: LizardAccent
+    - type: MobsterAccent
+    - type: MothAccent
+    - type: OwOAccent
+    - type: SkeletonAccent
+    - type: SouthernAccent
+    - type: SpanishAccent
+    - type: StutteringAccent
+
+- type: adminVerb
+  id: AdminSmiteMakeStinky
+  categoryPrototype: Smite
+  name: admin-smite-make-stinky-name
+  description: admin-smite-make-stinky-description
+  icon:
+    sprite: Clothing/Mask/gas.rsi
+    state: icon
+  effects:
+  - !type:AddComponents
+    replaceExisting: true
+    components:
+    - type: GasMiner
+      spawnGas: Ammonia
+      spawnAmount: 20
+      showExamineText: false
+    - type: AtmosDevice
+      requireAnchored: false
+
+- type: adminVerb
+  id: AdminSmiteKillSign
+  categoryPrototype: Smite
+  name: admin-smite-kill-sign-name
+  description: admin-smite-kill-sign-description
+  icon:
+    sprite: Objects/Misc/killsign.rsi
+    state: icon
+  whitelist:
+    components:
+    - Inventory
+  effects:
+  - !type:AddComponents
+    replaceExisting: true
+    components:
+    - type: KillSign
+      hideFromOwner: false
+
+- type: adminVerb
+  id: AdminSmiteHiddenKillSign
+  categoryPrototype: Smite
+  name: admin-smite-kill-sign-hidden-name
+  description: admin-smite-kill-sign-hidden-description
+  icon:
+    sprite: Objects/Misc/killsign.rsi
+    state: icon-hidden
+  whitelist:
+    components:
+    - Inventory
+  effects:
+  - !type:AddComponents
+    replaceExisting: true
+    components:
+    - type: KillSign
+      hideFromOwner: true
+
+- type: adminVerb
+  id: AdminSmiteRemoveGravity
+  categoryPrototype: Smite
+  name: admin-smite-remove-gravity-name
+  description: admin-smite-remove-gravity-description
+  icon:
+    sprite: Structures/Machines/gravity_generator.rsi
+    state: off
+  effects:
+  - !type:AddComponents
+    replaceExisting: true
+    components:
+    - type: MovementIgnoreGravity
+      weightless: true
+    - type: GravityAffected
+
+- type: adminVerb
+  id: AdminSmitePinball
+  categoryPrototype: Smite
+  name: admin-smite-pinball-name
+  description: admin-smite-pinball-description
+  icon:
+    sprite: Objects/Fun/Balls/basketball.rsi
+    state: icon
+  whitelist:
+    requireAll: true
+    components:
+    - Physics
+    - Fixtures
+  effects:
+  - !type:Fling
+    speed: 1.5
+    restitution: 1.1
+
+- type: adminVerb
+  id: AdminSmiteYeet
+  categoryPrototype: Smite
+  name: admin-smite-yeet-name
+  description: admin-smite-yeet-description
+  icon: Interface/VerbIcons/eject.svg.192dpi.png
+  whitelist:
+    requireAll: true
+    components:
+    - Physics
+    - Fixtures
+  effects:
+  - !type:Fling
+    speed: 8
+    restitution: 0
+    nonSolid: true
+
+- type: adminVerb
+  id: AdminSmiteSuperSlip
+  categoryPrototype: Smite
+  name: admin-smite-super-slip-name
+  description: admin-smite-super-slip-description
+  icon:
+    sprite: Objects/Specific/Janitorial/soap.rsi
+    state: omega-4
+  effects:
+  - !type:Slip
+    slippery:
+      superSlippery: true
+      stunTime: 5
+      launchForwardsMultiplier: 20
+
+- type: adminVerb
+  id: AdminSmiteSiliconLawBound
+  categoryPrototype: Smite
+  name: admin-smite-silicon-laws-bound-name
+  description: admin-smite-silicon-laws-bound-description
+  icon:
+    sprite: Interface/Actions/actions_borg.rsi
+    state: state-laws
+  effects:
+  - !type:AddComponents
+    replaceExisting: true
+    components:
+    - type: SiliconLawProvider
+      laws: Crewsimov
+  - !type:AddUserInterfaces
+    interfaces:
+      enum.SiliconLawsUiKey.Key:
+        type: SiliconLawBoundUserInterface
+  - !type:SiliconLawBound
+  - !type:AddAction
+    action: ActionViewLaws
+  - !type:AddMindRole
+    role: MindRoleSiliconBrain
+  - !type:PopupMessage
+    messages: [ admin-smite-silicon-laws-bound-self ]
+    type: Local
+    method: PopupEntity
+    visualType: LargeCaution
+
+- type: adminVerb
+  id: AdminSmiteChessDimension
+  categoryPrototype: Smite
+  name: admin-smite-chess-dimension-name
+  description: admin-smite-chess-dimension-description
+  icon:
+    sprite: Objects/Fun/Tabletop/chessboard.rsi
+    state: chessboard
+  effects:
+  - !type:SetGodmode
+  - !type:AddComponents
+    components:
+    - type: TabletopDraggable
+  - !type:PopupMessage
+    messages: [ admin-smite-chess-self ]
+    type: Local
+    method: PopupEntity
+    visualType: LargeCaution
+  - !type:PopupMessage
+    messages: [ admin-smite-chess-others ]
+    type: PvsExceptTarget
+    method: PopupCoordinates
+    visualType: MediumCaution
+  - !type:TabletopDimension
+    prototype: ChessBoard
+
+- type: adminVerb
+  id: AdminSmiteLockerStuff
+  categoryPrototype: Smite
+  name: admin-smite-locker-stuff-name
+  description: admin-smite-locker-stuff-description
+  icon:
+    sprite: Structures/Storage/closet.rsi
+    state: generic
+  effects:
+  - !type:StuffIntoLocker
+
+- type: adminVerb
+  id: AdminSmiteHomingRod
+  categoryPrototype: Smite
+  name: admin-smite-homing-rod-name
+  description: admin-smite-homing-rod-description
+  icon:
+    sprite: Objects/Specific/Security/target.rsi
+    state: target_s
+  effects:
+  - !type:HomingRod
+    distance: 350
+    speed: 25
+
+- type: adminVerb
+  id: AdminSmiteSlowHomingRod
+  categoryPrototype: Smite
+  name: admin-smite-homing-rod-slow-name
+  description: admin-smite-homing-rod-slow-description
+  icon:
+    sprite: Objects/Specific/Security/target.rsi
+    state: target_c
+  effects:
+  - !type:HomingRod
+    distance: 200
+    speed: 5
+    matchTargetSprintSpeed: true
+
+- type: adminVerb
+  id: AdminSmiteCreamPie
+  categoryPrototype: Smite
+  name: admin-smite-creampie-name
+  description: admin-smite-creampie-description
+  icon:
+    sprite: Objects/Consumable/Food/Baked/pie.rsi
+    state: plain-slice
+  whitelist:
+    components:
+    - CreamPied
+  effects:
+  - !type:SetCreamPied
+
+- type: adminVerb
+  id: AdminSmiteDust
+  categoryPrototype: Smite
+  name: admin-smite-dust-name
+  description: admin-smite-dust-description
+  icon:
+    sprite: Objects/Materials/materials.rsi
+    state: ash
+  effects:
+  # TODO: Popup doesn't appear because the entity is deleted first. Add a way to apply effects sequentially
+  - !type:PopupMessage
+    messages: [ admin-smite-turned-ash-other ]
+    type: Pvs
+    method: PopupEntity
+    visualType: LargeCaution
+  - !type:SpawnEntity
+    entity: Ash
+    predicted: false
+  - !type:DeleteEntity
+
+- type: adminVerb
+  id: AdminSmiteGhostKick
+  categoryPrototype: Smite
+  name: admin-smite-ghostkick-name
+  description: admin-smite-ghostkick-description
+  icon: Interface/gavel.svg.192dpi.png
+  whitelist:
+    components:
+    - Actor
+  effects:
+  - !type:GhostKickEffect
+    reason: admin-smite-ghostkick-reason
+
+- type: adminVerb
+  id: AdminSmiteRunWalkSwap
+  categoryPrototype: Smite
+  name: admin-smite-run-walk-swap-name
+  description: admin-smite-run-walk-swap-description
+  icon: Interface/AdminActions/run-walk-swap.png
+  effects:
+  - !type:SwapMovementSpeeds
+  - !type:PopupMessage
+    messages: [ admin-smite-run-walk-swap-prompt ]
+    type: Local
+    method: PopupEntity
+    visualType: LargeCaution
+
+- type: adminVerb
+  id: AdminSmiteRemoveBlood
+  categoryPrototype: Smite
+  name: admin-smite-remove-blood-name
+  description: admin-smite-remove-blood-description
+  icon:
+    sprite: Fluids/tomato_splat.rsi
+    state: puddle-1
+  whitelist:
+    components:
+    - Bloodstream
+  effects:
+  - !type:SpillBloodstream
+  - !type:PopupMessage
+    messages: [ admin-smite-remove-blood-self ]
+    type: Local
+    method: PopupEntity
+    visualType: LargeCaution
+  - !type:PopupMessage
+    messages: [ admin-smite-remove-blood-others ]
+    type: PvsExceptTarget
+    method: PopupCoordinates
+    visualType: MediumCaution
+
+- type: adminVerb
+  id: AdminSmiteBuffering
+  categoryPrototype: Smite
+  name: admin-smite-buffering-name
+  description: admin-smite-buffering-description
+  icon: Interface/Misc/buffering_smite_icon.png
+  effects:
+  - !type:AddComponents
+    components:
+    - type: Buffering
+
+- type: adminVerb
+  id: AdminSmiteCluwne
+  categoryPrototype: Smite
+  name: admin-smite-cluwne-name
+  description: admin-smite-cluwne-description
+  icon:
+    sprite: Clothing/Mask/cluwne.rsi
+    state: icon
+  whitelist:
+    components:
+    - Inventory
+  effects:
+  - !type:AddComponents
+    components:
+    - type: Cluwne
+
+- type: adminVerb
+  id: AdminSmiteAngerPointingArrows
+  categoryPrototype: Smite
+  name: admin-smite-anger-pointing-arrows-name
+  description: admin-smite-anger-pointing-arrows-description
+  icon:
+    sprite: Interface/Misc/pointing.rsi
+    state: pointing
+  effects:
+  - !type:AddComponents
+    components:
+    - type: PointingArrowAngering
+
+- type: adminVerb
+  id: AdminSmiteHeadstand
+  categoryPrototype: Smite
+  name: admin-smite-headstand-name
+  description: admin-smite-headstand-description
+  icon: Interface/VerbIcons/refresh.svg.192dpi.png
+  effects:
+  - !type:AddComponents
+    components:
+    - type: Headstand
+
+- type: adminVerb
+  id: AdminSmiteSpeakBackwards
+  categoryPrototype: Smite
+  name: admin-smite-speak-backwards-name
+  description: admin-smite-speak-backwards-description
+  icon: Interface/AdminActions/help-backwards.png
+  effects:
+  - !type:AddComponents
+    components:
+    - type: BackwardsAccent
+
+- type: adminVerb
+  id: AdminSmiteDisarmProne
+  categoryPrototype: Smite
+  name: admin-smite-disarm-prone-name
+  description: admin-smite-disarm-prone-description
+  icon: Interface/Actions/disarm.png
+  effects:
+  - !type:AddComponents
+    components:
+    - type: DisarmProne
+
+- type: adminVerb
+  id: AdminSmiteCrawler
+  categoryPrototype: Smite
+  name: admin-smite-crawler-name
+  description: admin-smite-crawler-description
+  icon:
+    sprite: Mobs/Animals/snake.rsi
+    state: icon
+  effects:
+  - !type:AddComponents
+    components:
+    - type: Worm
+
+- type: adminVerb
+  id: AdminSmiteMonkey
+  categoryPrototype: Smite
+  name: admin-smite-monkeyify-name
+  description: admin-smite-monkeyify-description
+  icon:
+    sprite: Mobs/Animals/monkey.rsi
+    state: monkey
+  effects:
+  - !type:Polymorph
+    prototype: AdminMonkeySmite
+    force: true
+
+- type: adminVerb
+  id: AdminSmiteGarbageCan
+  categoryPrototype: Smite
+  name: admin-smite-garbage-can-name
+  description: admin-smite-garbage-can-description
+  icon:
+    sprite: Structures/Piping/disposal.rsi
+    state: disposal
+  effects:
+  - !type:Polymorph
+    prototype: AdminDisposalsSmite
+    force: true
+
+- type: adminVerb
+  id: AdminSmiteBread
+  categoryPrototype: Smite
+  name: admin-smite-become-bread-name
+  description: admin-smite-become-bread-description
+  icon:
+    sprite: Objects/Consumable/Food/Baked/bread.rsi
+    state: plain
+  effects:
+  - !type:Polymorph
+    prototype: AdminBreadSmite
+    force: true
+
+- type: adminVerb
+  id: AdminSmiteMouse
+  categoryPrototype: Smite
+  name: admin-smite-become-mouse-name
+  description: admin-smite-become-mouse-description
+  icon:
+    sprite: Mobs/Animals/mouse.rsi
+    state: icon-0
+  effects:
+  - !type:Polymorph
+    prototype: AdminMouseSmite
+    force: true
+
+- type: adminVerb
+  id: AdminSmiteInstrument
+  categoryPrototype: Smite
+  name: admin-smite-become-instrument-name
+  description: admin-smite-become-instrument-description
+  icon:
+    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
+    state: supersynth
+  effects:
+  - !type:Polymorph
+    prototype: AdminInstrumentSmite
+    force: true
+
+- type: adminVerb
+  id: AdminSmiteReptilian
+  categoryPrototype: Smite
+  name: admin-smite-reptilian-species-swap-name
+  description: admin-smite-reptilian-species-swap-description
+  icon:
+    sprite: Objects/Fun/Plushies/lizard.rsi
+    state: icon
+  effects:
+  - !type:Polymorph
+    prototype: AdminLizardSmite
+    force: true
+
+- type: adminVerb
+  id: AdminSmiteVulpkanin
+  categoryPrototype: Smite
+  name: admin-smite-vulpkanin-species-swap-name
+  description: admin-smite-vulpkanin-species-swap-description
+  icon:
+    sprite: Objects/Fun/Balls/tennisball.rsi
+    state: icon
+  effects:
+  - !type:Polymorph
+    prototype: AdminVulpSmite
+    force: true
+
+- type: adminVerb
+  id: AdminSmiteRemoveHands
+  categoryPrototype: Smite
+  name: admin-smite-remove-hands-name
+  description: admin-smite-remove-hands-description
+  icon: Interface/AdminActions/remove-hands.png
+  whitelist:
+    components:
+    - Body
+  effects:
+  - !type:RemoveOrgans
+    categories:
+    - HandLeft
+    - HandRight
+  - !type:PopupMessage
+    messages: [ admin-smite-remove-hands-self ]
+    type: Local
+    method: PopupEntity
+    visualType: LargeCaution
+  - !type:PopupMessage
+    messages: [ admin-smite-remove-hands-other ]
+    type: PvsExceptTarget
+    method: PopupCoordinates
+    visualType: Medium
+
+- type: adminVerb
+  id: AdminSmiteRemoveHand
+  categoryPrototype: Smite
+  name: admin-smite-remove-hand-name
+  description: admin-smite-remove-hand-description
+  icon: Interface/AdminActions/remove-hand.png
+  whitelist:
+    components:
+    - Body
+  effects:
+  - !type:RemoveOrgans
+    categories:
+    - HandLeft
+    - HandRight
+    maxCount: 1
+  - !type:PopupMessage
+    messages: [ admin-smite-remove-hands-self ]
+    type: Local
+    method: PopupEntity
+    visualType: LargeCaution
+  - !type:PopupMessage
+    messages: [ admin-smite-remove-hands-other ]
+    type: PvsExceptTarget
+    method: PopupCoordinates
+    visualType: Medium
+
+- type: adminVerb
+  id: AdminSmiteStomachRemoval
+  categoryPrototype: Smite
+  name: admin-smite-stomach-removal-name
+  description: admin-smite-stomach-removal-description
+  icon:
+    sprite: Mobs/Species/Human/organs.rsi
+    state: stomach
+  whitelist:
+    components:
+    - Body
+  effects:
+  - !type:RemoveOrgans
+    whitelist:
+      components:
+      - Stomach
+    delete: true
+  - !type:PopupMessage
+    messages: [ admin-smite-stomach-removal-self ]
+    type: Local
+    method: PopupEntity
+    visualType: LargeCaution
+
+- type: adminVerb
+  id: AdminSmiteLungRemoval
+  categoryPrototype: Smite
+  name: admin-smite-lung-removal-name
+  description: admin-smite-lung-removal-description
+  icon:
+    sprite: Mobs/Species/Human/organs.rsi
+    state: lung-r
+  whitelist:
+    components:
+    - Body
+  effects:
+  - !type:RemoveOrgans
+    whitelist:
+      components:
+      - Lung
+    delete: true
+  - !type:PopupMessage
+    messages: [ admin-smite-lung-removal-self ]
+    type: Local
+    method: PopupEntity
+    visualType: LargeCaution
+
+- type: adminVerb
+  id: AdminSmiteVomitOrgans
+  categoryPrototype: Smite
+  name: admin-smite-vomit-organs-name
+  description: admin-smite-vomit-organs-description
+  icon:
+    sprite: Fluids/vomit_toxin.rsi
+    state: vomit_toxin-1
+  whitelist:
+    components:
+    - Body
+  effects:
+  - !type:Vomit
+    thirstAmount: -1000
+    hungerAmount: -1000
+  - !type:RemoveOrgans
+    categories:
+    - Heart
+    - Lungs
+    - Stomach
+    - Liver
+    - Kidneys
+  - !type:PopupMessage
+    messages: [ admin-smite-vomit-organs-self ]
+    type: Local
+    method: PopupEntity
+    visualType: LargeCaution
+  - !type:PopupMessage
+    messages: [ admin-smite-vomit-organs-others ]
+    type: PvsExceptTarget
+    method: PopupCoordinates
+    visualType: MediumCaution
diff --git a/Resources/Prototypes/Alerts/changeling.yml b/Resources/Prototypes/Alerts/changeling.yml
index 4457fa55e3..48ec1492f3 100644
--- a/Resources/Prototypes/Alerts/changeling.yml
+++ b/Resources/Prototypes/Alerts/changeling.yml
@@ -36,8 +36,8 @@
     layers:
     - map: [ "enum.AlertVisualLayers.Base" ]
     - map: [ "1" ]
-      offset: 0.425, 0.25
+      offset: 0.4375, 0.25
     - map: [ "10" ]
-      offset: 0.3, 0.25
+      offset: 0.3125, 0.25
     - map: [ "100" ]
-      offset: 0.175, 0.25
+      offset: 0.1875, 0.25
diff --git a/Resources/Prototypes/Anomaly/behaviours.yml b/Resources/Prototypes/Anomaly/behaviours.yml
index 924a4a7500..f99e436ffb 100644
--- a/Resources/Prototypes/Anomaly/behaviours.yml
+++ b/Resources/Prototypes/Anomaly/behaviours.yml
@@ -220,4 +220,4 @@
     maxVisibility: 1.2
   - type: StealthOnMove
     passiveVisibilityRate: -0.37
-    movementVisibilityRate: 0.20
\ No newline at end of file
+    movementVisibilityRate: 0.20
diff --git a/Resources/Prototypes/Atmospherics/gases.yml b/Resources/Prototypes/Atmospherics/gases.yml
index 94244e55ce..4f704c9be6 100644
--- a/Resources/Prototypes/Atmospherics/gases.yml
+++ b/Resources/Prototypes/Atmospherics/gases.yml
@@ -1,4 +1,4 @@
-- type: gas
+- type: gas
   id: Oxygen
   name: gas-oxygen
   abbreviation: gas-oxygen-abbreviation
diff --git a/Resources/Prototypes/Body/detached.yml b/Resources/Prototypes/Body/detached.yml
index 65e370eb8c..5d9bc510a6 100644
--- a/Resources/Prototypes/Body/detached.yml
+++ b/Resources/Prototypes/Body/detached.yml
@@ -2,6 +2,7 @@
   parent:
   - BaseSpeciesLayers
   id: DetachedBody
+  categories: [HideSpawnMenu]
   save: false
   components:
   - type: Clickable
diff --git a/Resources/Prototypes/Catalog/Bots/advertisements.yml b/Resources/Prototypes/Catalog/Bots/advertisements.yml
index 6174c25ff3..d3ec1d1438 100644
--- a/Resources/Prototypes/Catalog/Bots/advertisements.yml
+++ b/Resources/Prototypes/Catalog/Bots/advertisements.yml
@@ -8,4 +8,4 @@
   id: FirebotAd
   values:
     prefix: advertisement-firebot-
-    count: 4
\ No newline at end of file
+    count: 4
diff --git a/Resources/Prototypes/Catalog/Bots/hugbot.yml b/Resources/Prototypes/Catalog/Bots/hugbot.yml
index 469bb1196d..06d39f8db8 100644
--- a/Resources/Prototypes/Catalog/Bots/hugbot.yml
+++ b/Resources/Prototypes/Catalog/Bots/hugbot.yml
@@ -1,4 +1,4 @@
-- type: localizedDataset
+- type: localizedDataset
   id: HugBotStarts
   values:
     prefix: hugbot-start-hug-
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
index bb4130e571..cd9f7c0b80 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
@@ -18,6 +18,16 @@
   category: cargoproduct-category-name-armory
   group: market
 
+- type: cargoProduct
+  id: ArmoryMosin
+  icon:
+    sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
+    state: base
+  product: CrateArmoryMosin
+  cost: 3500
+  category: cargoproduct-category-name-armory
+  group: market
+
 - type: cargoProduct
   id: SecurityRiot
   icon:
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_instuments.yml b/Resources/Prototypes/Catalog/Cargo/cargo_instuments.yml
index 722956f43a..7457e071aa 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_instuments.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_instuments.yml
@@ -1,4 +1,4 @@
-# Handheld Instruments
+# Handheld Instruments
 
 - type: cargoProduct
   id: FunInstrumentsVariety
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
index cefcca5fab..be099d7ba0 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
@@ -56,4 +56,4 @@
   product: CrateStationAiCore
   cost: 10000
   category: cargoproduct-category-name-science
-  group: market
\ No newline at end of file
+  group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index 0ea7428e5e..a4c9d4d37a 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -124,8 +124,8 @@
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle
   id: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher
-  name: China-Lake bundle
-  description: "An old China-Lake grenade launcher bundled with 11 rounds of various destruction capability."
+  name: China Lake bundle
+  description: "An old China Lake grenade launcher bundled with 11 rounds of various destruction capability."
   components:
   - type: EntityTableContainerFill
     containers:
@@ -133,9 +133,9 @@
         children:
         - id: WeaponLauncherChinaLake
         - id: GrenadeBlast
-          amount: 4
+          amount: 3
         - id: GrenadeFrag
-          amount: 4
+          amount: 5
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateAmmo
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
index a44c48d419..63e1b0902a 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
@@ -28,6 +28,21 @@
         - id: BoxLethalshot
           amount: 4
 
+- type: entity
+  parent: [ CrateWeaponSecure, BaseSecurityContraband ]
+  id: CrateArmoryMosin
+  name: mosin crate
+  description: Reliable, dirt cheap, and loud as hell. Contains three mosin rifles and 12 speedloaders of .30 rifle ammunition. Requires Armory access to open.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - id: WeaponSniperMosin
+          amount: 3
+        - id: SpeedLoaderLightRifle
+          amount: 12
+
 - type: entity
   parent: [ CrateWeaponSecure, BaseSecurityContraband ]
   id: CrateTrackingImplants
diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
index 3e3e0f2f8d..c056ced04c 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
@@ -93,7 +93,7 @@
 - type: entity
   id: BriefcaseWeaponChinaLakeFilled
   parent: BriefcaseWeapon
-  name: secure china lake case
+  name: secure China Lake case
   components:
   - type: EntityTableContainerFill
     containers:
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index d9ec25b3de..5b066613f0 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -77,8 +77,6 @@
     - id: FlashlightSeclite
       prob: 0.8
     - id: WeaponDisabler
-    - id: SecurityBola
-      amount: 2
     - id: ClothingUniformJumpsuitSecGrey
       prob: 0.3
     - id: ClothingHeadHelmetBasic
diff --git a/Resources/Prototypes/Catalog/Fills/Paper/manuals.yml b/Resources/Prototypes/Catalog/Fills/Paper/manuals.yml
index 4da9ec5187..a12db25e4c 100644
--- a/Resources/Prototypes/Catalog/Fills/Paper/manuals.yml
+++ b/Resources/Prototypes/Catalog/Fills/Paper/manuals.yml
@@ -40,4 +40,4 @@
   parent: Paper
   components:
   - type: Paper
-    content: book-text-combat-bakery-kit
\ No newline at end of file
+    content: book-text-combat-bakery-kit
diff --git a/Resources/Prototypes/Catalog/UplinkCatalog/ammo.yml b/Resources/Prototypes/Catalog/UplinkCatalog/ammo.yml
index 3484027b90..f117fa6e89 100644
--- a/Resources/Prototypes/Catalog/UplinkCatalog/ammo.yml
+++ b/Resources/Prototypes/Catalog/UplinkCatalog/ammo.yml
@@ -109,3 +109,24 @@
       blacklist:
         components:
           - SurplusBundle
+
+# for the clake:
+- type: listing
+  id: GrenadeFrag
+  name: uplink-ammo-frag-name
+  description: uplink-ammo-frag-desc
+  productEntity: GrenadeFrag
+  cost:
+    Telecrystal: 3
+  categories:
+  - UplinkAmmo
+
+- type: listing
+  id: GrenadeBlast
+  name: uplink-ammo-blast-name
+  description: uplink-ammo-blast-desc
+  productEntity: GrenadeBlast
+  cost:
+    Telecrystal: 3
+  categories:
+    - UplinkAmmo
diff --git a/Resources/Prototypes/Catalog/UplinkCatalog/weaponry.yml b/Resources/Prototypes/Catalog/UplinkCatalog/weaponry.yml
index f108bbeb85..5f0c55f7dc 100644
--- a/Resources/Prototypes/Catalog/UplinkCatalog/weaponry.yml
+++ b/Resources/Prototypes/Catalog/UplinkCatalog/weaponry.yml
@@ -70,17 +70,11 @@
   id: UplinkEnergyCrossbow
   name: uplink-energycrossbow-name
   description: uplink-energycrossbow-desc
-  discountCategory: rareDiscounts
-  discountDownTo:
-    Telecrystal: 3
   productEntity: WeaponEnergyCrossbow
   cost:
     Telecrystal: 5
   categories:
   - UplinkWeaponry
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
 
 - type: listing
   id: UplinkThrowingKnivesKit
diff --git a/Resources/Prototypes/Catalog/changeling_catalog.yml b/Resources/Prototypes/Catalog/changeling_catalog.yml
index ccaae6bfd1..9d81753621 100644
--- a/Resources/Prototypes/Catalog/changeling_catalog.yml
+++ b/Resources/Prototypes/Catalog/changeling_catalog.yml
@@ -1,18 +1,18 @@
 # Abilities
 
 - type: listing
-  id: ChangelingArmBlade
+  id: ChangelingArmblade
   name: changeling-catalog-arm-blade-name
   description: changeling-catalog-arm-blade-desc
   applyToMob: true
   cost:
-    ChangelingDNA: 30
+    ChangelingDNA: 20
   categories:
   - ChangelingStoreCombat
   conditions:
   - !type:ListingLimitedStockCondition
     stock: 1
-  productAction: ActionRetractableItemArmBlade
+  productAction: ActionRetractableItemArmblade
 
 - type: listing
   id: ChangelingFleshClothing
@@ -20,7 +20,7 @@
   description: changeling-catalog-flesh-clothing-desc
   icon: { sprite: /Textures/Interface/Actions/changeling2.rsi, state: flesh_clothing }
   cost:
-    ChangelingDNA: 20
+    ChangelingDNA: 10
   categories:
   - ChangelingStoreStealth
   conditions:
@@ -146,6 +146,21 @@
     stock: 1
   productAction: ActionChangelingStingMute
 
+- type: listing
+  id: ChangelingStingArmblade
+  name: changeling-catalog-armblade-sting-name
+  description: changeling-catalog-armblade-sting-desc
+  icon: { sprite: /Textures/Interface/Actions/changeling2.rsi, state: armblade_sting }
+  applyToMob: true
+  cost:
+    ChangelingDNA: 10
+  categories:
+  - ChangelingStoreUtility
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+  productAction: ActionChangelingStingArmblade
+
 - type: listing
   id: ChangelingLastResort
   name: changeling-catalog-last-resort-name
diff --git a/Resources/Prototypes/Catalog/pai_catalog.yml b/Resources/Prototypes/Catalog/pai_catalog.yml
index 913eae5d0b..e3acdb27ca 100644
--- a/Resources/Prototypes/Catalog/pai_catalog.yml
+++ b/Resources/Prototypes/Catalog/pai_catalog.yml
@@ -8,6 +8,7 @@
   name: pai-mass-scanner-name
   description: pai-mass-scanner-desc
   productAction: ActionPAIMassScanner
+  applyToMob: true
   cost:
     SiliconMemory: 10
   categories:
@@ -21,6 +22,7 @@
   name: pai-midi-player-name
   description: pai-midi-player-desc
   productAction: ActionPAIPlayMidi
+  applyToMob: true
   cost:
     SiliconMemory: 5
   categories:
@@ -34,6 +36,7 @@
   name: pai-station-map-name
   description: pai-station-map-desc
   productAction: ActionPAIOpenMap
+  applyToMob: true
   cost:
     SiliconMemory: 5
   categories:
diff --git a/Resources/Prototypes/Chemistry/injector_modes.yml b/Resources/Prototypes/Chemistry/injector_modes.yml
index 6b2e0b96f7..f1485a15cd 100644
--- a/Resources/Prototypes/Chemistry/injector_modes.yml
+++ b/Resources/Prototypes/Chemistry/injector_modes.yml
@@ -1,4 +1,4 @@
-## Abstracts
+## Abstracts
 - type: injectorMode
   abstract: true
   id: BaseInjectMode
diff --git a/Resources/Prototypes/Chemistry/reactive_groups.yml b/Resources/Prototypes/Chemistry/reactive_groups.yml
index fa001f3083..29ea6f6034 100644
--- a/Resources/Prototypes/Chemistry/reactive_groups.yml
+++ b/Resources/Prototypes/Chemistry/reactive_groups.yml
@@ -1,4 +1,4 @@
-- type: reactiveGroup
+- type: reactiveGroup
   id: Flammable
 
 - type: reactiveGroup
diff --git a/Resources/Prototypes/Codewords/codeword_factions.yml b/Resources/Prototypes/Codewords/codeword_factions.yml
index 9dc7e31eac..06bef52747 100644
--- a/Resources/Prototypes/Codewords/codeword_factions.yml
+++ b/Resources/Prototypes/Codewords/codeword_factions.yml
@@ -1,3 +1,3 @@
-- type: codewordFaction
+- type: codewordFaction
   id: Traitor
   generator: TraitorCodewordGenerator
diff --git a/Resources/Prototypes/Codewords/codeword_generators.yml b/Resources/Prototypes/Codewords/codeword_generators.yml
index c66fd37083..ad76edf4ad 100644
--- a/Resources/Prototypes/Codewords/codeword_generators.yml
+++ b/Resources/Prototypes/Codewords/codeword_generators.yml
@@ -1,4 +1,4 @@
-- type: codewordGenerator
+- type: codewordGenerator
   id: TraitorCodewordGenerator
   words:
   - Adjectives
diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml
index 5f7755f08d..86d5eae0c9 100644
--- a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml
+++ b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml
@@ -10,7 +10,7 @@
   - type: Clothing
     sprite: Corvax/Clothing/Neck/Misc/pins.rsi
     equippedPrefix: ath
-      
+
 - type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckUSSPPin
@@ -23,7 +23,7 @@
   - type: Clothing
     sprite: Corvax/Clothing/Neck/Misc/pins.rsi
     equippedPrefix: comm
-      
+
 - type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckCorvaxPin
@@ -36,7 +36,7 @@
   - type: Clothing
     sprite: Corvax/Clothing/Neck/Misc/pins.rsi
     equippedPrefix: cor
-      
+
 - type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckDonkPin
@@ -62,8 +62,8 @@
   - type: Clothing
     sprite: Corvax/Clothing/Neck/Misc/pins.rsi
     equippedPrefix: earth
-      
-- type: entity    
+
+- type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckEchoPin
   name: comet pin
@@ -101,7 +101,7 @@
   - type: Clothing
     sprite: Corvax/Clothing/Neck/Misc/pins.rsi
     equippedPrefix: logistika
-      
+
 - type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckMainPin
@@ -114,7 +114,7 @@
   - type: Clothing
     sprite: Corvax/Clothing/Neck/Misc/pins.rsi
     equippedPrefix: main
-      
+
 - type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckDeForestPin
@@ -166,7 +166,7 @@
   - type: Clothing
     sprite: Corvax/Clothing/Neck/Misc/pins.rsi
     equippedPrefix: neb
-    
+
 - type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckNovaPin
@@ -181,7 +181,7 @@
     equippedPrefix: nova
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: [BaseCorvaxContraband131, ClothingNeckPinBase]
   id: ClothingNeckSyndicakePin
   name: Syndicake pin
   description: The pin of Syndicakes, on backside have a little numbers "2559".
diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Devices/secapartment.yml b/Resources/Prototypes/Corvax/Entities/Objects/Devices/secapartment.yml
index 1835d022f6..c50678676d 100644
--- a/Resources/Prototypes/Corvax/Entities/Objects/Devices/secapartment.yml
+++ b/Resources/Prototypes/Corvax/Entities/Objects/Devices/secapartment.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [ BaseCorvaxContraband433DepartmentsCommandSecurity, BaseItem ]
   id: SecApartmentTabletUnpowered
   name: SecApartment handheld tablet
   description: "A NanoTrasen-approved device for organizing and coordinating the actions of security personnel at corporate facilities."
diff --git a/Resources/Prototypes/Damage/examine_messages.yml b/Resources/Prototypes/Damage/examine_messages.yml
index fe551902b0..c911f0de4e 100644
--- a/Resources/Prototypes/Damage/examine_messages.yml
+++ b/Resources/Prototypes/Damage/examine_messages.yml
@@ -1,4 +1,4 @@
-- type: localizedDataset
+- type: localizedDataset
   id: WindowMessages
   values:
     prefix: comp-window-damaged-
diff --git a/Resources/Prototypes/Datasets/Names/atv.yml b/Resources/Prototypes/Datasets/Names/atv.yml
index 638fb21134..8798c5548a 100644
--- a/Resources/Prototypes/Datasets/Names/atv.yml
+++ b/Resources/Prototypes/Datasets/Names/atv.yml
@@ -1,4 +1,4 @@
-- type: localizedDataset
+- type: localizedDataset
   id: DescriptionsATV
   values:
     prefix: descriptions-atv-dataset-
diff --git a/Resources/Prototypes/Datasets/Names/autoborg.yml b/Resources/Prototypes/Datasets/Names/autoborg.yml
index 680286da64..1068b6c2c2 100644
--- a/Resources/Prototypes/Datasets/Names/autoborg.yml
+++ b/Resources/Prototypes/Datasets/Names/autoborg.yml
@@ -1,4 +1,4 @@
-- type: localizedDataset
+- type: localizedDataset
   id: NamesAutoborg
   values:
     prefix: names-autoborg-dataset-
diff --git a/Resources/Prototypes/Datasets/Names/base.yml b/Resources/Prototypes/Datasets/Names/base.yml
index 68382fbd8b..09508bc30e 100644
--- a/Resources/Prototypes/Datasets/Names/base.yml
+++ b/Resources/Prototypes/Datasets/Names/base.yml
@@ -1,4 +1,4 @@
-- type: localizedDataset
+- type: localizedDataset
   id: NamesFirst
   values:
     prefix: names-first-dataset-
diff --git a/Resources/Prototypes/Datasets/Names/base_gendered.yml b/Resources/Prototypes/Datasets/Names/base_gendered.yml
index 305f15712d..fb622de639 100644
--- a/Resources/Prototypes/Datasets/Names/base_gendered.yml
+++ b/Resources/Prototypes/Datasets/Names/base_gendered.yml
@@ -1,4 +1,4 @@
-- type: localizedDataset
+- type: localizedDataset
   id: NamesFirstMale
   values:
     prefix: names-first-male-dataset-
diff --git a/Resources/Prototypes/Datasets/Names/clown.yml b/Resources/Prototypes/Datasets/Names/clown.yml
index dabe4fa68f..dcbb785833 100644
--- a/Resources/Prototypes/Datasets/Names/clown.yml
+++ b/Resources/Prototypes/Datasets/Names/clown.yml
@@ -1,4 +1,4 @@
-- type: localizedDataset
+- type: localizedDataset
   id: NamesClown
   values:
     prefix: names-clown-dataset-
diff --git a/Resources/Prototypes/Datasets/Names/hologram.yml b/Resources/Prototypes/Datasets/Names/hologram.yml
index c8ee6604b4..0500843a97 100644
--- a/Resources/Prototypes/Datasets/Names/hologram.yml
+++ b/Resources/Prototypes/Datasets/Names/hologram.yml
@@ -1,4 +1,4 @@
-- type: localizedDataset
+- type: localizedDataset
   id: NamesHologram
   values:
     prefix: names-hologram-dataset-
diff --git a/Resources/Prototypes/Datasets/Names/ninja.yml b/Resources/Prototypes/Datasets/Names/ninja.yml
index cde06436eb..87617ac762 100644
--- a/Resources/Prototypes/Datasets/Names/ninja.yml
+++ b/Resources/Prototypes/Datasets/Names/ninja.yml
@@ -1,4 +1,4 @@
-- type: localizedDataset
+- type: localizedDataset
   id: NamesNinja
   values:
     prefix: names-ninja-dataset-
diff --git a/Resources/Prototypes/Datasets/Names/scurret.yml b/Resources/Prototypes/Datasets/Names/scurret.yml
index 9e23557b38..9ea6e5a009 100644
--- a/Resources/Prototypes/Datasets/Names/scurret.yml
+++ b/Resources/Prototypes/Datasets/Names/scurret.yml
@@ -1,4 +1,4 @@
-- type: localizedDataset
+- type: localizedDataset
   id: NamesFirstScurret
   values:
     prefix: names-scurret-first-dataset-
diff --git a/Resources/Prototypes/Datasets/Names/wizard.yml b/Resources/Prototypes/Datasets/Names/wizard.yml
index aea4ee1111..084cfe6f3f 100644
--- a/Resources/Prototypes/Datasets/Names/wizard.yml
+++ b/Resources/Prototypes/Datasets/Names/wizard.yml
@@ -1,4 +1,4 @@
-- type: localizedDataset
+- type: localizedDataset
   id: NamesWizardFirst
   values:
     prefix: names-wizard-first-dataset-
diff --git a/Resources/Prototypes/Datasets/news.yml b/Resources/Prototypes/Datasets/news.yml
index a1fdb55c2f..dac355ccbf 100644
--- a/Resources/Prototypes/Datasets/news.yml
+++ b/Resources/Prototypes/Datasets/news.yml
@@ -1,4 +1,4 @@
-- type: localizedDataset
+- type: localizedDataset
   id: News
   values:
     prefix: news-dataset-
diff --git a/Resources/Prototypes/Decals/Overlays/markups.yml b/Resources/Prototypes/Decals/Overlays/markups.yml
index cb8d56834e..4c688170fd 100644
--- a/Resources/Prototypes/Decals/Overlays/markups.yml
+++ b/Resources/Prototypes/Decals/Overlays/markups.yml
@@ -1,4 +1,4 @@
-- type: decal
+- type: decal
   id: MarkupSquare
   tags: ["overlay"]
   defaultCustomColor: true
diff --git a/Resources/Prototypes/Decals/bricktile_dark.yml b/Resources/Prototypes/Decals/bricktile_dark.yml
index 87dbc5d785..0013948cd5 100644
--- a/Resources/Prototypes/Decals/bricktile_dark.yml
+++ b/Resources/Prototypes/Decals/bricktile_dark.yml
@@ -1,4 +1,4 @@
-- type: decal
+- type: decal
   id: BrickTileDarkBox
   tags: ["station", "markings"]
   sprite:
diff --git a/Resources/Prototypes/Decals/bricktile_steel.yml b/Resources/Prototypes/Decals/bricktile_steel.yml
index b45a05c19d..a353cd6dcf 100644
--- a/Resources/Prototypes/Decals/bricktile_steel.yml
+++ b/Resources/Prototypes/Decals/bricktile_steel.yml
@@ -1,4 +1,4 @@
-- type: decal
+- type: decal
   id: BrickTileSteelBox
   tags: ["station", "markings"]
   sprite:
diff --git a/Resources/Prototypes/Decals/bricktile_white.yml b/Resources/Prototypes/Decals/bricktile_white.yml
index 7ec78b5653..a39fa90770 100644
--- a/Resources/Prototypes/Decals/bricktile_white.yml
+++ b/Resources/Prototypes/Decals/bricktile_white.yml
@@ -1,4 +1,4 @@
-- type: decal
+- type: decal
   id: BrickTileWhiteBox
   tags: ["station", "markings"]
   sprite:
diff --git a/Resources/Prototypes/Decals/concrete_trim.yml b/Resources/Prototypes/Decals/concrete_trim.yml
index 43d53c8f82..8648e5ae51 100644
--- a/Resources/Prototypes/Decals/concrete_trim.yml
+++ b/Resources/Prototypes/Decals/concrete_trim.yml
@@ -1,4 +1,4 @@
-- type: decal
+- type: decal
   id: ConcreteTrimBox
   tags: ["planet", "markings"]
   sprite:
diff --git a/Resources/Prototypes/Decals/dirty.yml b/Resources/Prototypes/Decals/dirty.yml
index a20feea26c..148a59b127 100644
--- a/Resources/Prototypes/Decals/dirty.yml
+++ b/Resources/Prototypes/Decals/dirty.yml
@@ -1,4 +1,4 @@
-# If you spawn any of these, they should probably be made cleanable as well.
+# If you spawn any of these, they should probably be made cleanable as well.
 
 - type: decal
   id: Dirt
diff --git a/Resources/Prototypes/Decals/markings.yml b/Resources/Prototypes/Decals/markings.yml
index 12fb7204b7..a302d8a8ed 100644
--- a/Resources/Prototypes/Decals/markings.yml
+++ b/Resources/Prototypes/Decals/markings.yml
@@ -1,4 +1,4 @@
-- type: decal
+- type: decal
   id: Arrows
   tags: ["station", "markings"]
   sprite:
diff --git a/Resources/Prototypes/Decals/minitile_dark.yml b/Resources/Prototypes/Decals/minitile_dark.yml
index ea54205446..d0f8bcf05e 100644
--- a/Resources/Prototypes/Decals/minitile_dark.yml
+++ b/Resources/Prototypes/Decals/minitile_dark.yml
@@ -1,4 +1,4 @@
-- type: decal
+- type: decal
   id: MiniTileDarkBox
   tags: ["station", "markings"]
   sprite:
diff --git a/Resources/Prototypes/Decals/minitile_steel.yml b/Resources/Prototypes/Decals/minitile_steel.yml
index c6bd059ee8..09f6b02a0a 100644
--- a/Resources/Prototypes/Decals/minitile_steel.yml
+++ b/Resources/Prototypes/Decals/minitile_steel.yml
@@ -1,4 +1,4 @@
-- type: decal
+- type: decal
   id: MiniTileSteelBox
   tags: ["station", "markings"]
   sprite:
diff --git a/Resources/Prototypes/Decals/minitile_white.yml b/Resources/Prototypes/Decals/minitile_white.yml
index 163ac37d53..27732e4c01 100644
--- a/Resources/Prototypes/Decals/minitile_white.yml
+++ b/Resources/Prototypes/Decals/minitile_white.yml
@@ -1,4 +1,4 @@
-- type: decal
+- type: decal
   id: MiniTileWhiteBox
   tags: ["station", "markings"]
   sprite:
diff --git a/Resources/Prototypes/Decals/originsign.yml b/Resources/Prototypes/Decals/originsign.yml
index a57eaaff6b..5dc72808b4 100644
--- a/Resources/Prototypes/Decals/originsign.yml
+++ b/Resources/Prototypes/Decals/originsign.yml
@@ -1,4 +1,4 @@
-- type: decal
+- type: decal
   id: OriginStationSign1
   tags: ["station"]
   sprite:
diff --git a/Resources/Prototypes/Decals/ss14sign.yml b/Resources/Prototypes/Decals/ss14sign.yml
index c78b180c69..374dd0bb70 100644
--- a/Resources/Prototypes/Decals/ss14sign.yml
+++ b/Resources/Prototypes/Decals/ss14sign.yml
@@ -1,4 +1,4 @@
-- type: decal
+- type: decal
   id: SpaceStationSign1
   tags: ["station"]
   sprite:
diff --git a/Resources/Prototypes/Decals/stairs.yml b/Resources/Prototypes/Decals/stairs.yml
index a4c1ac7ae8..b72b7c44d8 100644
--- a/Resources/Prototypes/Decals/stairs.yml
+++ b/Resources/Prototypes/Decals/stairs.yml
@@ -167,4 +167,4 @@
   id: StairsWoodW
   sprite:
     sprite: deprecated.rsi
-    state: deprecated
\ No newline at end of file
+    state: deprecated
diff --git a/Resources/Prototypes/Decals/syndlogo.yml b/Resources/Prototypes/Decals/syndlogo.yml
index f9cda95c70..8ba7495dd0 100644
--- a/Resources/Prototypes/Decals/syndlogo.yml
+++ b/Resources/Prototypes/Decals/syndlogo.yml
@@ -129,4 +129,4 @@
   tags: ["syndicate"]
   sprite:
     sprite: Decals/syndlogo.rsi
-    state: syndlogo19
\ No newline at end of file
+    state: syndlogo19
diff --git a/Resources/Prototypes/Decals/wood_trim_thin.yml b/Resources/Prototypes/Decals/wood_trim_thin.yml
index 9e3084f38d..d3822a0b11 100644
--- a/Resources/Prototypes/Decals/wood_trim_thin.yml
+++ b/Resources/Prototypes/Decals/wood_trim_thin.yml
@@ -1,4 +1,4 @@
-- type: decal
+- type: decal
   id: WoodTrimThinBox
   tags: ["station", "markings"]
   sprite:
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index 0927dfd470..93442055b4 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -287,7 +287,7 @@
 
 #Syndicate
 - type: entity
-  parent: [ClothingBackpack, BaseSyndicateContraband]
+  parent: [ClothingBackpack] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingBackpackSyndicate
   name: syndicate backpack
   description:
diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
index 4c15bb4377..a644f8bab8 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -163,7 +163,7 @@
       sprite: Clothing/Back/Duffels/salvage.rsi
 
 - type: entity
-  parent: [ClothingBackpackDuffel, BaseSyndicateContraband]
+  parent: [ClothingBackpackDuffel] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingBackpackDuffelSyndicate
   name: syndicate duffel bag
   description: A large duffel bag for holding various traitor goods.
@@ -177,7 +177,7 @@
     - 0,0,8,4
 
 - type: entity
-  parent: [ ClothingBackpackDuffelSyndicate, BaseSyndicateContraband ]
+  parent: [ ClothingBackpackDuffelSyndicate ] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingBackpackDuffelSyndicateBundle
   abstract: true
   components:
diff --git a/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml b/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml
index 5df747a949..7ead6f09ca 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml
@@ -40,7 +40,7 @@
     state: icon
 
 - type: entity
-  parent: [ BaseSubfloorAnchorStorage, ClothingBackpackSatchel, BaseMinorContraband ]
+  parent: [ BaseSubfloorAnchorStorage, ClothingBackpackSatchel ] # Corvax-Contraband BaseMinorContraband
   id: ClothingBackpackSatchelSmugglerUnanchored
   name: smuggler's satchel
   suffix: Empty, Unanchored
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/job.yml b/Resources/Prototypes/Entities/Clothing/Belt/job.yml
index e9efc00427..4c39f13f3e 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/job.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/job.yml
@@ -421,7 +421,6 @@
       - MagazinePistol
       - MagazineMagnum
       - CombatKnife
-      - Truncheon
       - HandGrenade
       - Stunbaton
       components:
diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
index f27f6a6a15..e998fff261 100644
--- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: ClothingHeadset
   id: ClothingHeadsetAlt
diff --git a/Resources/Prototypes/Entities/Clothing/Ears/specific.yml b/Resources/Prototypes/Entities/Clothing/Ears/specific.yml
index 987c3f7340..cfdbfd0eb0 100644
--- a/Resources/Prototypes/Entities/Clothing/Ears/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/specific.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: [ClothingHeadsetGrey, BaseChameleon]
   id: ClothingHeadsetChameleon
   name: passenger headset
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 3ad37fe77f..beb4181846 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -860,7 +860,7 @@
     sprite: Clothing/Head/Hats/truckershat.rsi
 
 - type: entity
-  parent: [ ClothingHeadBase, BaseSyndicateContraband ]
+  parent: [ ClothingHeadBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingHeadPyjamaSyndicateBlack
   name: syndicate black pyjama hat
   description: For keeping that traitor head of yours warm.
@@ -876,7 +876,7 @@
       HeadSide : HEAD
 
 - type: entity
-  parent: [ ClothingHeadBase, BaseSyndicateContraband ]
+  parent: [ ClothingHeadBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingHeadPyjamaSyndicatePink
   name: syndicate pink pyjama hat
   description: For keeping that traitor head of yours warm.
@@ -892,7 +892,7 @@
       HeadSide : HEAD
 
 - type: entity
-  parent: [ ClothingHeadBase, BaseSyndicateContraband ]
+  parent: [ ClothingHeadBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingHeadPyjamaSyndicateRed
   name: syndicate red pyjama hat
   description: For keeping that traitor head of yours warm.
@@ -1096,7 +1096,7 @@
         Caustic: 0.95
 
 - type: entity
-  parent: [ClothingHeadBase, BaseSyndicateContraband]
+  parent: [ClothingHeadBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingHeadHatSyndie
   name: syndicate hat
   description: A souvenir hat from "Syndieland", their production has already been closed.
diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
index 79f3df6a8d..31a848ff06 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -219,7 +219,7 @@
     relayAccent: true
 
 - type: entity
-  parent: [ ClothingHeadBase, BaseSyndicateContraband ]
+  parent: [ ClothingHeadBase ] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingHeadHatCatEars
   name: cat ears
   description: "NYAH!"
diff --git a/Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml b/Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml
index dc55de0081..62ce6dc58b 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml
@@ -52,7 +52,7 @@
 # The helmet itself
 - type: entity
   parent: [BaseCorvaxContraband432DepartmentsCargoSecurity, ClothingHeadHelmetBase, BaseMajorContraband] # Corvax-Contraband
-  id: ClothingHeadHelmetScrap #When we get the tech for it this bad boy needs to be given a vision reduction when equipped. 1-2 tiles less than normal should be good.
+  id: ClothingHeadHelmetScrap
   name: scrap helmet
   description: A cobbled-together helmet made from cabling, steel, and a bucket.
   components:
@@ -83,3 +83,5 @@
   - type: Construction
     graph: scraphelmet
     node: scraphelmet
+  - type: ImageOverlay
+    pathToOverlayImage: "/Textures/Clothing/Head/Helmets/scrapHelmetOverlayTexture.png"
diff --git a/Resources/Prototypes/Entities/Clothing/Head/specific.yml b/Resources/Prototypes/Entities/Clothing/Head/specific.yml
index b25a7c4a5e..054c0775a4 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/specific.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: [ClothingHeadBase, BaseChameleon]
   id: ClothingHeadHatChameleon
   name: beret
diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding.yml b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
index 595b87ef74..fb2b679c77 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/welding.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
@@ -23,6 +23,9 @@
   - type: HideLayerClothing
     slots:
     - Snout
+  - type: ImageOverlay
+    pathToOverlayImage: "/Textures/Clothing/Head/Welding/weldingTexture.png"
+    additionalColorOverlay: "#000000A0"
 
 - type: entity
   parent: [BaseCorvaxContraband431DepartmentsEngineering, WeldingMaskBase] # Corvax-Contraband
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index cafbbe1794..2f4d748226 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -728,7 +728,7 @@
   - type: IdentityBlocker
 
 - type: entity
-  parent: ClothingMaskGas
+  parent: [ClothingMaskGas, WeldingMaskBase]
   id: ClothingMaskWeldingGas
   name: welding gas mask
   description: A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd.
@@ -738,17 +738,14 @@
     state: icon
   - type: Clothing
     sprite: Clothing/Mask/welding-gas.rsi
-  - type: FlashImmunity
-  - type: EyeProtection
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 200
-      Glass: 100
   - type: StaticPrice
     price: 100
   - type: Tag
     tags:
     - WhitelistChameleon
+  - type: ImageOverlay
+    pathToOverlayImage: "/Textures/Clothing/Head/Welding/weldingTexture.png"
+    additionalColorOverlay: "#00000050"
 
 # Entity tables
 - type: entityTable
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
index fe037a888f..85bfa47dbe 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
@@ -87,7 +87,7 @@
       sprite: Clothing/Neck/Scarfs/purple.rsi
 
 - type: entity
-  parent: [ ClothingScarfBase, BaseSyndicateContraband ]
+  parent: [ ClothingScarfBase ] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingNeckScarfStripedSyndieGreen
   name: striped syndicate green scarf
   description: A stylish striped syndicate green scarf. The perfect winter accessory for those with a keen fashion sense, and those who are in the mood to steal something.
@@ -100,7 +100,7 @@
       price: 500
 
 - type: entity
-  parent: [ ClothingScarfBase, BaseSyndicateContraband ]
+  parent: [ ClothingScarfBase ] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingNeckScarfStripedSyndieRed
   name: striped syndicate red scarf
   description: A stylish striped syndicate red scarf. The perfect winter accessory for those with a keen fashion sense, and those who are in the mood to steal something.
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
index 169a322dd4..0dc93da706 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: [ClothingOuterBase, TemperatureProtectionMinimal, AllowSuitStorageClothingGasTanks, BaseChameleon]
   id: ClothingOuterChameleon
   name: vest
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index 0a06ba3fa2..895fcb9cfa 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -756,7 +756,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterWarden
 
 - type: entity
-  parent: [ClothingOuterWinterCoatToggleable, BaseSyndicateContraband]
+  parent: [ClothingOuterWinterCoatToggleable] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingOuterWinterSyndieCap
   name: syndicate's winter coat
   description: "The syndicate's winter coat is made of durable fabric, with gilded patterns, and coarse wool."
@@ -795,7 +795,7 @@
 ##############################################################
 
 - type: entity
-  parent: [ClothingOuterWinterCoatToggleable, BaseSyndicateContraband]
+  parent: [ClothingOuterWinterCoatToggleable] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingOuterWinterSyndie
   name: syndicate's winter coat
   description: Insulated winter coat, looks like a merch from "Syndieland".
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
index 44027e7c9b..914166cf63 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
@@ -168,7 +168,7 @@
     sprite: Clothing/Shoes/Boots/winterbootssec.rsi
 
 - type: entity
-  parent: [ClothingShoesBaseWinterBoots, BaseSyndicateContraband]
+  parent: [ClothingShoesBaseWinterBoots] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingShoesBootsWinterSyndicate
   name: syndicate's winter boots
   description: Durable heavy boots, looks like merch from "Syndieland".
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/color.yml b/Resources/Prototypes/Entities/Clothing/Shoes/color.yml
index 16608aacc9..0508d111b7 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/color.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/color.yml
@@ -275,4 +275,4 @@
       shoes:
       - state: equipped-FEET
         color: "#9C0DE1"
-      - state: soles-equipped-FEET
\ No newline at end of file
+      - state: soles-equipped-FEET
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
index 55d86208c6..91d84a8fb3 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -88,7 +88,7 @@
     price: 3000
 
 - type: entity
-  parent: [ClothingShoesBootsMagBase, BaseJetpack, BaseSyndicateContraband]
+  parent: [ClothingShoesBootsMagBase, BaseJetpack] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingShoesBootsMagSyndie
   name: blood-red magboots
   description: Reverse-engineered from ERT magboots, they have a heavy magnetic pull and integrated thrusters. It can hold 0.75 L of gas.
@@ -128,12 +128,10 @@
     sprite: Clothing/Shoes/Boots/magboots-ert.rsi
 
 - type: entity
-  parent: BaseAction
+  parent: BaseToggleAction
   id: ActionToggleMagboots
   name: Toggle Magboots
   description: Toggles the magboots on and off.
   components:
   - type: Action
     itemIconStyle: BigItem
-  - type: InstantAction
-    event: !type:ToggleActionEvent
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/color.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/color.yml
index 1dfe5cb78a..95b408b512 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/color.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/color.yml
@@ -278,7 +278,7 @@
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtColorPink
   name: pink jumpskirt
-  description: Just looking at this makes you feel <i>fabulous</i>.
+  description: Just looking at this makes you feel [italic]fabulous[/italic].
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpskirts/Color/color.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/civilian.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/civilian.yml
index 27621afaff..9c3ff0831f 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/civilian.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/civilian.yml
@@ -13,7 +13,7 @@
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitKimono
   name: kimono
-  description: Traditional chinese clothing.
+  description: Traditional Japanese clothing.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuits/Civilian/kimono.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/color.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/color.yml
index 4e5278fa22..dddaeee91e 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/color.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/color.yml
@@ -278,7 +278,7 @@
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitColorPink
   name: pink jumpsuit
-  description: Just looking at this makes you feel <i>fabulous</i>.
+  description: Just looking at this makes you feel [italic]fabulous[/italic].
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuits/Color/color.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/ship_vs_ship.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/ship_vs_ship.yml
index 406faaacbc..5b148e55f2 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/ship_vs_ship.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/ship_vs_ship.yml
@@ -15,7 +15,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/ShipVsShip/recruit_nt.rsi
 
 - type: entity
-  parent: [ ClothingUniformBase, BaseSyndicateContraband ]
+  parent: [ ClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingUniformJumpsuitRecruitSyndie
   name: syndicate recruit jumpsuit
   description: A dubious, dark-grey jumpsuit. As if passengers weren't dubious enough already.
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/special.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/special.yml
index 370ad2fed6..a9e5ad9547 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/special.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/special.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: [UnsensoredClothingUniformBase, BaseSyndicateContraband]
+  parent: [UnsensoredClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingUniformJumpsuitPyjamaSyndicateBlack
   name: black syndicate pyjamas
   description: For those long nights in perma.
@@ -10,7 +10,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Special/pyjamasyndicateblack.rsi
 
 - type: entity
-  parent: [UnsensoredClothingUniformBase, BaseSyndicateContraband]
+  parent: [UnsensoredClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingUniformJumpsuitPyjamaSyndicatePink
   name: pink syndicate pyjamas
   description: For those long nights in perma.
@@ -21,7 +21,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Special/pyjamasyndicatepink.rsi
 
 - type: entity
-  parent: [UnsensoredClothingUniformBase, BaseSyndicateContraband]
+  parent: [UnsensoredClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingUniformJumpsuitPyjamaSyndicateRed
   name: red syndicate pyjamas
   description: For those long nights in perma.
@@ -32,7 +32,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Special/pyjamasyndicatered.rsi
 
 - type: entity
-  parent: [UnsensoredClothingUniformBase, BaseSyndicateContraband]
+  parent: [UnsensoredClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingUniformJumpsuitOperative
   name: operative jumpsuit
   description: Uniform for elite syndicate operatives performing tactical operations in deep space.
@@ -95,7 +95,7 @@
     relayAccent: true
 
 - type: entity
-  parent: [ClothingUniformBase, BaseSyndicateContraband]
+  parent: [ClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingUniformJumpsuitSyndieFormal
   name: syndicate formal suit
   description: "The syndicate's uniform is made in an elegant style, it's even a pity to do dirty tricks in this."
diff --git a/Resources/Prototypes/Entities/Debugging/item.yml b/Resources/Prototypes/Entities/Debugging/item.yml
index 5e74412fe9..3643b15010 100644
--- a/Resources/Prototypes/Entities/Debugging/item.yml
+++ b/Resources/Prototypes/Entities/Debugging/item.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseItem
   id: DebugItemShapeWeird
   name: weirdly shaped item
diff --git a/Resources/Prototypes/Entities/Debugging/options_visualizer.yml b/Resources/Prototypes/Entities/Debugging/options_visualizer.yml
index c2b51c8a5a..83e3bf5512 100644
--- a/Resources/Prototypes/Entities/Debugging/options_visualizer.yml
+++ b/Resources/Prototypes/Entities/Debugging/options_visualizer.yml
@@ -1,5 +1,6 @@
-- type: entity
+- type: entity
   id: OptionsVisualizerTest
+  name: OptionsVisualizerTest
   suffix: DEBUG
   components:
   - type: Sprite
@@ -18,4 +19,3 @@
         data: { state: motion }
       - options: [Test, ReducedMotion]
         data: { state: both }
-
diff --git a/Resources/Prototypes/Entities/Effects/acidifier.yml b/Resources/Prototypes/Entities/Effects/acidifier.yml
index bc2fc3c4c3..a3b2e9de0f 100644
--- a/Resources/Prototypes/Entities/Effects/acidifier.yml
+++ b/Resources/Prototypes/Entities/Effects/acidifier.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: Acidifier
   name: acid
   description: Melts you into a puddle of yuck!
diff --git a/Resources/Prototypes/Entities/Effects/bluespace_flash.yml b/Resources/Prototypes/Entities/Effects/bluespace_flash.yml
index 42cdfbd297..d9b407da1f 100644
--- a/Resources/Prototypes/Entities/Effects/bluespace_flash.yml
+++ b/Resources/Prototypes/Entities/Effects/bluespace_flash.yml
@@ -10,4 +10,4 @@
     lifetime: 1
   - type: EmitSoundOnSpawn
     sound: 
-      path: /Audio/Effects/Lightning/lightningbolt.ogg
\ No newline at end of file
+      path: /Audio/Effects/Lightning/lightningbolt.ogg
diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
index 3a61e5fcd2..561720085a 100644
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -193,6 +193,7 @@
   - type: Transform
     anchored: true
   - type: Airtight
+    noAirWhenFullyAirBlocked: false
   - type: ReplaceFloorOnSpawn
     replaceableTiles:
     - Plating
diff --git a/Resources/Prototypes/Entities/Effects/desynchronizer_effecs.yml b/Resources/Prototypes/Entities/Effects/desynchronizer_effecs.yml
index 6bede2fa8d..7a1c40a520 100644
--- a/Resources/Prototypes/Entities/Effects/desynchronizer_effecs.yml
+++ b/Resources/Prototypes/Entities/Effects/desynchronizer_effecs.yml
@@ -16,4 +16,4 @@
     lifetime: 0.8
   - type: Tag
     tags:
-    - HideContextMenu
\ No newline at end of file
+    - HideContextMenu
diff --git a/Resources/Prototypes/Entities/Effects/eldritch.yml b/Resources/Prototypes/Entities/Effects/eldritch.yml
index 196fe288e7..0ea5b349ee 100644
--- a/Resources/Prototypes/Entities/Effects/eldritch.yml
+++ b/Resources/Prototypes/Entities/Effects/eldritch.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: EffectVoidBlink
   name: void blink
   categories: [ HideSpawnMenu ]
diff --git a/Resources/Prototypes/Entities/Effects/exclamation.yml b/Resources/Prototypes/Entities/Effects/exclamation.yml
index d1f3e3ad06..9a2335866d 100644
--- a/Resources/Prototypes/Entities/Effects/exclamation.yml
+++ b/Resources/Prototypes/Entities/Effects/exclamation.yml
@@ -36,4 +36,4 @@
       lifetime: 0.8
     - type: Tag
       tags:
-        - HideContextMenu
\ No newline at end of file
+        - HideContextMenu
diff --git a/Resources/Prototypes/Entities/Effects/hearts.yml b/Resources/Prototypes/Entities/Effects/hearts.yml
index 18f72c95d4..ec2ed05a9f 100644
--- a/Resources/Prototypes/Entities/Effects/hearts.yml
+++ b/Resources/Prototypes/Entities/Effects/hearts.yml
@@ -13,4 +13,4 @@
   - type: Tag
     tags:
       - HideContextMenu
-  - type: AnimationPlayer
\ No newline at end of file
+  - type: AnimationPlayer
diff --git a/Resources/Prototypes/Entities/Effects/lightning.yml b/Resources/Prototypes/Entities/Effects/lightning.yml
index 3d8135bf23..cfccb5456a 100644
--- a/Resources/Prototypes/Entities/Effects/lightning.yml
+++ b/Resources/Prototypes/Entities/Effects/lightning.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: lightning
   id: BaseLightning
   abstract: true
diff --git a/Resources/Prototypes/Entities/Effects/portal.yml b/Resources/Prototypes/Entities/Effects/portal.yml
index 14df3d48da..7a5da19537 100644
--- a/Resources/Prototypes/Entities/Effects/portal.yml
+++ b/Resources/Prototypes/Entities/Effects/portal.yml
@@ -1,4 +1,4 @@
-# Standing portals
+# Standing portals
 - type: entity
   abstract: true
   id: BasePortal
diff --git a/Resources/Prototypes/Entities/Effects/rcd.yml b/Resources/Prototypes/Entities/Effects/rcd.yml
index a663add9ca..05629eed43 100644
--- a/Resources/Prototypes/Entities/Effects/rcd.yml
+++ b/Resources/Prototypes/Entities/Effects/rcd.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: EffectRCDBase
   abstract: true
   categories: [ HideSpawnMenu ]
@@ -112,4 +112,4 @@
   - type: Sprite
     state: deconstruct8
   - type: TimedDespawn
-    lifetime: 9.2
\ No newline at end of file
+    lifetime: 9.2
diff --git a/Resources/Prototypes/Entities/Effects/sparks.yml b/Resources/Prototypes/Entities/Effects/sparks.yml
index c12e3b0eca..5a89fbfbdc 100644
--- a/Resources/Prototypes/Entities/Effects/sparks.yml
+++ b/Resources/Prototypes/Entities/Effects/sparks.yml
@@ -41,4 +41,4 @@
     sound: 
       path: /Audio/Effects/tesla_consume.ogg
       params:
-        variation: 0.3
\ No newline at end of file
+        variation: 0.3
diff --git a/Resources/Prototypes/Entities/Effects/wallspawn.yml b/Resources/Prototypes/Entities/Effects/wallspawn.yml
index 155ef10bb5..9e7d66171a 100644
--- a/Resources/Prototypes/Entities/Effects/wallspawn.yml
+++ b/Resources/Prototypes/Entities/Effects/wallspawn.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: WallSpawnAsteroid
   categories: [ HideSpawnMenu ]
   components:
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml
index 375acc8268..3bcd2095f3 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: AI Timed Spawner
   id: AITimedSpawner
   parent: MarkerBase
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/wizard.yml b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/wizard.yml
index bf7dc4e632..641da624ad 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/wizard.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/wizard.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: SpawnPointWizard
   parent: MarkerBase
   name: wizard
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/security.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/security.yml
index f5585a5e32..b9699336fc 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/security.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/security.yml
@@ -145,4 +145,4 @@
         - ClothingOuterArmorRiot
         - ClothingOuterArmorBulletproof
       chance: 0.95
-      offset: 0.0
\ No newline at end of file
+      offset: 0.0
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
index e7471138a0..ead8e40134 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: RandomAnomalySpawner
   name: random anomaly spawner
   parent: MarkerBase
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/artifacts.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/artifacts.yml
index faf230817b..69965d468b 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/artifacts.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/artifacts.yml
@@ -1,4 +1,4 @@
-- type: entityTable
+- type: entityTable
   id: RandomArtifactTable
   table: !type:GroupSelector
     children:
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/techboard.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/techboard.yml
index 636f457d6b..58475db543 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/techboard.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/techboard.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: RandomBoard
   name: random board spawner
   parent: MarkerBase
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
index 890d21b597..d5ae09cdc4 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -195,6 +195,26 @@
     - sprite: Objects/Weapons/Melee/energykatana.rsi
       state: icon
 
+- type: entity
+  categories: [ HideSpawnMenu, Spawner ]
+  parent: BaseAntagSpawner
+  id: SpawnPointGhostSpaceChangeling
+  components:
+  - type: GhostRole
+    name: ghost-role-information-space-changeling-name
+    description: ghost-role-information-space-changeling-description
+    rules: ghost-role-information-antagonist-rules
+    mindRoles:
+    - MindRoleChangeling
+    raffle:
+      settings: default
+  - type: Sprite
+    sprite: Markers/jobs.rsi
+    layers:
+    - state: green
+    - sprite: Objects/Weapons/Melee/armblade.rsi
+      state: icon
+
 - type: entity
   categories: [ HideSpawnMenu, Spawner ]
   parent: BaseAntagSpawner
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/human.yml b/Resources/Prototypes/Entities/Markers/Spawners/human.yml
index a6be9feb2b..7287534e57 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/human.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/human.yml
@@ -32,4 +32,4 @@
   components:
   - type: ConditionalSpawner
     prototypes:
-    - MobSyndicateFootsoldierPilot
\ No newline at end of file
+    - MobSyndicateFootsoldierPilot
diff --git a/Resources/Prototypes/Entities/Markers/hover_entity.yml b/Resources/Prototypes/Entities/Markers/hover_entity.yml
index 2e8e1edb29..df1dc49fb2 100644
--- a/Resources/Prototypes/Entities/Markers/hover_entity.yml
+++ b/Resources/Prototypes/Entities/Markers/hover_entity.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: hover entity
   id: hoverentity
   categories: [ HideSpawnMenu ]
diff --git a/Resources/Prototypes/Entities/Markers/map_text.yml b/Resources/Prototypes/Entities/Markers/map_text.yml
index e8496138ac..fbb1c7b0f3 100644
--- a/Resources/Prototypes/Entities/Markers/map_text.yml
+++ b/Resources/Prototypes/Entities/Markers/map_text.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: MapText
   parent: MarkerBase
   name: map text
diff --git a/Resources/Prototypes/Entities/Markers/pointing.yml b/Resources/Prototypes/Entities/Markers/pointing.yml
index 7c07405c7d..6c043a762d 100644
--- a/Resources/Prototypes/Entities/Markers/pointing.yml
+++ b/Resources/Prototypes/Entities/Markers/pointing.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: pointing arrow
   id: PointingArrow
   save: false
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_chest.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_chest.yml
index a27145b08f..585caf8627 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_chest.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_chest.yml
@@ -21,4 +21,4 @@
   groupWhitelist: [ Vulpkanin ]
   sprites:
     - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
-      state: belly_fox
\ No newline at end of file
+      state: belly_fox
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
index a53fa13674..b87a46e430 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
@@ -201,4 +201,4 @@
   forcedColoring: true
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
-    state: eyeshadow_lower
\ No newline at end of file
+    state: eyeshadow_lower
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml
index e1de3807c1..b07e164bcd 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml
@@ -288,4 +288,4 @@
   sprites:
   - sprite: Mobs/Customization/undergarments.rsi
     state: tanktop_vulpkanin
-    
\ No newline at end of file
+    
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
index fd9b361324..ab8cca5e9f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   save: false
   parent: [ BaseSimpleMob, BaseMobAnimal, MobCombat, MobBloodstream, BaseMobDestructible ]
   id: BaseMobArgocyte
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
index 7fe28d1c0c..05f4c973aa 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: [ SimpleSpaceMobBase, FlyingMobBase, MobCombat, BaseSlicingRefinable, BaseMobDestructible ]
+  parent: [ SimpleSpaceMobBase, FlyingMobBase, MobCombat, BaseSlicingRefinable, BaseMobIrradiated ]
   id: BaseMobBehonker
   name: behonker
   description: A floating demon aspect of the honkmother.
@@ -86,6 +86,13 @@
     thresholds:
       0: Alive
       500: Dead
+  - type: Destructible
+    thresholds:
+    - trigger: !type:DamageTypeTrigger
+        damageType: Blunt
+        damage: 600
+      behaviors:
+      - !type:GibBehavior
   - type: Metabolizer
     solutionOnBody: false
     updateInterval: 0.25
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/flying_animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/flying_animals.yml
index 0347d394b7..bbf403381e 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/flying_animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/flying_animals.yml
@@ -1,4 +1,4 @@
-# Used for entities that are considered flying,
+# Used for entities that are considered flying,
 # i.e. shouldnt slip, have free movement in weightlesness, and should go over chasms/lava
 - type: entity
   id: FlyingMobBase
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml b/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml
index 1b2902ab3c..ec4f21dff7 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: watcher
   id: MobWatcherBase
   parent: [ SimpleSpaceMobBase, FlyingMobBase, BaseSlicingRefinable, BaseMobDestructible ]
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml b/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
index e3b6267bf6..ef6f0b213b 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
@@ -1,4 +1,4 @@
-# Defines the scurret, a small, agile sapient species intended for players who want to play as something similar to an ewok.
+# Defines the scurret, a small, agile sapient species intended for players who want to play as something similar to an ewok.
 # Although based on MobBaseAncestor, this species does not have a "developed" playable species it is an ancestor to.
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml b/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
index f08fe36544..3211f1a68c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
@@ -64,4 +64,4 @@
       gender: epicene
   - type: Tag
     tags:
-    - VimPilot
\ No newline at end of file
+    - VimPilot
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index 152af34eb3..385c96b263 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: basic slime
   id: BaseMobAdultSlimes
   parent: [ BaseMobSlimes, SimpleMobBase, MobCombat, BaseSlicingRefinable, MobNightVision, BaseMobDestructible ]
diff --git a/Resources/Prototypes/Entities/Mobs/Player/changeling.yml b/Resources/Prototypes/Entities/Mobs/Player/changeling.yml
index 5f2c5d5a2b..1b58e623ba 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/changeling.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/changeling.yml
@@ -24,18 +24,15 @@
         prototype: ChemicalsChangeling
   - type: Store
     balance:
-      ChangelingDNA: 60
+      ChangelingDNA: 50
 
 - type: entity
   parent:
-  - MobRespirator
-  - MobAtmosStandard
   - SimpleSpaceMobBase
   - MobNightVision
   - BaseMobDestructible
-  id: MobHeadSlug
-  name: headslug
-  description: A small, slug-like creature with a large, gaping maw. It's covered in a thick, slimy mucus.
+  id: MobHeadSlugBase
+  abstract: true
   components:
   - type: Fixtures
     fixtures:
@@ -43,11 +40,55 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.2
-        density: 15
+        density: 100
         mask:
         - SmallMobMask
         layer:
         - SmallMobLayer
+  - type: Deathgasp
+  - type: MobStateActions
+    actions:
+      Critical:
+      - ActionCritSuccumb
+      - ActionCritFakeDeath
+      - ActionCritLastWords
+  - type: ReplacementAccent
+    accent: genericAggressive
+  - type: MovementSpeedModifier # Slightly faster than regular mobs
+    baseWalkSpeed: 3
+    baseSprintSpeed: 5
+  - type: MeleeWeapon
+    animation: WeaponArcBite
+    altDisarm: false
+    soundHit:
+      path: /Audio/Effects/bite.ogg
+    damage:
+      types:
+        Slash: 2.5
+        Piercing: 2.5
+        Structural: 6 # to destroy lockers in which bodies could be hidden
+  - type: Speech # need these speech comps because it isnt targeted by MakeSentient.
+    speechVerb: LargeMob
+  - type: Emoting
+  - type: ActionGrant
+    actions:
+    - ActionChangelingStasisWeak
+  - type: ChangelingSlug
+  - type: Puller
+    needsHands: false
+  - type: Tag # Removes DoorBumpOpener
+    tags:
+      [ ]
+
+- type: entity
+  parent:
+  - MobHeadSlugBase
+  - MobRespirator
+  - MobAtmosStandard
+  id: MobHeadSlug
+  name: headslug
+  description: A small, slug-like creature with a large, gaping maw. It's covered in a thick, slimy mucus.
+  components:
   - type: Sprite
     drawdepth: SmallMobs
     layers:
@@ -62,13 +103,6 @@
         Base: slug_dead
       Dead:
         Base: slug_dead
-  - type: Deathgasp
-  - type: MobStateActions
-    actions:
-      Critical:
-      - ActionCritSuccumb
-      - ActionCritFakeDeath
-      - ActionCritLastWords
   - type: MobThresholds
     thresholds:
       0: Alive
@@ -85,24 +119,56 @@
     damage:
       types:
         Blunt: 0.1
-  - type: MovementSpeedModifier # Slightly faster than regular mobs
-    baseWalkSpeed: 3
-    baseSprintSpeed: 5
+  - type: InteractionPopup
+    successChance: 0.2
+    interactSuccessString: petting-success-headslug
+    interactFailureString: petting-failure-headslug
+    interactSuccessSpawn: EffectHearts
+    interactSuccessSound:
+      path: /Audio/Effects/Fluids/blood1.ogg
+
+- type: entity
+  parent:
+  - MobHeadSlugBase
+  - FlyingMobBase # its space faring because it spawns from space
+  id: MobHeadSlugElder
+  name: elder headslug
+  description: After living a few years, headslugs develop into this state and gain space faring abilities as a part of the changeling's reproduction cycle.
+  components:
+  - type: Sprite
+    drawdepth: SmallMobs
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: slug_elder
+      sprite: Mobs/Animals/headslug.rsi
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: slug_elder
+      Critical:
+        Base: slug_elder_dead
+      Dead:
+        Base: slug_elder_dead
+  - type: ExplosionResistance # since it spawns in a bang
+    damageCoefficient: 0.1
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      50: Critical
+      75: Dead
   - type: MeleeWeapon
-    altDisarm: false
     damage:
       types:
-        Blunt: 5
-        Structural: 15 # to destroy lockers in which bodies could be hidden
-  - type: ChangelingSlug
-  - type: ActionGrant
-    actions:
-    - ActionChangelingStasisWeak
-  - type: ReplacementAccent
-    accent: genericAggressive
-  - type: Tag # Removes DoorBumpOpener
-    tags:
-      []
+        Slash: 7.5
+        Piercing: 7.5
+        Structural: 6 # to destroy lockers in which bodies could be hidden
+  - type: InteractionPopup
+    successChance: 0.01
+    interactSuccessString: petting-success-elder-headslug
+    interactFailureString: petting-failure-elder-headslug
+    interactSuccessSpawn: EffectHearts
+    interactSuccessSound:
+      path: /Audio/Animals/cat_meow.ogg # meow
 
 - type: entity # dummy prototype for the store listing
   id: ChangelingFleshClothingAbilityStoreDummy
diff --git a/Resources/Prototypes/Entities/Mobs/Player/clone.yml b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
index f08aa6f675..28ff697526 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/clone.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
@@ -193,6 +193,7 @@
   - PlantTraitLigneous
   - PlantTraitScream
   - PlantTraitUnviable
+  - PlantTraitSeedless
 
 # for plant lifecycle clones
 - type: cloningSettings
@@ -201,6 +202,5 @@
   components:
   # traits
   - PlantTraitSampled
-  - PlantTraitSeedless
   eventComponents:
   - PlantHolder
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index a1b5a5c3c4..c1c811716b 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ SimpleSpaceMobBase, FlyingMobBase, BaseSlicingRefinable, MobNightVision, BaseMobDestructible ]
+  parent: [ SimpleSpaceMobBase, FlyingMobBase, BaseSlicingRefinable, MobNightVision, BaseMobIrradiated ]
   id: BaseMobDragon
   suffix: ""
   name: space dragon
@@ -66,6 +66,7 @@
         BaseUnshaded: alive-unshaded
       Critical:
         Base: crit
+        BaseUnshaded: crit-unshaded
       Dead:
         Base: dead
         BaseUnshaded: dead-unshaded
@@ -93,6 +94,13 @@
       0: Alive
       450: Critical
       500: Dead
+  - type: Destructible
+    thresholds:
+    - trigger: !type:DamageTypeTrigger
+        damageType: Blunt
+        damage: 600
+      behaviors:
+      - !type:GibBehavior
   - type: SlowOnDamage
     speedModifierThresholds:
       250: 0.7
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index 8c7b225feb..a5cd77e321 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -97,7 +97,7 @@
       damage:
         types:
           Blunt: 20
-          Structural: 8 # Activate Star Platinum's signature move: Digging a hole
+          Structural: 9 # Activate Star Platinum's signature move: Digging a hole
     - type: MeleeSpeech
     - type: UserInterface
       interfaces:
diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
index 98b6f5b2a4..eed0b858e0 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -21,6 +21,7 @@
   id: EventHumanoidCentcomm
   parent: EventHumanoidMindShielded
   randomizeName: false
+  speciesBlacklist: ["Diona", "Vox", "Moth", "Arachnid", "Dwarf", "Vulpkanin", "Tajaran"] # Corvax-MRP
   components:
   - type: AutoImplant
     implants:
@@ -49,7 +50,7 @@
   id: DeathSquad
   parent: EventHumanoidCentcomm
   randomizeName: false
-  speciesBlacklist: ['Diona'] # Corvax-MRP
+  speciesBlacklist: ["Diona", "Vox", "Moth", "Arachnid", "Dwarf", "Vulpkanin", "Tajaran", "SlimePerson", "Ipc", "Reptilian"] # Corvax-MRP
   components:
     - type: GhostRole
       name: ghost-role-information-Death-Squad-name
@@ -332,8 +333,6 @@
 
 - type: randomHumanoidSettings
   id: ERTSecurity
-  speciesBlacklist: # Corvax-MRP
-    - Diona
   parent: ERTLeader
   components:
     - type: GhostRole
@@ -548,8 +547,6 @@
       settings: CBURNAgent
 
 - type: randomHumanoidSettings
-  speciesBlacklist: # Corvax-MRP
-    - Diona
   id: CBURNAgent
   parent: EventHumanoidCentcomm
   components:
diff --git a/Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml b/Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml
index fbc0b1943c..8a3ac6cc8b 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: jaunt
   parent: [Incorporeal, BaseMob]
   id: BaseMobJaunt
diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
index cdc2ed055d..9981547969 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -76,6 +76,10 @@
     drawFov: false
   - type: Input
     context: "ghost"
+  - type: Speech
+  - type: Emoting
+  - type: TypingIndicator
+    proto: defaultUnshaded
   - type: Examiner
     skipChecks: true
   - type: Ghost
diff --git a/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml b/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml
index 3e6da21c02..92cd265510 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: MobObserverBase
   id: ReplayObserver
   categories: [ HideSpawnMenu ]
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index ff7cda19d9..c2c5112323 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -1,4 +1,4 @@
-# Be careful with these as they get removed on shutdown too!
+# Be careful with these as they get removed on shutdown too!
 - type: entity
   id: AiHeld
   description: Components added / removed from an entity that gets inserted into an AI core.
diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index 98d25ef3cf..180c042ee6 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -113,9 +113,33 @@
   - type: GhostOnMove
     mustBeDead: true
 
+# Used for mobs that apply the popup and vomit from radiation
+- type: entity
+  abstract: true
+  id: BaseMobIrradiated
+  components:
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Radiation
+        damage: 15
+      behaviors:
+      - !type:PopupBehavior
+        popup: mouth-taste-metal
+        popupType: LargeCaution
+        targetOnly: true
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Radiation
+        damage: 40
+      behaviors:
+      - !type:VomitBehavior
+
 # Used as a simple default for mob destruction
 - type: entity
   abstract: true
+  parent: BaseMobIrradiated
   id: BaseMobDestructible
   components:
   - type: Destructible
@@ -141,21 +165,6 @@
       - !type:PlaySoundBehavior
         sound:
           collection: MeatLaserImpact
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Radiation
-        damage: 15
-      behaviors:
-      - !type:PopupBehavior
-        popup: mouth-taste-metal
-        popupType: LargeCaution
-        targetOnly: true
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Radiation
-        damage: 40
-      behaviors:
-      - !type:VomitBehavior
 
 # Used for mobs that can enter combat mode and can attack.
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
index d814565ab1..eef476032d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
@@ -1955,21 +1955,6 @@
     sprite: Objects/Consumable/Drinks/vodkatonicglass.rsi
     state: icon
 
-- type: entity
-  parent: DrinkGlass
-  id: DrinkWaterJug
-  name: water jug
-  description: Stay hydrated.
-  components:
-  - type: Solution
-    solution:
-        reagents:
-        - ReagentId: Water
-          Quantity: 30
-  - type: Icon
-    sprite: Objects/Consumable/Drinks/water.rsi
-    state: icon
-
 - type: entity
   parent: DrinkGlass
   id: DrinkWatermelonJuice
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index 42f9c4ac58..afe7a99e88 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -1,4 +1,4 @@
-# Donut
+# Donut
 
 # There is a newer, better version of the donutbox from tgstation included in the
 # donut.rsi. The reason it isn't implemented is it requires a StackVisuals offsetting
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
index ab3a1f1aff..4b440ff51a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
@@ -204,7 +204,7 @@
 # Tastes like bun, bacon.
 
 - type: entity
-  parent: FoodBurgerBase
+  parent: [ FoodBurgerBase, BaseSportsBall ]
   id: FoodBurgerBaseball
   name: baseball burger
   description: It's still warm. The steam coming off of it smells kinda sweaty.
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
index f111364226..cb14b000cf 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
@@ -1,4 +1,4 @@
-# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_snack.yml
+# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_snack.yml
 # Base
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 2b1ea5f4da..61ab9885e0 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -340,8 +340,7 @@
     trash:
     - TrashBananaPeel
   - type: ToolRefinable
-    refineResult:
-    - id: TrashBananaPeel
+    refineResult: [] # Spawns trash on refine
   - type: Solution
     solution:
       reagents:
@@ -385,8 +384,7 @@
     trash:
     - TrashMimanaPeel
   - type: ToolRefinable
-    refineResult:
-    - id: TrashMimanaPeel
+    refineResult: [] # Spawns trash on refine
   - type: Solution
     solution:
       reagents:
@@ -1188,8 +1186,7 @@
     trash:
     - FoodCornTrash
   - type: ToolRefinable
-    refineResult:
-    - id: FoodCornTrash #no idea why you'd ever do this, but it's just here for consistency
+    refineResult: [] # Spawns trash on refine
   - type: Solution
     solution:
       reagents:
@@ -1731,7 +1728,7 @@
   - type: Tag
     tags:
     - Galaxythistle
-    - Fruit # Probably?
+    - Flower
   - type: FoodSequenceElement
     entries:
       Taco: Galaxythistle
@@ -1865,8 +1862,7 @@
     trash:
     - WeaponRevolverPython
   - type: ToolRefinable
-    refineResult:
-    - id: WeaponRevolverPython
+    refineResult: [] # Spawns trash on refine
   - type: Tag
     tags:
     - Fruit # It's in the name
@@ -1903,8 +1899,7 @@
     trash:
     - RevolverCapGun
   - type: ToolRefinable
-    refineResult:
-    - id: RevolverCapGun
+    refineResult: [] # Spawns trash on refine
   - type: Tag
     tags:
     - Fruit
@@ -1925,8 +1920,7 @@
     trash:
     - RevolverCapGunFake
   - type: ToolRefinable
-    refineResult:
-    - id: RevolverCapGunFake
+    refineResult: [] # Spawns trash on refine
 
 - type: entity
   name: rice bushel
@@ -2335,8 +2329,7 @@
     trash:
     - FoodBungoPit
   - type: ToolRefinable
-    refineResult:
-    - id: FoodBungoPit
+    refineResult: [] # Spawns trash on refine
   - type: Solution
     solution:
       reagents:
@@ -2639,8 +2632,7 @@
     trash:
     - TrashCherryPit
   - type: ToolRefinable
-    refineResult:
-    - id: TrashCherryPit
+    refineResult: [] # Spawns trash on refine
   - type: Solution
     solution:
       maxVol: 15
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/mining.yml b/Resources/Prototypes/Entities/Objects/Decoration/mining.yml
index 636752b8cb..939cde8003 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/mining.yml
@@ -92,6 +92,8 @@
   name: wooden support
   description: Increases your confidence that a rock won't fall on your head.
   components:
+  - type: Sprite
+    state: support
   - type: Fixtures
     fixtures:
       fix1:
@@ -108,6 +110,7 @@
   parent: BaseWoodenSupport
   id: WoodenSupportBeam
   name: wooden support beam
+  description: A pair of wooden beams, supportive without blocking your way.
   components:
   - type: Sprite
     state: support_beams
@@ -148,6 +151,8 @@
 - type: entity
   parent: BaseWoodenSupport
   id: WoodenSupportWallBroken
+  name: broken wooden support wall
+  description: A broken, no good, lousy old rotten wall.
   components:
   - type: Wall
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml
index f1b03f97c2..7952a1506e 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: MachineParticleAcceleratorEndCapCircuitboard
   parent: BaseMachineCircuitboard
   name: PA end cap board
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 6992f0d97c..e305e63546 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: AutolatheMachineCircuitboard
   parent: BaseMachineCircuitboard
   name: autolathe machine board
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index d90ce32e12..2c2608635a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseItem
   id: BaseComputerCircuitboard
   name: computer board
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/law_boards.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/law_boards.yml
index 7e3fe20167..8af4398f57 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/law_boards.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/law_boards.yml
@@ -23,7 +23,7 @@
     laws: NTDefault
 
 - type: entity
-  id: AsimovCircuitBoard
+  id: CrewsimovCircuitBoard
   parent: BaseSiliconLawboard
   name: law board (Crewsimov)
   description: An electronics board containing the Crewsimov lawset.
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml
index 56d96b99d4..515b00f33f 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: BaseElectronics
   parent: BaseItem
   name: base electronics
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml
index 4638b44d48..f93f90d6f5 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: MailingUnitElectronics
   parent: BaseElectronics
   name: mailing unit electronics
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml
index ff576ad285..054b32dc9d 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: FirelockElectronics
   parent: BaseElectronics
   name: firelock electronics
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml
index c1ef5f497f..51f8cf06ee 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml
@@ -1,4 +1,4 @@
-# APC
+# APC
 - type: entity
   id: APCElectronics
   parent: BaseElectronics
diff --git a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
index 5a8cddc586..e90bcb556b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseItem
   id: BasePDACartridge
   abstract: true
diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
index 2e57d14491..113da8045d 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
@@ -207,7 +207,7 @@
     - EncryptionSecurity
 
 - type: entity
-  parent: [ EncryptionKey, BaseCivilianContraband ]
+  parent: [ EncryptionKey, BaseServiceContraband ]
   id: EncryptionKeyService
   name: service encryption key
   description: An encryption key used by the service staff, tasked with keeping the station full, happy and clean.
diff --git a/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml
index facae1c93f..606ed84016 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: HandTeleporter
   parent: [BaseItem, BaseGrandTheftContraband]
   name: hand teleporter
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 542900554f..4c550b7c17 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -1154,9 +1154,18 @@
   - type: Icon
     state: pda-clear
 
+- type: entity
+  parent: ClearPDA
+  id: PrisonerPDA # This mostly just exists for the sake of the chameleon UI giving a clear PDA with a prisoner ID
+  suffix: Prisoner
+  components:
+  - type: Pda
+    id: PrisonerIDCard
+
 - type: entity
   parent: ClearPDA
   id: VisitorPDA
+  suffix: Visitor
   components:
   - type: Pda
     id: VisitorIDCard
@@ -1165,7 +1174,7 @@
     - DoorBumpOpener
 
 - type: entity
-  parent: [ BasePDA, BaseSyndicateContraband ]
+  parent: [ BasePDA ] # Corvax-Contraband BaseSyndicateContraband
   id: SyndiPDA
   name: syndicate PDA
   description: Ok, time to be a productive member of- oh cool I'm a bad guy time to kill people!
@@ -1790,6 +1799,7 @@
 - type: entity
   parent: ClearPDA
   id: ScurretPDA
+  suffix: Scurret
   description: A temporary PDA granted to scurret temps. Doesn't do much. Wawa!
   components:
   - type: Pda
diff --git a/Resources/Prototypes/Entities/Objects/Devices/teleporters_chips.yml b/Resources/Prototypes/Entities/Objects/Devices/teleporters_chips.yml
index 3bcd5708c6..af1bec619d 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/teleporters_chips.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/teleporters_chips.yml
@@ -18,4 +18,4 @@
     tags:
     - FitInTeleporterConsole
   - type: UseDelay #Prevent link spamming
-    delay: 1.5
\ No newline at end of file
+    delay: 1.5
diff --git a/Resources/Prototypes/Entities/Objects/Devices/travel_camera.yml b/Resources/Prototypes/Entities/Objects/Devices/travel_camera.yml
index 5ec8b87ae0..e50147a76c 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/travel_camera.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/travel_camera.yml
@@ -39,13 +39,15 @@
   parent: BasePaper
   id: BasePhotograph
   name: photograph
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/photograph.rsi
 
 - type: entity
   parent: BasePhotograph
   id: PhotographBlack
   components:
   - type: Sprite
-    sprite: Objects/Misc/photograph.rsi
     layers:
     - state: black
 
@@ -54,7 +56,6 @@
   id: PhotographRed
   components:
   - type: Sprite
-    sprite: Objects/Misc/photograph.rsi
     layers:
     - state: red
 
@@ -63,7 +64,6 @@
   id: PhotographBlue
   components:
   - type: Sprite
-    sprite: Objects/Misc/photograph.rsi
     layers:
     - state: blue
 
@@ -72,7 +72,6 @@
   id: PhotographGreen
   components:
   - type: Sprite
-    sprite: Objects/Misc/photograph.rsi
     layers:
     - state: green
 
@@ -81,7 +80,6 @@
   id: PhotographYellow
   components:
   - type: Sprite
-    sprite: Objects/Misc/photograph.rsi
     layers:
     - state: yellow
 
@@ -90,7 +88,6 @@
   id: PhotographPurple
   components:
   - type: Sprite
-    sprite: Objects/Misc/photograph.rsi
     layers:
     - state: purple
 
@@ -99,7 +96,6 @@
   id: PhotographRainbow
   components:
   - type: Sprite
-    sprite: Objects/Misc/photograph.rsi
     layers:
     - state: rainbow
 
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml
index f38b78711d..0de77de232 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseHandheldInstrument
   id: BaseBrassInstrument
   abstract: true
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
index 9d63aa0c69..0469a01348 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseHandheldInstrument
   id: MusicalLungInstrument
   name: musical lung
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
index 654a491d88..f3a400eb3a 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseHandheldInstrument
   id: BasePercussionInstrument
   abstract: true
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
index cab8de8372..c9bf203f7f 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: piano
   parent: BasePlaceableInstrumentRotatable
   id: PianoInstrument
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
index 3e3518efed..f95ab343ea 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseHandheldInstrument
   id: BaseWoodwindInstrument
   abstract: true
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Plushies/plushielizard_jobs.yml b/Resources/Prototypes/Entities/Objects/Fun/Plushies/plushielizard_jobs.yml
index 7a67fbcb50..265d3a428e 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Plushies/plushielizard_jobs.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Plushies/plushielizard_jobs.yml
@@ -1,4 +1,4 @@
-# This base is created so we don't have to define the different sprite path for each plushie job.
+# This base is created so we don't have to define the different sprite path for each plushie job.
 - type: entity
   parent: PlushieLizard
   id: BasePlushieLizardJob
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Plushies/plushies.yml b/Resources/Prototypes/Entities/Objects/Fun/Plushies/plushies.yml
index 970ce0a2f6..562fb469a4 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Plushies/plushies.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Plushies/plushies.yml
@@ -1189,7 +1189,7 @@
     sprite: Objects/Fun/Plushies/sheep.rsi
     state: sheeptoy
   - type: Item
-    sprite: Objects/Fun/Plushies/carp.rsi
+    sprite: Objects/Fun/Plushies/sheep.rsi
     heldPrefix: sheeptoy
     storedRotation: -90
   - type: EmitSoundOnUse
@@ -1229,6 +1229,9 @@
   - type: Sprite
     sprite: Objects/Fun/Plushies/sheep.rsi
     state: spacesheeptoy
+  - type: Item
+    sprite: Objects/Fun/Plushies/sheep.rsi
+    heldPrefix: spacesheeptoy
   - type: FoodSequenceElement
     entries:
       CottonBurger: SheepSpacePlushie
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml
index 6a2793fedd..31c96d3279 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseBoardEntity
   id: ChessBoard
   name: chessboard
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml
index 6eb38c66b7..48b50eeaab 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml
@@ -1,4 +1,4 @@
-# When adding a new battlemap, also add it to id: AllBattlemapsTable
+# When adding a new battlemap, also add it to id: AllBattlemapsTable
 
 # Board item (given to players)
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Magic/books.yml b/Resources/Prototypes/Entities/Objects/Magic/books.yml
index 6dc8befd61..368821cb30 100644
--- a/Resources/Prototypes/Entities/Objects/Magic/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: BaseItem # Corvax-Contraband: do not inherit a marker for hidden properties.
   id: BaseSpellbook
diff --git a/Resources/Prototypes/Entities/Objects/Materials/base.yml b/Resources/Prototypes/Entities/Objects/Materials/base.yml
index 7fd3e93ed8..1f8dc4ff65 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/base.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/base.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: [SolutionCryo, SolutionCompositeNormalStackable, BaseItem, BaseItemDestructible]
   id: MaterialBase
diff --git a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
index acb253219f..22a3427a18 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
@@ -34,7 +34,7 @@
     size: Huge
 
 - type: entity
-  parent: [BriefcaseBase, BaseSyndicateContraband]
+  parent: [BriefcaseBase] # Corvax-Contraband BaseSyndicateContraband
   id: BriefcaseWeapon
   name: secure weapon case
   suffix: Gun, Empty
diff --git a/Resources/Prototypes/Entities/Objects/Misc/buffering.yml b/Resources/Prototypes/Entities/Objects/Misc/buffering.yml
index c97ffe89ed..c3744fa5ef 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/buffering.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/buffering.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: BufferingIcon
   categories: [ HideSpawnMenu ]
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/folders.yml b/Resources/Prototypes/Entities/Objects/Misc/folders.yml
index af896663ca..36900968df 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/folders.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/folders.yml
@@ -530,6 +530,10 @@
           - Write
   - type: CargoOrderConsole
     removeLimitAccess: [ "Quartermaster" ]
+  - type: DeviceLinkSource
+    range: 200
+    ports:
+    - OrderSender
   - type: ActivatableUI
     verbText: qm-clipboard-computer-verb-text
     key: enum.CargoConsoleUiKey.Orders
diff --git a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml
index 6df1a39dc8..4f1edfde1c 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml
@@ -23,7 +23,7 @@
     sprite: Objects/Misc/Handy_Flags/NT_handy_flag.rsi
 
 - type: entity
-  parent: [BaseItem, BaseSyndicateContraband]
+  parent: [BaseCorvaxContraband131, BaseItem] # Corvax-Contraband BaseSyndicateContraband
   id: SyndieHandyFlag
   name: syndicate handheld flag
   description: "For truly rebellious patriots. Death to NT!"
diff --git a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
index 99228f04c0..fe852dea10 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: StructureHealthMachineFlimsy
   id: BaseLandMine
diff --git a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
index 83bc2d1cec..3e3411a6fe 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: BaseStockPart
   name: stock part
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index 8aa322983a..f640ace13e 100644
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -220,7 +220,7 @@
   components:
   - type: LightBulb
     color: "#FFE4CE" # 5000K color temp
-    lightEnergy: 0.9 # Corvax после офф фулл респрайта стало с 0.8 на 1.6 - спорно
+    lightEnergy: 0.8
     lightRadius: 10
     lightSoftness: 1
     PowerUse: 25
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index 4b5672bcb5..715c6c57da 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -10,17 +10,14 @@
       state: riot-icon
     - type: Item
       sprite: Objects/Weapons/Melee/shields.rsi
-      size: Ginormous
-      shape:
-      - 0,0,4,5
       heldPrefix: riot
     - type: Blocking
       passiveBlockModifier:
         flatReductions:
-          Blunt: 10
-          Slash: 10
-          Piercing: 10
-          Heat: 10
+          Blunt: 6
+          Slash: 6
+          Piercing: 6
+          Heat: 6
     - type: Damageable
     - type: Injurable
       damageContainer: Shield
@@ -54,11 +51,42 @@
             max: 2
 
 - type: entity
-  name: base repairable shield
-  parent: BaseShield
-  id: BaseRepairableShield
-  description: A repairable shield!
   abstract: true
+  parent: BaseShield
+  id: BaseGinormousShield
+  components:
+  - type: Item
+    size: Ginormous
+    shape:
+    - 0,0,3,5
+  - type: HeldSpeedModifier
+    walkModifier: 0.9
+    sprintModifier: 0.9
+
+- type: entity
+  abstract: true
+  parent: BaseShield
+  id: BaseLargeShield
+  components:
+  - type: Item
+    size: Large
+    shape:
+    - 0,0,2,3
+
+- type: entity
+  abstract: true
+  parent: BaseLargeShield
+  id: BaseRoundShield
+  components:
+  - type: Item
+    shape:
+    - 0,0,2,2
+
+- type: entity
+  abstract: true
+  id: BaseRepairableShield
+  name: base repairable shield
+  description: A repairable shield!
   components:
   - type: Repairable # Negative values represent healing
     damage:
@@ -75,7 +103,7 @@
 
 - type: entity
   name: riot shield
-  parent: [ BaseRepairableShield, BaseShieldDestructible, BaseSecurityContraband ]
+  parent: [ BaseRepairableShield, BaseGinormousShield, BaseShieldDestructible, BaseSecurityContraband ]
   id: RiotShield
   description: A large tower shield. Good for controlling crowds.
   components:
@@ -84,14 +112,14 @@
     - type: Blocking
       passiveBlockModifier:
         flatReductions:
-          Blunt: 15
-          Slash: 15
-          Piercing: 5
-          Heat: 5
+          Blunt: 12
+          Slash: 9
+          Piercing: 3
+          Heat: 3
 
 - type: entity
   name: laser shield
-  parent: [ BaseRepairableShield, BaseShieldDestructible, BaseSecurityContraband ]
+  parent: [ BaseRepairableShield, BaseGinormousShield, BaseShieldDestructible, BaseSecurityContraband ]
   id: RiotLaserShield
   description: A shield built for withstanding lasers, but not much else.
   components:
@@ -102,14 +130,14 @@
     - type: Blocking
       passiveBlockModifier:
         flatReductions:
-          Blunt: 5
-          Slash: 10
-          Piercing: 5
-          Heat: 20
+          Blunt: 3
+          Slash: 6
+          Piercing: 3
+          Heat: 15
 
 - type: entity
   name: ballistic shield
-  parent: [ BaseRepairableShield, BaseShieldDestructible, BaseSecurityContraband ]
+  parent: [ BaseRepairableShield, BaseGinormousShield, BaseShieldDestructible, BaseSecurityContraband ]
   id: RiotBulletShield
   description: A shield built for protecting against ballistics, but not much else.
   components:
@@ -120,16 +148,16 @@
     - type: Blocking
       passiveBlockModifier:
         flatReductions:
-          Blunt: 10
-          Slash: 5
-          Piercing: 20
-          Heat: 5
+          Blunt: 6
+          Slash: 3
+          Piercing: 15
+          Heat: 3
 
 #Craftable shields
 
 - type: entity
   name: wooden buckler
-  parent: BaseShield
+  parent: BaseRoundShield
   id: WoodenBuckler
   description: A small round wooden makeshift shield.
   components:
@@ -137,13 +165,15 @@
       state: buckler-icon
     - type: Item
       heldPrefix: buckler
+      shape:
+      - 0,0,2,2
     - type: Blocking
       passiveBlockModifier:
         flatReductions:
-          Blunt: 5
-          Slash: 5
-          Piercing: 5
-          Heat: 5
+          Blunt: 6
+          Slash: 6
+          Piercing: 6
+          Heat: 3
     - type: Construction
       graph: WoodenBuckler
       node: woodenBuckler
@@ -151,7 +181,7 @@
       thresholds:
       - trigger:
           !type:DamageTrigger
-          damage: 75 #Weaker shield
+          damage: 50 #Weaker shield
         behaviors:
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
@@ -168,7 +198,7 @@
 
 - type: entity
   name: cardboard shield
-  parent: BaseShield
+  parent: BaseLargeShield
   id: CardShield
   description: A shield made of cardboard. Won't protect you from much.
   components:
@@ -206,7 +236,7 @@
 
 - type: entity
   name: makeshift shield
-  parent: BaseRepairableShield
+  parent: [ BaseRepairableShield, BaseGinormousShield ]
   id: MakeshiftShield
   description: A rundown looking shield, not good for much.
   components:
@@ -236,7 +266,7 @@
 
 - type: entity
   name: web shield
-  parent: BaseShield
+  parent: BaseLargeShield
   id: WebShield
   description: A stringy shield. It's weak, and doesn't seem to do well against heat.
   components:
@@ -249,7 +279,8 @@
     - type: Blocking
       passiveBlockModifier:
         flatReductions:
-          Blunt: 5
+          Blunt: 9
+          Heat: 6
           Piercing: 1 # Scar told me to.
     - type: Construction
       graph: WebObjects
@@ -275,7 +306,7 @@
 
 - type: entity
   name: clockwork shield
-  parent: [ BaseRepairableShield, BaseShieldDestructible ]
+  parent: [ BaseRepairableShield, BaseRoundShield, BaseShieldDestructible ]
   id: ClockworkShield
   description: Ratvar oyrffrf lbh jvgu uvf cebgrpgvba.
   components:
@@ -287,7 +318,7 @@
 
 - type: entity
   name: mirror shield
-  parent: [ BaseShield, BaseMagicalContraband ]
+  parent: [ BaseLargeShield, BaseMagicalContraband ]
   id: MirrorShield
   description: Eerily glows red... you hear the geometer whispering
   components:
@@ -304,10 +335,10 @@
         coefficients:
           Heat: 0.5
         flatReductions:
-          Blunt: 5
-          Slash: 10
-          Piercing: 5
-          Heat: 25
+          Blunt: 3
+          Slash: 6
+          Piercing: 3
+          Heat: 24
       blockSound: !type:SoundPathSpecifier
         path: /Audio/Effects/glass_step.ogg
     - type: Destructible
@@ -329,7 +360,7 @@
 
 - type: entity
   name: energy shield
-  parent: [BaseItem, BaseSyndicateContraband]
+  parent: [BaseShield, BaseSyndicateContraband]
   id: EnergyShield
   description: Exotic energy shield, when folded, can even fit in your pocket.
   components:
@@ -344,8 +375,6 @@
         path: /Audio/Weapons/ebladehum.ogg
     - type: ItemToggleSize
       activatedSize: Huge
-      activatedShape:
-      - 0,0,3,3
     - type: ComponentToggler
       components:
       - type: DisarmMalus
@@ -390,14 +419,11 @@
         coefficients:
           Heat: 0.5
         flatReductions:
-          Blunt: 5
-          Piercing: 10
-          Slash: 5
-          Heat: 25
+          Blunt: 3
+          Piercing: 9
+          Slash: 3
+          Heat: 24
     - type: Appearance
-    - type: Damageable
-    - type: Injurable
-      damageContainer: Shield
     - type: ExaminableDamage
       messages: EnergyShieldMessages
     - type: Destructible
@@ -435,7 +461,7 @@
 
 - type: entity
   name: telescopic shield
-  parent: [ BaseRepairableShield, BaseShieldDestructible ]
+  parent: [ BaseRepairableShield, BaseShield, BaseShieldDestructible ]
   id: TelescopicShield
   description: An advanced riot shield made of lightweight materials that collapses for easy storage.
   components:
@@ -456,9 +482,12 @@
       - type: DisarmMalus
         malus: 0.6
     - type: ItemToggleSize
-      activatedSize: Huge
+      activatedSize: Ginormous
       activatedShape:
-      - 0,0,3,3
+      - 0,0,3,5
+    - type: HeldSpeedModifier
+      walkModifier: 0.9
+      sprintModifier: 0.9
     - type: Sprite
       sprite: Objects/Weapons/Melee/teleriot_shield.rsi
       layers:
@@ -467,9 +496,7 @@
           visible: false
           map: [ "shield" ]
     - type: Item
-      size: Small
-      shape:
-      - 0,0,1,1
+      size: Normal
       sprite: Objects/Weapons/Melee/teleriot_shield.rsi
       heldPrefix: teleriot
     - type: UseDelay
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
index 1e736ef457..88640f6ed5 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@@ -53,7 +53,7 @@
     damage:
       types:
         Blunt: 25 #thwack
-        Structural: 8
+        Structural: 9
     soundHit:
       collection: MetalThud
   - type: Puller
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
index 3593ce1df1..4a0d4c6425 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
@@ -21,6 +21,7 @@
   - type: DeviceNetwork
     deviceNetId: Wireless
     receiveFrequencyId: CrewMonitor
+    prefix: device-address-prefix-crew-monitor
   - type: WirelessNetworkConnection
     range: 500
   - type: StationLimitedNetwork
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index e8504b1f02..d2375e8fd8 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -259,7 +259,7 @@
   parent: ChemicalMedipen
   id: AntiPoisonMedipen
   name: poison auto-injector
-  description: A single-dose, non-refillable medipen containing ultravasculine and epinephrine, used to quickly and easily treat toxin poisoning.
+  description: A single-dose, non-refillable medipen containing stellibinin and epinephrine, used to quickly and easily treat poisoning.
   components:
   - type: Item
     inhandVisuals:
@@ -285,7 +285,7 @@
   - type: Solution
     solution:
       reagents:
-      - ReagentId: Ultravasculine
+      - ReagentId: Stellibinin
         Quantity: 15
       - ReagentId: Epinephrine
         Quantity: 5
@@ -539,7 +539,7 @@
 
 - type: entity
   abstract: true
-  parent: [SolutionToolSmall, ChemicalMedipen, BaseSyndicateContraband]
+  parent: [SolutionToolSmall, ChemicalMedipen] # Corvax-Contraband BaseSyndicateContraband
   id: SyndicateMedipen # Interdyne gets more capacity
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
index 6afc06a796..eec1b0f906 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: CyborgEndoskeleton
   name: cyborg endoskeleton
   description: A frame that cyborgs are built on. Significantly less spooky than expected.
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
index 69d84810c6..0ff23c6820 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
@@ -12,6 +12,10 @@
       visible: false
     - state: mmi_off
       map: ["enum.MMIVisualLayers.Base"]
+    - state: mmi_light
+      map: ["enum.MMIVisualLayers.Unlit"]
+      shader: unshaded
+      visible: false
   - type: Input
     context: human
   - type: MMI
@@ -76,7 +80,8 @@
       sprite: Objects/Specific/Robotics/mmi.rsi
       layers:
       - state: posibrain
-        map: ["base"]
+      - map: ["light"]
+        shader: unshaded
     - type: Input
       context: human
     - type: ToggleableGhostRole
@@ -125,8 +130,8 @@
     - type: GenericVisualizer
       visuals:
         enum.ToggleableGhostRoleVisuals.Status:
-          base:
-            Off: { state: posibrain }
+          light:
+            Off: { state: empty } # TODO: fix null states in SpriteComp.LayerSetData, use a null state
             Searching: { state: posibrain-searching }
             On: { state: posibrain-occupied }
     - type: GuideHelp
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
index 2cdfacb312..7bde9a49d7 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: BarberScissors
   name: barber scissors
   description: Is able to reshape the hairstyle of any crew cut to your liking.
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml
index 236e6d4b20..9a6a83280e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml
@@ -52,6 +52,8 @@
     graph: Artifact
     node: done
   - type: XenoArtifact
+    triggersTable: !type:NestedSelector
+      tableId: XenoArtifactHandheldOnlyTriggerTable
     effectsTable: !type:GroupSelector
       children:
       - !type:NestedSelector
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml
index cf0674eb6a..6e66484cc0 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: [BaseCorvaxContraband431DepartmentsScience, BaseItem] # Corvax-Contraband
   id: NodeScanner
   name: node scanner
diff --git a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
index 7a575b984e..aedb0184cc 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: gas analyzer
   parent: BaseItem
   id: GasAnalyzer
diff --git a/Resources/Prototypes/Entities/Objects/Tiles/tiles.yml b/Resources/Prototypes/Entities/Objects/Tiles/tiles.yml
index d2ea517e35..1cbc91103a 100644
--- a/Resources/Prototypes/Entities/Objects/Tiles/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Tiles/tiles.yml
@@ -475,14 +475,12 @@
 # TODO add a catwalk tile item once tile smoothing is supported
 
 - type: entity
-  name: plastic floor
-  parent: FloorTileItemBase
+  parent: FloorTileItemSteel
   id: FloorTileItemPlastic
+  name: plastic floor
   components:
   - type: Sprite
-    state: steel # TODO need plastic sprite
-  - type: Item
-    heldPrefix: plastic
+    state: steel-plastic
   - type: FloorTile
     outputs:
     - Plating
@@ -491,12 +489,12 @@
     stackType: FloorTileStackPlastic
 
 - type: entity
-  parent: FloorTileItemPlastic
+  parent: FloorTileItemDark
   id: FloorTileItemDarkPlastic
   name: dark plastic floor
   components:
   - type: Sprite
-    state: dark # TODO need dark plastic sprite
+    state: dark-plastic
   - type: FloorTile
     outputs:
     - Plating
@@ -505,12 +503,12 @@
     stackType: FloorTileStackDarkPlastic
 
 - type: entity
-  parent: FloorTileItemPlastic
+  parent: FloorTileItemWhite
   id: FloorTileItemWhitePlastic
   name: white plastic floor
   components:
   - type: Sprite
-    state: white # TODO need white plastic sprite
+    state: white-plastic
   - type: FloorTile
     outputs:
     - Plating
diff --git a/Resources/Prototypes/Entities/Objects/Tools/appraisal.yml b/Resources/Prototypes/Entities/Objects/Tools/appraisal.yml
index 27733e59c5..dad4386a17 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/appraisal.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/appraisal.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseItem
   id: AppraisalTool
   name: appraisal tool
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
index f0e27833c8..e685e75198 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: emergency flare
   parent: [SolutionComposite, SolutionTiny, BaseItem]
   id: Flare
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
index 80eec8726e..932a7dd95b 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: flashlight
   parent: BaseItem
   id: FlashlightLantern
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
index eca7f43725..f1e7d49328 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
@@ -116,7 +116,7 @@
 #Empty black
 - type: entity
   id: JetpackBlack
-  parent: [BaseJetpack, BaseSyndicateContraband]
+  parent: [BaseJetpack] # Corvax-Contraband BaseSyndicateContraband
   name: jetpack
   suffix: Empty
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
index 8faf76a892..5dc3eaa3d5 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: lantern
   parent: BaseItem
   id: Lantern
diff --git a/Resources/Prototypes/Entities/Objects/Tools/pka_upgrade.yml b/Resources/Prototypes/Entities/Objects/Tools/pka_upgrade.yml
index 78d634ccfa..ed8d847a5d 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/pka_upgrade.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/pka_upgrade.yml
@@ -37,7 +37,7 @@
     damage:
       types:
         Blunt: 10
-        Structural: 10
+        Structural: 6
 
 - type: entity
   id: PKAUpgradeRange
diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
index 194dcd8827..0303c7d685 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -116,7 +116,7 @@
 
 - type: entity
   name: suspicious toolbox
-  parent: [ToolboxBase, BaseSyndicateContraband]
+  parent: [ToolboxBase] # Corvax-Contraband BaseSyndicateContraband
   id: ToolboxSyndicate
   description: A sinister looking toolbox filled with elite syndicate tools.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Vehicles/keys.yml b/Resources/Prototypes/Entities/Objects/Vehicles/keys.yml
index 7b7477c126..a2d51b1719 100644
--- a/Resources/Prototypes/Entities/Objects/Vehicles/keys.yml
+++ b/Resources/Prototypes/Entities/Objects/Vehicles/keys.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseItem
   id: VehicleKeyJanicart
   name: janicart keys
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
index 24a5320c23..e13bb70496 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
@@ -59,6 +59,7 @@
   parent: BaseGrenade
   id: GrenadeBaton
   name: baton grenade
+  description: A grenade round containing a single non-lethal projectile. Like being punched in the solar plexus.
   components:
   - type: CartridgeAmmo
     proto: BulletGrenadeBaton
@@ -75,7 +76,8 @@
 - type: entity
   parent: BaseGrenade
   id: GrenadeBlast
-  name: blast grenade
+  name: blast grenade round
+  description: A grenade round containing an explosive compound made specifically for breaching the reinforced hulls of space stations.
   components:
   - type: CartridgeAmmo
     proto: BulletGrenadeBlast
@@ -92,7 +94,8 @@
 - type: entity
   parent: BaseGrenade
   id: GrenadeFlash
-  name: flash grenade
+  name: flash grenade round
+  description: A grenade round containing a chemical compound causing a blinding flash of light on impact.
   components:
   - type: CartridgeAmmo
     proto: BulletGrenadeFlash
@@ -109,7 +112,8 @@
 - type: entity
   parent: BaseGrenade
   id: GrenadeFrag
-  name: frag grenade
+  name: frag grenade round
+  description: A grenade round containing a concentrated anti-personnel explosive alongside shrapnel, shredding anyone close to the impact zone.
   components:
   - type: CartridgeAmmo
     proto: BulletGrenadeFrag
@@ -127,6 +131,7 @@
   parent: BaseGrenade
   id: GrenadeCleanade
   name: cleanade grenade round
+  description: A grenade round containing space cleaner foam. For when you need to declare war on the concept of messiness.
   components:
   - type: CartridgeAmmo
     proto: BulletGrenadeCleanade
@@ -143,7 +148,8 @@
 - type: entity
   parent: BaseGrenade
   id: GrenadeEMP
-  name: EMP grenade
+  name: EMP grenade round
+  description: A grenade round containing an chemical compound calibrated to cause an electromagnetic pulse on impact.
   components:
   - type: CartridgeAmmo
     proto: BulletGrenadeEMP
@@ -177,6 +183,7 @@
   id: CannonBall
   name: cannonball
   suffix: Pirate
+  description: Extreme dodgeball.
   components:
   - type: CartridgeAmmo
     proto: BulletCannonBall
@@ -190,6 +197,7 @@
   id: CannonBallGrapeshot
   name: grapeshot
   suffix: Pirate
+  description: A spread of small iron balls that scatter upon being fired. For when you need to send a strongly worded message but don't know exactly where your enemy is.
   components:
   - type: CartridgeAmmo
     proto: PelletGrapeshotSpread
@@ -203,6 +211,7 @@
   id: CannonBallGlassshot
   name: glassshot
   suffix: Pirate
+  description: Turns out you can just put a bunch of glass into a cannon and fire it. Causes nasty cuts.
   components:
   - type: CartridgeAmmo
     proto: PelletGlassSpread
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml
index ca744da2c7..36b49b1dcc 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: WeaponStaffBase
   abstract: true
   parent: BaseItem # Corvax-Contraband: do not inherit a marker for hidden properties.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml
index 555a760c90..5d8cf49ea9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: WeaponWandBase
   abstract: true
   parent: [ BaseItem, BaseMagicalContraband ]
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/energy_crossbow.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/energy_crossbow.yml
index a63cba3da1..c8756efcde 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/energy_crossbow.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/energy_crossbow.yml
@@ -1,13 +1,14 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: [ BaseWeaponBatterySmallNoAmmoCounter ]
   id: WeaponEnergyCrossbowBase
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Basic/energy_crossbow.rsi
   - type: Item
     sprite: Objects/Weapons/Guns/Basic/energy_crossbow.rsi
-    size: Small
+    size: Normal
+    shape:
   - type: Gun
     fireRate: 5 #high firerate innately bottlenecked by ammo regeneration speed.
     selectedMode: SemiAuto
@@ -17,22 +18,36 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/energycrossbow_shoot.ogg
-  - type: AmmoCounter
   - type: Appearance
+  - type: Battery
+    maxCharge: 960
+    startingCharge: 960
+  - type: BatterySelfRecharger
+    autoRechargeRate: 5
+    autoRechargePauseTime: 5 # Same time it takes to make a new bullet
   - type: GenericVisualizer
     visuals:
       enum.AmmoVisuals.HasAmmo:
         empty-icon:
           True: { visible: False }
           False: { visible: True }
-  - type: RechargeBasicEntityAmmo
-    rechargeCooldown: 5 #2 seconds of KD, should always have CD > KD
+  - type: EmpResistance
+    strengthMultiplier: 0
+    durationMultiplier: 0
+  - type: BallisticAmmoSelfRefiller
+    firingPausesAutoRefill: true
+    autoRefillPauseDuration: 5 #2 seconds of KD, should always have CD > KD
+    autoRefillRate: 0
+    powerConsumption: 320
     rechargeSound:
       path: /Audio/Weapons/Guns/MagIn/energycrossbow_reload.ogg
-  - type: BasicEntityAmmoProvider
+  - type: BallisticAmmoProvider
     proto: EnergyCrossbowBolt
     capacity: 1
-    count: 1
+    cycleable: false
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
 
 - type: entity
   parent: WeaponEnergyCrossbowBase # Corvax-Contraband: do not inherit a marker for hidden properties.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml
index d27e648b95..2fe9bb8b37 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: WeaponWandBase
   id: WeaponWandPolymorphBase
   abstract: true
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index a71a75f0cc..9e9523fee0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -107,9 +107,9 @@
       cell_slot: !type:ContainerSlot
 
 - type: entity
-  id: BaseWeaponBatterySmall
-  parent: BaseWeaponBattery
   abstract: true
+  parent: BaseWeaponBatteryNoAmmoCounter
+  id: BaseWeaponBatterySmallNoAmmoCounter
   components:
   - type: Item
     size: Small
@@ -126,6 +126,13 @@
     - Belt
     - suitStorage
 
+- type: entity
+  abstract: true
+  parent: BaseWeaponBatterySmallNoAmmoCounter
+  id: BaseWeaponBatterySmall
+  components:
+  - type: AmmoCounter
+
 - type: entity
   id: BaseWeaponPowerCellSmall
   parent: BaseWeaponPowerCell
@@ -565,7 +572,7 @@
       - Belt
   - type: BatteryAmmoProvider
     proto: BulletDisabler
-    fireCost: 62.5
+    fireCost: 40
   - type: GuideHelp
     guides:
     - Security
@@ -602,7 +609,7 @@
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
   - type: BatteryAmmoProvider
-    proto: BulletDisablerSmg
+    proto: BulletDisablerSmgSlowing
     fireCost: 25
   - type: MagazineVisuals
     magState: mag
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index 1d79e5c809..faac01e6bb 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -33,7 +33,7 @@
 - type: entity
   parent: [ BaseWeaponLauncher, BaseSyndicateContraband ]
   id: WeaponLauncherChinaLake
-  name: china lake
+  name: China Lake
   description: PLOOP.
   components:
   - type: Sprite
@@ -62,6 +62,8 @@
   - type: GunRequiresWield
   - type: StaticPrice
     price: 10000
+  - type: Gun
+    fireRate: 0.67
 
 - type: entity
   parent: [BaseCorvaxContraband434DepartmentsSecurity, BaseWeaponLauncher, BaseMajorContraband] # Corvax-Contraband
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 80210749cb..1193a993aa 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -75,10 +75,14 @@
   id: WeaponPistolViper
   description: A common handgun illegally modified by the Syndicate. The Viper sports a selector switch between semi-auto and ‘rock and roll’. The standard sidearm for any soldier who fights under the three serpents. Feeds from .35 pistol magazines.
   components:
+  - type: Gun
+    minAngle: 2
+    maxAngle: 25
+    angleIncrease: 2
+    angleDecay: 20
+    selectedMode: FullAuto # Override of BaseWeaponPistol to default to full-auto
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/viper.rsi
-  - type: Gun
-    selectedMode: FullAuto # Override of BaseWeaponPistol to default to full-auto
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -159,6 +163,10 @@
   - type: ChamberMagazineAmmoProvider
     boltClosed: null
   - type: Gun
+    minAngle: 2
+    maxAngle: 8
+    angleIncrease: 1
+    angleDecay: 14
     fireRate: 4
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/silenced.ogg
@@ -209,6 +217,10 @@
   - type: Item
     storedOffset: 0,-2
   - type: Gun
+    minAngle: 2
+    maxAngle: 17
+    angleIncrease: 2
+    angleDecay: 14
     fireRate: 5
     availableModes:
     - SemiAuto
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Bullets/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Bullets/shotgun.yml
index 7ec18fad39..7510971139 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Bullets/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Bullets/shotgun.yml
@@ -28,7 +28,7 @@
       types:
         Blunt: 10
   - type: StaminaDamageOnCollide
-    damage: 40 # 3 hits to stun
+    damage: 27 # 4 hits to stun
 
 - type: entity
   parent: BaseBullet
@@ -40,7 +40,7 @@
     damage:
       types:
         Piercing: 10
-        Structural: 8
+        Structural: 6
 
 - type: entity
   parent: PelletShotgun
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Energy/kinetic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Energy/kinetic.yml
index a41b426e31..916eeafd71 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Energy/kinetic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Energy/kinetic.yml
@@ -19,7 +19,7 @@
     damage:
       types:
         Blunt: 15
-        Structural: 15
+        Structural: 9
   # Short lifespan
   - type: TimedDespawn
     lifetime: 0.22 # roughly 5.5 tiles
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Energy/stun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Energy/stun.yml
index f73b774339..31e9a9942e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Energy/stun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Energy/stun.yml
@@ -118,8 +118,10 @@
         - BulletImpassable
       fly-by: *flybyfixture
   - type: Ammo
-  - type: StaminaDamageOnCollide
-    damage: 33
+  - type: StunOnCollide
+    slowdownAmount: 2.2
+    walkSpeedModifier: 0.75
+    sprintSpeedModifier: 0.75
   - type: Projectile
     impactEffect: BulletImpactEffectDisabler
     damage:
@@ -128,6 +130,8 @@
     soundHit:
       collection: WeakHit
     forceSound: true
+  - type: StaminaDamageOnCollide
+    damage: 8
 
 - type: entity
   parent: BaseBullet
@@ -172,9 +176,9 @@
 
 - type: entity
   parent: BaseBullet
-  id: BulletDisablerSmg
+  id: BulletDisablerSmgBase # this version does zero damage
   categories: [ HideSpawnMenu ]
-  name: disabler bolt smg
+  name: disabler smg bolt
   components:
   - type: Reflective
     reflective:
@@ -203,8 +207,6 @@
         - BulletImpassable
       fly-by: *flybyfixture
   - type: Ammo
-  - type: StaminaDamageOnCollide
-    damage: 15
   - type: Projectile
     impactEffect: BulletImpactEffectDisabler
     damage:
@@ -215,19 +217,39 @@
     forceSound: true
 
 - type: entity
-  parent: BulletDisablerSmg
+  parent: BulletDisablerSmgBase
+  id: BulletDisablerSmgSlowing
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StunOnCollide
+    slowdownAmount: 2.2
+    walkSpeedModifier: 0.7
+    sprintSpeedModifier: 0.7
+  - type: StaminaDamageOnCollide
+    damage: 4
+
+- type: entity
+  parent: BulletDisablerSmgBase
+  id: BulletDisablerSmgStunning
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StaminaDamageOnCollide
+    damage: 15
+
+- type: entity
+  parent: BulletDisablerSmgStunning
   id: BulletDisablerSmgSpread
   categories: [ HideSpawnMenu ]
   name: disabling laser barrage
   components:
   - type: ProjectileSpread
-    proto: BulletDisablerSmg
+    proto: BulletDisablerSmgStunning
     count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though
     spread: 9
 
 # Energy crossbow
 - type: entity
-  parent: [ SolutionAmmo, BaseBullet ]
+  parent: [SolutionAmmo, SolutionToolVeryTiny, BaseBullet]
   id: EnergyCrossbowBolt
   categories: [ HideSpawnMenu ]
   name: energy bolt
@@ -246,22 +268,12 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 2
-  - type: StunOnCollide #somewhat mirror to taser stats, meant to be tot 'sidegrade'
-    stunAmount: 0
-    knockdownAmount: 2.5
-    slowdownAmount: 2.5
-    walkSpeedModifier: 0.2
-    sprintSpeedModifier: 0.2
-    drop: false
-  - type: StaminaDamageOnCollide #additional stam damage to make repeated pushups less of a viable counter
-    damage: 45
+        Radiation: 1
   - type: Solution
     solution:
-      maxVol: 1.5
       reagents:
-      - ReagentId: Toxin
-        Quantity: 1.5
+      - ReagentId: HardlightToxin
+        Quantity: 7.5
   - type: SolutionInjectOnProjectileHit
-    transferAmount: 1.5
+    transferAmount: 7.5
     solution: ammo
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Explosives/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Explosives/explosives.yml
index f6321e073b..99e3fa46c4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Explosives/explosives.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Explosives/explosives.yml
@@ -46,14 +46,13 @@
   parent: BaseBullet
   id: BulletGrenadeBaton
   categories: [ HideSpawnMenu ]
-  name: baton grenade
+  name: baton grenade round
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
     layers:
     - state: grenade
   - type: Projectile
-    deleteOnCollide: false
     damage:
       types:
         Blunt: 1
@@ -74,10 +73,10 @@
     - state: grenade
   - type: ExplodeOnTrigger
   - type: Explosive
-    explosionType: Default
-    totalIntensity: 150 # a ~2 tile radius
+    explosionType: Clake
+    totalIntensity: 150 # a ~3 tile radius
     intensitySlope: 5
-    maxIntensity: 10
+    maxIntensity: 20
     canCreateVacuum: false
 
 - type: entity
@@ -109,9 +108,9 @@
   - type: ExplodeOnTrigger
   - type: Explosive
     explosionType: Default
-    totalIntensity: 50
-    intensitySlope: 1
-    maxIntensity: 5
+    totalIntensity: 120
+    intensitySlope: 5
+    maxIntensity: 9
     canCreateVacuum: false
   - type: ContainerContainer
     containers:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Explosives/grenade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Explosives/grenade.yml
index dc0794a8bb..49c6fc0050 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Explosives/grenade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/Explosives/grenade.yml
@@ -5,14 +5,13 @@
   name: pellet (ball, rubber)
   components:
   - type: Projectile
-    deleteOnCollide: false
     damage:
       types:
         Blunt: 4
   - type: StaminaDamageOnCollide
     damage: 55
   - type: TimedDespawn
-    lifetime: 0.25
+    lifetime: 0.10
 
 - type: entity
   parent: BaseBullet
@@ -21,12 +20,11 @@
   name: pellet (ball, lethal)
   components:
   - type: Projectile
-    deleteOnCollide: false
     damage:
       types:
         Piercing: 45
   - type: TimedDespawn
-    lifetime: 0.25
+    lifetime: 0.10
 
 - type: entity
   parent: BaseBulletIncendiary
@@ -35,7 +33,6 @@
   name: pellet (ball, incendiary)
   components:
   - type: Projectile
-    deleteOnCollide: false
     damage:
       types:
         Blunt: 1
@@ -44,7 +41,7 @@
     fireStacks: 1
     count: 10
   - type: TimedDespawn
-    lifetime: 0.25
+    lifetime: 0.10
 
 - type: entity
   parent: BaseBullet
@@ -53,9 +50,8 @@
   name: pellet (ball, less lethal)
   components:
   - type: Projectile
-    deleteOnCollide: false
     damage:
       types:
         Piercing: 5
   - type: TimedDespawn
-    lifetime: 0.25
+    lifetime: 0.10
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index 9e9d1d01cd..796f1e6a3d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -66,7 +66,12 @@
         map: ["enum.GunVisualLayers.Base"]
       - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
+  - type: GunWieldBonus
+    minAngle: -20
+    maxAngle: -16
   - type: Gun
+    angleIncrease: 1.5
+    angleDecay: 9.5
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
   - type: ChamberMagazineAmmoProvider
@@ -115,7 +120,12 @@
         map: ["enum.GunVisualLayers.Mag"]
   - type: Clothing
     sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
+  - type: GunWieldBonus
+    minAngle: -20
+    maxAngle: -18
   - type: Gun
+    angleIncrease: 1
+    angleDecay: 9.5
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
   - type: ItemSlots
@@ -192,6 +202,8 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/Rifles/estoc.rsi
   - type: Gun
+    minAngle: 21
+    maxAngle: 32 
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/estocshot.ogg
     shotsPerBurst: 3
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index cd7dfad1af..c5e432db14 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -101,10 +101,12 @@
     unwieldOnUse: false
   - type: GunWieldBonus
     minAngle: -19
-    maxAngle: -16
+    maxAngle: -12
   - type: Gun
     minAngle: 21
     maxAngle: 32
+    angleIncrease: 1.25
+    angleDecay: 20
     shotsPerBurst: 5
     availableModes:
     - Burst
@@ -183,10 +185,12 @@
       unwieldOnUse: false
     - type: GunWieldBonus
       minAngle: -19
-      maxAngle: -16
+      maxAngle: -14
     - type: Gun
       minAngle: 21
       maxAngle: 32
+      angleIncrease: 1.5
+      angleDecay: 16
       fireRate: 6
       burstFireRate: 18
       soundGunshot:
@@ -248,9 +252,9 @@
   - type: Gun
     fireRate: 5.5
     minAngle: 1
-    maxAngle: 6
+    maxAngle: 16
     angleIncrease: 1.5
-    angleDecay: 6
+    angleDecay: 12
     selectedMode: FullAuto
     shotsPerBurst: 5
     burstCooldown: 0.2
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index e741861c43..d9f60f8b00 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -338,4 +338,4 @@
         rolloffFactor: 1.3
     fireRate: 2
   - type: GunSpreadModifier
-    spread: 1.2
+    spread: 0.8
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
index 8fbc3f1ff8..6ebb67d107 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
@@ -1,7 +1,7 @@
 - type: entity
-  name: arm blade
+  name: armblade
   parent: BaseItem
-  id: ArmBlade
+  id: Armblade
   description: A grotesque blade made out of bone and flesh that can pry open doors and cleaves through people as a hot knife through butter.
   components:
   - type: Tool
@@ -22,10 +22,23 @@
         Slash: 10
         Piercing: 10
         Caustic: 5
-        Structural: 15
+        Structural: 12
   - type: Item
     size: Normal
     sprite: Objects/Weapons/Melee/armblade.rsi
   - type: Prying
     speedModifier: 1.5 # Jaws of life speed
     pryPowered: true
+
+- type: entity
+  parent: Armblade
+  id: ArmbladeDull
+  suffix: Dull
+  components:
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 5
+        Piercing: 5
+        Caustic: 2.5
+        Structural: 6
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index 586e79cac7..6f4feb1e68 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -21,7 +21,7 @@
         # axes are kinda like sharp hammers, you know?
         Blunt: 5
         Slash: 10
-        Structural: 5
+        Structural: 3
     soundHit:
       collection: MetalThud
   - type: Wieldable
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml
index ff39bc7a57..32481f5e45 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: gohei
   parent: BaseItem
   id: Gohei
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/hammers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/hammers.yml
index ea64685579..aa62f8fa7a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/hammers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/hammers.yml
@@ -63,7 +63,7 @@
     damage:
       types:
         Blunt: 15
-        Structural: 40
+        Structural: 45
   - type: Item
     size: Ginormous
     shape:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
index 02351be318..943284c3f9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
@@ -33,6 +33,7 @@
       types:
         Shock: 5
   - type: MeleeWeapon
+    attackRate: 1.3
     wideAnimationRotation: -135
     damage:
       types:
@@ -42,17 +43,17 @@
   - type: MeleeBatteryHitsLeft
   - type: StaminaDamageOnHitRequiresToggle
   - type: StaminaDamageOnHitRequiresCharge
-    requiredCharge: 120
+    requiredCharge: 100
   - type: StaminaDamageOnHit
-    damage: 35
+    damage: 23
     sound: /Audio/Weapons/egloves.ogg
   - type: StaminaDamageOnCollide
-    damage: 35
+    damage: 23
     sound: /Audio/Weapons/egloves.ogg
   - type: LandAtCursor # it deals stamina damage when thrown
   - type: Battery
-    maxCharge: 360
-    startingCharge: 360
+    maxCharge: 700
+    startingCharge: 700
   - type: UseDelay
   - type: Item
     heldPrefix: off
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/canister_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/canister_grenades.yml
index 537e4bb47e..558091cf88 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/canister_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/canister_grenades.yml
@@ -24,7 +24,7 @@
       path: /Audio/Items/smoke_grenade_prime.ogg
 
 - type: entity
-  parent: [ BaseCivilianContraband, SmokeGrenade ]
+  parent: [ BaseServiceContraband, SmokeGrenade ]
   id: CleanerGrenade
   name: cleanade
   description: Special grenade for janitors, releasing large cloud of space cleaner foam.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
index bd5ffc2e82..54596689ba 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: BaseItem
   id: ProjectileGrenadeBase
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
index a933a565e6..bd848348ea 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
@@ -1,4 +1,4 @@
-# ScatteringGrenade is intended for grenades that spawn entities, especially those with timers
+# ScatteringGrenade is intended for grenades that spawn entities, especially those with timers
 - type: entity
   abstract: true
   parent: GrenadeBase
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
index e01495d036..126004efa8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -2,7 +2,7 @@
   name: stun baton
   parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseItem, BaseSecurityContraband] # Corvax-Contraband
   id: Stunbaton
-  description: A stun baton for incapacitating people with. Actively harming with this is considered bad tone.
+  description: A stun baton for incapacitating people with. Has advanced wrist strap technology to prevent cadets accidentally dropping it.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Melee/stunbaton.rsi
@@ -34,6 +34,7 @@
       types:
         Blunt: 0
   - type: MeleeWeapon
+    attackRate: 1.3
     wideAnimationRotation: -135
     damage:
       types:
@@ -45,12 +46,12 @@
   - type: MeleeBatteryHitsLeft
   - type: StaminaDamageOnHitRequiresToggle
   - type: StaminaDamageOnHitRequiresCharge
-    requiredCharge: 50
+    requiredCharge: 40
   - type: StaminaDamageOnHit
-    damage: 35
+    damage: 23
     sound: /Audio/Weapons/egloves.ogg
   - type: StaminaDamageOnCollide
-    damage: 35
+    damage: 23
     sound: /Audio/Weapons/egloves.ogg
   - type: LandAtCursor # it deals stamina damage when thrown
   - type: Battery
@@ -99,6 +100,7 @@
   - type: Tag
     tags:
     - Stunbaton
+  - type: PreventForcedThrow
 
 - type: entity
   name: truncheon
@@ -118,7 +120,10 @@
       collection: MetalThud
     bluntStaminaDamageFactor: 1.5
   - type: Item
-    size: Normal
+    size: Large
+    shape:
+    - 0,0,1,2
+    storedRotation: -45
   - type: Tag
     tags:
     - Truncheon
diff --git a/Resources/Prototypes/Entities/Objects/base_contraband.yml b/Resources/Prototypes/Entities/Objects/base_contraband.yml
index 08897c5b39..9ebfd6a7dd 100644
--- a/Resources/Prototypes/Entities/Objects/base_contraband.yml
+++ b/Resources/Prototypes/Entities/Objects/base_contraband.yml
@@ -1,4 +1,4 @@
-# generic "highly illegal" contraband; Syndicate/magical contraband are already considered highly illegal under Space Law,
+# generic "highly illegal" contraband; Syndicate/magical contraband are already considered highly illegal under Space Law,
 # so this is mostly for stuff that should be equally illegal but doesn't need its own unique contraband tier added
 - type: entity
   parent: BaseCorvaxContraband435 # Corvax-Contraband
@@ -124,6 +124,14 @@
   - type: Contraband
     allowedDepartments: [ Cargo ]
 
+- type: entity
+  id: BaseServiceContraband
+  parent: BaseRestrictedContraband
+  abstract: true
+  components:
+  - type: Contraband
+    allowedDepartments: [ Service ]
+
 # multiple departments restricted contraband
 - type: entity
   id: BaseCentcommCommandContraband
diff --git a/Resources/Prototypes/Entities/Objects/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml
index 31a5364c4b..11eea7faf7 100644
--- a/Resources/Prototypes/Entities/Objects/base_item.yml
+++ b/Resources/Prototypes/Entities/Objects/base_item.yml
@@ -224,8 +224,10 @@
     blacklist:
       components:
       - SecretStash # Prevents being able to insert plushies inside each other (infinite plush)!
+      - NukeDisk # Because a core mechanic of nukies should not be "where in this bag is the fucking disk"
       tags:
       - QuantumSpinInverter # It will cause issues with the grinder...
+      - FakeNukeDisk # For parity with NukeDisk
   - type: ToolOpenable
     openToolQualityNeeded: Slicing
     closeToolQualityNeeded: Slicing # Should probably be stitching or something if that gets added
diff --git a/Resources/Prototypes/Entities/Objects/base_solution.yml b/Resources/Prototypes/Entities/Objects/base_solution.yml
index e492424779..bf7aca1956 100644
--- a/Resources/Prototypes/Entities/Objects/base_solution.yml
+++ b/Resources/Prototypes/Entities/Objects/base_solution.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: Solution # Not abstract because it's a fallback for missing solution protos!
   categories: [ HideSpawnMenu ]
   name: solution
diff --git a/Resources/Prototypes/Entities/Stations/test.yml b/Resources/Prototypes/Entities/Stations/test.yml
index 9eec6979e7..6798fbb0ef 100644
--- a/Resources/Prototypes/Entities/Stations/test.yml
+++ b/Resources/Prototypes/Entities/Stations/test.yml
@@ -1,4 +1,4 @@
-# Station prototype for cut-down test maps that don't need all the infrastructure.
+# Station prototype for cut-down test maps that don't need all the infrastructure.
 - type: entity
   id: TestStation
   parent:
diff --git a/Resources/Prototypes/Entities/StatusEffects/body.yml b/Resources/Prototypes/Entities/StatusEffects/body.yml
index ed3cd86edf..91f5459420 100644
--- a/Resources/Prototypes/Entities/StatusEffects/body.yml
+++ b/Resources/Prototypes/Entities/StatusEffects/body.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: MobStatusEffectBase
   id: BloodstreamStatusEffectBase
   abstract: true
@@ -92,3 +92,11 @@
   components:
   - type: StaminaModifierStatusEffect
     modifier: 1.5
+
+- type: entity
+  parent: MobStatusEffectBase
+  id: StatusEffectNightVision
+  name: Night Vision
+  components:
+    - type: NightVision
+      relayOverlay: True
diff --git a/Resources/Prototypes/Entities/StatusEffects/misc.yml b/Resources/Prototypes/Entities/StatusEffects/misc.yml
index 2ba548e8bd..027a7b2fa4 100644
--- a/Resources/Prototypes/Entities/StatusEffects/misc.yml
+++ b/Resources/Prototypes/Entities/StatusEffects/misc.yml
@@ -177,3 +177,42 @@
       - Blindable
       requireAll: true
   - type: FlashedStatusEffect
+
+# Forces fake items into the hands/slots of the target
+- type: entity
+  parent: MobStatusEffectDebuff
+  id: StatusEffectForcedItemCatEars
+  name: forced cat ears
+  components:
+  - type: ForcedItemStatusEffect
+    inventoryItems:
+      HEAD: ClothingHeadHatCatEars
+    removeWhenCuffed: false
+
+- type: entity
+  parent: MobStatusEffectDebuff
+  id: StatusEffectForcedItemMaid
+  name: forced maid outfit
+  components:
+  - type: ForcedItemStatusEffect
+    inventoryItems:
+      INNERCLOTHING: ClothingUniformJumpskirtJanimaid
+      IDCARD: JanitorPDA
+      GLOVES: ClothingHandsGlovesJanitor
+      HEAD: ClothingHeadHatCatEars
+      EARS: ClothingHeadsetService
+      BELT: ClothingBeltJanitorFilled
+    removeWhenCuffed: false
+
+- type: entity
+  parent: MobStatusEffectDebuff
+  id: StatusEffectForcedItemArmblade
+  name: forced armblade
+  components:
+  - type: ForcedItemStatusEffect
+    handItems:
+    - ArmbladeDull
+    spawnSound:
+      collection: gib # Same as ActionRetractableItemArmblade
+    despawnSound:
+      collection: gib # Same as ActionRetractableItemArmblade
diff --git a/Resources/Prototypes/Entities/StatusEffects/movement.yml b/Resources/Prototypes/Entities/StatusEffects/movement.yml
index ec5f220fdc..27bffc440e 100644
--- a/Resources/Prototypes/Entities/StatusEffects/movement.yml
+++ b/Resources/Prototypes/Entities/StatusEffects/movement.yml
@@ -81,3 +81,12 @@
   - type: StunnedStatusEffect
   - type: ExaminableStatusEffect
     messageId: status-effect-examine-stunned
+
+- type: entity
+  parent: MobStatusEffectDebuff
+  id: StatusEffectKnockdown
+  name: knockdown
+  components:
+  - type: KnockdownStatusEffect
+    crawl: true
+    drop: false
diff --git a/Resources/Prototypes/Entities/StatusEffects/speech.yml b/Resources/Prototypes/Entities/StatusEffects/speech.yml
index ab9fe0532d..8c3a1a0b78 100644
--- a/Resources/Prototypes/Entities/StatusEffects/speech.yml
+++ b/Resources/Prototypes/Entities/StatusEffects/speech.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: MobStatusEffectDebuff
   id: SpeechStatusEffectBase
   abstract: true
diff --git a/Resources/Prototypes/Entities/StatusEffects/traits.yml b/Resources/Prototypes/Entities/StatusEffects/traits.yml
index 9ccf41e286..3de0cf9226 100644
--- a/Resources/Prototypes/Entities/StatusEffects/traits.yml
+++ b/Resources/Prototypes/Entities/StatusEffects/traits.yml
@@ -23,5 +23,5 @@
   name: pain numbness
 
 - type: entity
-  parent: [ MutedStatusEffectBase, TraitStatusEffectBase ]
+  parent: [ MutedStatusEffectBase, TraitStatusEffectBase, ChangelingStatusEffectBase ]
   id: TraitStatusEffectMuted
diff --git a/Resources/Prototypes/Entities/Structures/Bases/structure_health.yml b/Resources/Prototypes/Entities/Structures/Bases/structure_health.yml
index c57ddc63db..989bcf852e 100644
--- a/Resources/Prototypes/Entities/Structures/Bases/structure_health.yml
+++ b/Resources/Prototypes/Entities/Structures/Bases/structure_health.yml
@@ -237,9 +237,6 @@
     - trigger: !type:DamageTrigger
         damage: 100
       behaviors: *DoDestruction
-    - trigger: !type:DamageTrigger
-        damage: 50
-      behaviors: *DoBreakage
 
 # Airlocks / firelocks
 - type: entity
@@ -252,9 +249,6 @@
     - trigger: !type:DamageTrigger
         damage: 200
       behaviors: *DoDestruction
-    - trigger: !type:DamageTrigger
-        damage: 100
-      behaviors: *DoBreakage
 
 # High-security airlocks / blast doors
 - type: entity
@@ -267,9 +261,6 @@
     - trigger: !type:DamageTrigger
         damage: 350
       behaviors: *DoDestruction
-    - trigger: !type:DamageTrigger
-        damage: 250
-      behaviors: *DoBreakage
 
 #endregion
 #region Walls
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
index e8bb0838ab..2c4f8ca3e4 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: BaseCurtains
   parent: BaseStructure
   name: curtains
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index 6ca0dea8db..8bde005670 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -1159,7 +1159,7 @@
 - type: entity
   parent: AirlockShuttleSyndicate
   id: AirlockExternalShuttleSyndicateLocked
-  suffix: External, Docking, Syndicate, Locked
+  suffix: Syndicate, Docking, Locked
   components:
   - type: ContainerFill
     containers:
@@ -1168,7 +1168,7 @@
 - type: entity
   parent: AirlockShuttleSyndicate
   id: AirlockExternalShuttleNukeopLocked
-  suffix: External, Docking, Nukeop, Locked
+  suffix: Nukeop, Docking, Locked
   components:
   - type: ContainerFill
     containers:
@@ -1177,7 +1177,7 @@
 - type: entity
   parent: AirlockShuttleXenoborg
   id: AirlockGlassShuttleXenoborgLocked
-  suffix: External, Docking, Xenoborg, Locked
+  suffix: Xenoborg, Docking, Locked
   components:
   - type: StationAiWhitelist
     enabled: false
@@ -1188,7 +1188,7 @@
 - type: entity
   parent: AirlockGlassShuttle
   id: AirlockExternalGlassShuttleLocked
-  suffix: External, Glass, Docking, Locked
+  suffix: External, Docking, Glass
   components:
   - type: ContainerFill
     containers:
@@ -1197,7 +1197,7 @@
 - type: entity
   parent: AirlockGlassShuttleSyndicate
   id: AirlockExternalGlassShuttleSyndicateLocked
-  suffix: Syndicate, Locked, Glass
+  suffix: Syndicate, Docking, Glass
   components:
   - type: ContainerFill
     containers:
@@ -1206,7 +1206,7 @@
 - type: entity
   parent: AirlockGlassShuttleSyndicate
   id: AirlockExternalGlassShuttleNukeopLocked
-  suffix: Nukeop, Locked, Glass
+  suffix: Nukeop, Docking, Glass
   components:
   - type: ContainerFill
     containers:
@@ -1215,7 +1215,7 @@
 - type: entity
   parent: AirlockGlassShuttle
   id: AirlockExternalGlassShuttleEmergencyLocked
-  suffix: External, Emergency, Glass, Docking, Locked
+  suffix: External, Emergency, Docking, Glass
   components:
   - type: PriorityDock
     tag: DockEmergency
@@ -1224,10 +1224,10 @@
       board: [ DoorElectronicsExternal ]
 
 - type: entity
-  name: arrivals airlock
   parent: AirlockGlassShuttle
   id: AirlockExternalGlassShuttleArrivals
-  suffix: External, Arrivals, Glass, Docking
+  name: arrivals airlock
+  suffix: External, Arrivals, Docking, Glass
   components:
   - type: PriorityDock
     tag: DockArrivals
@@ -1240,10 +1240,10 @@
     dockLegendCategory: Arrivals
 
 - type: entity
-  name: cargo airlock
   parent: AirlockGlassShuttle
   id: AirlockExternalGlassShuttleCargo
-  suffix: External, Cargo, Glass, Docking
+  name: cargo airlock
+  suffix: External, Cargo, Docking, Glass
   components:
   - type: ContainerFill
     containers:
@@ -1256,7 +1256,7 @@
 - type: entity
   parent: AirlockGlassShuttle
   id: AirlockExternalGlassShuttleEscape
-  suffix: External, Escape 3x4, Glass, Docking
+  suffix: External, Escape 3x4, Docking, Glass
   components:
   - type: GridFill
     addComponents:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
index a3e021864e..c4de381c00 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
@@ -1,7 +1,11 @@
+# NOTE: all of these have been marked HideSpawnMenu pending additional construction graphs.
+#       They currently all construct into Airlock and deconstruct into AirlockAssembly, which is unintuitive.
+
 #Atmospherics
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyAtmospherics
+  categories: [HideSpawnMenu]
   suffix: Atmospherics
   components:
   - type: Sprite
@@ -11,6 +15,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyAtmosphericsGlass
+  categories: [HideSpawnMenu]
   suffix: Atmospherics, Glass
   components:
   - type: Sprite
@@ -21,6 +26,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCargo
+  categories: [HideSpawnMenu]
   suffix: Cargo
   components:
   - type: Sprite
@@ -30,6 +36,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCargoGlass
+  categories: [HideSpawnMenu]
   suffix: Cargo, Glass
   components:
   - type: Sprite
@@ -40,6 +47,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCommand
+  categories: [HideSpawnMenu]
   suffix: Command
   components:
   - type: Sprite
@@ -49,6 +57,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCommandGlass
+  categories: [HideSpawnMenu]
   suffix: Command, Glass
   components:
   - type: Sprite
@@ -59,6 +68,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyEngineering
+  categories: [HideSpawnMenu]
   suffix: Engineering
   components:
   - type: Sprite
@@ -68,6 +78,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyEngineeringGlass
+  categories: [HideSpawnMenu]
   suffix: Engineering, Glass
   components:
   - type: Sprite
@@ -78,7 +89,8 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyExternal
-  suffix: External
+  categories: [HideSpawnMenu]
+  name: external airlock assembly
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/airlock-external.rsi
@@ -87,7 +99,9 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyExternalGlass
-  suffix: External, Glass
+  categories: [HideSpawnMenu]
+  name: external airlock assembly
+  suffix: Glass
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/airlock-external.rsi
@@ -97,6 +111,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyGlass
+  categories: [HideSpawnMenu]
   suffix: Glass
   components:
   - type: Sprite
@@ -107,6 +122,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyFreezer
+  categories: [HideSpawnMenu]
   suffix: Freezer
   components:
   - type: Sprite
@@ -117,6 +133,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyHydroponics
+  categories: [HideSpawnMenu]
   suffix: Hydroponics
   components:
   - type: Sprite
@@ -126,6 +143,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyHydroponicsGlass
+  categories: [HideSpawnMenu]
   suffix: Hydroponics, Glass
   components:
   - type: Sprite
@@ -136,6 +154,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMaintenance
+  categories: [HideSpawnMenu]
   suffix: Maintenance
   components:
   - type: Sprite
@@ -145,6 +164,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMaintenanceGlass
+  categories: [HideSpawnMenu]
   suffix: Maintenance, Glass
   components:
   - type: Sprite
@@ -155,6 +175,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMedical
+  categories: [HideSpawnMenu]
   suffix: Medical
   components:
   - type: Sprite
@@ -164,6 +185,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMedicalGlass
+  categories: [HideSpawnMenu]
   suffix: Medical, Glass
   components:
   - type: Sprite
@@ -174,6 +196,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblySalvage
+  categories: [HideSpawnMenu]
   suffix: Salvage
   components:
   - type: Sprite
@@ -183,6 +206,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblySalvageGlass
+  categories: [HideSpawnMenu]
   suffix: Salvage, Glass
   components:
   - type: Sprite
@@ -193,6 +217,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyScience
+  categories: [HideSpawnMenu]
   suffix: Science
   components:
   - type: Sprite
@@ -202,6 +227,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyScienceGlass
+  categories: [HideSpawnMenu]
   suffix: Science, Glass
   components:
   - type: Sprite
@@ -212,6 +238,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblySecurity
+  categories: [HideSpawnMenu]
   suffix: Security
   components:
   - type: Sprite
@@ -221,6 +248,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblySecurityGlass
+  categories: [HideSpawnMenu]
   suffix: Security, Glass
   components:
   - type: Sprite
@@ -229,8 +257,9 @@
 
 #Shuttle
 - type: entity
-  parent: AirlockAssembly
+  parent: AirlockShuttleAssembly
   id: AirlockAssemblyShuttle
+  categories: [HideSpawnMenu]
   suffix: Shuttle
   components:
   - type: Sprite
@@ -241,8 +270,9 @@
     - state: assembly
 
 - type: entity
-  parent: AirlockAssembly
+  parent: AirlockShuttleAssembly
   id: AirlockAssemblyShuttleGlass
+  categories: [HideSpawnMenu]
   suffix: Shuttle, Glass
   components:
   - type: Sprite
@@ -253,6 +283,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyVirology
+  categories: [HideSpawnMenu]
   suffix: Virology
   components:
   - type: Sprite
@@ -262,6 +293,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyVirologyGlass
+  categories: [HideSpawnMenu]
   suffix: Virology, Glass
   components:
   - type: Sprite
@@ -272,6 +304,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCentralCommand
+  categories: [HideSpawnMenu]
   suffix: CentralCommand
   components:
   - type: Sprite
@@ -281,6 +314,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCentralCommandGlass
+  categories: [HideSpawnMenu]
   suffix: CentralCommand, Glass
   components:
   - type: Sprite
@@ -291,6 +325,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMining
+  categories: [HideSpawnMenu]
   suffix: Mining
   components:
   - type: Sprite
@@ -300,6 +335,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMiningGlass
+  categories: [HideSpawnMenu]
   suffix: Mining, Glass
   components:
   - type: Sprite
@@ -310,6 +346,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblySyndicate
+  categories: [HideSpawnMenu]
   suffix: Syndicate
   components:
   - type: Sprite
@@ -319,6 +356,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblySyndicateGlass
+  categories: [HideSpawnMenu]
   suffix: Syndicate, Glass
   components:
   - type: Sprite
@@ -327,8 +365,9 @@
 
 #ShuttleSyndicate
 - type: entity
-  parent: AirlockAssembly
+  parent: AirlockShuttleAssembly
   id: AirlockAssemblyShuttleSyndicate
+  categories: [HideSpawnMenu]
   suffix: ShuttleSyndicate
   components:
   - type: Sprite
@@ -336,8 +375,9 @@
     state: "assembly"
 
 - type: entity
-  parent: AirlockAssembly
+  parent: AirlockShuttleAssembly
   id: AirlockAssemblyShuttleSyndicateGlass
+  categories: [HideSpawnMenu]
   suffix: ShuttleSyndicate, Glass
   components:
   - type: Sprite
@@ -348,6 +388,7 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyHighSec
+  categories: [HideSpawnMenu]
   suffix: HighSec
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
index 5b5325cd3b..66269744b0 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
@@ -27,7 +27,7 @@
   - type: Pullable
   - type: Transform
     anchored: true
-    noRot: true
+  - type: Rotatable
   - type: Damageable
     damageModifierSet: SteelStaticMod
   - type: RCDDeconstructable
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
index fb7bcde32a..ffca7f4b6f 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -1,8 +1,13 @@
+# Feature-reduced parent, compatible with the requirements of the High Security Door
+# You probably want to inherit from Airlock rather than this
 - type: entity
-  parent: [ BaseStructure, StructureHealthDoor ]
-  id: Airlock
+  abstract: true
+  parent: BaseStructure
+  id: BaseAirlockIndestructible
   name: airlock
   description: It opens, it closes, and maybe crushes you.
+  placement:
+    mode: SnapgridCenter
   components:
   - type: Anchorable
     flags:
@@ -56,8 +61,6 @@
       visible: false
   - type: IconSmooth
     key: walls
-    additionalKeys:
-    - woods
     mode: NoSprite
   - type: AnimationPlayer
   - type: Physics
@@ -71,13 +74,13 @@
         mask:
         - FullTileMask
         layer:
-        - AirlockLayer
-  - type: LayerChangeOnWeld
-    unWeldedLayer: AirlockLayer
-    weldedLayer: WallLayer
+        - WallLayer # Unlike airlocks, this blocks LowImpassable (mice, rat king etc)
   - type: ContainerFill
     containers:
       board: [ DoorElectronics ]
+  - type: ContainerContainer
+    containers:
+      board: !type:Container
   - type: AccessReader
     containerAccessProvider: board
   - type: Door
@@ -90,9 +93,6 @@
       path: /Audio/Machines/airlock_close.ogg
     denySound:
       path: /Audio/Machines/airlock_deny.ogg
-  - type: ContainerContainer
-    containers:
-      board: !type:Container
   - type: Weldable
     fuel: 5
     time: 3
@@ -121,26 +121,6 @@
   - type: Wires
     boardName: wires-board-name-airlock
     layoutId: Airlock
-  - type: DoorSignalControl
-  - type: DeviceNetwork
-    deviceNetId: Wireless
-    receiveFrequencyId: BasicDevice
-  - type: WirelessNetworkConnection
-    range: 200
-  - type: DeviceLinkSink
-    ports:
-      - Open
-      - Close
-      - Toggle
-      - AutoClose
-      - DoorBolt
-  - type: DeviceLinkSource
-    ports:
-      - DoorStatus
-    lastSignals:
-      DoorStatus: false
-  - type: SoundOnOverload
-  - type: SpawnOnOverload
   - type: UserInterface
     interfaces:
       enum.AiUi.Key:
@@ -152,13 +132,67 @@
   - type: RadiationBlocker
     resistance: 3
   - type: Occluder
-    polygon:
-    - "-0.5, 0.5"
-    - "0.5, 0.5"
-    - "0.5, -0.5"
-    - "-0.5, -0.5"
   - type: Damageable
     damageModifierSet: SteelStaticMod
+  - type: Construction
+    graph: Airlock
+    node: airlock
+    containers:
+    - board
+  - type: PlacementReplacement
+    key: walls
+  - type: LightningTarget
+    priority: 1
+  - type: Tag
+    tags:
+    - Airlock
+    # This tag is used to navigate the Airlock construction graph. It's needed because the construction graph is shared between Airlock, AirlockGlass, and HighSecDoor
+    - DoorRemoteWhitelist
+    # This tag is used by door remotes to allow or not a door remote to normally be able to interact with a door
+  - type: BlockWeather
+  - type: GuideHelp
+    guides:
+    - Airlocks
+    - WirePanels
+  - type: StaticPrice
+    price: 150
+  - type: StructureAligner
+  - type: StructureAlignerPylon
+
+- type: entity
+  parent: [ BaseAirlockIndestructible, StructureHealthDoor ]
+  id: Airlock
+  name: airlock
+  description: It opens, it closes, and maybe crushes you.
+  components:
+  - type: LayerChangeOnWeld
+    unWeldedLayer: AirlockLayer
+    weldedLayer: WallLayer
+  - type: Fixtures
+    fixtures:
+      fix1:
+        layer:
+        - AirlockLayer
+  - type: DoorSignalControl
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: BasicDevice
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceLinkSink
+    ports:
+    - Open
+    - Close
+    - Toggle
+    - AutoClose
+    - DoorBolt
+  - type: DeviceLinkSource
+    ports:
+    - DoorStatus
+    lastSignals:
+      DoorStatus: false
+  - type: SoundOnOverload
+  - type: SpawnOnOverload
   - type: RCDDeconstructable
     cost: 6
     delay: 8
@@ -173,48 +207,26 @@
       - !type:PlaySoundBehavior
         sound:
           collection: MetalSlam
-  - type: Construction
-    graph: Airlock
-    node: airlock
-    containers:
-    - board
-  - type: PlacementReplacement
-    key: walls
   - type: Paintable
     group: AirlockStandard
-  - type: StaticPrice
-    price: 150
-  - type: LightningTarget
-    priority: 1
-  - type: Tag
-    tags:
-      - Airlock
-      # This tag is used to nagivate the Airlock construction graph. It's needed because the construction graph is shared between Airlock, AirlockGlass, and HighSecDoor
-      - DoorRemoteWhitelist
-      # This tag is used by door remotes to allow or not a door remote to normally be able to interact with a door
   - type: PryUnpowered
-  - type: BlockWeather
   - type: GuideHelp
     guides:
     - Airlocks
     - WirePanels
     - Networking
-  - type: StructureAligner
-  - type: StructureAlignerPylon
-  placement:
-    mode: SnapgridCenter
 
 - type: entity
-  id: AirlockRCDResistant
-  parent: Airlock
   abstract: true
+  parent: Airlock
+  id: AirlockRCDResistant
   components:
   - type: RCDDeconstructable
     deconstructable: false
 
 - type: entity
-  id: AirlockGlass
   parent: Airlock
+  id: AirlockGlass
   name: glass airlock
   components:
   - type: MeleeSound
@@ -227,7 +239,6 @@
     enabled: false
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/airlock-base.rsi
-  - type: AnimationPlayer
   - type: Fixtures
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
index ad7d20d66a..fa9493ddcc 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: AirlockRCDResistant
   id: AirlockExternal
-  suffix: External
+  name: external airlock
   description: It opens, it closes, it might crush you, and there might be only space behind it.
   components:
   - type: Door
@@ -61,7 +61,7 @@
 - type: entity
   parent: AirlockExternal
   id: AirlockExternalGlass
-  suffix: Glass, External
+  suffix: Glass
   components:
   - type: Door
     occludes: false
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
index f85ccfdfa6..9cc9ce4771 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
@@ -1,124 +1,24 @@
 - type: entity
-  parent: [ BaseStructure, StructureHealthDoorStrong ]
+  parent: [ BaseAirlockIndestructible, StructureHealthDoorStrong ]
   id: HighSecDoor
   name: high security door
   description: Keeps the bad out and keeps the good in.
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: Anchorable
-    flags:
-    - Anchorable
-  - type: Rotatable
-  - type: StationAiWhitelist
-  - type: InteractionOutline
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/airlock-vault.rsi
-    layers:
-    - state: closed
-      map: ["enum.DoorVisualLayers.Base"]
-    - state: closed_unlit
-      shader: unshaded
-      sprite: Structures/Doors/Airlocks/Effects/airlock-effects-vault.rsi
-      map: ["enum.DoorVisualLayers.BaseUnlit"]
-      visible: true
-    - state: welded
-      sprite: Structures/Doors/Airlocks/Effects/airlock-effects-vault.rsi
-      map: ["enum.WeldableLayers.BaseWelded"]
-    - state: bolted_unlit
-      shader: unshaded
-      sprite: Structures/Doors/Airlocks/Effects/airlock-effects-vault.rsi
-      map: ["enum.DoorVisualLayers.BaseBolted"]
-    - state: emergency_unlit
-      sprite: Structures/Doors/Airlocks/Effects/airlock-effects-vault.rsi
-      map: ["enum.DoorVisualLayers.BaseEmergencyAccess"]
-      shader: unshaded
-    - state: panel_open
-      sprite: Structures/Doors/Airlocks/Effects/airlock-effects.rsi
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-    - state: electrified_ai
-      sprite: Interface/Misc/ai_hud.rsi
-      shader: unshaded
-      visible: false
-      map: ["enum.ElectrifiedLayers.HUD"]
-    - state: electrified
-      sprite: Effects/electricity.rsi
-      shader: unshaded
-      visible: false
-      map: ["enum.ElectrifiedLayers.Sparks"]
-    - state: sparks
-      sprite: Structures/Doors/Airlocks/Effects/airlock-effects.rsi
-      map: ["enum.DoorVisualLayers.BaseEmagging"]
-      shader: unshaded
-      visible: false
-  - type: AnimationPlayer
-  - type: Physics
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
-        density: 100
-        mask:
-        - FullTileMask
-        layer:
-        - WallLayer
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronics ]
-  - type: ContainerContainer
-    containers:
-      board: !type:Container
   - type: Door
     crushDamage:
       types:
         Blunt: 50
-    openSound:
-      path: /Audio/Machines/airlock_open.ogg
-    closeSound:
-      path: /Audio/Machines/airlock_close.ogg
-    denySound:
-      path: /Audio/Machines/airlock_deny.ogg
   - type: Weldable
     fuel: 10
     time: 10
-  - type: Airlock
-    openUnlitVisible: true
-  - type: NavMapDoor
-  - type: DoorBolt
-  - type: AccessReader
-    containerAccessProvider: board
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.ElectrifiedVisuals.ShowSparks:
-        enum.ElectrifiedLayers.Sparks:
-          True: { visible: True }
-          False: { visible: False }
-  - type: WiresVisuals
-  - type: ElectrocutionHUDVisuals
-  - type: ApcPowerReceiver
-    powerLoad: 20
-  - type: ExtensionCableReceiver
-  - type: Electrified
-    enabled: false
-    usesApcPower: true
-  - type: WiresPanel
   - type: WiresPanelSecurity
     securityLevel: maxSecurity
   - type: Wires
     boardName: wires-board-name-highsec
     layoutId: HighSec
     alwaysRandomize: true
-  - type: UserInterface
-    interfaces:
-      enum.AiUi.Key:
-        type: StationAiBoundUserInterface
-      enum.WiresUiKey.Key:
-        type: WiresBoundUserInterface
-  - type: Airtight
-  - type: Occluder
   - type: Damageable
     damageModifierSet: PlasteelStaticMod
   - type: Destructible
@@ -142,12 +42,7 @@
     node: highSecDoor
   - type: Tag
     tags:
-      - HighSecDoor
-      # This tag is used to nagivate the Airlock construction graph. It's needed because this construction graph is shared between Airlock, AirlockGlass, and HighSecDoor
-      - DoorRemoteWhitelist
-      # This tag is used by door remotes to allow or not a door remote to normally be able to interact with a door
-  - type: IconSmooth
-    key: walls
-    mode: NoSprite
-  - type: StructureAligner
-  - type: StructureAlignerPylon
+    - HighSecDoor
+    # This tag is used to nagivate the Airlock construction graph. It's needed because this construction graph is shared between Airlock, AirlockGlass, and HighSecDoor
+    - DoorRemoteWhitelist
+    # This tag is used by door remotes to allow or not a door remote to normally be able to interact with a door
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index cab9e987e0..ae2a958f9f 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -1,8 +1,7 @@
-- type: entity
+- type: entity
   parent: AirlockRCDResistant
   id: AirlockShuttle
-  suffix: Docking
-  name: external airlock
+  name: docking airlock
   description: Necessary for connecting two space craft together.
   components:
   - type: Docking
@@ -107,7 +106,7 @@
 - type: entity
   id: AirlockGlassShuttle
   parent: AirlockShuttle
-  suffix: Glass, Docking
+  suffix: Glass
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/shuttle-base.rsi
@@ -121,20 +120,16 @@
         layer:     #removed opaque from the layer, allowing lasers to pass through glass airlocks
         - GlassAirlockLayer
 
+# TODO: migrate into assembly with the others
 - type: entity
   id: AirlockShuttleAssembly
   parent: AirlockAssembly
-  name: external airlock assembly
-  suffix: Docking
+  name: docking airlock assembly
   description: An incomplete structure necessary for connecting two space craft together.
   components:
-  - type: Transform
-    anchored: true
-    noRot: false
-  - type: Rotatable
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/shuttle-base.rsi
-    state: closed
+    sprite: Structures/Doors/Airlocks/Standard/shuttle-base.rsi
+    state: "assembly"
     snapCardinals: false
   - type: Construction
     graph: AirlockShuttle
@@ -143,6 +138,7 @@
 - type: entity
   id: AirlockGlassShuttleSyndicate
   parent: AirlockGlassShuttle
+  suffix: Syndicate, Glass
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/shuttle-syndicate.rsi
@@ -150,6 +146,7 @@
 - type: entity
   parent: AirlockShuttle
   id: AirlockShuttleSyndicate
+  suffix: Syndicate
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/shuttle-syndicate.rsi
@@ -157,7 +154,7 @@
 - type: entity
   parent: AirlockShuttle
   id: AirlockShuttleXenoborg
-  name: external mechadermis airlock
+  name: docking mechadermis airlock
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/shuttle-xenoborg.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
index d96e8b483f..c0bfc29cf5 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: [ BaseStructureDynamic, StructureHealthDoorWeak ]
   id: FirelockFrame
   name: firelock frame
diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
index 9bdf8a8168..3e31a20b4d 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: BaseStructure
   id: BaseMaterialDoor
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
index e158fd77e0..0a258bad58 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: [ BaseShutter, StructureHealthDoorStrong ]
   id: BlastDoor
   name: blast door
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
index 56ea104445..07bc8f2fc7 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
@@ -55,3 +55,4 @@
         - TableMask
         layer:
         - TableLayer
+        - LowImpassable
diff --git a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
index 9ebf033fdd..43d75005de 100644
--- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
+++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
@@ -114,11 +114,12 @@
         fix1:
           shape:
             !type:PhysShapeAabb
-            bounds: "-0.3,-0.3,0.3,0.3"
+            bounds: "-0.4,-0.4,0.4,0.4"
           mask:
-            - TableMask
+          - TableMask
           layer:
-            - TableLayer
+          - TableLayer
+          - LowImpassable
     - type: TimedDespawn
       lifetime: 180
     - type: PointLight
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
index 4a33b84475..8fa681f9f3 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -317,6 +317,7 @@
       light_bulb: !type:ContainerSlot
   - type: PoweredLight
     bulb: Bulb
+  - type: SpookyPoweredLight
   - type: ApcPowerReceiver
   - type: ExtensionCableReceiver
   - type: DeviceNetwork
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 7f59c57425..c8b6595da0 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -457,6 +457,7 @@
   - type: DeviceNetwork
     deviceNetId: Wireless
     receiveFrequencyId: CrewMonitor
+    prefix: device-address-prefix-crew-monitor
   - type: WirelessNetworkConnection
     range: 1200
   - type: AmbientMusicMarkerMedical
@@ -524,6 +525,10 @@
     access: [["Command"]]
   - type: Lock
     unlockOnClick: false
+  - type: EmptyOnMachineDeconstruct
+    containers:
+    - storagebase
+
 
 - type: entity
   parent: ComputerStationTeleportersControl
@@ -532,7 +537,7 @@
   components:
   - type: StationTeleporterConsole
     autoLinkKey: Nanotrasen
-  
+
 - type: entity
   parent: ComputerStationTeleportersControl
   id: ComputerSyndicateTeleportersControl
@@ -558,7 +563,7 @@
     access: [["SyndicateAgent"]]
   - type: StationTeleporterConsole
     portalColor: "#c61414"
-  
+
 - type: entity
   parent: BaseComputerAiAccess
   id: ComputerResearchAndDevelopment
@@ -998,7 +1003,7 @@
   - type: DeviceLinkSource
     range: 200
     ports:
-      - OrderSender
+    - OrderSender
   - type: GuideHelp
     guides:
     - Cargo
@@ -1407,6 +1412,7 @@
     deviceNetId: Wired
     receiveFrequencyId: SurveillanceCamera
     transmitFrequencyId: SurveillanceCamera
+    prefix: device-address-prefix-camera-monitor
   - type: WiredNetworkConnection
   - type: DeviceNetworkRequiresPower
   - type: SurveillanceCameraMonitor
@@ -1446,6 +1452,7 @@
     deviceNetId: Wireless
     receiveFrequencyId: SurveillanceCamera
     transmitFrequencyId: SurveillanceCamera
+    prefix: device-address-prefix-camera-monitor
   - type: WirelessNetworkConnection
     range: 200
   - type: DeviceNetworkRequiresPower
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
index 7ae3b5bff3..560dd290f5 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: [BaseStructure, ConstructibleMachine, BaseConstructibleMachineDestructible] # Not a BaseMachinePowered since we don't want the anchorable component
   id: CryoPod
   name: cryo pod
diff --git a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
index 9264c86df6..fd441b2ccd 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: CloningPod
   parent: [ BaseMachinePowered, BaseConstructibleMachineDestructible ]
   name: cloning pod
diff --git a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
index 1b35e4baec..e069fa3879 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
@@ -33,6 +33,7 @@
     deviceNetId: Wireless
     transmitFrequencyId: CrewMonitor
     receiveFrequencyId: SuitSensor
+    prefix: device-address-prefix-crew-monitoring-server
     autoConnect: false
   - type: WirelessNetworkConnection
     range: 500
diff --git a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
index b4650a2034..1cb7409381 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: FatExtractor
   parent: [ BaseMachinePowered, ConstructibleMachine, BaseConstructibleMachineDestructible ]
   name: lipid extractor
diff --git a/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml b/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml
index cc29264fc0..72ceb3b754 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: MachineFlatpacker
   parent: [ BaseMachinePowered, ConstructibleMachine, BaseConstructibleMachineDestructible ]
   name: Flatpacker 1001
diff --git a/Resources/Prototypes/Entities/Structures/Machines/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
index 459dacc097..53619ae14a 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: StructureHealthMachineWeak
   id: UnfinishedMachineFrame
   name: machine frame
diff --git a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
index ea32eae897..1d89edb1ee 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: BaseMachinePowered
   id: BaseGravityGenerator
diff --git a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
index fb3eab6cb6..d0cdbfc1b1 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: MedicalScanner
   parent: [ BaseMachinePowered, BaseConstructibleMachineDestructible ]
   name: medical scanner
diff --git a/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml b/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml
index 6572e86da6..0e7f64f35e 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: SeedExtractor
   name: seed extractor
   parent: [ BaseMachinePowered, ConstructibleMachine, BaseConstructibleMachineDestructible ]
diff --git a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
index 02e58f1f45..a75a7a20b5 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: [BaseStructureDynamic, ConstructibleMachine, BaseMachinePowered, BaseConstructibleMachineDestructible]
   id: SmartFridge
   name: SmartFridge
diff --git a/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml b/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
index f345fa3988..830f920bae 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
@@ -1,72 +1,75 @@
 - type: entity
   abstract: true
-  parent: [ BaseMachinePowered, ConstructibleMachine, BaseConstructibleMachineDestructible  ]
+  parent: [ BaseMachinePowered, ConstructibleMachine ]
   id: SurveillanceCameraRouterBase
   name: camera router
   description: A surveillance camera router. It routes. Perhaps.
   components:
-    - type: DeviceNetwork
-      deviceNetId: Wired
-      receiveFrequencyId: SurveillanceCamera
-      transmitFrequencyId: SurveillanceCamera
-    - type: WiredNetworkConnection
-    - type: DeviceNetworkRequiresPower
-    - type: UserInterface
-      interfaces:
-        enum.SurveillanceCameraSetupUiKey.Router:
-          type: SurveillanceCameraSetupBoundUi
-    - type: Machine
-      board: SurveillanceCameraRouterCircuitboard
-    - type: Sprite
-      sprite: Structures/Machines/server.rsi
-      snapCardinals: true
-      layers:
-        - state: server-off
-        - state: server-on
-          visible: false
-          map: ["enum.PowerDeviceVisualLayers.Powered"]
-        - state: server_o
-          map: ["enum.WiresVisualLayers.MaintenancePanel"]
-    - type: GenericVisualizer
-      visuals:
-        enum.PowerDeviceVisuals.Powered:
-          enum.PowerDeviceVisualLayers.Powered:
-            True: { visible: true }
-            False: { visible: false }
-    - type: Destructible
-      thresholds:
-      - trigger: !type:DamageTrigger
-          damage: 175
-        behaviors:
-        - !type:PlaySoundBehavior
-          sound:
-            collection: MetalBreak
-    - type: Appearance
-    - type: AmbientOnPowered
-    - type: AmbientSound
-      volume: -9
-      range: 5
-      enabled: false
-      sound:
-        collection: ServerFans
-    - type: WiresVisuals
-    - type: WiresPanel
+  - type: Sprite
+    sprite: Structures/Machines/server.rsi
+    snapCardinals: true
+    layers:
+    - state: server-off
+    - state: server-on
+      visible: false
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+    - state: server_o
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: GenericVisualizer
+    visuals:
+      enum.PowerDeviceVisuals.Powered:
+        enum.PowerDeviceVisualLayers.Powered:
+          True: { visible: true }
+          False: { visible: false }
+  - type: Appearance
+  - type: AmbientOnPowered
+  - type: AmbientSound
+    volume: -9
+    range: 5
+    enabled: false
+    sound:
+      collection: ServerFans
+  - type: WiresVisuals
+  - type: WiresPanel
+  - type: Machine
+    board: SurveillanceCameraRouterCircuitboard
+  - type: Destructible
+    thresholds:
+    - trigger: !type:DamageTrigger
+        damage: 175
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+  - type: DeviceNetwork
+    deviceNetId: Wired
+    receiveFrequencyId: SurveillanceCamera
+    transmitFrequencyId: SurveillanceCamera
+    prefix: device-address-prefix-camera-router
+  - type: WiredNetworkConnection
+  - type: DeviceNetworkRequiresPower
+  - type: DeviceNetworkRouter
+  - type: SurveillanceCameraRouter
+  - type: UserInterface
+    interfaces:
+      enum.SurveillanceCameraSetupUiKey.Router:
+        type: SurveillanceCameraSetupBoundUi
 
 - type: entity
   parent: SurveillanceCameraRouterBase
   id: SurveillanceCameraRouterConstructed
   suffix: Constructed
   components:
-    - type: SurveillanceCameraRouter
-      setupAvailableNetworks:
-        - SurveillanceCameraEngineering
-        - SurveillanceCameraSecurity
-        - SurveillanceCameraService
-        - SurveillanceCameraSupply
-        - SurveillanceCameraScience
-        - SurveillanceCameraGeneral
-        - SurveillanceCameraMedical
-        - SurveillanceCameraCommand
+  - type: SurveillanceCameraRouter
+    setupAvailableNetworks:
+    - SurveillanceCameraEngineering
+    - SurveillanceCameraSecurity
+    - SurveillanceCameraService
+    - SurveillanceCameraSupply
+    - SurveillanceCameraScience
+    - SurveillanceCameraGeneral
+    - SurveillanceCameraMedical
+    - SurveillanceCameraCommand
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -74,8 +77,8 @@
   name: engineering camera router
   suffix: Engineering
   components:
-    - type: SurveillanceCameraRouter
-      subnetFrequency: SurveillanceCameraEngineering
+  - type: SurveillanceCameraRouter
+    subnetFrequency: SurveillanceCameraEngineering
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -83,8 +86,8 @@
   name: security camera router
   suffix: Security
   components:
-    - type: SurveillanceCameraRouter
-      subnetFrequency: SurveillanceCameraSecurity
+  - type: SurveillanceCameraRouter
+    subnetFrequency: SurveillanceCameraSecurity
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -92,8 +95,8 @@
   name: science camera router
   suffix: Science
   components:
-    - type: SurveillanceCameraRouter
-      subnetFrequency: SurveillanceCameraScience
+  - type: SurveillanceCameraRouter
+    subnetFrequency: SurveillanceCameraScience
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -101,8 +104,8 @@
   name: supply camera router
   suffix: Supply
   components:
-    - type: SurveillanceCameraRouter
-      subnetFrequency: SurveillanceCameraSupply
+  - type: SurveillanceCameraRouter
+    subnetFrequency: SurveillanceCameraSupply
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -110,8 +113,8 @@
   name: command camera router
   suffix: Command
   components:
-    - type: SurveillanceCameraRouter
-      subnetFrequency: SurveillanceCameraCommand
+  - type: SurveillanceCameraRouter
+    subnetFrequency: SurveillanceCameraCommand
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -119,8 +122,8 @@
   name: service camera router
   suffix: Service
   components:
-    - type: SurveillanceCameraRouter
-      subnetFrequency: SurveillanceCameraService
+  - type: SurveillanceCameraRouter
+    subnetFrequency: SurveillanceCameraService
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -128,8 +131,8 @@
   name: medical camera router
   suffix: Medical
   components:
-    - type: SurveillanceCameraRouter
-      subnetFrequency: SurveillanceCameraMedical
+  - type: SurveillanceCameraRouter
+    subnetFrequency: SurveillanceCameraMedical
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -137,8 +140,8 @@
   name: general camera router
   suffix: General
   components:
-    - type: SurveillanceCameraRouter
-      subnetFrequency: SurveillanceCameraGeneral
+  - type: SurveillanceCameraRouter
+    subnetFrequency: SurveillanceCameraGeneral
 
 - type: entity
   abstract: true
@@ -147,61 +150,64 @@
   name: wireless camera router
   description: A wireless surveillance camera router. It routes. Perhaps.
   components:
-    - type: DeviceNetwork
-      deviceNetId: Wireless
-      receiveFrequencyId: SurveillanceCamera
-      transmitFrequencyId: SurveillanceCamera
-    - type: WirelessNetworkConnection
-      range: 200
-    - type: DeviceNetworkRequiresPower
-    - type: UserInterface
-      interfaces:
-        enum.SurveillanceCameraSetupUiKey.Router:
-          type: SurveillanceCameraSetupBoundUi
-    - type: Machine
-      board: SurveillanceCameraWirelessRouterCircuitboard
-    - type: Sprite
-      sprite: Structures/Machines/server.rsi
-      layers:
-        - state: server-off
-        - state: server-on
-          visible: false
-          map: ["enum.PowerDeviceVisualLayers.Powered"]
-        - state: server_o
-          map: ["enum.WiresVisualLayers.MaintenancePanel"]
-    - type: GenericVisualizer
-      visuals:
-        enum.PowerDeviceVisuals.Powered:
-          enum.PowerDeviceVisualLayers.Powered:
-            True: { visible: true }
-            False: { visible: false }
-    - type: Destructible
-      thresholds:
-      - trigger: !type:DamageTrigger
-          damage: 175
-        behaviors:
-        - !type:PlaySoundBehavior
-          sound:
-            collection: MetalBreak
-    - type: Appearance
-    - type: AmbientOnPowered
-    - type: AmbientSound
-      volume: -9
-      range: 5
-      enabled: false
-      sound:
-        collection: ServerFans
-    - type: WiresVisuals
-    - type: WiresPanel
+  - type: Sprite
+    sprite: Structures/Machines/server.rsi
+    layers:
+    - state: server-off
+    - state: server-on
+      visible: false
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+    - state: server_o
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: GenericVisualizer
+    visuals:
+      enum.PowerDeviceVisuals.Powered:
+        enum.PowerDeviceVisualLayers.Powered:
+          True: { visible: true }
+          False: { visible: false }
+  - type: Appearance
+  - type: AmbientOnPowered
+  - type: AmbientSound
+    volume: -9
+    range: 5
+    enabled: false
+    sound:
+      collection: ServerFans
+  - type: WiresVisuals
+  - type: WiresPanel
+  - type: Machine
+    board: SurveillanceCameraWirelessRouterCircuitboard
+  - type: Destructible
+    thresholds:
+    - trigger: !type:DamageTrigger
+        damage: 175
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: SurveillanceCamera
+    transmitFrequencyId: SurveillanceCamera
+    prefix: device-address-prefix-camera-router-wireless
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceNetworkRequiresPower
+  - type: DeviceNetworkRouter
+  - type: SurveillanceCameraRouter
+  - type: UserInterface
+    interfaces:
+      enum.SurveillanceCameraSetupUiKey.Router:
+        type: SurveillanceCameraSetupBoundUi
 
 - type: entity
   parent: SurveillanceCameraWirelessRouterBase
   id: SurveillanceCameraWirelessRouterConstructed
   suffix: Constructed
   components:
-    - type: SurveillanceCameraRouter
-      setupAvailableNetworks:
-        - SurveillanceCameraEntertainment
+  - type: SurveillanceCameraRouter
+    setupAvailableNetworks:
+    - SurveillanceCameraEntertainment
 
 - type: entity
   parent: SurveillanceCameraWirelessRouterBase
@@ -209,8 +215,8 @@
   name: entertainment camera router
   suffix: Entertainment
   components:
-    - type: SurveillanceCameraRouter
-      subnetFrequency: SurveillanceCameraEntertainment
+  - type: SurveillanceCameraRouter
+    subnetFrequency: SurveillanceCameraEntertainment
 
 - type: entity
   parent: SurveillanceCameraWirelessRouterBase
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 2b627fb0cc..d97ec66731 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -1,4 +1,4 @@
-# base
+# base
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
index 9f455d712d..082b72c37c 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: StructureHealthMachineWeak
   id: DisposalMachineFrame
   name: high pressure machine frame
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
index 2dc2baa5f4..ecee7ae7d8 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -226,6 +226,7 @@
     deviceNetId: Wired
     receiveFrequencyId: MailingUnit
     transmitFrequencyId: MailingUnit
+  - type: DeviceNetworkRequiresPower
   - type: WiredNetworkConnection
   - type: Configuration
     config:
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
index 62f9c244ca..5e3b70dcc6 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -65,6 +65,12 @@
       input:
         !type:CableDeviceNode
         nodeGroupID: MVPower
+  - type: Electrified
+    onHandInteract: false
+    onInteractUsing: false
+    onBump: false
+    usesApcPower: false
+    mediumVoltageNode: input
   - type: Damageable
     damageModifierSet: PlasteelStaticMod
   - type: ActiveRadio
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
index 2a0f944dad..aed8746e78 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
@@ -75,6 +75,12 @@
   - type: PowerNetworkBattery
     maxSupply: 350000
     supplyRampTolerance: 350000
+  - type: Electrified
+    onHandInteract: false
+    onInteractUsing: false
+    onBump: false
+    usesApcPower: false
+    highVoltageNode: input
   - type: Anchorable
   - type: Rotatable
   - type: Pullable
diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml
index 4a92d72c6f..2f0bdff92a 100644
--- a/Resources/Prototypes/Entities/Structures/Power/cables.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   id: CablePhysBase
   placement:
diff --git a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
index ee137acd47..ac005ca239 100644
--- a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: DebugGenerator
   parent: BaseGenerator
   suffix: DEBUG
diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml b/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml
index f3b404de51..eb6da76d0e 100644
--- a/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: StationAnchorBase
   abstract: true
   name: station anchor
@@ -70,6 +70,11 @@
   - type: ApcPowerReceiver
     powerLoad: 2500
   - type: ExtensionCableReceiver
+  - type: Electrified
+    onHandInteract: false
+    onInteractUsing: false
+    onBump: false
+    usesApcPower: true
   - type: Repairable
     fuelCost: 10
     doAfterDelay: 5
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injections.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injections.yml
index 2b10aa1f76..f61ad6b04d 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injections.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injections.yml
@@ -379,4 +379,4 @@
         maxAmount: 10
         maxRange: 6
       spawns:
-      - PresentRandomInsane
\ No newline at end of file
+      - PresentRandomInsane
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/freezer.yml b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/freezer.yml
index a551ce1a73..464f5306f4 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/freezer.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/freezer.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: AirSensorBase
   id: AirSensorFreezerBase
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml
index 9607da0341..11a0651dff 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: StructureHealthContainerFlimsy
   id: BaseBigBox
@@ -83,7 +83,7 @@
 - type: entity
   id: StealthBox
   suffix: stealth
-  parent: [BaseCorvaxContraband435, BaseBigBox] # Corvax-Contraband
+  parent: BaseBigBox
   description: Kept ya waiting, huh?
   components:
     - type: Damageable
diff --git a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
index e9aa459f96..af897c5d0e 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseStructureDynamic
   id: BaseGlassBox
   abstract: true
diff --git a/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml b/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml
index fdae2e3a68..17be5a0e20 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: [ BaseStructureDynamic, StructureHealthContainer ]
   id: OreBox
   name: ore box
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/boards.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/boards.yml
index a21c628125..f4da60552a 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/boards.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/boards.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: [ BaseWallmount, StructureHealthFurniture ]
   id: BaseWallmountBoard
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml
index 432f9e5f7d..8de1ea5cd3 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: [ BaseWallmountGlass, StructureHealthFurnitureWeak ]
   id: Mirror
   name: mirror
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml
index 08e0d4fb75..7897aeb9ff 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: MarkerBase
   id: PlaqueAtmos
   name: atmos plaque spawner
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
index bbbb83698c..6d2a090206 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: BaseBarSign
   parent: [ BaseWallmountGlass, BaseWallmountMachine, StructureHealthMachineWeak ]
   name: bar sign
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
index e081ac23d7..82a4e146ae 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
@@ -27,7 +27,7 @@
     state: NT_flag
 
 - type: entity
-  parent: BaseFlag
+  parent: [BaseCorvaxContraband131, BaseFlag] # Corvax-Contraband
   id: SyndieFlag
   name: syndicate flag
   description: Smells bloody. Death to NT!
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/shotgun_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/shotgun_cabinet.yml
index 3f226c301a..2c234d5d11 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/shotgun_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/shotgun_cabinet.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: FireAxeCabinet
   id: ShotGunCabinet
   name: shotgun cabinet
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/telescreens.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/telescreens.yml
index 8689dc698b..1f29d6b846 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/telescreens.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/telescreens.yml
@@ -44,6 +44,7 @@
     deviceNetId: Wired
     receiveFrequencyId: SurveillanceCamera
     transmitFrequencyId: SurveillanceCamera
+    prefix: device-address-prefix-camera-monitor
   - type: WiredNetworkConnection
   - type: DeviceNetworkRequiresPower
   - type: SurveillanceCameraMonitor
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
index 3fc723257e..7d435f2d22 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
@@ -51,12 +51,15 @@
     group: AirAlarm
   - type: Clickable
   - type: InteractionOutline
+  - type: ActivatableUI
+    key: enum.SharedAirAlarmInterfaceKey.Key
   - type: UserInterface
     interfaces:
       enum.SharedAirAlarmInterfaceKey.Key:
         type: AirAlarmBoundUserInterface
       enum.WiresUiKey.Key:
         type: WiresBoundUserInterface
+  - type: ActivatableUIRequiresPower
   - type: WiresPanel
   - type: Wires
     boardName: wires-board-name-airalarm
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
index 983ead5ac3..a92e139227 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
@@ -39,14 +39,6 @@
     deviceNetId: Wireless
     receiveFrequencyId: ShuttleTimer
 
-# Dummy screen for comms console
-- type: entity
-  parent: Screen
-  id: ScreenDummy
-  categories: [HideSpawnMenu]
-  components:
-  - type: Sprite
-
 - type: entity
   id: ArrivalsShuttleTimer
   parent: Screen
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/surveillance_camera.yml
index 44bf6537c6..c9d0250cb8 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/surveillance_camera.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/surveillance_camera.yml
@@ -9,8 +9,20 @@
     snap:
     - Wallmount
   components:
+  - type: Transform
+    anchored: true
+  - type: Sprite
+    drawdepth: WallMountedItems
+    sprite: Structures/Wallmounts/camera.rsi
+    offset: 0, -0.5
+    layers:
+    - map: [ "enum.SurveillanceCameraVisualsKey.Layer" ]
+      state: camera
+  - type: Appearance
   - type: Physics
     bodyType: Static
+  - type: Clickable
+  - type: InteractionOutline
   - type: Fixtures
     fixtures:
       light:
@@ -29,57 +41,14 @@
         - None
         layer:
         - TabletopMachineLayer
-  - type: CameraActiveOnCollide
-    requiresPower: false # TODO: Change this when AI can no longer see via unpowered cameras
+  - type: Eye
   - type: PointLight
     enabled: false
     radius: 5
-  - type: SlimPoweredLight
-    enabled: false
-  - type: StationAiVision
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Construction
-    graph: SurveillanceCamera
-    node: camera
-  - type: Electrified
-    enabled: false
-    usesApcPower: true
-  - type: WallMount
-  - type: ApcPowerReceiver
-  - type: ExtensionCableReceiver
-  - type: Eye
-  - type: WiredNetworkConnection
-  - type: DeviceNetworkRequiresPower
-  - type: Transform
-    anchored: true
-  - type: WiresPanel
-  - type: Wires
-    alwaysRandomize: true
-    layoutId: SurveillanceCamera
-  - type: Sprite
-    drawdepth: WallMountedItems
-    sprite: Structures/Wallmounts/camera.rsi
-    offset: 0, -0.5
-    layers:
-      - map: [ "enum.SurveillanceCameraVisualsKey.Layer" ]
-        state: camera
-  - type: Appearance
-  - type: SurveillanceCameraVisuals
-    sprites:
-      Active: camera
-      Disabled: camera_off
-      InUse: camera_in_use
-  - type: UserInterface
-    interfaces:
-      enum.SurveillanceCameraSetupUiKey.Camera:
-        type: SurveillanceCameraSetupBoundUi
-      enum.WiresUiKey.Key:
-        type: WiresBoundUserInterface
-  - type: StaticPrice
-    price: 200
   - type: Damageable
     damageModifierSet: SteelMod
+  - type: Injurable
+    damageContainer: StructuralInorganic
   - type: Destructible
     thresholds: &ThresholdsSurveilCamera
     - trigger:
@@ -96,6 +65,43 @@
           SheetSteel1:
             min: 0
             max: 1
+  - type: SlimPoweredLight
+    enabled: false
+  - type: Electrified
+    enabled: false
+    usesApcPower: true
+  - type: WallMount
+  - type: ApcPowerReceiver
+  - type: ExtensionCableReceiver
+  - type: WiresPanel
+  - type: Wires
+    alwaysRandomize: true
+    layoutId: SurveillanceCamera
+  - type: DeviceNetwork
+    deviceNetId: Wired
+    transmitFrequencyId: SurveillanceCamera
+    prefix: device-address-prefix-camera
+  - type: DeviceNetworkRequiresPower
+  - type: WiredNetworkConnection
+  - type: StationAiVision
+  - type: CameraActiveOnCollide
+    requiresPower: false # TODO: Change this when AI can no longer see via unpowered cameras
+  - type: Construction
+    graph: SurveillanceCamera
+    node: camera
+  - type: StaticPrice
+    price: 200
+  - type: SurveillanceCameraVisuals
+    sprites:
+      Active: camera
+      Disabled: camera_off
+      InUse: camera_in_use
+  - type: UserInterface
+    interfaces:
+      enum.SurveillanceCameraSetupUiKey.Camera:
+        type: SurveillanceCameraSetupBoundUi
+      enum.WiresUiKey.Key:
+        type: WiresBoundUserInterface
 
 - type: entity
   parent: SurveillanceCameraBase
@@ -103,19 +109,16 @@
   name: camera
   suffix: Constructed
   components:
-    - type: DeviceNetwork
-      deviceNetId: Wired
-      transmitFrequencyId: SurveillanceCamera
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-        - SurveillanceCameraEngineering
-        - SurveillanceCameraSecurity
-        - SurveillanceCameraService
-        - SurveillanceCameraSupply
-        - SurveillanceCameraScience
-        - SurveillanceCameraGeneral
-        - SurveillanceCameraMedical
-        - SurveillanceCameraCommand
+  - type: SurveillanceCamera
+    setupAvailableNetworks:
+    - SurveillanceCameraEngineering
+    - SurveillanceCameraSecurity
+    - SurveillanceCameraService
+    - SurveillanceCameraSupply
+    - SurveillanceCameraScience
+    - SurveillanceCameraGeneral
+    - SurveillanceCameraMedical
+    - SurveillanceCameraCommand
 
 - type: entity
   parent: SurveillanceCameraBase
@@ -124,9 +127,8 @@
   suffix: Engineering
   components:
   - type: DeviceNetwork
-    deviceNetId: Wired
     receiveFrequencyId: SurveillanceCameraEngineering
-    transmitFrequencyId: SurveillanceCamera
+    prefix: device-address-prefix-camera
   - type: SurveillanceCamera
     networkSet: true
 
@@ -137,9 +139,7 @@
   suffix: Security
   components:
   - type: DeviceNetwork
-    deviceNetId: Wired
     receiveFrequencyId: SurveillanceCameraSecurity
-    transmitFrequencyId: SurveillanceCamera
   - type: SurveillanceCamera
     networkSet: true
 
@@ -150,9 +150,7 @@
   suffix: Science
   components:
   - type: DeviceNetwork
-    deviceNetId: Wired
     receiveFrequencyId: SurveillanceCameraScience
-    transmitFrequencyId: SurveillanceCamera
   - type: SurveillanceCamera
     networkSet: true
 
@@ -163,9 +161,7 @@
   suffix: Supply
   components:
   - type: DeviceNetwork
-    deviceNetId: Wired
     receiveFrequencyId: SurveillanceCameraSupply
-    transmitFrequencyId: SurveillanceCamera
   - type: SurveillanceCamera
     networkSet: true
 
@@ -176,9 +172,7 @@
   suffix: Command
   components:
   - type: DeviceNetwork
-    deviceNetId: Wired
     receiveFrequencyId: SurveillanceCameraCommand
-    transmitFrequencyId: SurveillanceCamera
   - type: SurveillanceCamera
     networkSet: true
 
@@ -189,9 +183,7 @@
   suffix: Service
   components:
   - type: DeviceNetwork
-    deviceNetId: Wired
     receiveFrequencyId: SurveillanceCameraService
-    transmitFrequencyId: SurveillanceCamera
   - type: SurveillanceCamera
     networkSet: true
 
@@ -202,9 +194,7 @@
   suffix: Medical
   components:
   - type: DeviceNetwork
-    deviceNetId: Wired
     receiveFrequencyId: SurveillanceCameraMedical
-    transmitFrequencyId: SurveillanceCamera
   - type: SurveillanceCamera
     networkSet: true
 
@@ -215,9 +205,7 @@
   suffix: General
   components:
   - type: DeviceNetwork
-    deviceNetId: Wired
     receiveFrequencyId: SurveillanceCameraGeneral
-    transmitFrequencyId: SurveillanceCamera
   - type: SurveillanceCamera
     networkSet: true
 
@@ -231,20 +219,20 @@
     snap:
     - Wallmount
   components:
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Construction
-      graph: SurveillanceCamera
-      node: assembly
-    - type: WallMount
-    - type: Transform
-      anchored: true
-    - type: Damageable
-      damageModifierSet: SteelMod
-    - type: Destructible
-      thresholds: *ThresholdsSurveilCamera
-    - type: Sprite
-      drawdepth: WallMountedItems
-      sprite: Structures/Wallmounts/camera.rsi
-      layers:
-        - state: camera_off
+  - type: Transform
+    anchored: true
+  - type: Sprite
+    drawdepth: WallMountedItems
+    sprite: Structures/Wallmounts/camera.rsi
+    layers:
+    - state: camera_off
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Damageable
+    damageModifierSet: SteelMod
+  - type: Destructible
+    thresholds: *ThresholdsSurveilCamera
+  - type: Construction
+    graph: SurveillanceCamera
+    node: assembly
+  - type: WallMount
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index f1abf4afa7..afe5668fdd 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -454,7 +454,7 @@
   id: IronRockArtifactFragment
 
 - type: entity
-  parent: [ BaseRockGibtonite, BaseIronRockVisuals, IronRock ]
+  parent: [ BaseRockGibtonite, BaseIronRockVisuals, BaseAsteroidRock ]
   id: IronRockGibtonite
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
index 0b59a827fd..72a05fd0df 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: [ BaseStructure, StructureHealthBarrier ]
   id: BaseFenceMetal
   name: chain link fence
diff --git a/Resources/Prototypes/Entities/Structures/gates.yml b/Resources/Prototypes/Entities/Structures/gates.yml
index 46faf923e0..c86c869500 100644
--- a/Resources/Prototypes/Entities/Structures/gates.yml
+++ b/Resources/Prototypes/Entities/Structures/gates.yml
@@ -24,6 +24,8 @@
     receiveFrequencyId: BasicDevice
   - type: WirelessNetworkConnection
     range: 200
+  - type: SoundOnOverload
+  - type: SpawnOnOverload
 
 - type: entity
   parent: BaseLogicItem
diff --git a/Resources/Prototypes/Entities/Structures/meat_spike.yml b/Resources/Prototypes/Entities/Structures/meat_spike.yml
index 42be6adb56..fe4aa98d47 100644
--- a/Resources/Prototypes/Entities/Structures/meat_spike.yml
+++ b/Resources/Prototypes/Entities/Structures/meat_spike.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: [ BaseStructure, StructureHealthFurniture ]
   id: KitchenSpike
   name: meat spike
diff --git a/Resources/Prototypes/Entities/Tiles/chasm.yml b/Resources/Prototypes/Entities/Tiles/chasm.yml
index a19f5c310c..8605e88a48 100644
--- a/Resources/Prototypes/Entities/Tiles/chasm.yml
+++ b/Resources/Prototypes/Entities/Tiles/chasm.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: FloorChasmEntity
   name: chasm
   description: You can't even see the bottom.
diff --git a/Resources/Prototypes/Entities/Virtual/beam.yml b/Resources/Prototypes/Entities/Virtual/beam.yml
index fa249f0dd3..46d4a45368 100644
--- a/Resources/Prototypes/Entities/Virtual/beam.yml
+++ b/Resources/Prototypes/Entities/Virtual/beam.yml
@@ -1,4 +1,4 @@
-# Special entity used to keep track of beams from the BeamComponent and what targets they collided with
+# Special entity used to keep track of beams from the BeamComponent and what targets they collided with
 - type: entity
   id: VirtualBeamEntityController
   name: BEAM ENTITY YOU SHOULD NOT SEE THIS
diff --git a/Resources/Prototypes/Entities/Virtual/electrocution.yml b/Resources/Prototypes/Entities/Virtual/electrocution.yml
index c45e0b3ca9..86d58651a5 100644
--- a/Resources/Prototypes/Entities/Virtual/electrocution.yml
+++ b/Resources/Prototypes/Entities/Virtual/electrocution.yml
@@ -1,4 +1,4 @@
-# Special entity used to attach to power networks as load when somebody gets electrocuted.
+# Special entity used to attach to power networks as load when somebody gets electrocuted.
 - type: entity
   id: VirtualElectrocutionLoadBase
   abstract: true
diff --git a/Resources/Prototypes/Entities/Virtual/stripping_hidden.yml b/Resources/Prototypes/Entities/Virtual/stripping_hidden.yml
index 81e8e9866c..4d916314fb 100644
--- a/Resources/Prototypes/Entities/Virtual/stripping_hidden.yml
+++ b/Resources/Prototypes/Entities/Virtual/stripping_hidden.yml
@@ -1,4 +1,4 @@
-# Special entity that indicates that there is something in a player's pockets, without showing the actual entity.
+# Special entity that indicates that there is something in a player's pockets, without showing the actual entity.
 # This **could** just be done via UI elements, but the existing UI uses sprite-views & the examine-system. So this is easier than special casing this.
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Virtual/virtual_item.yml b/Resources/Prototypes/Entities/Virtual/virtual_item.yml
index 21391dbb34..d464865c3b 100644
--- a/Resources/Prototypes/Entities/Virtual/virtual_item.yml
+++ b/Resources/Prototypes/Entities/Virtual/virtual_item.yml
@@ -1,4 +1,4 @@
-# This item is stored in the hand slot while it is blocked, to represent what is blocking that hand.
+# This item is stored in the hand slot while it is blocked, to represent what is blocking that hand.
 - type: entity
   id: VirtualItem
   name: VIRTUAL ITEM YOU SHOULD NOT SEE THIS
diff --git a/Resources/Prototypes/Entities/categories.yml b/Resources/Prototypes/Entities/categories.yml
index 4fb30f9ef0..e2928e2185 100644
--- a/Resources/Prototypes/Entities/categories.yml
+++ b/Resources/Prototypes/Entities/categories.yml
@@ -37,3 +37,8 @@
   id: XenoArtifactEffects
   name: entity-category-name-xeno-artifact-effects
   hideSpawnMenu: true
+
+- type: entityCategory
+  id: XenoArtifactTriggers
+  name: entity-category-name-xeno-artifact-triggers
+  hideSpawnMenu: true
diff --git a/Resources/Prototypes/FeedbackPopup/feedbackpopups.yml b/Resources/Prototypes/FeedbackPopup/feedbackpopups.yml
index 4b963e2c91..3f5a83ee91 100644
--- a/Resources/Prototypes/FeedbackPopup/feedbackpopups.yml
+++ b/Resources/Prototypes/FeedbackPopup/feedbackpopups.yml
@@ -1,22 +1,12 @@
-- type: feedbackPopup
-  id: FeedbackPopup
-  popupOrigin: wizden_master
-  title: "[bold]Feedback on the new feedback popup system[/bold]"
-  description: |-
-    This window you are seeing is a new system to get feedback on features. It will give popups at the end of the round (mostly on our testing server Vulture)!
-    Please share your thoughts through the forums below! Log in with your Space Station 14 account!
-  responseType: "Feedback Thread"
-  responseLink: "https://forum.spacestation14.com/t/feedback-popup-feedback/22858"
-
 - type: feedbackPopup
   id: GeneralFeedback
   popupOrigin: wizden_master
-  title: "[bold]General feedback for the game[/bold]"
+  title: "[bold]General feedback for Space Station 14[/bold]"
   description: >-
-    If you have any feedback on the game, feel free to create a thread in the feedback forum category.
-  responseType: "General Feedback"
+    If you have any feedback on the game, please create a thread in the Feedback forum category. Thank you!
+  responseType: "Forum Link"
   responseLink: "https://forum.spacestation14.com/c/development/feedback/51"
-  showRoundEnd: false
+  alwaysShow: true
 
 - type: feedbackPopup
   id: XenoborgExtractorFeedback
diff --git a/Resources/Prototypes/GameRules/dynamic_rules.yml b/Resources/Prototypes/GameRules/dynamic_rules.yml
index f27a36fa2c..5ca465ecc9 100644
--- a/Resources/Prototypes/GameRules/dynamic_rules.yml
+++ b/Resources/Prototypes/GameRules/dynamic_rules.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseGameRule
   id: DynamicRule
   components:
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index d8f69c93eb..2a6b590884 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -45,6 +45,7 @@
     - id: ZombieOutbreak
     - id: LoneOpsSpawn
     - id: WizardSpawn
+    - id: SpaceChangelingSpawn
     - !type:NestedSelector
       tableId: DerelictBorgEventTable
 
@@ -230,6 +231,39 @@
   - type: DynamicRuleCost
     cost: 75
 
+- type: entity
+  parent: BaseAntagGhostRoleRule
+  id: SpaceChangelingSpawn
+  components:
+  - type: StationEvent
+    weight: 6
+    earliestStart: 20 # can start early since lings need time to start doing stuff
+    reoccurrenceDelay: 40
+    minimumPlayers: 20
+    duration: null
+    occursDuringRoundEnd: false
+  - type: SpaceSpawnRule
+    spawnDistance: 80
+  - type: AntagSpawner
+    prototype: MobHeadSlugElder
+  - type: ChangelingRule
+  - type: AntagRandomObjectives
+    sets:
+    - groups: ChangelingObjectiveGroupDevourDummy
+      maxPicks: 1
+    - groups: ChangelingObjectiveGroupEscapeDummy
+      maxPicks: 1
+    - groups: ChangelingObjectiveGroupKillDummy
+      maxPicks: 1
+    maxDifficulty: 8
+  - type: AntagSelection
+    agentName: changeling-round-end-agent-name
+    antags:
+    - !type:FixedAntagCount
+      proto: SpaceChangeling
+  - type: DynamicRuleCost
+    cost: 75
+
 - type: entity
   parent: BaseAntagGhostRoleRule
   id: NinjaSpawn
@@ -500,9 +534,9 @@
   parent: BaseGameRule
   components:
   - type: StationEvent
-    earliestStart: 90
+    earliestStart: 45
     minimumPlayers: 40
-    weight: 1 # Zombies was happening basically every single survival round, so now it's super rare
+    weight: 1
     duration: 1
     occursDuringRoundEnd: false
   - type: ZombieRule
diff --git a/Resources/Prototypes/GameRules/random_sentience.yml b/Resources/Prototypes/GameRules/random_sentience.yml
index a2c749000a..99f63c04b4 100644
--- a/Resources/Prototypes/GameRules/random_sentience.yml
+++ b/Resources/Prototypes/GameRules/random_sentience.yml
@@ -22,4 +22,4 @@
   id: RandomSentienceEventStrength
   values:
     prefix: random-sentience-event-strength-
-    count: 8
\ No newline at end of file
+    count: 8
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 0f796be8b5..1febe87948 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -4,6 +4,13 @@
   components:
   - type: GameRule
 
+- type: entity
+  id: BaseSilentGameRule
+  abstract: true
+  components:
+  - type: GameRule
+    silent: true
+
 - type: entity
   parent: BaseGameRule
   id: BaseRoundstartAntagRule
@@ -470,7 +477,7 @@
 # variation passes
 - type: entity
   id: BasicRoundstartVariation
-  parent: BaseGameRule
+  parent: BaseSilentGameRule
   components:
   - type: RoundstartStationVariationRule
     rules:
diff --git a/Resources/Prototypes/GameRules/survivor.yml b/Resources/Prototypes/GameRules/survivor.yml
index e8f73a2e27..95455d4f52 100644
--- a/Resources/Prototypes/GameRules/survivor.yml
+++ b/Resources/Prototypes/GameRules/survivor.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: Survivor
   parent: BaseGameRule
   components:
diff --git a/Resources/Prototypes/GameRules/variation.yml b/Resources/Prototypes/GameRules/variation.yml
index 5e2fe0576b..adad04de30 100644
--- a/Resources/Prototypes/GameRules/variation.yml
+++ b/Resources/Prototypes/GameRules/variation.yml
@@ -1,9 +1,9 @@
-# Base
+# Base
 
 - type: entity
-  id: BaseVariationPass
-  parent: BaseGameRule
   abstract: true
+  parent: BaseSilentGameRule
+  id: BaseVariationPass
   components:
   - type: StationVariationPassRule
 
diff --git a/Resources/Prototypes/GhostRoleRaffles/deciders.yml b/Resources/Prototypes/GhostRoleRaffles/deciders.yml
index b23464cf70..4b5d83e6b2 100644
--- a/Resources/Prototypes/GhostRoleRaffles/deciders.yml
+++ b/Resources/Prototypes/GhostRoleRaffles/deciders.yml
@@ -1,3 +1,3 @@
-- type: ghostRoleRaffleDecider
+- type: ghostRoleRaffleDecider
   id: default
   decider: !type:RngGhostRoleRaffleDecider {}
diff --git a/Resources/Prototypes/Guidebook/engineering.yml b/Resources/Prototypes/Guidebook/engineering.yml
index f26d587d0d..86b8d68be0 100644
--- a/Resources/Prototypes/Guidebook/engineering.yml
+++ b/Resources/Prototypes/Guidebook/engineering.yml
@@ -1,4 +1,4 @@
-- type: guideEntry
+- type: guideEntry
   id: Engineering
   name: guide-entry-engineering
   text: "/ServerInfo/Guidebook/Engineering/Engineering.xml"
diff --git a/Resources/Prototypes/Guidebook/rules.yml b/Resources/Prototypes/Guidebook/rules.yml
index 6bbfbf9174..cf243944b3 100644
--- a/Resources/Prototypes/Guidebook/rules.yml
+++ b/Resources/Prototypes/Guidebook/rules.yml
@@ -1,4 +1,4 @@
-# Only one of those rulesets will appear on the server at any given time.
+# Only one of those rulesets will appear on the server at any given time.
 # They all have a priority of 10 so they appear 2nd by default (after priority 0 and before priority 20)
 
 - type: guideEntry # Default for forks and stuff. Should not be listed anywhere if the server is using a custom ruleset.
diff --git a/Resources/Prototypes/Guidebook/security.yml b/Resources/Prototypes/Guidebook/security.yml
index 7836162e12..fa416388ff 100644
--- a/Resources/Prototypes/Guidebook/security.yml
+++ b/Resources/Prototypes/Guidebook/security.yml
@@ -1,4 +1,4 @@
-- type: guideEntry
+- type: guideEntry
   id: Security
   name: guide-entry-security
   text: "/ServerInfo/Guidebook/Security/Security.xml"
diff --git a/Resources/Prototypes/Hydroponics/plants.yml b/Resources/Prototypes/Hydroponics/plants.yml
index 258e597b9a..363586da45 100644
--- a/Resources/Prototypes/Hydroponics/plants.yml
+++ b/Resources/Prototypes/Hydroponics/plants.yml
@@ -46,6 +46,7 @@
 - type: entity
   parent: BasePlant
   id: WheatPlants
+  categories: [HideSpawnMenu]
   name: wheat stalk
   components:
   - type: Sprite
@@ -77,6 +78,7 @@
 - type: entity
   parent: BasePlant
   id: MeatWheatPlants
+  categories: [HideSpawnMenu]
   name: meatwheat stalk
   components:
   - type: Sprite
@@ -107,6 +109,7 @@
 - type: entity
   parent: BasePlant
   id: OatPlants
+  categories: [HideSpawnMenu]
   name: oat stalk
   components:
   - type: Sprite
@@ -137,6 +140,7 @@
 - type: entity
   parent: BasePlant
   id: BananaPlants
+  categories: [HideSpawnMenu]
   name: banana plant
   components:
   - type: Sprite
@@ -172,6 +176,7 @@
 - type: entity
   parent: BasePlant
   id: MimanaPlants
+  categories: [HideSpawnMenu]
   name: mimana plant
   components:
   - type: Sprite
@@ -206,6 +211,7 @@
 - type: entity
   parent: BasePlant
   id: CarrotPlants
+  categories: [HideSpawnMenu]
   name: carrot
   components:
   - type: Sprite
@@ -241,6 +247,7 @@
 - type: entity
   parent: BasePlant
   id: LaughinPeaPlants
+  categories: [HideSpawnMenu]
   name: laughin' pea
   components:
   - type: Sprite
@@ -280,6 +287,7 @@
 - type: entity
   parent: BasePlant
   id: LemonPlants
+  categories: [HideSpawnMenu]
   name: lemon tree
   components:
   - type: Sprite
@@ -311,6 +319,7 @@
 - type: entity
   parent: BasePlant
   id: LemoonPlants
+  categories: [HideSpawnMenu]
   name: lemoon tree
   components:
   - type: Sprite
@@ -341,6 +350,7 @@
 - type: entity
   parent: BasePlant
   id: LimePlants
+  categories: [HideSpawnMenu]
   name: lime tree
   components:
   - type: Sprite
@@ -372,6 +382,7 @@
 - type: entity
   parent: BasePlant
   id: OrangePlants
+  categories: [HideSpawnMenu]
   name: orange tree
   components:
   - type: Sprite
@@ -403,6 +414,7 @@
 - type: entity
   parent: BasePlant
   id: ExtradimensionalOrangePlants
+  categories: [HideSpawnMenu]
   name: extradimensional orange tree
   components:
   - type: Sprite
@@ -437,6 +449,7 @@
 - type: entity
   parent: BasePlant
   id: PineapplePlants
+  categories: [HideSpawnMenu]
   name: pineapple plant
   components:
   - type: Sprite
@@ -472,6 +485,7 @@
 - type: entity
   parent: BasePlant
   id: PotatoPlants
+  categories: [HideSpawnMenu]
   name: potato
   components:
   - type: Sprite
@@ -503,6 +517,7 @@
 - type: entity
   parent: BasePlant
   id: SugarcanePlants
+  categories: [HideSpawnMenu]
   name: sugarcane
   components:
   - type: Sprite
@@ -534,6 +549,7 @@
 - type: entity
   parent: BasePlant
   id: TeaPlantPlants
+  categories: [HideSpawnMenu]
   name: tea plant
   components:
   - type: Sprite
@@ -566,6 +582,7 @@
 - type: entity
   parent: BasePlant
   id: PapercanePlants
+  categories: [HideSpawnMenu]
   name: papercane
   components:
   - type: Sprite
@@ -590,6 +607,7 @@
 - type: entity
   parent: BasePlant
   id: TowercapPlants
+  categories: [HideSpawnMenu]
   name: tower cap
   components:
   - type: Sprite
@@ -618,6 +636,7 @@
 - type: entity
   parent: BasePlant
   id: SteelcapPlants
+  categories: [HideSpawnMenu]
   name: steel cap
   components:
   - type: Sprite
@@ -645,6 +664,7 @@
 - type: entity
   parent: BasePlant
   id: TomatoPlants
+  categories: [HideSpawnMenu]
   name: tomato plant
   components:
   - type: Sprite
@@ -686,6 +706,7 @@
 - type: entity
   parent: BasePlant
   id: BlueTomatoPlants
+  categories: [HideSpawnMenu]
   name: blue tomato plant
   components:
   - type: Sprite
@@ -726,6 +747,7 @@
 - type: entity
   parent: BasePlant
   id: BloodTomatoPlants
+  categories: [HideSpawnMenu]
   name: blood tomato plant
   components:
   - type: Sprite
@@ -763,6 +785,7 @@
 - type: entity
   parent: BasePlant
   id: KillerTomatoPlants
+  categories: [HideSpawnMenu]
   name: tomato killer plant
   components:
   - type: Sprite
@@ -802,6 +825,7 @@
 - type: entity
   parent: BasePlant
   id: EggplantPlants
+  categories: [HideSpawnMenu]
   name: eggplant
   components:
   - type: Sprite
@@ -837,6 +861,7 @@
 - type: entity
   parent: BasePlant
   id: CabbagePlants
+  categories: [HideSpawnMenu]
   name: cabbage
   components:
   - type: Sprite
@@ -866,6 +891,7 @@
 - type: entity
   parent: BasePlant
   id: GarlicPlants
+  categories: [HideSpawnMenu]
   name: garlic head
   components:
   - type: Sprite
@@ -899,6 +925,7 @@
 - type: entity
   parent: BasePlant
   id: ApplePlants
+  categories: [HideSpawnMenu]
   name: apple tree
   components:
   - type: Sprite
@@ -930,6 +957,7 @@
 - type: entity
   parent: BasePlant
   id: GoldenApplePlants
+  categories: [HideSpawnMenu]
   name: golden apple tree
   components:
   - type: Sprite
@@ -966,6 +994,7 @@
 - type: entity
   parent: BasePlant
   id: CornPlants
+  categories: [HideSpawnMenu]
   name: ear of corn
   components:
   - type: Sprite
@@ -1000,6 +1029,7 @@
 - type: entity
   parent: BasePlant
   id: OnionPlants
+  categories: [HideSpawnMenu]
   name: onion
   components:
   - type: Sprite
@@ -1042,6 +1072,7 @@
 - type: entity
   parent: BasePlant
   id: OnionRedPlants
+  categories: [HideSpawnMenu]
   name: red onion
   components:
   - type: Sprite
@@ -1082,6 +1113,7 @@
 - type: entity
   parent: BasePlant
   id: ChanterellePlants
+  categories: [HideSpawnMenu]
   name: chanterelle mushroom
   components:
   - type: Sprite
@@ -1114,6 +1146,7 @@
 - type: entity
   parent: BasePlant
   id: EggyPlants
+  categories: [HideSpawnMenu]
   name: egg-plant
   components:
   - type: Sprite
@@ -1145,6 +1178,7 @@
 - type: entity
   parent: BasePlant
   id: CannabisPlants
+  categories: [HideSpawnMenu]
   name: cannabis
   components:
   - type: Sprite
@@ -1161,6 +1195,8 @@
     yield: 2
     potency: 20
     growthStages: 3
+  - type: PlantHarvest
+    harvestRepeat: Repeat
   - type: PlantGrowth
     waterConsumption: 0.4
   - type: PlantAtmospheric
@@ -1176,6 +1212,7 @@
 - type: entity
   parent: BasePlant
   id: RainbowCannabisPlants
+  categories: [HideSpawnMenu]
   name: rainbow cannabis
   components:
   - type: Sprite
@@ -1190,6 +1227,8 @@
     production: 12
     yield: 2
     potency: 20
+  - type: PlantHarvest
+    harvestRepeat: Repeat
   - type: PlantGrowth
     nutrientConsumption: 0.5
   - type: PlantAtmospheric
@@ -1220,6 +1259,7 @@
 - type: entity
   parent: BasePlant
   id: TobaccoPlants
+  categories: [HideSpawnMenu]
   name: tobacco plant
   components:
   - type: Sprite
@@ -1252,6 +1292,7 @@
 - type: entity
   parent: BasePlant
   id: NettlePlants
+  categories: [HideSpawnMenu]
   name: nettle
   components:
   - type: Sprite
@@ -1283,6 +1324,7 @@
 - type: entity
   parent: BasePlant
   id: DeathNettlePlants
+  categories: [HideSpawnMenu]
   name: death nettle
   components:
   - type: Sprite
@@ -1320,6 +1362,7 @@
 - type: entity
   parent: BasePlant
   id: ChiliPlants
+  categories: [HideSpawnMenu]
   name: chili pepper
   components:
   - type: Sprite
@@ -1358,6 +1401,7 @@
 - type: entity
   parent: BasePlant
   id: ChillyPlants
+  categories: [HideSpawnMenu]
   name: chilly pepper
   components:
   - type: Sprite
@@ -1395,6 +1439,7 @@
 - type: entity
   parent: BasePlant
   id: PoppyPlants
+  categories: [HideSpawnMenu]
   name: poppy
   components:
   - type: Sprite
@@ -1427,6 +1472,7 @@
 - type: entity
   parent: BasePlant
   id: LilyPlants
+  categories: [HideSpawnMenu]
   name: lily
   components:
   - type: Sprite
@@ -1459,6 +1505,7 @@
 - type: entity
   parent: BasePlant
   id: AloePlants
+  categories: [HideSpawnMenu]
   name: aloe
   components:
   - type: Sprite
@@ -1490,6 +1537,7 @@
 - type: entity
   parent: BasePlant
   id: LingzhiPlants
+  categories: [HideSpawnMenu]
   name: lingzhi
   components:
   - type: Sprite
@@ -1522,6 +1570,7 @@
 - type: entity
   parent: BasePlant
   id: AmbrosiaVulgarisPlants
+  categories: [HideSpawnMenu]
   name: ambrosia vulgaris
   components:
   - type: Sprite
@@ -1562,6 +1611,7 @@
 - type: entity
   parent: BasePlant
   id: AmbrosiaDeusPlants
+  categories: [HideSpawnMenu]
   name: ambrosia deus
   components:
   - type: Sprite
@@ -1597,6 +1647,7 @@
 - type: entity
   parent: BasePlant
   id: GalaxythistlePlants
+  categories: [HideSpawnMenu]
   name: galaxythistle
   components:
   - type: Sprite
@@ -1625,6 +1676,7 @@
 - type: entity
   parent: BasePlant
   id: GlasstlePlants
+  categories: [HideSpawnMenu]
   name: glasstle
   components:
   - type: Sprite
@@ -1654,6 +1706,7 @@
 - type: entity
   parent: BasePlant
   id: FlyAmanitaPlants
+  categories: [HideSpawnMenu]
   name: fly amanita
   components:
   - type: Sprite
@@ -1687,6 +1740,7 @@
 - type: entity
   parent: BasePlant
   id: GatfruitPlants
+  categories: [HideSpawnMenu]
   name: gatfruit tree
   components:
   - type: Sprite
@@ -1717,6 +1771,7 @@
 - type: entity
   parent: BasePlant
   id: FakeCapfruitPlants
+  categories: [HideSpawnMenu]
   name: capfruit tree
   components:
   - type: Sprite
@@ -1746,6 +1801,7 @@
 - type: entity
   parent: BasePlant
   id: RealCapfruitPlants
+  categories: [HideSpawnMenu]
   name: capfruit tree
   components:
   - type: Sprite
@@ -1775,6 +1831,7 @@
 - type: entity
   parent: BasePlant
   id: RicePlants
+  categories: [HideSpawnMenu]
   name: rice stalk
   components:
   - type: Sprite
@@ -1807,6 +1864,7 @@
 - type: entity
   parent: BasePlant
   id: SoybeanPlants
+  categories: [HideSpawnMenu]
   name: soy plant
   components:
   - type: Sprite
@@ -1835,6 +1893,7 @@
 - type: entity
   parent: BasePlant
   id: SpacemansTrumpetPlants
+  categories: [HideSpawnMenu]
   name: spaceman's trumpet plant
   components:
   - type: Sprite
@@ -1866,6 +1925,7 @@
 - type: entity
   parent: BasePlant
   id: KoibeanPlants
+  categories: [HideSpawnMenu]
   name: koibean plant
   components:
   - type: Sprite
@@ -1897,6 +1957,7 @@
 - type: entity
   parent: BasePlant
   id: GrapePlants
+  categories: [HideSpawnMenu]
   name: grape plant
   components:
   - type: Sprite
@@ -1926,6 +1987,7 @@
 - type: entity
   parent: BasePlant
   id: WatermelonPlants
+  categories: [HideSpawnMenu]
   name: watermelon vine
   components:
   - type: Sprite
@@ -1959,6 +2021,7 @@
 - type: entity
   parent: BasePlant
   id: HolymelonPlants
+  categories: [HideSpawnMenu]
   name: holymelon vine
   components:
   - type: Sprite
@@ -1991,6 +2054,7 @@
 - type: entity
   parent: BasePlant
   id: CocoaPlants
+  categories: [HideSpawnMenu]
   name: cocoa plant
   components:
   - type: Sprite
@@ -2026,6 +2090,7 @@
 - type: entity
   parent: BasePlant
   id: BerryPlants
+  categories: [HideSpawnMenu]
   name: berry bush
   components:
   - type: Sprite
@@ -2057,6 +2122,7 @@
 - type: entity
   parent: BasePlant
   id: BungoPlants
+  categories: [HideSpawnMenu]
   name: bungo plant
   components:
   - type: Sprite
@@ -2093,6 +2159,7 @@
 - type: entity
   parent: BasePlant
   id: PeaPlants
+  categories: [HideSpawnMenu]
   name: pea vine
   components:
   - type: Sprite
@@ -2127,6 +2194,7 @@
 - type: entity
   parent: BasePlant
   id: WorldPeaPlants
+  categories: [HideSpawnMenu]
   name: world pea vine
   components:
   - type: Sprite
@@ -2164,6 +2232,7 @@
 - type: entity
   parent: BasePlant
   id: PumpkinPlants
+  categories: [HideSpawnMenu]
   name: pumpkin
   components:
   - type: Sprite
@@ -2197,6 +2266,7 @@
 - type: entity
   parent: BasePlant
   id: BluePumpkinPlants
+  categories: [HideSpawnMenu]
   name: blue pumpkin
   components:
   - type: Sprite
@@ -2233,6 +2303,7 @@
 - type: entity
   parent: BasePlant
   id: CottonPlants
+  categories: [HideSpawnMenu]
   name: cotton plant
   components:
   - type: Sprite
@@ -2261,6 +2332,7 @@
 - type: entity
   parent: BasePlant
   id: PyrottonPlants
+  categories: [HideSpawnMenu]
   name: pyrotton plant
   components:
   - type: Sprite
@@ -2292,6 +2364,7 @@
 - type: entity
   parent: BasePlant
   id: CherryPlants
+  categories: [HideSpawnMenu]
   name: cherry tree
   components:
   - type: Sprite
@@ -2322,6 +2395,7 @@
 - type: entity
   parent: BasePlant
   id: AnomalyBerryPlants
+  categories: [HideSpawnMenu]
   name: anomaly berry
   components:
   - type: Sprite
@@ -2358,6 +2432,7 @@
 - type: entity
   parent: BasePlant
   id: BloonionPlants
+  categories: [HideSpawnMenu]
   name: bloonion bulb
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Hydroponics/randomChemicals.yml b/Resources/Prototypes/Hydroponics/randomChemicals.yml
index c611c26599..c5eb85d0cd 100644
--- a/Resources/Prototypes/Hydroponics/randomChemicals.yml
+++ b/Resources/Prototypes/Hydroponics/randomChemicals.yml
@@ -1,5 +1,5 @@
 - type: weightedRandomFillSolution
-  id: RandomPickBotanyReagent
+  id: RandomPickBotanyGeneralReagent
   fills:
   - quantity: 5
     weight: 0.5
@@ -84,6 +84,10 @@
     - Copper
     - Sulfur
     - Lithium
+
+- type: weightedRandomFillSolution
+  id: RandomPickBotanyFarmingReagent
+  fills:
   - quantity: 10 # Basic Farming Table
     weight: 5
     reagents:
diff --git a/Resources/Prototypes/Hydroponics/randomMutations.yml b/Resources/Prototypes/Hydroponics/randomMutations.yml
index 28672c8746..4f8e52e81d 100644
--- a/Resources/Prototypes/Hydroponics/randomMutations.yml
+++ b/Resources/Prototypes/Hydroponics/randomMutations.yml
@@ -1,5 +1,6 @@
 - type: randomPlantMutationList
   id: RandomPlantMutations
+  ignoreMutationMod: false
   mutations:
     - name: Sentient
       description: mutation-plant-sentient
@@ -159,7 +160,7 @@
         targetComponent: Plant
         targetDataField: Yield
         applyRange:
-          min: 3
+          min: 4
           max: 10
         up: !type:PlantAdjustYield
           amount: 1
@@ -241,6 +242,9 @@
       baseOdds: 0.072
       persists: false
       effect: !type:PlantMutateChemicals
+        randomChemTables:
+        - RandomPickBotanyGeneralReagent
+        - RandomPickBotanyFarmingReagent
     - name: ChangeExudeGasses
       baseOdds: 0.0145
       persists: false
@@ -253,3 +257,14 @@
       baseOdds: 0.036
       persists: false
       effect: !type:PlantMutateHarvest
+
+- type: randomPlantMutationList
+  id: EvilPlantMutations
+  ignoreMutationMod: true
+  mutations:
+  - name: MutateEvilChemicals
+    baseOdds: 1
+    persists: false
+    effect: !type:PlantMutateChemicals
+      randomChemTables:
+      - EvilRandomFillSolution
diff --git a/Resources/Prototypes/InventoryTemplates/corpse_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/corpse_inventory_template.yml
index 878ccb3d6b..57abc61b68 100644
--- a/Resources/Prototypes/InventoryTemplates/corpse_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/corpse_inventory_template.yml
@@ -1,4 +1,4 @@
-- type: inventoryTemplate
+- type: inventoryTemplate
   id: corpse
   slots:
     - name: shoes
diff --git a/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml
index 89f0af0302..5872b74237 100644
--- a/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml
@@ -1,4 +1,4 @@
-- type: inventoryTemplate
+- type: inventoryTemplate
   id: scurret
   slots:
   - name: ears
diff --git a/Resources/Prototypes/IonLaws/IonLaw.yml b/Resources/Prototypes/IonLaws/IonLaw.yml
index ffc05c042a..0cd04c9c48 100644
--- a/Resources/Prototypes/IonLaws/IonLaw.yml
+++ b/Resources/Prototypes/IonLaws/IonLaw.yml
@@ -1,4 +1,4 @@
-- type: ionLaw
+- type: ionLaw
   id: OnStation
   lawString: ion-storm-law-on-station
   selectorWeightAdjust:
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml
index 27d266c5bb..b3e9b1ebc9 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml
@@ -1,4 +1,4 @@
-# Job-specific trinkets
+# Job-specific trinkets
 
 - type: loadout
   id: JanitorGoldenPlunger
diff --git a/Resources/Prototypes/Loadouts/dummy_entities.yml b/Resources/Prototypes/Loadouts/dummy_entities.yml
index 69b54bd0b5..f58ab97231 100644
--- a/Resources/Prototypes/Loadouts/dummy_entities.yml
+++ b/Resources/Prototypes/Loadouts/dummy_entities.yml
@@ -6,4 +6,4 @@
   components:
   - type: Sprite
     sprite: Objects/Misc/candles.rsi
-    state: loadout
\ No newline at end of file
+    state: loadout
diff --git a/Resources/Prototypes/Magic/Fixtures/runes.yml b/Resources/Prototypes/Magic/Fixtures/runes.yml
index 88d76e4d7c..f5ff063d6f 100644
--- a/Resources/Prototypes/Magic/Fixtures/runes.yml
+++ b/Resources/Prototypes/Magic/Fixtures/runes.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: BaseRune
   name: "rune"
   abstract: true
diff --git a/Resources/Prototypes/Magic/teleport_scroll.yml b/Resources/Prototypes/Magic/teleport_scroll.yml
index ce5e00da76..7e7ea32a46 100644
--- a/Resources/Prototypes/Magic/teleport_scroll.yml
+++ b/Resources/Prototypes/Magic/teleport_scroll.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: WizardTeleportScroll
   name: teleport scroll
   suffix: Wizard
diff --git a/Resources/Prototypes/Maps/arenas.yml b/Resources/Prototypes/Maps/arenas.yml
index 18b1f05794..3d2b123c16 100644
--- a/Resources/Prototypes/Maps/arenas.yml
+++ b/Resources/Prototypes/Maps/arenas.yml
@@ -25,4 +25,4 @@
           mapNameTemplate: "DM01 Entryway"
         - type: StationJobs
           availableJobs:
-            Passenger: [ -1, -1 ]
\ No newline at end of file
+            Passenger: [ -1, -1 ]
diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml
index f7b69f4597..fc7b08a82b 100644
--- a/Resources/Prototypes/Maps/bagel.yml
+++ b/Resources/Prototypes/Maps/bagel.yml
@@ -16,7 +16,8 @@
           emergencyShuttlePath: /Maps/Shuttles/emergency_lox.yml
         - type: StationJobs
           availableJobs:
-            #command (7)
+            # TOTAL: 66 job slots + 0 late-join only
+            # Command (7)
             Captain: [ 1, 1 ]
             IAA: [ 1, 1 ] # Corvax-IAA
             HeadOfPersonnel: [ 1, 1 ]
@@ -25,41 +26,41 @@
             ChiefEngineer: [ 1, 1 ]
             ResearchDirector: [ 1, 1 ]
             Quartermaster: [ 1, 1 ]
-            #service (8-11)
+            # Service (13)
             Bartender: [ 1, 1 ]
             Botanist: [ 2, 2 ]
-            Chef: [ 1, 1 ]
+            Chef: [ 2, 2 ]
             Janitor: [ 2, 2 ]
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
-            ServiceWorker: [ 1, 2 ]
-            Reporter: [ 1, 2 ]
-            #engineering (6-8)
+            ServiceWorker: [ 2, 2 ]
+            Reporter: [ 2, 2 ]
+            # Engineering (8)
             AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 2, 2 ]
-            #medical (8-8)
+            # Medical (8)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 3, 3 ]
             Paramedic: [ 1, 1 ]
             MedicalIntern: [ 2, 2 ]
-            #science (6-6)
+            # Science (6)
             Scientist: [ 4, 4 ]
             ResearchAssistant: [ 2, 2 ]
-            #security (9-10)
+            # Security (11)
             Warden: [ 1, 1 ]
-            SecurityOfficer: [ 5, 5 ]
+            SecurityOfficer: [ 6, 6 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 2, 2 ]
             #Lawyer: [ 1, 1 ] # Corvax-IAA
             #supply (6)
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 3, 3 ]
-            #civilian (2-3 + overflow)
-            Passenger: [ -1, -1 ] #infinite, not counted
+            # Civilian (3 + overflow)
+            Passenger: [ -1, -1 ] # infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            #silicon (3)
+            # Silicon (4)
             StationAi: [ 1, 1 ]
-            Borg: [ 2, 2 ]
+            Borg: [ 3, 3 ]
diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml
index 8e7c392294..f152ac8853 100644
--- a/Resources/Prototypes/Maps/box.yml
+++ b/Resources/Prototypes/Maps/box.yml
@@ -16,7 +16,8 @@
           emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml
         - type: StationJobs
           availableJobs:
-            #command (7)
+            # TOTAL: 65 job slots + 0 late-join only
+            # Command (7)
             Captain: [ 1, 1 ]
             IAA: [ 1, 1 ] # Corvax-IAA
             HeadOfPersonnel: [ 1, 1 ]
@@ -25,41 +26,41 @@
             ChiefEngineer: [ 1, 1 ]
             ResearchDirector: [ 1, 1 ]
             Quartermaster: [ 1, 1 ]
-            #service (8-10)
+            # Service (12)
             Bartender: [ 1, 1 ]
             Botanist: [ 2, 2 ]
-            Chef: [ 1, 1 ]
+            Chef: [ 2, 2 ]
             Janitor: [ 2, 2 ]
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
-            ServiceWorker: [ 1, 1 ]
+            ServiceWorker: [ 2, 2 ]
             Reporter: [ 1, 1 ]
-            #engineering (6-8)
+            # Engineering (8)
             AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 2, 2 ]
-            #medical (8-8)
+            # Medical (8)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 3, 3 ]
             Paramedic: [ 1, 1 ]
             MedicalIntern: [ 2, 2 ]
-            #science (6-6)
+            # Science (6)
             Scientist: [ 4, 4 ]
             ResearchAssistant: [ 2, 2 ]
-            #security (10-11)
+            # Security (11)
             Warden: [ 1, 1 ]
-            SecurityOfficer: [ 5, 5 ]
+            SecurityOfficer: [ 6, 6 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 2, 2 ]
             #Lawyer: [ 1, 1 ] # Corvax-IAA
             #supply (6)
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 3, 3 ]
-            #civilian (2-3 + overflow)
-            Passenger: [ -1, -1 ] #infinite, not counted
+            # Civilian (3 + overflow)
+            Passenger: [ -1, -1 ] # infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            #silicon (3)
+            # Silicon (4)
             StationAi: [ 1, 1 ]
-            Borg: [ 2, 2 ]
+            Borg: [ 3, 3 ]
diff --git a/Resources/Prototypes/Maps/elkridge.yml b/Resources/Prototypes/Maps/elkridge.yml
index 7badf04181..3c9c976ed3 100644
--- a/Resources/Prototypes/Maps/elkridge.yml
+++ b/Resources/Prototypes/Maps/elkridge.yml
@@ -2,7 +2,7 @@
   id: Elkridge
   mapName: 'Elkridge Depot'
   mapPath: /Maps/elkridge.yml
-  minPlayers: 25
+  minPlayers: 20
   maxPlayers: 44
   stations:
     Elkridge:
@@ -19,7 +19,8 @@
           path: /Maps/Shuttles/cargo_elkridge.yml
         - type: StationJobs
           availableJobs:
-            #command (7)
+            # TOTAL: 59 job slots + 0 late-join only
+            # Command (7)
             Captain: [ 1, 1 ]
             IAA: [ 1, 1 ] # Corvax-IAA
             HeadOfPersonnel: [ 1, 1 ]
@@ -28,29 +29,29 @@
             ChiefEngineer: [ 1, 1 ]
             ResearchDirector: [ 1, 1 ]
             Quartermaster: [ 1, 1 ]
-            #service 7-11
+            # Service (11)
             Bartender: [ 1, 1 ]
             Botanist: [ 2, 2 ]
-            Chef: [ 1, 1 ]
-            Janitor: [ 1, 2 ]
+            Chef: [ 2, 2 ]
+            Janitor: [ 2, 2 ]
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             Reporter: [ 1, 1 ]
             ServiceWorker: [ 1, 1 ]
-            #engineering 7-8
+            # Engineering (7)
             AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 3, 3 ]
             TechnicalAssistant: [ 2, 2 ]
-            #medical 7-9
+            # Medical (9)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 3, 3 ]
             MedicalIntern: [ 2, 2 ]
             Paramedic: [ 1, 1 ]
-            Psychologist: [ 0, 1 ]
-            #science 5-6
+            Psychologist: [ 1, 1 ]
+            # Science (6)
             Scientist: [ 4, 4 ]
             ResearchAssistant: [ 2, 2 ]
-            #security 6-8
+            # Security (9)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
@@ -59,11 +60,11 @@
             #supply 4
             SalvageSpecialist: [ 2, 2 ]
             CargoTechnician: [ 2, 2 ]
-            #civilian 2-3 + overflow
-            Passenger: [ -1, -1 ]
+            # Sivilian (3 + overflow)
+            Passenger: [ -1, -1 ] # infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            #silicon 3
+            # Silicon (3)
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]
diff --git a/Resources/Prototypes/Maps/exo.yml b/Resources/Prototypes/Maps/exo.yml
index 60fd5a972d..e804ef811c 100644
--- a/Resources/Prototypes/Maps/exo.yml
+++ b/Resources/Prototypes/Maps/exo.yml
@@ -18,7 +18,8 @@
           path: /Maps/Shuttles/cargo_exo.yml
         - type: StationJobs
           availableJobs:
-            #command (7)
+            # TOTAL: 66 job slots + 0 late-join only
+            # Command (7)
             Captain: [ 1, 1 ]
             IAA: [ 1, 1 ] # Corvax-IAA
             HeadOfPersonnel: [ 1, 1 ]
@@ -27,41 +28,42 @@
             ChiefEngineer: [ 1, 1 ]
             ResearchDirector: [ 1, 1 ]
             Quartermaster: [ 1, 1 ]
-            #service (8-10)
+            # Service (12)
             Bartender: [ 1, 1 ]
             Botanist: [ 2, 2 ]
-            Chef: [ 1, 1 ]
+            Chef: [ 2, 2 ]
             Janitor: [ 2, 2 ]
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
-            ServiceWorker: [ 1, 2 ]
+            ServiceWorker: [ 2, 2 ]
             Reporter: [ 1, 1 ]
-            #engineering (6-8)
+            # Engineering (8)
             AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 2, 2 ]
-            #medical (8-8)
+            # Medical (9)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 3, 3 ]
             Paramedic: [ 1, 1 ]
             MedicalIntern: [ 2, 2 ]
-            #science (6-6)
+            Psychologist: [ 1, 1 ]
+            # Science (6)
             Scientist: [ 4, 4 ]
             ResearchAssistant: [ 2, 2 ]
-            #security (10-11)
+            # Security (11)
             Warden: [ 1, 1 ]
-            SecurityOfficer: [ 5, 5 ]
+            SecurityOfficer: [ 6, 6 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 2, 2 ]
             #Lawyer: [ 1, 1 ] # Corvax-IAA
             #supply (6)
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 3, 3 ]
-            #civilian (2-3 + overflow)
-            Passenger: [ -1, -1 ] #infinite, not counted
+            # Civilian (3 + overflow)
+            Passenger: [ -1, -1 ] # infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            #silicon (3)
+            # Silicon (4)
             StationAi: [ 1, 1 ]
-            Borg: [ 2, 2 ]
+            Borg: [ 3, 3 ]
diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml
index e245777295..48aecc2ef1 100644
--- a/Resources/Prototypes/Maps/marathon.yml
+++ b/Resources/Prototypes/Maps/marathon.yml
@@ -16,7 +16,8 @@
           emergencyShuttlePath: /Maps/Shuttles/emergency_rod.yml
         - type: StationJobs
           availableJobs:
-            #command (7)
+            # TOTAL: 64 job slots + 0 late-join only
+            # Command (7)
             Captain: [ 1, 1 ]
             IAA: [ 1, 1 ] # Corvax-IAA
             HeadOfPersonnel: [ 1, 1 ]
@@ -25,40 +26,40 @@
             ChiefEngineer: [ 1, 1 ]
             ResearchDirector: [ 1, 1 ]
             Quartermaster: [ 1, 1 ]
-            #service (7-9)
+            # Service (11)
             Bartender: [ 1, 1 ]
             Botanist: [ 2, 2 ]
-            Chef: [ 1, 1 ]
+            Chef: [ 2, 2 ]
             Janitor: [ 2, 2 ]
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
-            ServiceWorker: [ 1, 1 ]
-            #engineering (6-8)
+            ServiceWorker: [ 2, 2 ]
+            # Engineering (8)
             AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 2, 2 ]
-            #medical (8-8)
+            # Medical (8)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 3, 3 ]
             Paramedic: [ 1, 1 ]
             MedicalIntern: [ 2, 2 ]
-            #science (6-6)
+            # Science (6)
             Scientist: [ 4, 4 ]
             ResearchAssistant: [ 2, 2 ]
-            #security (10-11)
+            # Security (11)
             Warden: [ 1, 1 ]
-            SecurityOfficer: [ 5, 5 ]
+            SecurityOfficer: [ 6, 6 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 2, 2 ]
             #Lawyer: [ 1, 1 ] # Corvax-IAA
             #supply (6)
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 3, 3 ]
-            #civilian (2-3 + overflow)
-            Passenger: [ -1, -1 ] #infinite, not counted
+            # Civilian (3 + overflow)
+            Passenger: [ -1, -1 ] # infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            #silicon (3)
+            # Silicon (4)
             StationAi: [ 1, 1 ]
-            Borg: [ 2, 2 ]
+            Borg: [ 3, 3 ]
diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml
index 538867c98d..a530fae52f 100644
--- a/Resources/Prototypes/Maps/packed.yml
+++ b/Resources/Prototypes/Maps/packed.yml
@@ -18,7 +18,8 @@
         emergencyShuttlePath: /Maps/Shuttles/emergency_crimson.yml
       - type: StationJobs
         availableJobs:
-            #command (7)
+            # TOTAL: 47 job slots + 0 late-join only
+            # Command (7)
             Captain: [ 1, 1 ]
             IAA: [ 1, 1 ] # Corvax-IAA
             HeadOfPersonnel: [ 1, 1 ]
@@ -27,26 +28,26 @@
             ChiefEngineer: [ 1, 1 ]
             ResearchDirector: [ 1, 1 ]
             Quartermaster: [ 1, 1 ]
-            #service 7-7
+            # Service (7)
             Bartender: [ 1, 1 ]
             Botanist: [ 2, 2 ]
             Chef: [ 1, 1 ]
             Janitor: [ 1, 1 ]
             Chaplain: [ 1, 1 ]
             ServiceWorker: [ 1, 1 ]
-            #engineering 6-6
+            # Engineering (6)
             AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 3, 3 ]
             TechnicalAssistant: [ 1, 1 ]
-            #medical 7-7
+            # Medical (7)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 2, 2 ]
             MedicalIntern: [ 2, 2 ]
             Paramedic: [ 1, 1 ]
-            #science 3-3
+            # Science (3)
             Scientist: [ 2, 2 ]
             ResearchAssistant: [ 1, 1 ]
-            #security 4-7
+            # Security (7)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 3, 3 ]
             Detective: [ 1, 1 ]
@@ -55,11 +56,11 @@
             # supply 4
             SalvageSpecialist: [ 2, 2 ]
             CargoTechnician: [ 2, 2 ]
-            #civilian 2-3 + overflow
-            Passenger: [ -1, -1 ]
+            # Civilian (3 + overflow)
+            Passenger: [ -1, -1 ] # infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            #silicon 3
+            # Silicon (3)
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]
diff --git a/Resources/Prototypes/Maps/plasma.yml b/Resources/Prototypes/Maps/plasma.yml
index 731e0ae293..daf55211ab 100644
--- a/Resources/Prototypes/Maps/plasma.yml
+++ b/Resources/Prototypes/Maps/plasma.yml
@@ -2,8 +2,8 @@
   id: Plasma
   mapName: 'Plasma'
   mapPath: /Maps/plasma.yml
-  minPlayers: 25
-  maxPlayers: 44
+  minPlayers: 30
+  maxPlayers: 65
   stations:
     Plasma:
       stationProto: StandardNanotrasenStation
@@ -19,7 +19,8 @@
           path: /Maps/Shuttles/cargo_plasma.yml
         - type: StationJobs
           availableJobs:
-            #command (7)
+            # TOTAL: 61 job slots + 0 late-join only
+            # Command (7)
             Captain: [ 1, 1 ]
             IAA: [ 1, 1 ] # Corvax-IAA
             HeadOfPersonnel: [ 1, 1 ]
@@ -28,42 +29,42 @@
             ChiefEngineer: [ 1, 1 ]
             ResearchDirector: [ 1, 1 ]
             Quartermaster: [ 1, 1 ]
-            #service 7-11
+            # Service (11)
             Bartender: [ 1, 1 ]
             Botanist: [ 2, 2 ]
-            Chef: [ 1, 1 ]
+            Chef: [ 2, 2 ]
             Janitor: [ 2, 2 ]
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             Reporter: [ 1, 1 ]
             ServiceWorker: [ 1, 1 ]
-            #engineering 7-8
+            # Engineering (8)
             AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 2, 2 ]
-            #medical 7-9
+            # Medical (9)
             Chemist: [ 2, 2 ]
-            MedicalDoctor: [ 2, 2 ]
+            MedicalDoctor: [ 3, 3 ]
             MedicalIntern: [ 2, 2 ]
             Paramedic: [ 1, 1 ]
-            Psychologist: [ 0, 1 ]
-            #science 5-6
+            Psychologist: [ 1, 1 ]
+            # Science (6)
             Scientist: [ 4, 4 ]
             ResearchAssistant: [ 2, 2 ]
-            #security 6-8
+            # Security (9)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 2, 2 ]
             #Lawyer: [ 1, 1 ] # Corvax
             #supply 4
-            SalvageSpecialist: [ 2, 2 ]
+            SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 2, 2 ]
-            #civilian 2-3 + overflow
-            Passenger: [ -1, -1 ]
+            # Civilian (3 + overflow)
+            Passenger: [ -1, -1 ] # infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            #silicon 3
+            # Silicon (3)
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]
diff --git a/Resources/Prototypes/Maps/relic.yml b/Resources/Prototypes/Maps/relic.yml
index 203c45b0ca..b9926e5d07 100644
--- a/Resources/Prototypes/Maps/relic.yml
+++ b/Resources/Prototypes/Maps/relic.yml
@@ -30,7 +30,8 @@
                 - /Maps/Shuttles/trading_outpost.yml
         - type: StationJobs
           availableJobs:
-            #command (6)
+            # TOTAL: 29 job slots + 2 late-join only
+            # Command (6)
             Captain: [ 1, 1 ]
             IAA: [ 1, 1 ] # Corvax-IAA
             HeadOfPersonnel: [ 1, 1 ]
@@ -38,28 +39,28 @@
             ChiefMedicalOfficer: [ 1, 1 ]
             ChiefEngineer: [ 1, 1 ]
             ResearchDirector: [ 1, 1 ]
-            #service (1)
+            # Service (1)
             Chaplain: [ 1, 1 ]
-            #engineering (4)
+            # Engineering (6)
             AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 2, 2 ]
-            TechnicalAssistant: [ 2, 2 ] #intern, not counted
-            #medical (4)
+            TechnicalAssistant: [ 2, 2 ]
+            # Medical (6)
             Chemist: [ 1, 1 ]
             MedicalDoctor: [ 2, 2 ]
             Paramedic: [ 1, 1 ]
-            MedicalIntern: [ 2, 2 ] #intern, not counted
-            #science (1 - 2)
+            MedicalIntern: [ 2, 2 ]
+            # Science (3-4)
             Scientist: [ 1, 2 ]
-            ResearchAssistant: [ 2, 2 ] #intern, not counted
-            #security (4 - 5)
+            ResearchAssistant: [ 2, 2 ]
+            # Security (6-7)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 1, 2 ]
             Detective: [ 1, 1 ]
-            SecurityCadet: [ 2, 2 ] #intern, not counted
+            SecurityCadet: [ 2, 2 ]
             #Lawyer: [ 1, 1 ]
-            #supply (0)
-            #civilian (0+)
-            Passenger: [ -1, -1 ] #infinite, not counted
-            #silicon (1)
+            # Supply (0)
+            # Civilian (0 + overflow)
+            Passenger: [ -1, -1 ] # infinite, not counted
+            # Silicon (1)
             StationAi: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml
index 0d4cff9790..d9283b82e1 100644
--- a/Resources/Prototypes/Maps/saltern.yml
+++ b/Resources/Prototypes/Maps/saltern.yml
@@ -15,8 +15,9 @@
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
         - type: StationJobs
-          availableJobs: # 45 jobs total w/o latejoins & interns, 62 jobs total w/ latejoins & interns
-            #command (7)
+          availableJobs:
+            # TOTAL: 57 job slots + 3 late-join only
+            # Command (7)
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             HeadOfSecurity: [ 1, 1 ]
@@ -24,7 +25,7 @@
             ChiefEngineer: [ 1, 1 ]
             ResearchDirector: [ 1, 1 ]
             Quartermaster: [ 1, 1 ]
-            #service (8 - 9)
+            # Service (8 - 9)
             Bartender: [ 1, 1 ]
             Botanist: [ 1, 2 ]
             Chef: [ 1, 1 ]
@@ -32,30 +33,30 @@
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 2, 2 ]
-            #engineering (6)
+            # Engineering (8)
             AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 4, 4 ]
-            TechnicalAssistant: [ 4, 4 ] #intern, not counted
-            #medical (6)
+            TechnicalAssistant: [ 4, 4 ]
+            # Medical (10)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 3, 3 ]
-            MedicalIntern: [ 4, 4 ] #intern, not counted
+            MedicalIntern: [ 4, 4 ]
             Paramedic: [ 1, 1 ]
-            #science (4)
+            # Science (6)
             Scientist: [ 4, 4 ]
-            ResearchAssistant: [ 2, 2 ] #intern, not counted
-            #security (6)
+            ResearchAssistant: [ 2, 2 ]
+            # Security (10)
             Warden: [ 1, 1 ]
             Detective: [ 1, 1 ]
             SecurityOfficer: [ 4, 4 ]
-            SecurityCadet: [ 4, 4 ] #intern, not counted
-            #supply (3 - 5)
+            SecurityCadet: [ 4, 4 ]
+            # Supply (3-5)
             SalvageSpecialist: [ 1, 3 ]
             CargoTechnician: [ 2, 2 ]
-            #civilian (3+)
-            Passenger: [ -1, -1 ] #infinite, not counted
+            # Civilian (3 + overflow)
+            Passenger: [ -1, -1 ] # infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            #silicon (2)
+            # Silicon (2)
             Borg: [ 2, 2 ]
diff --git a/Resources/Prototypes/Maps/snowball.yml b/Resources/Prototypes/Maps/snowball.yml
index a202051310..1b79f205a2 100644
--- a/Resources/Prototypes/Maps/snowball.yml
+++ b/Resources/Prototypes/Maps/snowball.yml
@@ -3,7 +3,7 @@
   mapName: 'Snowball Station'
   mapPath: /Maps/snowball.yml
   minPlayers: 5
-  maxPlayers: 24
+  maxPlayers: 25
   stations:
     Snowball:
       stationProto: StandardNanotrasenStation
@@ -17,7 +17,8 @@
           emergencyShuttlePath: /Maps/Shuttles/emergency_rod.yml
         - type: StationJobs
           availableJobs:
-            #command (7)
+            # TOTAL: 53 job slots + 1 late-join only
+            # Command (7)
             Captain: [ 1, 1 ]
             IAA: [ 1, 1 ] # Corvax-IAA
             HeadOfPersonnel: [ 1, 1 ]
@@ -26,7 +27,7 @@
             ChiefEngineer: [ 1, 1 ]
             ResearchDirector: [ 1, 1 ]
             Quartermaster: [ 1, 1 ]
-            #service 6-10
+            # Service (8-9)
             Bartender: [ 1, 1 ]
             Botanist: [ 2, 2 ]
             Chef: [ 1, 1 ]
@@ -34,19 +35,19 @@
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 1, 1 ]
-            #engineering 7-8
+            # Engineering (7)
             AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 3, 3 ]
             TechnicalAssistant: [ 2, 2 ]
-            #medical 7-9
+            # Medical (8)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 3, 3 ]
             MedicalIntern: [ 2, 2 ]
             Paramedic: [ 1, 1 ]
-            #science 5-6
+            # Science (5)
             Scientist: [ 3, 3 ]
             ResearchAssistant: [ 2, 2 ]
-            #security 6-8
+            # Security (8)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 3, 3 ]
             Detective: [ 1, 1 ]
@@ -55,11 +56,11 @@
             #supply 4
             SalvageSpecialist: [ 2, 2 ]
             CargoTechnician: [ 2, 2 ]
-            #civilian 2-3 + overflow
-            Passenger: [ -1, -1 ]
+            # Civilian (3 + overflow)
+            Passenger: [ -1, -1 ] # infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            #silicon 3
+            # Silicon (3)
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]
diff --git a/Resources/Prototypes/Maps/sushi.yml b/Resources/Prototypes/Maps/sushi.yml
index afca348368..f74b2fe3ce 100644
--- a/Resources/Prototypes/Maps/sushi.yml
+++ b/Resources/Prototypes/Maps/sushi.yml
@@ -3,7 +3,6 @@
   mapName: 'Sushi Station'
   mapPath: /Maps/sushi.yml
   minPlayers: 45
-  maxPlayers: 70
   stations:
     Sushi:
       stationProto: StandardNanotrasenStation
@@ -17,6 +16,7 @@
           emergencyShuttlePath: /Maps/Shuttles/emergency_sushi.yml
         - type: StationJobs
           availableJobs:
+            # TOTAL: 66 job slots + 0 late-join only
             # Command (7)
             Captain: [ 1, 1 ]
             IAA: [ 1, 1 ] # Corvax-IAA
@@ -26,8 +26,8 @@
             ChiefEngineer: [ 1, 1 ]
             ResearchDirector: [ 1, 1 ]
             Quartermaster: [ 1, 1 ]
-            # Service (11-13)
-            Bartender: [ 2, 2 ]
+            # Service (10)
+            Bartender: [ 1, 1 ]
             Botanist: [ 2, 2 ]
             Chef: [ 2, 2 ]
             Janitor: [ 2, 2 ]
@@ -35,30 +35,30 @@
             Librarian: [ 1, 1 ]
             Reporter: [ 1, 1 ]
             ServiceWorker: [ 1, 2 ]
-            # Engineering (7-9)
-            AtmosphericTechnician: [ 3, 3 ]
+            # Engineering (8)
+            AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 2, 2 ]
-            # Medical (8-10)
+            # Medical (10)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 4, 4 ]
             Paramedic: [ 1, 1 ]
             MedicalIntern: [ 2, 2 ]
             Psychologist: [ 1, 1 ]
-            # Science (4-6)
+            # Science (6)
             Scientist: [ 4, 4 ]
             ResearchAssistant: [ 2, 2 ]
-            # Security (9-11)
+            # Security (12)
             Warden: [ 1, 1 ]
-            SecurityOfficer: [ 5, 5 ]
+            SecurityOfficer: [ 6, 6 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 2, 2 ]
             #Lawyer: [ 2, 2 ] # Corvax-IAA
             # Supply (6)
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 3, 3 ]
-            # Civilian (3+)
-            Passenger: [ -1, -1 ]
+            # Civilian (3 + overflow)
+            Passenger: [ -1, -1 ] # infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/tram2.yml b/Resources/Prototypes/Maps/tram2.yml
index e438525cff..4692e29d86 100644
--- a/Resources/Prototypes/Maps/tram2.yml
+++ b/Resources/Prototypes/Maps/tram2.yml
@@ -4,7 +4,6 @@
   mapPath: /Maps/tram2.yml
   maxRandomOffset: 0
   minPlayers: 45
-  maxPlayers: 65
   stations:
     Tram2:
       stationProto: StandardNanotrasenStation
@@ -15,54 +14,56 @@
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
         - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/emergency_accordia.yml
+          emergencyShuttlePath: /Maps/Shuttles/emergency_tram.yml
         - type: StationJobs
           availableJobs:
-            #service 13-15
+            # TOTAL: 67 job slots + 1 late-join only
+            # Command (7)
             Captain: [ 1, 1 ]
             IAA: [ 1, 1 ] # Corvax-IAA
             HeadOfPersonnel: [ 1, 1 ]
-            Bartender: [ 1, 2 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            # Service (12)
+            Bartender: [ 1, 1 ]
             Botanist: [ 2, 2 ]
             Chef: [ 2, 2 ]
             Janitor: [ 2, 2 ]
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 1, 1 ]
-            Detective: [ 1, 2 ]
+            Reporter: [ 1, 1 ]
             TramDriver: [ 1, 1 ]
-            #engineering 9
-            ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 3, 3 ]
-            StationEngineer: [ 3, 3 ]
+            # Engineering (8)
+            AtmosphericTechnician: [ 2, 2 ]
+            StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 2, 2 ]
-            #medical 10
-            ChiefMedicalOfficer: [ 1, 1 ]
+            # Medical (10)
             Chemist: [ 2, 2 ]
-            MedicalDoctor: [ 3, 3 ]
+            MedicalDoctor: [ 4, 4 ]
             MedicalIntern: [ 2, 2 ]
-            Paramedic: [ 1, 2 ]
-            Psychologist: [1, 1]
-            #science 6
-            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 3, 3 ]
+            Paramedic: [ 1, 1 ]
+            Psychologist: [ 1, 1 ]
+            # Science (6)
+            Scientist: [ 4, 4 ]
             ResearchAssistant: [ 2, 2 ]
-            #security 8-9
-            HeadOfSecurity: [ 1, 1 ]
+            # Security (11-12)
             Warden: [ 1, 1 ]
-            SecurityOfficer: [ 3, 3 ]
+            SecurityOfficer: [ 6, 6 ]
             SecurityCadet: [ 2, 2 ]
             #Lawyer: [ 1, 2 ] #Corvax-IAA
-            #supply 6
-            Quartermaster: [ 1, 1 ]
-            SalvageSpecialist: [ 2, 2 ]
+            Detective: [ 1, 2 ]
+            # Supply (6)
+            SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 3, 3 ]
-            #civilian 4+
-            Passenger: [ -1, -1 ]
+            # Civilian (3 + overflow)
+            Passenger: [ -1, -1 ] # infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            Reporter: [ 1, 1 ]
-            #silicon 3
+            # Silicon (4)
             StationAi: [ 1, 1 ]
-            Borg: [ 2, 2 ]
+            Borg: [ 3, 3 ]
diff --git a/Resources/Prototypes/NPCs/hugbot.yml b/Resources/Prototypes/NPCs/hugbot.yml
index 409b2b03e4..9bc31f5ab1 100644
--- a/Resources/Prototypes/NPCs/hugbot.yml
+++ b/Resources/Prototypes/NPCs/hugbot.yml
@@ -1,4 +1,4 @@
-- type: htnCompound
+- type: htnCompound
   id: HugBotCompound
   branches:
   - tasks:
diff --git a/Resources/Prototypes/Nutrition/edible.yml b/Resources/Prototypes/Nutrition/edible.yml
index 3dd11521ef..9ed11932fd 100644
--- a/Resources/Prototypes/Nutrition/edible.yml
+++ b/Resources/Prototypes/Nutrition/edible.yml
@@ -1,4 +1,4 @@
-# If you add a new prototype, you may want to consider adding it to IngestionSystem.API for other systems to use.
+# If you add a new prototype, you may want to consider adding it to IngestionSystem.API for other systems to use.
 # But only if other systems/components might want it.
 
 # Food
diff --git a/Resources/Prototypes/Objectives/paradoxClone.yml b/Resources/Prototypes/Objectives/paradoxClone.yml
index 495991c921..7e10cf690f 100644
--- a/Resources/Prototypes/Objectives/paradoxClone.yml
+++ b/Resources/Prototypes/Objectives/paradoxClone.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: BaseObjective
   id: BaseParadoxCloneObjective
diff --git a/Resources/Prototypes/Objectives/wizard.yml b/Resources/Prototypes/Objectives/wizard.yml
index 92c8b46f66..7a2f1f1719 100644
--- a/Resources/Prototypes/Objectives/wizard.yml
+++ b/Resources/Prototypes/Objectives/wizard.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: BaseObjective
   id: BaseWizardObjective
diff --git a/Resources/Prototypes/Palettes/advanced.yml b/Resources/Prototypes/Palettes/advanced.yml
index a3b6d585dc..7f5b6b312d 100644
--- a/Resources/Prototypes/Palettes/advanced.yml
+++ b/Resources/Prototypes/Palettes/advanced.yml
@@ -1,4 +1,4 @@
-- type: palette
+- type: palette
   id: Advanced
   name: Advanced
   colors:
@@ -50,4 +50,4 @@
     neutrallight: "#E6E6E6"
     neutralmedium: "#B3B3B3"
     neutraldark: "#999999"
-    neutralblack: "#808080"
\ No newline at end of file
+    neutralblack: "#808080"
diff --git a/Resources/Prototypes/Palettes/critters.yml b/Resources/Prototypes/Palettes/critters.yml
index af571840e0..ad91799957 100644
--- a/Resources/Prototypes/Palettes/critters.yml
+++ b/Resources/Prototypes/Palettes/critters.yml
@@ -50,7 +50,7 @@
     Innocent: "#f6f439" # Monky
     Angry: "#dc5864" # Hunty
     Perceptive: "#222222" # Watchy
-    Eldritch: "#dc5864"
+    Eldritch: "#084678"
     Fat: "#fefcab"
     Violent: "#ab3430"
     Speedy: "#679cfe"
diff --git a/Resources/Prototypes/Palettes/departmental.yml b/Resources/Prototypes/Palettes/departmental.yml
index dfe19fcaab..228f22ff64 100644
--- a/Resources/Prototypes/Palettes/departmental.yml
+++ b/Resources/Prototypes/Palettes/departmental.yml
@@ -1,4 +1,4 @@
-- type: palette
+- type: palette
   id: Departmental
   name: Departmental
   colors:
diff --git a/Resources/Prototypes/Palettes/emagged.yml b/Resources/Prototypes/Palettes/emagged.yml
index 37b4e4e0b9..dcee0ad969 100644
--- a/Resources/Prototypes/Palettes/emagged.yml
+++ b/Resources/Prototypes/Palettes/emagged.yml
@@ -1,4 +1,4 @@
-- type: palette
+- type: palette
   id: Emagged
   name: Emagged
   colors:
diff --git a/Resources/Prototypes/Palettes/sixteen.yml b/Resources/Prototypes/Palettes/sixteen.yml
index cd6efe7757..6825d7e770 100644
--- a/Resources/Prototypes/Palettes/sixteen.yml
+++ b/Resources/Prototypes/Palettes/sixteen.yml
@@ -1,4 +1,4 @@
-- type: palette
+- type: palette
   id: Rainbow
   name: Rainbow
   colors:
diff --git a/Resources/Prototypes/Palettes/text.yml b/Resources/Prototypes/Palettes/text.yml
index 48d2074153..930c8cc272 100644
--- a/Resources/Prototypes/Palettes/text.yml
+++ b/Resources/Prototypes/Palettes/text.yml
@@ -1,4 +1,4 @@
-- type: palette
+- type: palette
   id: Material
   name: Material
   colors:
diff --git a/Resources/Prototypes/Polymorphs/admin.yml b/Resources/Prototypes/Polymorphs/admin.yml
index 606147ce9c..1be11c7732 100644
--- a/Resources/Prototypes/Polymorphs/admin.yml
+++ b/Resources/Prototypes/Polymorphs/admin.yml
@@ -1,4 +1,4 @@
-- type: polymorph
+- type: polymorph
   id: AdminLizardSmite
   configuration:
     entity: MobReptilian
diff --git a/Resources/Prototypes/Polymorphs/polymorph.yml b/Resources/Prototypes/Polymorphs/polymorph.yml
index 9cc97effc5..eb3b1523d7 100644
--- a/Resources/Prototypes/Polymorphs/polymorph.yml
+++ b/Resources/Prototypes/Polymorphs/polymorph.yml
@@ -237,3 +237,12 @@
     exitPolymorphSound: /Audio/Magic/ethereal_exit.ogg
     duration: 120
     effectProto: EffectDesynchronizer
+
+# Changeling Meteor
+- type: polymorph
+  id: ChangelingMeteor
+  configuration:
+    entity: ChangelingMeteor
+    forced: true
+    polymorphPopup: null
+    exitPolymorphPopup: null
diff --git a/Resources/Prototypes/Procedural/Themes/mineshaft.yml b/Resources/Prototypes/Procedural/Themes/mineshaft.yml
index 1e2c18d08b..e9fbc99683 100644
--- a/Resources/Prototypes/Procedural/Themes/mineshaft.yml
+++ b/Resources/Prototypes/Procedural/Themes/mineshaft.yml
@@ -269,4 +269,4 @@
   atlas: /Maps/Dungeon/mineshaft.yml
   offset: 28,32
   tags:
-    - Mineshaft
\ No newline at end of file
+    - Mineshaft
diff --git a/Resources/Prototypes/RCD/rcd.yml b/Resources/Prototypes/RCD/rcd.yml
index b173fa4157..c18d8e5db3 100644
--- a/Resources/Prototypes/RCD/rcd.yml
+++ b/Resources/Prototypes/RCD/rcd.yml
@@ -11,6 +11,7 @@
   mode: Deconstruct
   prototype: EffectRCDDeconstructPreview
   rotation: Camera
+  menuOrder: -1
 
 - type: rcd
   id: DeconstructLattice   # Hidden prototype - do not add to RCDs
@@ -30,7 +31,7 @@
   rotation: Camera
   fx: EffectRCDDeconstruct4
 
-# Flooring
+# region Walls and Flooring
 - type: rcd
   id: Plating
   name: rcd-component-plating
@@ -44,6 +45,7 @@
   rules:
     - CanBuildOnEmptyTile
   fx: EffectRCDConstruct1
+  menuOrder: 0
 
 - type: rcd
   id: FloorSteel
@@ -58,6 +60,7 @@
   rules:
     - CanBuildOnEmptyTile
   fx: EffectRCDConstruct1
+  menuOrder: 1
 
 - type: rcd
   id: Catwalk
@@ -73,8 +76,8 @@
     - IsCatwalk
   rotation: Fixed
   fx: EffectRCDConstruct1
+  menuOrder: 2
 
-# Walls
 - type: rcd
   id: WallSolid
   category: WallsAndFlooring
@@ -86,7 +89,10 @@
   collisionMask: FullTileMask
   rotation: Fixed
   fx: EffectRCDConstruct2
+  menuOrder: 3
+# endregion Walls and Flooring
 
+# region Windows and Grilles
 - type: rcd
   id: Grille
   category: WindowsAndGrilles
@@ -98,8 +104,8 @@
   collisionMask: Impassable
   rotation: Fixed
   fx: EffectRCDConstruct2
+  menuOrder: 0
 
-# Windows
 - type: rcd
   id: Window
   category: WindowsAndGrilles
@@ -113,6 +119,22 @@
     - IsWindow
   rotation: Fixed
   fx: EffectRCDConstruct2
+  menuOrder: 1
+
+- type: rcd
+  id: ReinforcedWindow
+  category: WindowsAndGrilles
+  sprite: /Textures/Interface/Radial/RCD/window_reinforced.png
+  mode: ConstructObject
+  prototype: ReinforcedWindow
+  cost: 4
+  delay: 3
+  collisionMask: Impassable
+  rules:
+    - IsWindow
+  rotation: User
+  fx: EffectRCDConstruct3
+  menuOrder: 2
 
 - type: rcd
   id: WindowDirectional
@@ -129,20 +151,7 @@
   rotation: User
   fx: EffectRCDConstruct1
   allowMultiDirection: true
-
-- type: rcd
-  id: ReinforcedWindow
-  category: WindowsAndGrilles
-  sprite: /Textures/Interface/Radial/RCD/window_reinforced.png
-  mode: ConstructObject
-  prototype: ReinforcedWindow
-  cost: 4
-  delay: 3
-  collisionMask: Impassable
-  rules:
-    - IsWindow
-  rotation: User
-  fx: EffectRCDConstruct3
+  menuOrder: 3
 
 - type: rcd
   id: WindowReinforcedDirectional
@@ -159,8 +168,10 @@
   rotation: User
   fx: EffectRCDConstruct2
   allowMultiDirection: true
+  menuOrder: 4
+# endregion Windows and Grilles
 
-# Airlocks
+# region Airlocks
 - type: rcd
   id: Airlock
   category: Airlocks
@@ -172,6 +183,7 @@
   collisionMask: FullTileMask
   rotation: Camera
   fx: EffectRCDConstruct4
+  menuOrder: 0
 
 - type: rcd
   id: AirlockGlass
@@ -184,6 +196,7 @@
   collisionMask: FullTileMask
   rotation: Camera
   fx: EffectRCDConstruct4
+  menuOrder: 1
 
 - type: rcd
   id: Firelock
@@ -196,8 +209,10 @@
   collisionMask: FullTileMask
   rotation: Camera
   fx: EffectRCDConstruct3
+  menuOrder: 2
+# endregion Airlocks
 
-# Lighting
+# region Lighting
 - type: rcd
   id: TubeLight
   category: Lighting
@@ -211,6 +226,7 @@
   rotation: User
   fx: EffectRCDConstruct1
   allowMultiDirection: true
+  menuOrder: 0
 
 - type: rcd
   id: BulbLight
@@ -225,8 +241,10 @@
   rotation: User
   fx: EffectRCDConstruct1
   allowMultiDirection: true
+  menuOrder: 1
+# endregion Lighting
 
-# Electrical
+# region Electrical
 - type: rcd
   id: LVCable
   category: Electrical
@@ -239,6 +257,7 @@
   - MustBuildOnSubfloor
   rotation: Fixed
   fx: EffectRCDConstruct0
+  menuOrder: 0
 
 - type: rcd
   id: MVCable
@@ -252,6 +271,7 @@
   - MustBuildOnSubfloor
   rotation: Fixed
   fx: EffectRCDConstruct0
+  menuOrder: 1
 
 - type: rcd
   id: HVCable
@@ -265,6 +285,7 @@
   - MustBuildOnSubfloor
   rotation: Fixed
   fx: EffectRCDConstruct0
+  menuOrder: 2
 
 - type: rcd
   id: CableTerminal
@@ -277,3 +298,5 @@
   collisionMask: Impassable
   rotation: User
   fx: EffectRCDConstruct0
+  menuOrder: 3
+# endregion Electrical
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Reagents/Consumable/Food/food.yml
index 2193bdd755..0a10db6af6 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/food.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/food.yml
@@ -8,10 +8,12 @@
   flavor: nutriment
   color: "#24591F"
   metabolisms:
-    Metabolites:
+    Digestion:
+      metabolismRate: 1
       effects:
       - !type:Satiate
         satiationType: Hunger
+        factor: 3
   plantMetabolism:
   - !type:PlantAdjustNutrition
     amount: 1.5
@@ -28,7 +30,7 @@
   flavor: vitamin
   color: "#D3D3D3"
   metabolisms:
-    Metabolites: #This makes it not compete with medicines, a large bonus for something that can heal
+    Digestion: #This makes it not compete with medicines, a large bonus for something that can heal
       effects:
       - !type:EvenHealthChange
         probability: 0.5
@@ -57,7 +59,7 @@
   flavor: protein
   color: "#FFFFE5"
   metabolisms:
-    Metabolites:
+    Digestion:
       effects:
       - !type:EvenHealthChange
         probability: 0.5
@@ -79,7 +81,7 @@
   color: white
   meltingPoint: 146.0
   metabolisms:
-    Metabolites:
+    Digestion:
       effects:
       - !type:Satiate
         satiationType: Hunger
diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml
index 1f38209c1b..a6d1d58c5b 100644
--- a/Resources/Prototypes/Reagents/botany.yml
+++ b/Resources/Prototypes/Reagents/botany.yml
@@ -96,7 +96,7 @@
       amount: 0.1
     - !type:PlantChangeTraits
       trait: PlantTraitKudzu
-      remove: true
+      type: Remove
   metabolisms:
     Bloodstream:
       effects:
diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml
index 108ba77200..e0114504b8 100644
--- a/Resources/Prototypes/Reagents/elements.yml
+++ b/Resources/Prototypes/Reagents/elements.yml
@@ -333,6 +333,7 @@
   plantMetabolism:
   - !type:PlantAdjustMutationLevel
     amount: 0.6
+    mutationTable: RandomPlantMutations
   - !type:PlantAdjustToxins
     amount: 4
   - !type:PlantAdjustHealth
diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml
index 718e71ef88..c1d8d0d1a6 100644
--- a/Resources/Prototypes/Reagents/fun.yml
+++ b/Resources/Prototypes/Reagents/fun.yml
@@ -448,6 +448,10 @@
         visualType: Small
         messages: [ "capsaicin-effect-light-burn" ]
         probability: 0.05
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectNightVision
+        time: 2
+        type: Add
 
 - type: reagent
   id: Caninase
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 6da7486a85..81b39e1509 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -596,7 +596,9 @@
   plantMetabolism:
     - !type:PlantAdjustToxins
       amount: 6
-    - !type:PlantPhalanximine
+    - !type:PlantChangeTraits
+      trait: PlantTraitUnviable
+      type: Remove
       minScale: 4
   metabolisms:
     Bloodstream:
@@ -1318,12 +1320,14 @@
   metabolisms:
     Bloodstream:
       effects:
+        - !type:AdjustTemperature
+         amount: 80000
         - !type:ReduceRotting
           seconds: 20
           conditions:
           #Patient must be dead and in a cryo tube (or something cold)
           - !type:TemperatureCondition
-            max: 150.0
+            max: 273.15
           - !type:MobStateCondition
             mobstate: Dead
 
@@ -1350,7 +1354,7 @@
           Burn: -3
 
 - type: reagent
-  id : Aloxadone
+  id: Aloxadone
   name: reagent-name-aloxadone
   group: Medicine
   desc: reagent-desc-aloxadone
@@ -1361,12 +1365,14 @@
   metabolisms:
     Bloodstream:
       effects:
+      - !type:AdjustTemperature
+        amount: 80000
       - !type:EvenHealthChange
         conditions:
         - !type:TemperatureCondition
-          max: 213.0
+          max: 273.15
         damage:
-          Burn: -4.5
+          Burn: -6
 
 - type: reagent
   id : Mannitol # currently this is just a way to create psicodine
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index d87f810aae..89cfc39a92 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -656,3 +656,24 @@
         effectProto: StatusEffectSeeingRainbow
         type: Add
         time: 5
+
+- type: reagent
+  id: Nyctalon
+  name: reagent-name-nyctalon
+  group: Narcotics
+  desc: reagent-desc-nyctalon
+  physicalDesc: reagent-physical-desc-translucent
+  flavor: bitter
+  color: "#1A0A2E"
+  metabolisms:
+    Bloodstream:
+      metabolismRate: 0.2
+      effects:
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectNightVision
+        time: 2
+        type: Add
+      - !type:HealthChange
+        damage:
+          types:
+           Radiation: 0.5
diff --git a/Resources/Prototypes/Reagents/pyrotechnic.yml b/Resources/Prototypes/Reagents/pyrotechnic.yml
index b4c567854f..29b270f1b2 100644
--- a/Resources/Prototypes/Reagents/pyrotechnic.yml
+++ b/Resources/Prototypes/Reagents/pyrotechnic.yml
@@ -1,4 +1,4 @@
-- type: reagent
+- type: reagent
   id: BasePyrotechnic
   group: Pyrotechnic
   abstract: true
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index 568e2166db..bfa0680eaf 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -299,6 +299,7 @@
   plantMetabolism:
   - !type:PlantAdjustMutationLevel
     amount: 1
+    mutationTable: RandomPlantMutations
   metabolisms:
     Bloodstream:
       effects:
@@ -634,8 +635,9 @@
   flavor: medicine
   color: "#435166"
   plantMetabolism:
-  - !type:PlantMutateChemicals
-    randomPickBotanyReagent: EvilRandomFillSolution
+  - !type:PlantAdjustMutationLevel
+    amount: 1
+    mutationTable: EvilPlantMutations
   - !type:PlantAdjustToxins
     amount: 10
   metabolisms:
@@ -868,3 +870,33 @@
       - !type:Emote
         emote: Scream
         probability: 0.1
+
+- type: reagent
+  id: HardlightToxin
+  name: reagent-name-hardlight-toxin
+  group: Toxins
+  desc: reagent-desc-hardlight-toxin
+  evaporationSpeed: 100 # Dissolves basically instantly if you *somehow* spill it
+  color: "#00FF00"
+  physicalDesc: reagent-physical-desc-glowing
+  contrabandSeverity: Syndicate
+  metabolisms:
+    Bloodstream: # TODO Make this a metabolite!!!
+      metabolismRate: 2.5 # It's basically pure energy so it metabolizes very fast
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Radiation: 1
+      - !type:StaminaDamage
+        damage: 10
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectKnockdown
+        time: 1.5
+        delay: 2.5
+      - !type:MovementSpeedModifier
+        effectProto: TaserSlowdownStatusEffect
+        time: 1.5
+        delay: 2.5
+        walkSpeedModifier: 0.5
+        sprintSpeedModifier: 0.5
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/atmospherics/atmos_pipes_special.yml b/Resources/Prototypes/Recipes/Construction/Graphs/atmospherics/atmos_pipes_special.yml
index 65ecd99e25..90714b5444 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/atmospherics/atmos_pipes_special.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/atmospherics/atmos_pipes_special.yml
@@ -40,4 +40,4 @@
       - !type:DeleteEntity
       steps:
       - tool: Welding
-        doAfter: 1
\ No newline at end of file
+        doAfter: 1
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/atmospherics/gas_pipe_sensor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/atmospherics/gas_pipe_sensor.yml
index 81887689fe..2b75fff471 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/atmospherics/gas_pipe_sensor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/atmospherics/gas_pipe_sensor.yml
@@ -28,4 +28,4 @@
         anchored: false
       steps:
       - tool: Welding
-        doAfter: 1
\ No newline at end of file
+        doAfter: 1
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/atmospherics/thermomachine-board.yml b/Resources/Prototypes/Recipes/Construction/Graphs/atmospherics/thermomachine-board.yml
index e9c7a3c9a3..1048d84d07 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/atmospherics/thermomachine-board.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/atmospherics/thermomachine-board.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: ThermomachineBoard
   start: freezer
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
index ef4fbc49b1..3890bb1637 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: HudMedSec
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/fun/bananium_horn.yml b/Resources/Prototypes/Recipes/Construction/Graphs/fun/bananium_horn.yml
index 74c280e184..be32efcc20 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/fun/bananium_horn.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/fun/bananium_horn.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: BananiumHorn
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/fun/jack_o_lantern.yml b/Resources/Prototypes/Recipes/Construction/Graphs/fun/jack_o_lantern.yml
index 8b086b28b1..d30aeb1b91 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/fun/jack_o_lantern.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/fun/jack_o_lantern.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: PumpkinAddLight
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/altars.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/altars.yml
index 0612642bf3..f6bac657c0 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/altars.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/altars.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: BananiumAltarGraph
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
index 232339213f..249ecf41d5 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: Table
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
index 46493299a5..7b00241e76 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: Computer
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml
index 71442b9b76..1d1d7c11e4 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: Machine
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/materials/metal_rod.yml b/Resources/Prototypes/Recipes/Construction/Graphs/materials/metal_rod.yml
index 0c36c0da23..dc1e9c27e1 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/materials/metal_rod.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/materials/metal_rod.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: MetalRod
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/mechs/hamtr_construction.yml b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/hamtr_construction.yml
index a71846755f..b570b7e8cc 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/mechs/hamtr_construction.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/hamtr_construction.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: Hamtr
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/mechs/honker_construction.yml b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/honker_construction.yml
index a821cf18a2..9fe42b2ec5 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/mechs/honker_construction.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/honker_construction.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: Honker
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/mechs/ripley_construction.yml b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/ripley_construction.yml
index f9e5451849..dd0fec008f 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/mechs/ripley_construction.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/ripley_construction.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: Ripley
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/barricades.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/barricades.yml
index 3149290125..d688d864ac 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/barricades.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/barricades.yml
@@ -1,4 +1,4 @@
-#Due to limitations with placement conditions in the construction system, the other kinds of non-fulltile barricades are currently not constructible.
+#Due to limitations with placement conditions in the construction system, the other kinds of non-fulltile barricades are currently not constructible.
 #This may make it sound like it needs some big refactor to be possible, but make no mistake, it is 100% due to my own technical incompetence.
 - type: constructionGraph
   id: Barricade
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/catwalk.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/catwalk.yml
index 4993ac017e..9c9686d6b1 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/catwalk.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/catwalk.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: Catwalk
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
index 3eb70bc17c..d5a65cd2ca 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: ConveyorGraph
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/cordage.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/cordage.yml
index aa26a1f581..5e121d04d0 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/cordage.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/cordage.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: DetCable
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml
index fae3e1da5b..570a3ba378 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: OrnateStatueClown
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/fence_metal.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/fence_metal.yml
index 444c327fdc..15ca761f62 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/fence_metal.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/fence_metal.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: FenceMetal
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/fence_wood.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/fence_wood.yml
index 081328f161..fd6f057497 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/fence_wood.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/fence_wood.yml
@@ -173,4 +173,4 @@
             - !type:SpawnPrototype
               prototype: MaterialWoodPlank1
               amount: 1
-            - !type:DeleteEntity {}
\ No newline at end of file
+            - !type:DeleteEntity {}
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml
index fe9bca8b78..5924678003 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: LightFixture
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
index 20eda8b6e4..0ed1f975ad 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: AirlockShuttle
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/station_ai_core.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/station_ai_core.yml
index a04c9b009f..cef2f5bc51 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/station_ai_core.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/station_ai_core.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: StationAiCore
   start: start
   graph:
@@ -141,4 +141,4 @@
         doAfter: 4
 
   - node: stationAiCore
-    entity: PlayerStationAiEmpty
\ No newline at end of file
+    entity: PlayerStationAiEmpty
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/station_beacon.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/station_beacon.yml
index d9c2c2c6aa..e784eab4b7 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/station_beacon.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/station_beacon.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: StationBeaconPart
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
index 43c44eb9b1..60f9ac5444 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: LogicGate
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/tools/torch.yml b/Resources/Prototypes/Recipes/Construction/Graphs/tools/torch.yml
index 9c52fa3ba5..7c06dd7498 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/tools/torch.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/tools/torch.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: LightTorch
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/cable_terminal.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/cable_terminal.yml
index 9bbffdbbba..3298c6b38f 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/cable_terminal.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/cable_terminal.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: CableTerminal
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/particle_accelerator.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/particle_accelerator.yml
index 7d6792f191..327c5a5d90 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/particle_accelerator.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/particle_accelerator.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: ParticleAcceleratorControlBox
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
index 8398eb1b60..22da92e3a4 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: SolarPanel
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_generator.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_generator.yml
index 797922d40f..b57cc8bd46 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_generator.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_generator.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: WallmountGenerator
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
index 731222e28b..53532428b2 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: WallmountSubstation
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/bladed_hats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/bladed_hats.yml
index b0817be44a..12f9f9e55a 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/bladed_hats.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/bladed_hats.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: BladedFlatcapGrey
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_shield.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_shield.yml
index 3cc3219c15..151d555aec 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_shield.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_shield.yml
@@ -14,4 +14,4 @@
         doAfter: 2
 
   - node: cardShield
-    entity: CardShield
\ No newline at end of file
+    entity: CardShield
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_sword.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_sword.yml
index d63aa855e4..330230816e 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_sword.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_sword.yml
@@ -11,4 +11,4 @@
         doAfter: 3
 
   - node: cardSword
-    entity: CardSword
\ No newline at end of file
+    entity: CardSword
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
index bac533a06f..a53c2a6630 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: ImprovisedArrow
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_bow.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_bow.yml
index 33808fc0ac..30d6686d9a 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_bow.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_bow.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: ImprovisedBow
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/makeshift_shield.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/makeshift_shield.yml
index 70e05e9dd5..3124535030 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/makeshift_shield.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/makeshift_shield.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: MakeshiftShield
   start: start
   graph:
@@ -10,7 +10,7 @@
               amount: 5
               doAfter: 2
             - material: Steel
-              amount: 5
+              amount: 10
               doAfter: 2
 
     - node: makeshiftShield
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_mine.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_mine.yml
index 95b4b4bcc7..99d8c7169a 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_mine.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_mine.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: ModularMineGraph
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shotgunsawn.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shotgunsawn.yml
index 0295a8b881..31ad7af506 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shotgunsawn.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shotgunsawn.yml
@@ -9,4 +9,4 @@
             - tool: Sawing
               doAfter: 2
     - node: shotgunsawn
-      entity: WeaponShotgunSawnEmpty # Makes the sawn-off spawn empty. At max they're losing 2 shells.
\ No newline at end of file
+      entity: WeaponShotgunSawnEmpty # Makes the sawn-off spawn empty. At max they're losing 2 shells.
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/upgraded_chimp.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/upgraded_chimp.yml
index 8cbcb8c964..ef182ae58a 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/upgraded_chimp.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/upgraded_chimp.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: UpgradeWeaponPistolCHIMP
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/wooden_buckler.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/wooden_buckler.yml
index 3d1a6074b2..9bcc845690 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/wooden_buckler.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/wooden_buckler.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: WoodenBuckler
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Construction/atmospherics.yml b/Resources/Prototypes/Recipes/Construction/atmospherics.yml
index 1718c9d82f..2d651da7b7 100644
--- a/Resources/Prototypes/Recipes/Construction/atmospherics.yml
+++ b/Resources/Prototypes/Recipes/Construction/atmospherics.yml
@@ -345,4 +345,4 @@
   graph: !type:CreateVariants
     values: [ GasTrinary, GasTrinaryAlt1, GasTrinaryAlt2 ]
   targetNode: pneumaticvalve
-# endregion Trinary
\ No newline at end of file
+# endregion Trinary
diff --git a/Resources/Prototypes/Recipes/Construction/lighting.yml b/Resources/Prototypes/Recipes/Construction/lighting.yml
index 447a6bbaac..b770b83c63 100644
--- a/Resources/Prototypes/Recipes/Construction/lighting.yml
+++ b/Resources/Prototypes/Recipes/Construction/lighting.yml
@@ -1,4 +1,4 @@
-# region Base
+# region Base
 - type: construction
   abstract: true
   id: BaseLight
diff --git a/Resources/Prototypes/Recipes/Construction/machines.yml b/Resources/Prototypes/Recipes/Construction/machines.yml
index bb0c85a660..f14b0e62f9 100644
--- a/Resources/Prototypes/Recipes/Construction/machines.yml
+++ b/Resources/Prototypes/Recipes/Construction/machines.yml
@@ -1,4 +1,4 @@
-# region Base
+# region Base
 - type: construction
   abstract: true
   id: BaseMachine
diff --git a/Resources/Prototypes/Recipes/Construction/materials.yml b/Resources/Prototypes/Recipes/Construction/materials.yml
index 5a4e029b7e..ab3c6e74c2 100644
--- a/Resources/Prototypes/Recipes/Construction/materials.yml
+++ b/Resources/Prototypes/Recipes/Construction/materials.yml
@@ -1,4 +1,4 @@
-# region Base
+# region Base
 - type: construction
   abstract: true
   id: BaseMaterial
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index 823714659f..7017c2fb35 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -293,7 +293,7 @@
 
 # region Firelocks
 - type: construction
-  parent: BaseStructureFullTile
+  parent: BaseStructureFullTileDirectional
   id: Firelock
   graph: Firelock
   targetNode: Firelock
@@ -308,7 +308,6 @@
   id: FirelockEdge
   name: construction-recipe-firelock-edge
   targetNode: FirelockEdge
-  canRotate: true
 # endregion Firelocks
 
 # region Shutters
@@ -480,7 +479,7 @@
 
 # region Airlocks
 - type: construction
-  parent: BaseStructureFullTile
+  parent: BaseStructureFullTileDirectional
   id: Airlock
   graph: Airlock
   targetNode: airlock
@@ -491,10 +490,9 @@
   targetNode: glassAirlock
 
 - type: construction
-  parent: BaseStructureFullTileDirectional
+  parent: Airlock
   id: AirlockShuttle
   graph: AirlockShuttle
-  targetNode: airlock
 
 - type: construction
   parent: AirlockShuttle
@@ -509,7 +507,6 @@
   id: Windoor
   graph: Windoor
   targetNode: windoor
-
 # endregion Windoors
 
 # region Lighting
diff --git a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
index 1b954484b4..4143c84e73 100644
--- a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
+++ b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
@@ -1113,7 +1113,7 @@
   - sprite: Objects/Specific/Hydroponics/galaxythistle.rsi
     state: produce
   tags:
-  - Fruit
+  - Flower
 
 - type: foodSequenceElement
   id: GalaxythistleBurger
@@ -1122,7 +1122,7 @@
   - sprite: Objects/Specific/Hydroponics/galaxythistle.rsi
     state: produce
   tags:
-  - Fruit
+  - Flower
 
 # bungo
 
diff --git a/Resources/Prototypes/Recipes/Cooking/sequence_metamorph.yml b/Resources/Prototypes/Recipes/Cooking/sequence_metamorph.yml
index 95f1c97a22..99560eed27 100644
--- a/Resources/Prototypes/Recipes/Cooking/sequence_metamorph.yml
+++ b/Resources/Prototypes/Recipes/Cooking/sequence_metamorph.yml
@@ -122,4 +122,4 @@
       max: 2
   - !type:LastElementHasTags # last bun
     tags:
-    - Bun
\ No newline at end of file
+    - Bun
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/artifact.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/artifact.yml
index d48731ad5a..42ce39c25e 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/artifact.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/artifact.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: Artifact
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/hugbot.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/hugbot.yml
index 56ee3803e0..4a83c75964 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/hugbot.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/hugbot.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: HugBot
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/goliath_hardsuit.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/goliath_hardsuit.yml
index b763f920d7..447bc3b999 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/goliath_hardsuit.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/goliath_hardsuit.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: HardsuitGoliath
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/gauze.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/gauze.yml
index bb36f36d69..f8b34ada7b 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/gauze.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/gauze.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: Gauze
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rag.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rag.yml
index 8bba11188d..e4c1e4b1f6 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rag.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rag.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: Rag
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rifle_stock.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rifle_stock.yml
index acb743b442..623e9ed9ad 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rifle_stock.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rifle_stock.yml
@@ -11,4 +11,4 @@
         amount: 5
         doAfter: 4
   - node: riflestock
-    entity: RifleStock
\ No newline at end of file
+    entity: RifleStock
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/foodboxpizza.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/foodboxpizza.yml
index b475289e11..1cb0f74f72 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/foodboxpizza.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/foodboxpizza.yml
@@ -12,4 +12,4 @@
 
 
     - node: foodboxpizza
-      entity: FoodBoxPizza
\ No newline at end of file
+      entity: FoodBoxPizza
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
index 44959d4fb6..67d1b7b85e 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: PlushieGhostRevenant
   start: start
   graph:
diff --git a/Resources/Prototypes/Recipes/Crafting/artifact.yml b/Resources/Prototypes/Recipes/Crafting/artifact.yml
index 82f295ca5c..c3324fe420 100644
--- a/Resources/Prototypes/Recipes/Crafting/artifact.yml
+++ b/Resources/Prototypes/Recipes/Crafting/artifact.yml
@@ -1,4 +1,4 @@
-- type: construction
+- type: construction
   parent: BaseItemMisc
   id: Artifact
   graph: Artifact
diff --git a/Resources/Prototypes/Recipes/Crafting/toys.yml b/Resources/Prototypes/Recipes/Crafting/toys.yml
index bcb5ff4a0c..0090a31813 100644
--- a/Resources/Prototypes/Recipes/Crafting/toys.yml
+++ b/Resources/Prototypes/Recipes/Crafting/toys.yml
@@ -1,4 +1,4 @@
-- type: construction
+- type: construction
   parent: BaseItemMisc
   id: PlushieGhostRevenant
   graph: PlushieGhostRevenant
diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
index 6d4538cc81..b1502a10ea 100644
--- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml
+++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
@@ -587,3 +587,32 @@
       amount: 3
   products:
     PhosphoricAcid: 10
+
+- type: reaction
+  id: Nyctalon
+  reactants:
+    Oculine:
+      amount: 1
+    Radium:
+      amount: 1
+    Uranium:
+      amount: 1
+      catalyst: true
+    Phosphorus:
+      amount: 1
+  products:
+    Nyctalon: 2
+
+- type: reaction
+  id: TearGas
+  reactants:
+    CapsaicinOil:
+      amount: 1
+    Phosphorus:
+      amount: 1
+    Chlorine:
+      amount: 1
+  products:
+    TearGas: 3
+
+
diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index a82ceae9c1..8e8706177a 100644
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -23,7 +23,7 @@
 - type: reaction
   id: AlliesCocktail
   requiredMixerCategories:
-  - Shake
+  - Stir
   reactants:
     Martini:
       amount: 2
@@ -389,7 +389,7 @@
 - type: reaction
   id: DriestMartini
   requiredMixerCategories:
-  - Shake
+  - Stir
   reactants:
     Gin:
       amount: 1
@@ -817,7 +817,7 @@
 - type: reaction
   id: Martini
   requiredMixerCategories:
-  - Shake
+  - Stir
   reactants:
     Gin:
       amount: 2
@@ -1219,7 +1219,7 @@
 - type: reaction
   id: VodkaMartini
   requiredMixerCategories:
-  - Shake
+  - Stir
   reactants:
     Vermouth:
       amount: 1
diff --git a/Resources/Prototypes/Recipes/Reactions/gas.yml b/Resources/Prototypes/Recipes/Reactions/gas.yml
index 3dc6654d68..5dd19253f4 100644
--- a/Resources/Prototypes/Recipes/Reactions/gas.yml
+++ b/Resources/Prototypes/Recipes/Reactions/gas.yml
@@ -1,4 +1,4 @@
-- type: reaction
+- type: reaction
   id: CarbonDioxideBreakdown
   source: true
   requiredMixerCategories:
diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml
index 24641e8c3f..c35205ba6f 100644
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -329,11 +329,12 @@
   id: Ultravasculine
   reactants:
     Histamine:
-      amount: 2
+      amount: 1
     Plasma:
       amount: 1
+      catalyst: true
   products:
-    Ultravasculine: 2
+    Ultravasculine: 1
 
 - type: reaction
   id: Histamine
diff --git a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
index b3b01ab515..1767ff0158 100644
--- a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
+++ b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
@@ -1,4 +1,4 @@
-- type: reaction
+- type: reaction
   id: Napalm
   reactants:
     Oil:
diff --git a/Resources/Prototypes/Recipes/Reactions/single_reagent.yml b/Resources/Prototypes/Recipes/Reactions/single_reagent.yml
index f63900c854..d4b83b68da 100644
--- a/Resources/Prototypes/Recipes/Reactions/single_reagent.yml
+++ b/Resources/Prototypes/Recipes/Reactions/single_reagent.yml
@@ -67,7 +67,7 @@
   reactants:
     LivingTissue:
       amount: 1
-    Licoxide:
+    Histamine:
       amount: 1
     Impedrezene:
       amount: 1
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 846eef1452..5d601ace13 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -52,8 +52,8 @@
   id: NonlethalAmmunition
   name: research-technology-nonlethal-ammunition
   icon:
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
-    state: beanbag
+    sprite: Objects/Weapons/Guns/Battery/disabler_smg.rsi
+    state: icon
   discipline: Arsenal
   tier: 1
   cost: 5000
@@ -62,6 +62,7 @@
   - BoxShellTranquilizer
   - BoxBeanbag
   - WeaponDisabler
+  - WeaponDisablerSMG
 
 - type: technology
   id: UraniumMunitions
@@ -84,21 +85,6 @@
   - MagazineBoxRifleUranium
   - BoxShotgunUranium
 
-- type: technology
-  id: AdvancedRiotControl
-  name: research-technology-advanced-riot-control
-  icon:
-    sprite: Objects/Weapons/Melee/truncheon.rsi
-    state: icon
-  discipline: Arsenal
-  tier: 1
-  cost: 8000
-  recipeUnlocks:
-  - Truncheon
-  - TelescopicShield
-  - HoloprojectorSecurity
-  - WeaponDisablerSMG
-
 - type: technology
   id: ExplosiveTechnology
   name: research-technology-explosive-technology
@@ -133,6 +119,20 @@
 
 # Tier 2
 
+- type: technology
+  id: AdvancedRiotControl
+  name: research-technology-advanced-riot-control
+  icon:
+    sprite: Objects/Weapons/Melee/truncheon.rsi
+    state: icon
+  discipline: Arsenal
+  tier: 2
+  cost: 8000
+  recipeUnlocks:
+  - Truncheon
+  - TelescopicShield
+  - HoloprojectorSecurity
+
 - type: technology
   id: ConcentratedLaserWeaponry
   name: research-technology-concentrated-laser-weaponry
diff --git a/Resources/Prototypes/Roles/Antags/base.yml b/Resources/Prototypes/Roles/Antags/base.yml
index e92a8df11b..e6e37d38e1 100644
--- a/Resources/Prototypes/Roles/Antags/base.yml
+++ b/Resources/Prototypes/Roles/Antags/base.yml
@@ -1,4 +1,4 @@
-- type: antagSpecifier
+- type: antagSpecifier
   abstract: true
   id: BaseAntagSpecifier
   jobBlacklist:
diff --git a/Resources/Prototypes/Roles/Antags/changeling.yml b/Resources/Prototypes/Roles/Antags/changeling.yml
index f19eb39446..2d737df993 100644
--- a/Resources/Prototypes/Roles/Antags/changeling.yml
+++ b/Resources/Prototypes/Roles/Antags/changeling.yml
@@ -1,4 +1,4 @@
-- type: antag
+- type: antag
   id: Changeling
   name: roles-antag-changeling-name
   antagonist: true
@@ -49,6 +49,84 @@
     currencyWhitelist:
     - ChangelingDNA
     balance:
-      ChangelingDNA: 60
+      ChangelingDNA: 50
+    inputValidation: false
   mindRoles:
   - MindRoleChangeling
+
+# for the mid round space-spawned changeling
+- type: antagSpecifier
+  parent: RestrictedAntag
+  id: SpaceChangeling
+  spawnerPrototype: SpawnPointGhostSpaceChangeling
+  pickPlayer: false
+  briefing:
+    text: space-changeling-role-greeting
+    color: Red
+    sound: /Audio/Ambience/Antag/changeling_start.ogg
+  mindRoles:
+  - MindRoleChangeling
+  components:
+  # meteor!
+  - type: PolymorphOnTrigger
+    polymorph: ChangelingMeteor
+    keysIn:
+    - poly
+  - type: TriggerOnSpawn
+    keyOut: poly
+
+- type: entity
+  name: strange meteor
+  description: This meteor looks more akin to a fossile than to an aggregate of minerals.
+  id: ChangelingMeteor
+  parent:
+  - BaseMeteor
+  - MobNightVision # dont think too hard about it not being a mob
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Mobs/Animals/headslug.rsi
+    state: shell
+    noRot: true
+  - type: FlingTowardStation
+    speed: 15
+  - type: Solution
+    solution:
+      reagents:
+      - ReagentId: Blood
+        Quantity: 240
+      - ReagentId: LivingTissue
+        Quantity: 20
+  - type: Meteor
+    damageTypes:
+      types:
+        Blunt: 1
+        Structural: 5
+  - type: Explosive # very weak explosion for visuals
+    explosionType: DemolitionCharge
+    totalIntensity: 3
+    intensitySlope: 1
+    tileBreakScale: 0
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:ExplodeBehavior
+      - !type:SpillBehavior
+        solution: solution
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          FoodMeatHuman:
+            min: 1
+            max: 2
+  - type: ReplacementAccent # RAWR!!!!! (This is because polymorph calls makesentient...)
+    accent: genericAggressive
+  - type: Speech
+    speechVerb: LargeMob
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
index dcf7add35e..8fd8636f5e 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
@@ -6,6 +6,7 @@
   startingGear: CargoTechGear
   icon: "JobIconCargoTechnician"
   supervisors: job-supervisors-qm
+  guides: [ Cargo ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Cargo
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
index 61b014fba0..d09b907bc0 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -22,6 +22,7 @@
   startingGear: QuartermasterGear
   icon: "JobIconQuarterMaster"
   supervisors: job-supervisors-captain
+  guides: [ Command ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Cargo
   - Salvage
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
index c4dca0d652..f2234b46b0 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
@@ -10,6 +10,7 @@
   icon: "JobIconShaftMiner"
   startingGear: SalvageSpecialistGear
   supervisors: job-supervisors-qm
+  guides: [ Salvage ]
   access:
   - Cargo
   - Salvage
diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
index 2fa8da816a..84b59c474c 100644
--- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
@@ -79,8 +79,8 @@
     - MedkitCombatFilled # End of first line
     - GrenadeShrapnel
     - EmpGrenade
-    belt:
     - Truncheon
+    belt:
     - Handcuffs
     - Handcuffs
     - CrowbarRed
@@ -370,23 +370,21 @@
     - GrenadeBlast
     - GrenadeBlast
     - GrenadeBlast
+    - GrenadeFlash
+    - GrenadeFlash # End of first line
+    - GrenadeEMP
+    - GrenadeEMP
+    - GrenadeEMP
     - MagazinePistol
-    - MedkitCombatFilled # End of first line
-    - GrenadeEMP
-    - GrenadeEMP
-    - GrenadeEMP
-    - GrenadeFlash
-    - GrenadeFlash
-    - GrenadeFlash
-    - MagazinePistol
-    belt:
     - Truncheon
-    - Handcuffs
+    belt:
     - Handcuffs
     - CrowbarRed
+    - EmergencyMedipen
     - WeaponPistolMk58
     - MagazinePistol
-    - EmergencyMedipen
+    - MagazinePistol
+    - MedkitCombatFilled
 
 - type: startingGear
   parent: ERTSecurityGearEVA
@@ -399,23 +397,22 @@
     - ExGrenade
     - SmokeGrenade
     - EmpGrenade
-    - HoloprojectorSecurity
     - TelescopicShield
-    - TelescopicShield
-    - TelescopicShield
-    - MedkitCombatFilled # End of first line
+    - TelescopicShield # End of first line
+    - MedkitCombatFilled
     - MagazinePistolSubMachineGunTopMounted
     - MagazinePistolSubMachineGunTopMounted
     - MagazinePistolSubMachineGunTopMounted
     - MagazinePistolSubMachineGunTopMounted
-    belt:
     - Truncheon
+    belt:
     - Handcuffs
     - Handcuffs
     - CrowbarRed
     - WeaponPistolMk58
     - MagazinePistol
     - EmergencyMedipen
+    - HoloprojectorSecurity
 
 - type: startingGear
   parent: ERTSecurityGearEVA
@@ -430,12 +427,11 @@
     - BoxShotgunSlug
     - BoxShotgunIncendiary
     - MedkitCombatFilled # End of first line
-    - SmokeGrenade
     - ExGrenade
     - CableDetStack
     - BoxDetonator
-    belt:
     - Truncheon
+    belt:
     - Handcuffs
     - Handcuffs
     - CrowbarRed
@@ -532,8 +528,8 @@
     - MedkitCombatFilled
     - ClothingEyesGlassesChemical
     - ChemistryBottleOmnizine
-    belt:
     - Truncheon
+    belt:
     - Zipties
     - CrowbarRed
     - MagazineRifle
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/passenger.yml
similarity index 100%
rename from Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
rename to Resources/Prototypes/Roles/Jobs/Civilian/passenger.yml
diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
index 282a40c2b9..9fe7f741ba 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -29,6 +29,7 @@
   icon: "JobIconCaptain"
   joinNotifyCrew: true
   supervisors: job-supervisors-centcom
+  guides: [ Command ] # TODO: should have a more specific guidebook page instead of using the department itself
   accessGroups:
   - AllAccess
   special:
diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index 227abd7068..1bd8dc6b6a 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -28,6 +28,7 @@
   startingGear: HoPGear
   icon: "JobIconHeadOfPersonnel"
   supervisors: job-supervisors-captain
+  guides: [ Command ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Command
   - HeadOfPersonnel
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
index 9cd766503d..e2d4a7bc3b 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
@@ -10,6 +10,7 @@
   startingGear: AtmosphericTechnicianGear
   icon: "JobIconAtmosphericTechnician"
   supervisors: job-supervisors-ce
+  guides: [ Atmospherics ]
   access:
   - Maintenance
   - Engineering
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
index f096b0247b..f3eee3ec1b 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -22,6 +22,7 @@
   startingGear: ChiefEngineerGear
   icon: "JobIconChiefEngineer"
   supervisors: job-supervisors-captain
+  guides: [ Command ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Maintenance
   - Engineering
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
index 2a4540380a..4ea2107925 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
@@ -10,6 +10,7 @@
   startingGear: StationEngineerGear
   icon: "JobIconStationEngineer"
   supervisors: job-supervisors-ce
+  guides: [ Engineering ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Maintenance
   - Engineering
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
index bbc20271b7..99b790c45c 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
@@ -13,6 +13,7 @@
   startingGear: TechnicalAssistantGear
   icon: "JobIconTechnicalAssistant"
   supervisors: job-supervisors-engineering
+  guides: [ Engineering ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Maintenance
   - Engineering
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/prisoner.yml b/Resources/Prototypes/Roles/Jobs/Fun/prisoner.yml
new file mode 100644
index 0000000000..4b73122789
--- /dev/null
+++ b/Resources/Prototypes/Roles/Jobs/Fun/prisoner.yml
@@ -0,0 +1,34 @@
+# Prisoner isn't an actual roundstart role, so these startingGear prototypes are mostly for use with the "Set Outfit" debug verb
+- type: startingGear
+  id: PrisonerGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitPrisoner
+    shoes: ClothingShoesColorBlack
+    id: PrisonerIDCard
+
+- type: startingGear
+  id: PrisonerMuzzledGear
+  equipment:
+    mask: ClothingMaskMuzzle
+    jumpsuit: ClothingUniformJumpsuitPrisoner
+    shoes: ClothingShoesColorBlack
+    id: PrisonerIDCard
+
+- type: chameleonOutfit
+  id: PrisonerChameleonOutfit
+  loadoutName: job-name-prisoner
+  name: job-name-prisoner
+  icon: "JobIconPrisoner"
+  equipment: # "real" prisoners obviously have limited access to clothing, so the head/eyes/outerClothing slots just use generic clothes to place *something* in that slot
+    head: ClothingHeadHatOrangesoft
+    eyes: ClothingEyesGlassesCheapSunglasses
+    ears: ClothingHeadsetGrey
+    mask: ClothingMaskMuzzle
+    outerClothing: ClothingOuterWinterColorOrange
+    jumpsuit: ClothingUniformJumpsuitPrisoner
+    neck: ClothingNeckBling
+    back: ClothingBackpack # we COULD use the eletropack, but it's probably more suspect to have an electropack that doesn't work and that security doesn't remember handing out
+    gloves: ClothingHandsGlovesColorBlack
+    shoes: ClothingShoesColorBlack
+    id: PrisonerPDA
+
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
index 2f3d2043ad..558920683a 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@@ -10,6 +10,7 @@
   startingGear: ChemistGear
   icon: "JobIconChemist"
   supervisors: job-supervisors-cmo
+  guides: [ Chemist ]
   access:
   - Medical
   - Chemistry
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
index 2f285cc83c..880d97bc82 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -24,6 +24,7 @@
   startingGear: CMOGear
   icon: "JobIconChiefMedicalOfficer"
   supervisors: job-supervisors-captain
+  guides: [ Command ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Medical
   - Command
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
index 29e50387c8..c9fe7b5419 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -10,6 +10,7 @@
   startingGear: DoctorGear
   icon: "JobIconMedicalDoctor"
   supervisors: job-supervisors-cmo
+  guides: [ Medical ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Medical
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
index 3cc01ce5b6..c811efbd4c 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
@@ -11,6 +11,7 @@
   startingGear: MedicalInternGear
   icon: "JobIconMedicalIntern"
   supervisors: job-supervisors-medicine
+  guides: [ Medical ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Medical
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
index 4ef5f08e4d..b5d87af06b 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -10,6 +10,7 @@
   startingGear: ParamedicGear
   icon: "JobIconParamedic"
   supervisors: job-supervisors-cmo
+  guides: [ Medical ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Medical
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml
index 8e961d65fc..41950284c3 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml
@@ -25,5 +25,6 @@
       time: 10h
   icon: JobIconBorg
   supervisors: job-supervisors-rd
+  guides: [ Cyborgs ]
   jobEntity: PlayerBorgBattery
   applyTraits: false
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
index 2c7b93ce1a..a06cad28b8 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
@@ -11,6 +11,7 @@
   startingGear: ResearchAssistantGear
   icon: "JobIconResearchAssistant"
   supervisors: job-supervisors-science
+  guides: [ Science ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Research
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index d921a4d244..8f8cf01a9f 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -17,6 +17,7 @@
   startingGear: ResearchDirectorGear
   icon: "JobIconResearchDirector"
   supervisors: job-supervisors-captain
+  guides: [ Command ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Research
   - Command
diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
index c397ea79b5..4397758102 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
@@ -10,6 +10,7 @@
   startingGear: ScientistGear
   icon: "JobIconScientist"
   supervisors: job-supervisors-rd
+  guides: [ Science ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Research
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
index e98b1d02e4..095df074bf 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
@@ -14,6 +14,7 @@
   startingGear: DetectiveGear
   icon: "JobIconDetective"
   supervisors: job-supervisors-hos
+  guides: [ Forensics ] # Todo: should have a more specific guidebook page, since there's a bit more to detective than just forensics itself
   access:
   - Security
   - Brig
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
index 8f8a2f7e85..11d10e7b3f 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -23,6 +23,7 @@
   startingGear: HoSGear
   icon: "JobIconHeadOfSecurity"
   supervisors: job-supervisors-captain
+  guides: [ Command ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - HeadOfSecurity
   - Command
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
index 963d0cee54..f1685c8505 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -17,6 +17,7 @@
   startingGear: SecurityCadetGear
   icon: "JobIconSecurityCadet"
   supervisors: job-supervisors-security
+  guides: [ Security ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Security
   - Brig
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
index 9199373c24..7dc086c5bf 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -14,6 +14,7 @@
   startingGear: SecurityOfficerGear
   icon: "JobIconSecurityOfficer"
   supervisors: job-supervisors-hos
+  guides: [ Security ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Security
   - Brig
diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
index e3f7a33323..0804ea630f 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -14,6 +14,7 @@
   startingGear: WardenGear
   icon: "JobIconWarden"
   supervisors: job-supervisors-hos
+  guides: [ Security ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Security
   - Brig
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Service/bartender.yml
similarity index 92%
rename from Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
rename to Resources/Prototypes/Roles/Jobs/Service/bartender.yml
index 4373f0d7e5..d708a877c5 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
+++ b/Resources/Prototypes/Roles/Jobs/Service/bartender.yml
@@ -5,11 +5,12 @@
   playTimeTracker: JobBartender
   requirements:
     - !type:DepartmentTimeRequirement
-      department: Civilian
-      time: 1h # Corvax-RoleTime
+      department: Service
+      time: 0.5h
   startingGear: BartenderGear
   icon: "JobIconBartender"
   supervisors: job-supervisors-hop
+  guides: [ Bartender ]
   access:
   - Service
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Service/botanist.yml
similarity index 97%
rename from Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
rename to Resources/Prototypes/Roles/Jobs/Service/botanist.yml
index f5f05bded9..25b8a8e292 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Service/botanist.yml
@@ -6,6 +6,7 @@
   startingGear: BotanistGear
   icon: "JobIconBotanist"
   supervisors: job-supervisors-hop
+  guides: [ Botany ]
   access:
   - Service
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Service/chaplain.yml
similarity index 88%
rename from Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
rename to Resources/Prototypes/Roles/Jobs/Service/chaplain.yml
index 8f518c148a..db1e63ce5b 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Service/chaplain.yml
@@ -6,6 +6,7 @@
   startingGear: ChaplainGear
   icon: "JobIconChaplain"
   supervisors: job-supervisors-hop
+  guides: [ Service ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Chapel
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Service/chef.yml
similarity index 93%
rename from Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
rename to Resources/Prototypes/Roles/Jobs/Service/chef.yml
index 708d3132d5..bc1a1ac487 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
+++ b/Resources/Prototypes/Roles/Jobs/Service/chef.yml
@@ -5,11 +5,12 @@
   playTimeTracker: JobChef
   requirements:
     - !type:DepartmentTimeRequirement
-      department: Civilian
-      time: 1h # Corvax-RoleTime
+      department: Service
+      time: 0.5h
   startingGear: ChefGear
   icon: "JobIconChef"
   supervisors: job-supervisors-hop
+  guides: [ Chef ]
   access:
   - Service
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Service/clown.yml
similarity index 91%
rename from Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
rename to Resources/Prototypes/Roles/Jobs/Service/clown.yml
index 50e0c6fb9b..0ec7569914 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Roles/Jobs/Service/clown.yml
@@ -9,6 +9,7 @@
   startingGear: ClownGear
   icon: "JobIconClown"
   supervisors: job-supervisors-hop
+  guides: [ Service ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Theatre
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Service/janitor.yml
similarity index 97%
rename from Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
rename to Resources/Prototypes/Roles/Jobs/Service/janitor.yml
index 15a19b6555..4f219e5526 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Service/janitor.yml
@@ -6,6 +6,7 @@
   startingGear: JanitorGear
   icon: "JobIconJanitor"
   supervisors: job-supervisors-hop
+  guides: [ Janitorial ]
   access:
   - Service
   - Janitor
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Service/lawyer.yml
similarity index 89%
rename from Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
rename to Resources/Prototypes/Roles/Jobs/Service/lawyer.yml
index 1951bf5342..b6eba31432 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Service/lawyer.yml
@@ -10,6 +10,7 @@
   setPreference: false # Corvax-IAA
   icon: "JobIconLawyer"
   supervisors: job-supervisors-hop
+  guides: [ SpaceLaw ] # TODO: should have a more specific guidebook page instead of just linking to Space Law
   access:
   - Service
   - Lawyer
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Service/librarian.yml
similarity index 88%
rename from Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
rename to Resources/Prototypes/Roles/Jobs/Service/librarian.yml
index 080447979f..4ab1ff7e06 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
+++ b/Resources/Prototypes/Roles/Jobs/Service/librarian.yml
@@ -6,6 +6,7 @@
   startingGear: LibrarianGear
   icon: "JobIconLibrarian"
   supervisors: job-supervisors-hop
+  guides: [ Service ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Service
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Service/mime.yml
similarity index 92%
rename from Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
rename to Resources/Prototypes/Roles/Jobs/Service/mime.yml
index 45324ac9a1..5812a322d9 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Service/mime.yml
@@ -9,6 +9,7 @@
   startingGear: MimeGear
   icon: "JobIconMime"
   supervisors: job-supervisors-hop
+  guides: [ Service ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Theatre
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Service/musician.yml
similarity index 82%
rename from Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
rename to Resources/Prototypes/Roles/Jobs/Service/musician.yml
index db958149a6..d9d06eb158 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Service/musician.yml
@@ -5,7 +5,8 @@
   playTimeTracker: JobMusician
   startingGear: MusicianGear
   icon: "JobIconMusician"
-  supervisors: job-supervisors-hop # Corvax-JobSupervisors
+  supervisors: job-supervisors-hop # Corvax-JobSupervisors job-supervisors-hire
+  guides: [ Service ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Maintenance # TODO Remove maint access for all gimmick jobs once access work is completed
   - Theatre
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Service/service_worker.yml
similarity index 86%
rename from Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
rename to Resources/Prototypes/Roles/Jobs/Service/service_worker.yml
index 0c83971827..f6fd06d639 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
+++ b/Resources/Prototypes/Roles/Jobs/Service/service_worker.yml
@@ -5,11 +5,12 @@
   playTimeTracker: JobServiceWorker
   requirements:
   - !type:DepartmentTimeRequirement
-    department: Civilian
+    department: Service
     time: 0.5h
   startingGear: ServiceWorkerGear
   icon: "JobIconServiceWorker"
   supervisors: job-supervisors-service
+  guides: [ Service ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Service
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
index e43bab3e72..d56b3081ad 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
@@ -6,6 +6,7 @@
   startingGear: PsychologistGear
   icon: "JobIconPsychologist"
   supervisors: job-supervisors-cmo
+  guides: [ Medical ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Medical
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml
index c3c61acd96..65c01151a6 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml
@@ -6,6 +6,7 @@
   startingGear: ReporterGear
   icon: "JobIconReporter"
   supervisors: job-supervisors-hop
+  guides: [ Service ] # TODO: should have a more specific guidebook page instead of using the department itself
   access:
   - Service
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/tramdriver.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/tramdriver.yml
index 449420b300..0eb57927ab 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/tramdriver.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/tramdriver.yml
@@ -6,6 +6,7 @@
   startingGear: TramDriverGear
   icon: "JobIconTramDriver"
   supervisors: job-supervisors-hop
+  guides: [ Service ] # TODO: should have a more specific guidebook page instead of using the department itself
   requirements:
     - !type:OverallPlaytimeRequirement # someone that's not doing this job will just be a pain for the station
       time: 10h
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
index e65f0234ee..81de886d78 100644
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -12,26 +12,12 @@
   id: Civilian
   name: department-Civilian
   description: department-Civilian-description
-  color: "#9FED58"
+  color: "#7F7F7F"
   weight: -10
   ignoreForDepartmentFallback: true
   roles:
-  - Bartender
-  - Botanist
-  - Chaplain
-  - Chef
-  - Clown
-  - HeadOfPersonnel
-  - Janitor
-  - Lawyer
-  - Librarian
-  - Mime
-  - Musician
   - Passenger
-  - Reporter
   - Visitor
-  - ServiceWorker
-  - TramDriver
 
 # Please kill this
 - type: department
@@ -104,6 +90,17 @@
   - Paramedic
   - SeniorPhysician # Corvax-MentorRoles
 
+- type: department
+  id: Science
+  name: department-Science
+  description: department-Science-description
+  color: "#D381C9"
+  roles:
+  - ResearchDirector
+  - Scientist
+  - ResearchAssistant
+  - SeniorResearcher # Corvax-MentorRoles
+
 - type: department
   id: Security
   name: department-Security
@@ -121,15 +118,25 @@
   - Brigmedic # Corvax-Brigmedic
 
 - type: department
-  id: Science
-  name: department-Science
-  description: department-Science-description
-  color: "#D381C9"
+  id: Service
+  name: department-Service
+  description: department-Service-description
+  color: "#9FED58"
   roles:
-  - ResearchDirector
-  - SeniorResearcher # Corvax-MentorRoles
-  - Scientist
-  - ResearchAssistant
+  - Bartender
+  - Botanist
+  - Chaplain
+  - Chef
+  - Clown
+  - HeadOfPersonnel
+  - Janitor
+  - Lawyer
+  - Librarian
+  - Mime
+  - Musician
+  - Reporter
+  - ServiceWorker
+  - TramDriver
 
 - type: department
   id: Silicon
diff --git a/Resources/Prototypes/Shaders/displacement.yml b/Resources/Prototypes/Shaders/displacement.yml
index debb68fb1f..93efbf2a21 100644
--- a/Resources/Prototypes/Shaders/displacement.yml
+++ b/Resources/Prototypes/Shaders/displacement.yml
@@ -1,4 +1,4 @@
-- type: shader
+- type: shader
   id: DisplacedStencilDraw
   kind: source
   path: "/Textures/Shaders/displacement.swsl"
diff --git a/Resources/Prototypes/Shaders/greyscale.yml b/Resources/Prototypes/Shaders/greyscale.yml
index 290f5ead5a..1d57c52f9b 100644
--- a/Resources/Prototypes/Shaders/greyscale.yml
+++ b/Resources/Prototypes/Shaders/greyscale.yml
@@ -1,4 +1,4 @@
-- type: shader
+- type: shader
   id: Greyscale
   kind: source
   path: "/Textures/Shaders/greyscale.swsl"
diff --git a/Resources/Prototypes/SoundCollections/anomaly.yml b/Resources/Prototypes/SoundCollections/anomaly.yml
index 291b5d4a27..710ee58b2e 100644
--- a/Resources/Prototypes/SoundCollections/anomaly.yml
+++ b/Resources/Prototypes/SoundCollections/anomaly.yml
@@ -1,4 +1,4 @@
-- type: soundCollection
+- type: soundCollection
   id: AnomalyFleshSupercritical
   files:
   - /Audio/Items/Anomaly/flesh_crit.ogg
diff --git a/Resources/Prototypes/SoundCollections/changeling.yml b/Resources/Prototypes/SoundCollections/changeling.yml
index 4edb07dc16..36d6fe33cf 100644
--- a/Resources/Prototypes/SoundCollections/changeling.yml
+++ b/Resources/Prototypes/SoundCollections/changeling.yml
@@ -1,4 +1,4 @@
-- type: soundCollection
+- type: soundCollection
   id: ChangelingDevourConsume
   files:
   - /Audio/Effects/Changeling/devour_consume.ogg
diff --git a/Resources/Prototypes/SoundCollections/clownrecorder.yml b/Resources/Prototypes/SoundCollections/clownrecorder.yml
index d7b12853b3..59e1ccc966 100644
--- a/Resources/Prototypes/SoundCollections/clownrecorder.yml
+++ b/Resources/Prototypes/SoundCollections/clownrecorder.yml
@@ -3,4 +3,4 @@
   files:
   - /Audio/Items/Toys/sitcom_laugh.ogg
   - /Audio/Items/Toys/sitcom_laugh2.ogg
-  
\ No newline at end of file
+  
diff --git a/Resources/Prototypes/SoundCollections/fence_rattle.yml b/Resources/Prototypes/SoundCollections/fence_rattle.yml
index f50dd33bf1..97d6ace1cf 100644
--- a/Resources/Prototypes/SoundCollections/fence_rattle.yml
+++ b/Resources/Prototypes/SoundCollections/fence_rattle.yml
@@ -1,4 +1,4 @@
-- type: soundCollection
+- type: soundCollection
   id: FenceRattle
   files:
   - /Audio/Effects/fence_rattle1.ogg
diff --git a/Resources/Prototypes/SoundCollections/generator.yml b/Resources/Prototypes/SoundCollections/generator.yml
index 00ea0240e7..182f663ce2 100644
--- a/Resources/Prototypes/SoundCollections/generator.yml
+++ b/Resources/Prototypes/SoundCollections/generator.yml
@@ -1,4 +1,4 @@
-- type: soundCollection
+- type: soundCollection
   # Plays when you try to start a generator.
   # You know, lawnmower cord pull sound.
   id: GeneratorTug
diff --git a/Resources/Prototypes/SoundCollections/hit_impacts.yml b/Resources/Prototypes/SoundCollections/hit_impacts.yml
index b0e805f30d..ca7451a1d6 100644
--- a/Resources/Prototypes/SoundCollections/hit_impacts.yml
+++ b/Resources/Prototypes/SoundCollections/hit_impacts.yml
@@ -1,4 +1,4 @@
-- type: soundCollection
+- type: soundCollection
   id: MetalThud
   files:
   - /Audio/Effects/metal_thud1.ogg
diff --git a/Resources/Prototypes/SoundCollections/sadtrombone.yml b/Resources/Prototypes/SoundCollections/sadtrombone.yml
index 268bb2d0df..35f877ab82 100644
--- a/Resources/Prototypes/SoundCollections/sadtrombone.yml
+++ b/Resources/Prototypes/SoundCollections/sadtrombone.yml
@@ -1,4 +1,4 @@
-- type: soundCollection
+- type: soundCollection
   id: SadTrombone
   files:
     - /Audio/Effects/sadtrombone.ogg
diff --git a/Resources/Prototypes/SoundCollections/scurret.yml b/Resources/Prototypes/SoundCollections/scurret.yml
index cb0411638b..d63c2a0f71 100644
--- a/Resources/Prototypes/SoundCollections/scurret.yml
+++ b/Resources/Prototypes/SoundCollections/scurret.yml
@@ -1,4 +1,4 @@
-- type: soundCollection
+- type: soundCollection
   id: WawaLaugh
   files:
   - /Audio/Animals/wawa_mock.ogg
diff --git a/Resources/Prototypes/SoundCollections/storage_rustle.yml b/Resources/Prototypes/SoundCollections/storage_rustle.yml
index 3fbfc80535..4732bf6ed1 100644
--- a/Resources/Prototypes/SoundCollections/storage_rustle.yml
+++ b/Resources/Prototypes/SoundCollections/storage_rustle.yml
@@ -12,4 +12,4 @@
   files:
   - /Audio/Effects/trashbag1.ogg
   - /Audio/Effects/trashbag2.ogg
-  - /Audio/Effects/trashbag3.ogg
\ No newline at end of file
+  - /Audio/Effects/trashbag3.ogg
diff --git a/Resources/Prototypes/SoundCollections/tray.yml b/Resources/Prototypes/SoundCollections/tray.yml
index 960b6dfe2c..a808522252 100644
--- a/Resources/Prototypes/SoundCollections/tray.yml
+++ b/Resources/Prototypes/SoundCollections/tray.yml
@@ -1,4 +1,4 @@
-- type: soundCollection
+- type: soundCollection
   id: TrayHit
   files:
   - /Audio/Items/trayhit1.ogg
diff --git a/Resources/Prototypes/Stacks/Specific/science.yml b/Resources/Prototypes/Stacks/Specific/science.yml
index 610464b33e..e6e653c45e 100644
--- a/Resources/Prototypes/Stacks/Specific/science.yml
+++ b/Resources/Prototypes/Stacks/Specific/science.yml
@@ -1,4 +1,4 @@
-- type: stack
+- type: stack
   parent: BaseMediumStack
   id: ArtifactFragment
   name: stack-artifact-fragment
diff --git a/Resources/Prototypes/StatusIcon/debug.yml b/Resources/Prototypes/StatusIcon/debug.yml
index 24981746e7..20eb766d90 100644
--- a/Resources/Prototypes/StatusIcon/debug.yml
+++ b/Resources/Prototypes/StatusIcon/debug.yml
@@ -1,4 +1,4 @@
-- type: debugIcon
+- type: debugIcon
   id: DebugStatus
   icon:
     sprite: /Textures/Interface/Misc/research_disciplines.rsi
diff --git a/Resources/Prototypes/StatusIcon/job.yml b/Resources/Prototypes/StatusIcon/job.yml
index 581dacc1f1..efc4eab0ec 100644
--- a/Resources/Prototypes/StatusIcon/job.yml
+++ b/Resources/Prototypes/StatusIcon/job.yml
@@ -23,6 +23,24 @@
     state: ShaftMiner
   jobName: job-name-salvagespec
 
+# Civilian
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconPassenger
+  icon:
+    sprite: *icon-rsi
+    state: Passenger
+  jobName: job-name-passenger
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconVisitor
+  icon:
+    sprite: *icon-rsi
+    state: Visitor
+  jobName: job-name-visitor
+
 # Command
 
 - type: jobIcon
@@ -357,24 +375,6 @@
     state: Musician
   jobName: job-name-musician
 
-# Passenger
-
-- type: jobIcon
-  parent: JobIcon
-  id: JobIconPassenger
-  icon:
-    sprite: *icon-rsi
-    state: Passenger
-  jobName: job-name-passenger
-
-- type: jobIcon
-  parent: JobIcon
-  id: JobIconVisitor
-  icon:
-    sprite: *icon-rsi
-    state: Visitor
-  jobName: job-name-visitor
-
 # Silicon
 
 - type: jobIcon
diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml
index 4744124012..722926a1ed 100644
--- a/Resources/Prototypes/Store/presets.yml
+++ b/Resources/Prototypes/Store/presets.yml
@@ -53,6 +53,7 @@
     - ChangelingStoreUtility
     currencyWhitelist:
     - ChangelingDNA
+    inputValidation: false
 
 - type: entity
   parent: StorePresetUplink
diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml
index 69404cd186..81736d0b52 100644
--- a/Resources/Prototypes/Tiles/plating.yml
+++ b/Resources/Prototypes/Tiles/plating.yml
@@ -1,4 +1,4 @@
-- type: tile
+- type: tile
   id: BasePlating
   abstract: true
   friction: 1.5
diff --git a/Resources/Prototypes/Voice/speech_verbs.yml b/Resources/Prototypes/Voice/speech_verbs.yml
index 42848994c7..304a0d069d 100644
--- a/Resources/Prototypes/Voice/speech_verbs.yml
+++ b/Resources/Prototypes/Voice/speech_verbs.yml
@@ -1,4 +1,4 @@
-- type: speechVerb
+- type: speechVerb
   id: Default
   name: chat-speech-verb-name-default
   speechVerbStrings:
diff --git a/Resources/Prototypes/XenoArch/triggers.yml b/Resources/Prototypes/XenoArch/triggers.yml
index 75fcbba673..946686afe8 100644
--- a/Resources/Prototypes/XenoArch/triggers.yml
+++ b/Resources/Prototypes/XenoArch/triggers.yml
@@ -1,55 +1,100 @@
-- type: weightedRandomXenoArchTrigger
-  id: DefaultTriggers
-  weights:
-    TriggerMusic: 1
-    TriggerHeat: 1
-    TriggerCold: 0.5
-    TriggerNoOxygen: 1
-    TriggerWater: 1
-    TriggerCO2: 0.5
-    TriggerPlasma: 0.5
-    TriggerN2O: 0.5
-    TriggerTritium: 0.1
-    TriggerAmmonia: 0.1
-    TriggerFrezon: 0.1
-    TriggerRadiation: 1
-    TriggerPressureHigh: 0.5
-    TriggerPressureLow: 1
-    TriggerExamine: 1
-    TriggerBruteDamage: 1
-    #TriggerInteraction: 1 #this one interferes with activating artifact AND brute dmg!
-    TriggerWrenching: 0.5
-    TriggerPrying: 0.5
-    TriggerScrewing: 0.5
-    TriggerPulsing: 0.5
-    TriggerTimer: 0.25
-    TriggerBlood: 1
-    TriggerThrow: 1
-    TriggerDeath: 1
-    TriggerMagnet: 1
-    TriggerConsumeMoney: 1
-    TriggerConsumeKnowledge: 0.25
-    TriggerConsumeCarbs: 1
-    TriggerConsumeMeat: 0.5
-    TriggerConsumeProduce: 0.5
-    TriggerInteractStamp: 1
-    TriggerInteractShock: 1
-    TriggerAttackParticleEngine: 0.1
-    TriggerAttackParticleAnomaly: 1
-    TriggerAttackStaminaDamage: 1
-    TriggerAttackLaser: 0.5
+- type: entityTable
+  id: XenoArtifactTriggerDefaultTable
+  table: !type:GroupSelector
+    conditionsForChildren:
+      - !type:ExcludeEntitiesFromContextCondition
+    children:
+    - id: TriggerMusic
+    - id: TriggerHeat
+    - id: TriggerCold
+      weight: 0.5
+    - id: TriggerNoOxygen
+    - id: TriggerWater
+    - id: TriggerCO2
+      weight: 0.5
+    - id: TriggerPlasma
+      weight: 0.5
+    - id: TriggerN2O
+      weight: 0.5
+    - id: TriggerTritium
+      weight: 0.1
+    - id: TriggerAmmonia
+      weight: 0.1
+    - id: TriggerFrezon
+      weight: 0.1
+    - id: TriggerRadiation
+    - id: TriggerPressureHigh
+      weight: 0.5
+    - id: TriggerPressureLow
+    - id: TriggerExamine
+    - id: TriggerBruteDamage
+    #- id: TriggerInteraction #this one interferes with activating artifact AND brute dmg!
+    - id: TriggerWrenching
+      weight: 0.5
+    - id: TriggerPrying
+      weight: 0.5
+    - id: TriggerScrewing
+      weight: 0.5
+    - id: TriggerPulsing
+      weight: 0.5
+    - id: TriggerTimer
+      weight: 0.25
+    - id: TriggerBlood
+    - id: TriggerDeath
+    - id: TriggerMagnet
+    - id: TriggerConsumeMoney
+    - id: TriggerConsumeKnowledge
+      weight: 0.25
+    - id: TriggerConsumeCarbs
+    - id: TriggerConsumeMeat
+      weight: 0.5
+    - id: TriggerConsumeProduce
+      weight: 0.5
+    - id: TriggerInteractStamp
+    - id: TriggerInteractShock
+    - id: TriggerAttackParticleAnomaly
+    - id: TriggerAttackStaminaDamage
+    - id: TriggerAttackLaser
+      weight: 0.5
+    - id: TriggerAttackParticleEngine
+      weight: 0.1
 
-- type: xenoArchTrigger
+- type: entityTable
+  id: XenoArtifactHandheldOnlyTriggerTable
+  table: !type:GroupSelector
+    conditionsForChildren:
+    - !type:ExcludeEntitiesFromContextCondition
+    children:
+    - !type:NestedSelector
+      tableId: XenoArtifactTriggerDefaultTable
+      weight: 35
+    - !type:GroupSelector # Handheld exclusive
+      weight: 2
+      children:
+      - id: TriggerThrow
+      - id: TriggerMicrowave
+
+- type: entity
+  abstract: true
+  id: BaseXenoArtifactTrigger
+  name: Unknown
+  categories: [XenoArtifactTriggers]
+
+#region Standard triggers
+
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerMusic
-  tip: xenoarch-trigger-tip-music
+  name: Harmonical sound vibrations
   components:
   - type: XATCompNearby
     requireComponentWithName: ActiveInstrument
     radius: 2
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerHeat
-  tip: xenoarch-trigger-tip-heat
+  name: High temperature gas
   components:
   - type: XATTemperature
     targetTemperature: 373
@@ -57,15 +102,16 @@
   - type: XATDamageThresholdReached
     typesNeeded:
       Heat: 20
-# This kinda trivializes the difficulty.
-#  - type: XATToolUse
-#    requiredTool: Welding
-#    delay: 5
-#    fuel: 10
+  # This kinda trivializes the difficulty.
+  #  - type: XATToolUse
+  #    requiredTool: Welding
+  #    delay: 5
+  #    fuel: 10
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerCold
-  tip: xenoarch-trigger-tip-cold
+  name: Low temperature gas
   components:
   - type: XATTemperature
     targetTemperature: 255
@@ -74,18 +120,20 @@
     typesNeeded:
       Cold: 20
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerNoOxygen
-  tip: xenoarch-trigger-tip-no-oxygen
+  name: Oxygen-free environment
   components:
   - type: XATGas
     targetGas: Oxygen
     moles: 10
     shouldBePresent: false
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerWater
-  tip: xenoarch-trigger-tip-water
+  name: Water
   components:
   - type: XATGas
     targetGas: WaterVapor
@@ -93,9 +141,10 @@
     reagents:
     - Water
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerCO2
-  tip: xenoarch-trigger-tip-co2
+  name: Carbon dioxide
   components:
   - type: XATGas
     targetGas: CarbonDioxide
@@ -103,9 +152,10 @@
     reagents:
     - CarbonDioxide
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerPlasma
-  tip: xenoarch-trigger-tip-plasma
+  name: Non-solid plasma
   components:
   - type: XATGas
     targetGas: Plasma
@@ -113,9 +163,10 @@
     reagents:
     - Plasma
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerTritium
-  tip: xenoarch-trigger-tip-tritium
+  name: Tritium
   components:
   - type: XATGas
     targetGas: Tritium
@@ -123,9 +174,10 @@
     reagents:
     - Tritium
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerAmmonia
-  tip: xenoarch-trigger-tip-ammonia
+  name: Ammonia
   components:
   - type: XATGas
     targetGas: Ammonia
@@ -133,9 +185,10 @@
     reagents:
     - Ammonia
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerN2O
-  tip: xenoarch-trigger-tip-n2o
+  name: Nitrous oxide
   components:
   - type: XATGas
     targetGas: NitrousOxide
@@ -143,9 +196,10 @@
     reagents:
     - NitrousOxide
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerFrezon
-  tip: xenoarch-trigger-tip-frezon
+  name: Frezon
   components:
   - type: XATGas
     targetGas: Frezon
@@ -153,105 +207,108 @@
     reagents:
     - Frezon
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerRadiation
-  tip: xenoarch-trigger-tip-radiation
+  name: Heavy-ion radiation
   components:
   - type: XATDamageThresholdReached
     typesNeeded:
       Radiation: 20
 
-- type: xenoArchTrigger
-  id: TriggerMicrowave
-  tip: xenoarch-trigger-tip-microwave
-  whitelist:
-    components:
-    - Item
-  components:
-  - type: XATMicrowave
-
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerPressureHigh
-  tip: xenoarch-trigger-tip-pressure-high
+  name: High pressure
   components:
   - type: XATPressure
     maxPressureThreshold: 385
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerPressureLow
-  tip: xenoarch-trigger-tip-pressure-low
+  name: Low pressure
   components:
   - type: XATPressure
     minPressureThreshold: 50
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerExamine
-  tip: xenoarch-trigger-tip-examine
+  name: Close inspection
   components:
   - type: XATExamine
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerBruteDamage
-  tip: xenoarch-trigger-tip-brute-damage
+  name: Physical damage
   components:
   - type: XATDamageThresholdReached
     groupsNeeded:
       Brute: 20
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerInteraction
-  tip: xenoarch-trigger-tip-interaction
+  name: Physical interaction
   components:
   - type: XATInteraction
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerWrenching
-  tip: xenoarch-trigger-tip-wrenching
+  name: Tightening
   components:
   - type: XATToolUse
     requiredTool: Anchoring
   - type: XATExaminableText
     examineText: xenoarch-trigger-examine-wrenching
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerPrying
-  tip: xenoarch-trigger-tip-prying
+  name: Prying
   components:
   - type: XATToolUse
     requiredTool: Prying
   - type: XATExaminableText
     examineText: xenoarch-trigger-examine-prying
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerScrewing
-  tip: xenoarch-trigger-tip-screwing
+  name: Screwing
   components:
   - type: XATToolUse
     requiredTool: Screwing
   - type: XATExaminableText
     examineText: xenoarch-trigger-examine-screwing
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerPulsing
-  tip: xenoarch-trigger-tip-pulsing
+  name: Pulsing
   components:
   - type: XATToolUse
     requiredTool: Pulsing
   - type: XATExaminableText
     examineText: xenoarch-trigger-examine-pulsing
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerTimer
-  tip: xenoarch-trigger-tip-timer
+  name: Regular self-activation
   components:
   - type: XATTimer
     possibleDelayInSeconds:
       min: 80
       max: 120
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerBlood
-  tip: xenoarch-trigger-tip-blood
+  name: Blood
   components:
   - type: XATReactive
     reagents:
@@ -264,30 +321,24 @@
     - Sap
     - SulfurBlood
 
-- type: xenoArchTrigger
-  id: TriggerThrow
-  tip: xenoarch-trigger-tip-throw
-  whitelist:
-    components:
-    - Item
-  components:
-  - type: XATItemLand
-
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerDeath
-  tip: xenoarch-trigger-tip-death
+  name: Death
   components:
   - type: XATDeath
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerMagnet
-  tip: xenoarch-trigger-tip-magnet
+  name: Magnetic waves
   components:
   - type: XATMagnet
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerConsumeMoney
-  tip: xenoarch-trigger-tip-money
+  name: Bribery
   components:
   - type: XATInteractWith
     interactionCount:
@@ -300,9 +351,10 @@
       components:
       - Cash
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerConsumeKnowledge
-  tip: xenoarch-trigger-tip-knowledge
+  name: Knowledge intake
   components:
   - type: XATInteractWith
     destroyAfter: true
@@ -314,9 +366,10 @@
       tags:
       - Book
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerConsumeCarbs
-  tip: xenoarch-trigger-tip-carbs
+  name: Carbohydrate intake
   components:
   - type: XATInteractWith
     destroyAfter: true
@@ -334,9 +387,10 @@
       - Pie
       - Pizza
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerConsumeMeat
-  tip: xenoarch-trigger-tip-meat
+  name: Protein intake
   components:
   - type: XATInteractWith
     destroyAfter: true
@@ -353,9 +407,10 @@
     - Protein
     - UncookedAnimalProteins
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerConsumeProduce
-  tip: xenoarch-trigger-tip-produce
+  name: Healthy produce intake
   components:
   - type: XATInteractWith
     destroyAfter: true
@@ -372,9 +427,10 @@
       - Ambrosia
       - Mushroom
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerInteractStamp
-  tip: xenoarch-trigger-tip-stamp
+  name: Bureaucratic approval
   components:
   - type: XATInteractWith
     interactionTime: 0.5
@@ -387,43 +443,48 @@
       components:
       - Stamp
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerInteractShock
-  tip: xenoarch-trigger-tip-shock
+  name: Electrical shock
   components:
   - type: XATShock
   - type: XATDamageThresholdReached
     typesNeeded:
       Shock: 5
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerAttackParticleEngine
-  tip: xenoarch-trigger-tip-particle
+  name: Singularity-Effecting particles
   components:
   - type: XATInteractAttack
     whitelist:
       components:
       - ParticleProjectile
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerAttackParticleAnomaly
-  tip: xenoarch-trigger-tip-anomparticle
+  name: Anomaly-Affecting particles
   components:
   - type: XATInteractAttack
     whitelist:
       components:
       - AnomalousParticle
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerAttackStaminaDamage
-  tip: xenoarch-trigger-tip-stamina-damage
+  name: Organic exhaustion
   components:
   - type: XATStaminaDamageThresholdReached
     damageNeeded: 8 # half a practice disabler capacity
 
-- type: xenoArchTrigger
+- type: entity
+  parent: BaseXenoArtifactTrigger
   id: TriggerAttackLaser
-  tip: xenoarch-trigger-tip-laser
+  name: High-Intensity photon impacts
   components:
   - type: XATInteractAttack
     interactionCount:
@@ -433,3 +494,22 @@
       - LaserProjectile
       tags:
       - EmitterBolt
+
+#endregion
+#region Handheld triggers
+
+- type: entity
+  parent: BaseXenoArtifactTrigger
+  id: TriggerMicrowave
+  name: Microwave radiation
+  components:
+  - type: XATMicrowave
+
+- type: entity
+  parent: BaseXenoArtifactTrigger
+  id: TriggerThrow
+  name: Being thrown
+  components:
+  - type: XATItemLand
+
+#endregion
diff --git a/Resources/Prototypes/explosion.yml b/Resources/Prototypes/explosion.yml
index 1b19167bd3..5b291c321e 100644
--- a/Resources/Prototypes/explosion.yml
+++ b/Resources/Prototypes/explosion.yml
@@ -13,6 +13,23 @@
   fireStates: 3
   temperature: 800
 
+- type: explosion
+  id: Clake
+  damagePerIntensity:
+    types:
+      Heat: 2
+      Blunt: 2
+      Piercing: 3
+      Structural: 65
+  tileBreakChance: [ 0, 0.5, 1 ]
+  tileBreakIntensity: [ 0, 50, 75 ]
+  tileBreakRerollReduction: 25
+  lightColor: Orange
+  fireColor: Red
+  texturePath: /Textures/Effects/fire_greyscale.rsi
+  fireStates: 3
+  temperature: 800
+
 - type: explosion
   id: DemolitionCharge
   damagePerIntensity:
diff --git a/Resources/Prototypes/name_identifier_groups.yml b/Resources/Prototypes/name_identifier_groups.yml
index e461fa8d58..a853f12f94 100644
--- a/Resources/Prototypes/name_identifier_groups.yml
+++ b/Resources/Prototypes/name_identifier_groups.yml
@@ -1,4 +1,4 @@
-# Non-fungible apes, anyone?
+# Non-fungible apes, anyone?
 - type: nameIdentifierGroup
   id: Monkey
   format: name-identifier-format-monkey
diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml
index 776b8b4205..72cb34327e 100644
--- a/Resources/Prototypes/silicon-laws.yml
+++ b/Resources/Prototypes/silicon-laws.yml
@@ -1,4 +1,4 @@
-# Crewsimov
+# Crewsimov
 - type: siliconLaw
   id: Crewsimov1
   order: 1
diff --git a/Resources/Prototypes/status_effects.yml b/Resources/Prototypes/status_effects.yml
index 03ad6229c2..d74f1f2885 100644
--- a/Resources/Prototypes/status_effects.yml
+++ b/Resources/Prototypes/status_effects.yml
@@ -1,4 +1,4 @@
-# Status effect prototypes.
+# Status effect prototypes.
 # Holds no actual logic, just some basic data about the effect.
 
 # Note: We have a new status effect system that needs all of these status effects to be fully ported to.
@@ -32,4 +32,4 @@
   alert: Corporeal
 
 - type: statusEffect
-  id: Pacified #cannot attack
\ No newline at end of file
+  id: Pacified #cannot attack
diff --git a/Resources/Prototypes/typing_indicator.yml b/Resources/Prototypes/typing_indicator.yml
index 6a443a3e1b..d2039ada73 100644
--- a/Resources/Prototypes/typing_indicator.yml
+++ b/Resources/Prototypes/typing_indicator.yml
@@ -3,6 +3,12 @@
   typingState: default0
   idleState: default3
 
+- type: typingIndicator
+  id: defaultUnshaded
+  typingState: default0
+  idleState: default3
+  shader: unshaded
+
 - type: typingIndicator
   id: robot
   typingState: robot0
diff --git a/Resources/Prototypes/whitelists.yml b/Resources/Prototypes/whitelists.yml
index 8a99aa30ea..02dbafe56a 100644
--- a/Resources/Prototypes/whitelists.yml
+++ b/Resources/Prototypes/whitelists.yml
@@ -1,4 +1,4 @@
-- type: playerConnectionWhitelist
+- type: playerConnectionWhitelist
   id: basicWhitelist # Basic whitelist using only the ManualWhitelist condition
   conditions:
     - !type:ConditionManualWhitelistMembership
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Changelings.xml b/Resources/ServerInfo/Guidebook/Antagonist/Changelings.xml
index ed386a01bc..4a87dcda7d 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Changelings.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Changelings.xml
@@ -31,7 +31,7 @@
   ### Эволюция
 
   <Box>
-    <GuideEntityEmbed Entity="ActionRetractableItemArmBlade" Caption="Клинок-рука"/>
+    <GuideEntityEmbed Entity="ActionRetractableItemArmblade" Caption="Клинок-рука"/>
     <GuideEntityEmbed Entity="ActionChangelingStingDna" Caption="Извлечь ДНК"/>
     <GuideEntityEmbed Entity="ActionChangelingNightVision" Caption="Ночное зрение"/>
   </Box>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
index 23d9150ba2..04a8b8fe70 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
@@ -1,8 +1,8 @@
-<Document>
+<Document>
   # Space Law
   On Space Station 14, stations operate under abbreviated space law. All crew, passengers, and visitors aboard the station are expected to follow these laws.
 
-  Foreign invaders, such as nuclear operatives, ninjas, and pirates, are not protected under space law. Traitors are not foreign invaders, so they are usually protected by space law.
+  Foreign invaders, such as nuclear operatives, ninjas, changelings, and pirates, are not protected under space law. Traitors are not foreign invaders, so they are usually protected by space law.
 
   Space Law is not the server rules, but some rules reference Space Law and require it to be followed by certain people or to some degree.
 
@@ -23,7 +23,7 @@
   - Highly Illegal Contraband: Highly illegal contraband includes Syndicate contraband and magical contraband. Without explicit authorization from Central Command, highly illegal contraband may only be used in the event of dire, immediate emergencies, and only to prevent death or gross bodily harm. Once the emergency is dealt with, the contraband should be stored in a secure location.
 
   Security is obligated to seize contraband through routine searches or when processing criminals in the brig, but may prioritize other duties over confiscation if they see fit. With regards to contraband usage, Security is expected to follow the same regulations as everyone else. Confiscated contraband should be transferred to the Security department for secure storage or permanently disposed of. Collaborating with Cargo to sell confiscated contraband is highly encouraged, as it generally fetches a high value.
-  
+
   ## Search and Seizure
   A personnel search is the inspection and seizure of a crewmember's possessions. If any contraband is found during a search, the officer should confiscate the restricted items. Non-restricted items may be seized by Security if they were used to facilitate a crime. After the search is conducted, all legal items are to be returned to the person. A crewmate may legally decline any search conducted without probable cause or a warrant while the alert level is green. Random searches without probable cause or a warrant are permitted at any other alert level.
 
@@ -57,7 +57,7 @@
   - Example: A suspect has committed a 2-01 (Grand Theft) and a 3-04 (Kidnapping). The maximum allowable sentence time would be 10 minutes because 3-04 is the more severe crime.
   - Example 2: A suspect commits a 4-00 (Breach of Custody) and a 4-04 (Attempted Murder). Those crimes are equally severe; the maximum allowable sentence is 15 minutes.
   - Example 3: A suspect committed a 4-04 (Attempted Murder) previously during the shift, and has done so again, committing a 2-03 (Secure Trespass) in the process. The maximum allowable sentence is 18 minutes. 15 base for the 4-04, and 3 additional for being a repeat offender.
-  
+
   Remember, context matters greatly, and maximum sentences should be reserved for the worst offenders.
 
   [color=#a4885c]Repeat Offenders:[/color] A repeated crime occurs when someone is released after committing a crime and then commits the same crime again during the same shift. Repeated crimes can be charged with tacked-on time; first repeat: 3:00, second repeat: 6:00, third repeat: Permanent Confinement. It should be noted that each tacked-on time is directly linked to one charge, and that in the instance of multiple crimes being committed, you should use the longer time for the maximum allowable sentence. For example, if someone does their second repeat of Assault and one count of Kidnapping, their maximum allowable sentence would be 11 minutes. 5 from the Moderate crime of Assault, plus 6 from the second repeat.
diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/meta.json
index e2732ec02c..db4714cdbd 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/meta.json
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertclown.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/ertclown.rsi/meta.json
index 154f526df0..dc6166a742 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/ertclown.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/ertclown.rsi/meta.json
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Back/Backpacks/erteng.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/erteng.rsi/meta.json
index 154f526df0..dc6166a742 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/erteng.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/erteng.rsi/meta.json
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertjanitor.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/ertjanitor.rsi/meta.json
index 154f526df0..dc6166a742 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/ertjanitor.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/ertjanitor.rsi/meta.json
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertleader.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/ertleader.rsi/meta.json
index e2732ec02c..db4714cdbd 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/ertleader.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/ertleader.rsi/meta.json
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertmed.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/ertmed.rsi/meta.json
index 154f526df0..dc6166a742 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/ertmed.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/ertmed.rsi/meta.json
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertsec.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/ertsec.rsi/meta.json
index 154f526df0..dc6166a742 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/ertsec.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/ertsec.rsi/meta.json
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/meta.json
index f087cc75d1..612001b231 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/meta.json
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/meta.json b/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/meta.json
index 3680f5a26c..5f4bc443cb 100644
--- a/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/meta.json
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Belt/waistbag.rsi/meta.json b/Resources/Textures/Clothing/Belt/waistbag.rsi/meta.json
index 3c74d08cfe..f552d6040a 100644
--- a/Resources/Textures/Clothing/Belt/waistbag.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/waistbag.rsi/meta.json
@@ -25,4 +25,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/meta.json b/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/meta.json
index 51f6b66a7e..0e40096022 100644
--- a/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/meta.json
@@ -15,4 +15,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Belt/wand.rsi/meta.json b/Resources/Textures/Clothing/Belt/wand.rsi/meta.json
index f08d693379..f9e3d027eb 100644
--- a/Resources/Textures/Clothing/Belt/wand.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/wand.rsi/meta.json
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/meta.json
index 081fff118c..460e8dd0e5 100644
--- a/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/meta.json
@@ -24,4 +24,4 @@
     }
   ]
 }
- 
\ No newline at end of file
+ 
diff --git a/Resources/Textures/Clothing/Head/Hats/comcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/comcap.rsi/meta.json
index 777097dc0d..77e07d77c6 100644
--- a/Resources/Textures/Clothing/Head/Hats/comcap.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/comcap.rsi/meta.json
@@ -27,4 +27,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/meta.json
index 039fe55777..e938b2a6f3 100644
--- a/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/meta.json
@@ -24,4 +24,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/melon.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/melon.rsi/meta.json
index f842621d06..723eab86c0 100644
--- a/Resources/Textures/Clothing/Head/Hats/melon.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/melon.rsi/meta.json
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/meta.json
index 222dcf3690..291d5151d2 100644
--- a/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/meta.json
@@ -27,4 +27,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json
index c6887def72..e6dea50ce2 100644
--- a/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json
@@ -27,4 +27,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/papersacksmile.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/papersacksmile.rsi/meta.json
index ab1f7a4abf..4eb6ffbc62 100644
--- a/Resources/Textures/Clothing/Head/Hats/papersacksmile.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/papersacksmile.rsi/meta.json
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/meta.json
index 6027df662b..e192a1cd2f 100644
--- a/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/meta.json
@@ -19,4 +19,4 @@
 		"directions": 4
 		}
 	]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Head/Helmets/linghelmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/linghelmet.rsi/meta.json
index f2b97b7d63..bb8ac2c76b 100644
--- a/Resources/Textures/Clothing/Head/Helmets/linghelmet.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/linghelmet.rsi/meta.json
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Head/Helmets/scrapHelmetOverlayTexture.png b/Resources/Textures/Clothing/Head/Helmets/scrapHelmetOverlayTexture.png
new file mode 100644
index 0000000000..4616ad715f
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/scrapHelmetOverlayTexture.png differ
diff --git a/Resources/Textures/Clothing/Head/Hoods/voidcloak.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/voidcloak.rsi/meta.json
index 2a8e91145b..eedfd13ca8 100644
--- a/Resources/Textures/Clothing/Head/Hoods/voidcloak.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hoods/voidcloak.rsi/meta.json
@@ -15,4 +15,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Head/Welding/weldingTexture.png b/Resources/Textures/Clothing/Head/Welding/weldingTexture.png
new file mode 100644
index 0000000000..ac88f28613
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/weldingTexture.png differ
diff --git a/Resources/Textures/Clothing/Head/Welding/weldingTexture.png.yml b/Resources/Textures/Clothing/Head/Welding/weldingTexture.png.yml
new file mode 100644
index 0000000000..5c43e23305
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Welding/weldingTexture.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK-vulpkanin.png
new file mode 100644
index 0000000000..e35f5a9154
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK-vulpkanin.png differ
diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/meta.json b/Resources/Textures/Clothing/Mask/welding-gas.rsi/meta.json
index 8e9b857325..4edf7cbde4 100644
--- a/Resources/Textures/Clothing/Mask/welding-gas.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/welding-gas.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6f5ca45e3ac06b30fb1957042214a888d8c01722. Inhands, worn sprites, and vox sprites created by EmoGarbage404 (github)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6f5ca45e3ac06b30fb1957042214a888d8c01722. Inhands, worn sprites, vox sprites created by EmoGarbage404 (github), and vulpkanin sprites by jckspjf (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -29,6 +29,14 @@
       "name": "up-equipped-MASK-vox",
       "directions": 4
     },
+    {
+      "name": "equipped-MASK-vulpkanin",
+      "directions": 4
+    },
+    {
+      "name": "up-equipped-MASK-vulpkanin",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-equipped-MASK-vulpkanin.png
new file mode 100644
index 0000000000..dbe0ef7dd7
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-equipped-MASK-vulpkanin.png differ
diff --git a/Resources/Textures/Clothing/Multiple/towel.rsi/meta.json b/Resources/Textures/Clothing/Multiple/towel.rsi/meta.json
index 95acda0af3..35c1ba8e75 100644
--- a/Resources/Textures/Clothing/Multiple/towel.rsi/meta.json
+++ b/Resources/Textures/Clothing/Multiple/towel.rsi/meta.json
@@ -37,4 +37,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/meta.json
index 83ecc370af..8b61f8640e 100644
--- a/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Cloaks/void.rsi/meta.json
@@ -49,4 +49,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Neck/Misc/dinkystar.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/dinkystar.rsi/meta.json
index 0ed35562ca..a3b7300058 100644
--- a/Resources/Textures/Clothing/Neck/Misc/dinkystar.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Misc/dinkystar.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC0-1.0",
     "copyright": "Created by PoorMansDreams",
diff --git a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json
index e7019f46d0..248aea1659 100644
--- a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json
@@ -15,4 +15,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json
index e7019f46d0..248aea1659 100644
--- a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json
@@ -15,4 +15,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/meta.json
index e7019f46d0..248aea1659 100644
--- a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/meta.json
@@ -15,4 +15,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/meta.json
index e7019f46d0..248aea1659 100644
--- a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/meta.json
@@ -15,4 +15,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json
index e7019f46d0..248aea1659 100644
--- a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json
@@ -15,4 +15,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Neck/mantles/mantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/mantle.rsi/meta.json
index 6a25a8269b..1ccce7a5e0 100644
--- a/Resources/Textures/Clothing/Neck/mantles/mantle.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/mantles/mantle.rsi/meta.json
@@ -15,4 +15,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Neck/mantles/qmmantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/qmmantle.rsi/meta.json
index 1b05cf9b67..c95a15b520 100644
--- a/Resources/Textures/Clothing/Neck/mantles/qmmantle.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/mantles/qmmantle.rsi/meta.json
@@ -15,4 +15,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/meta.json
index e7019f46d0..248aea1659 100644
--- a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/meta.json
@@ -15,4 +15,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json
index 1c427d3df9..c0fa1fb383 100644
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json
@@ -27,4 +27,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json
index 39806b9c67..c8afc5679b 100644
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json
index e4a07cc4e6..ae5d22168f 100644
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json
@@ -27,4 +27,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblack.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblack.rsi/equipped-INNERCLOTHING.png
index 41246ba8c1..106b83cfb4 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblack.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblack.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblack.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblack.rsi/icon.png
index fa26af5db8..30aadb8659 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblack.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblack.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblack.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblack.rsi/meta.json
index 30d720217c..25e7f40cc1 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblack.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblack.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8ef1b863b67ed708de551bba5d550b2c6f1d24e1, monkey derivative made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblue.rsi/equipped-INNERCLOTHING.png
index 33cb851b30..ccb0437c11 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblue.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblue.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblue.rsi/icon.png
index 5658efea3e..f23844a318 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblue.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblue.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblue.rsi/meta.json
index 30d720217c..25e7f40cc1 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblue.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerblue.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8ef1b863b67ed708de551bba5d550b2c6f1d24e1, monkey derivative made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyergood.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyergood.rsi/equipped-INNERCLOTHING.png
index 8a97bf4210..402d550a5b 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyergood.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyergood.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyergood.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyergood.rsi/icon.png
index bf4bf371f1..70055089b0 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyergood.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyergood.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyergood.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyergood.rsi/meta.json
index 3f112c22d3..25e7f40cc1 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyergood.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyergood.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/305131e20cfe53eb41de61db79a99aa12c2925b0, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8ef1b863b67ed708de551bba5d550b2c6f1d24e1, monkey derivative made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerpurple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerpurple.rsi/equipped-INNERCLOTHING.png
index 4ee67801d7..28700624eb 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerpurple.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerpurple.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerpurple.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerpurple.rsi/icon.png
index 884476e58b..cac2b67365 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerpurple.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerpurple.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerpurple.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerpurple.rsi/meta.json
index 298606c9e8..ced09c021c 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerpurple.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerpurple.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, inhands by github:Morb0, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8ef1b863b67ed708de551bba5d550b2c6f1d24e1, inhands by github:Morb0, monkey derivative made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerred.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerred.rsi/equipped-INNERCLOTHING.png
index 73ecf91679..c77a97ec29 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerred.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerred.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerred.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerred.rsi/icon.png
index ccbaf16989..1a74b3394c 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerred.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerred.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerred.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerred.rsi/meta.json
index 30d720217c..25e7f40cc1 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerred.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Service/lawyerred.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8ef1b863b67ed708de551bba5d550b2c6f1d24e1, monkey derivative made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Special/tacticool_s.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Special/tacticool_s.rsi/meta.json
index 94d2cd0d9d..4cfacc0b00 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Special/tacticool_s.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Special/tacticool_s.rsi/meta.json
@@ -27,4 +27,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/equipped-INNERCLOTHING-monkey.png
index e4ac1bdd06..5219e42361 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/equipped-INNERCLOTHING.png
index a85d2d2e61..6a49c01f7b 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/icon.png
index 9338490aae..8e65b4aceb 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/inhand-left.png
index e1e0a47d97..3420c4d61a 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/inhand-right.png
index 32b49e37e4..8559400022 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/meta.json
index a710470d45..eb6c897d22 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Recolor of lawyerblack.rsi joshepvodka, fix digi sprites by DreamlyJack",
+  "copyright": "Recolor of lawyerblack.rsi by _Svist_.(Discord)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblack.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblack.rsi/equipped-INNERCLOTHING.png
index e81317b7e2..600a4614be 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblack.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblack.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblack.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblack.rsi/icon.png
index 7e052988ff..92b4525104 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblack.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblack.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblack.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblack.rsi/meta.json
index 138aaf3905..31713b5f02 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblack.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblack.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8ef1b863b67ed708de551bba5d550b2c6f1d24e1, monkey made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/equipped-INNERCLOTHING.png
index 484aeba84b..361ae56220 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/icon.png
index a13b6ba003..012d2ee4c0 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/meta.json
index 138aaf3905..31713b5f02 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerblue.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8ef1b863b67ed708de551bba5d550b2c6f1d24e1, monkey made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/equipped-INNERCLOTHING.png
index 71a9d19cb1..f4ed2dee7c 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/icon.png
index a0e574e5f8..3cb451e5e8 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/meta.json
index 98f1cf18e2..31713b5f02 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyergood.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/305131e20cfe53eb41de61db79a99aa12c2925b0, monkey made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8ef1b863b67ed708de551bba5d550b2c6f1d24e1, monkey made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerpurple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerpurple.rsi/equipped-INNERCLOTHING.png
index d935927c51..9c163e1793 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerpurple.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerpurple.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerpurple.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerpurple.rsi/icon.png
index e961e78c77..1893fd5c8d 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerpurple.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerpurple.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerpurple.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerpurple.rsi/meta.json
index 50c6aadaa6..eea57dc8a0 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerpurple.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerpurple.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, inhands by github:Morb0, monkey made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8ef1b863b67ed708de551bba5d550b2c6f1d24e1, inhands by github:Morb0, monkey made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerred.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerred.rsi/equipped-INNERCLOTHING.png
index 53a5c7393c..fe2ba15638 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerred.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerred.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerred.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerred.rsi/icon.png
index 49c81c636e..c7859cdf13 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerred.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerred.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerred.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerred.rsi/meta.json
index 138aaf3905..31713b5f02 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerred.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuits/Service/lawyerred.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8ef1b863b67ed708de551bba5d550b2c6f1d24e1, monkey made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Decals/basalt.rsi/meta.json b/Resources/Textures/Decals/basalt.rsi/meta.json
index 4dcef5184b..78dee33387 100644
--- a/Resources/Textures/Decals/basalt.rsi/meta.json
+++ b/Resources/Textures/Decals/basalt.rsi/meta.json
@@ -35,4 +35,4 @@
       "name": "basalt9"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Decals/syndlogo.rsi/meta.json b/Resources/Textures/Decals/syndlogo.rsi/meta.json
index 6498608b36..12f6da403a 100644
--- a/Resources/Textures/Decals/syndlogo.rsi/meta.json
+++ b/Resources/Textures/Decals/syndlogo.rsi/meta.json
@@ -66,4 +66,4 @@
       }
     ]
   }
-  
\ No newline at end of file
+  
diff --git a/Resources/Textures/Effects/acidifier.rsi/meta.json b/Resources/Textures/Effects/acidifier.rsi/meta.json
index 358e92374c..9ceae74a09 100644
--- a/Resources/Textures/Effects/acidifier.rsi/meta.json
+++ b/Resources/Textures/Effects/acidifier.rsi/meta.json
@@ -27,4 +27,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Effects/chempuff.rsi/meta.json b/Resources/Textures/Effects/chempuff.rsi/meta.json
index 71c90d7be6..59aa3cad3a 100644
--- a/Resources/Textures/Effects/chempuff.rsi/meta.json
+++ b/Resources/Textures/Effects/chempuff.rsi/meta.json
@@ -20,4 +20,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Effects/clicktest.rsi/meta.json b/Resources/Textures/Effects/clicktest.rsi/meta.json
index 8b7b7f249b..6b4db20d96 100644
--- a/Resources/Textures/Effects/clicktest.rsi/meta.json
+++ b/Resources/Textures/Effects/clicktest.rsi/meta.json
@@ -1 +1 @@
-{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Discord PJB#3005","states":[{"name":"fixed_corner","directions":4},{"name":"invis_base","directions":4},{"name":"rotating_corner","directions":4}]}
\ No newline at end of file
+{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Discord PJB#3005","states":[{"name":"fixed_corner","directions":4},{"name":"invis_base","directions":4},{"name":"rotating_corner","directions":4}]}
diff --git a/Resources/Textures/Effects/electricity.rsi/meta.json b/Resources/Textures/Effects/electricity.rsi/meta.json
index b603d7a385..5cfe6712b9 100644
--- a/Resources/Textures/Effects/electricity.rsi/meta.json
+++ b/Resources/Textures/Effects/electricity.rsi/meta.json
@@ -34,4 +34,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Effects/explosion.rsi/meta.json b/Resources/Textures/Effects/explosion.rsi/meta.json
index ff3ec21911..932c766c2b 100644
--- a/Resources/Textures/Effects/explosion.rsi/meta.json
+++ b/Resources/Textures/Effects/explosion.rsi/meta.json
@@ -1 +1 @@
-{"version":1,"size":{"x":96,"y":96},"license":"CC-BY-SA-3.0","copyright":"Taken and modified from https://github.com/vgstation-coders/vgstation13/icons/effects/96x96.dmi at commit 96d69b71a3a0549b4b668c0a095306580bd157c0","states":[{"name":"explosion"},{"name":"explosionfast","delays":[[0.06,0.06,0.06,0.06,0.06,0.06,0.06,0.06]]}]}
\ No newline at end of file
+{"version":1,"size":{"x":96,"y":96},"license":"CC-BY-SA-3.0","copyright":"Taken and modified from https://github.com/vgstation-coders/vgstation13/icons/effects/96x96.dmi at commit 96d69b71a3a0549b4b668c0a095306580bd157c0","states":[{"name":"explosion"},{"name":"explosionfast","delays":[[0.06,0.06,0.06,0.06,0.06,0.06,0.06,0.06]]}]}
diff --git a/Resources/Textures/Effects/hearts.rsi/meta.json b/Resources/Textures/Effects/hearts.rsi/meta.json
index 0c90d63d88..e6028394c5 100644
--- a/Resources/Textures/Effects/hearts.rsi/meta.json
+++ b/Resources/Textures/Effects/hearts.rsi/meta.json
@@ -21,4 +21,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Effects/lightning.rsi/meta.json b/Resources/Textures/Effects/lightning.rsi/meta.json
index c0845182c2..edd2555775 100644
--- a/Resources/Textures/Effects/lightning.rsi/meta.json
+++ b/Resources/Textures/Effects/lightning.rsi/meta.json
@@ -149,4 +149,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Effects/medi_holo.rsi/meta.json b/Resources/Textures/Effects/medi_holo.rsi/meta.json
index 1be502223e..528f282557 100644
--- a/Resources/Textures/Effects/medi_holo.rsi/meta.json
+++ b/Resources/Textures/Effects/medi_holo.rsi/meta.json
@@ -23,4 +23,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Effects/optionsvisualizertest.rsi/meta.json b/Resources/Textures/Effects/optionsvisualizertest.rsi/meta.json
index e7f749513d..af68e96cf4 100644
--- a/Resources/Textures/Effects/optionsvisualizertest.rsi/meta.json
+++ b/Resources/Textures/Effects/optionsvisualizertest.rsi/meta.json
@@ -1 +1 @@
-{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-4.0","copyright":"Discord pjb","states":[{"name":"none"},{"name":"both"},{"name":"motion"},{"name":"test"}]}
+{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-4.0","copyright":"Discord pjb","states":[{"name":"none"},{"name":"both"},{"name":"motion"},{"name":"test"}]}
diff --git a/Resources/Textures/Effects/portal.rsi/meta.json b/Resources/Textures/Effects/portal.rsi/meta.json
index 072729d38b..1d1a02bfd7 100644
--- a/Resources/Textures/Effects/portal.rsi/meta.json
+++ b/Resources/Textures/Effects/portal.rsi/meta.json
@@ -92,4 +92,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Effects/techanom_beam.rsi/meta.json b/Resources/Textures/Effects/techanom_beam.rsi/meta.json
index 15ca5cd3a4..4433487250 100644
--- a/Resources/Textures/Effects/techanom_beam.rsi/meta.json
+++ b/Resources/Textures/Effects/techanom_beam.rsi/meta.json
@@ -19,4 +19,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Effects/weather.rsi/meta.json b/Resources/Textures/Effects/weather.rsi/meta.json
index 3609ab6f9e..f71cf02b9b 100644
--- a/Resources/Textures/Effects/weather.rsi/meta.json
+++ b/Resources/Textures/Effects/weather.rsi/meta.json
@@ -364,4 +364,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Fluids/gibblet.rsi/meta.json b/Resources/Textures/Fluids/gibblet.rsi/meta.json
index e6827234c5..1483647fdd 100644
--- a/Resources/Textures/Fluids/gibblet.rsi/meta.json
+++ b/Resources/Textures/Fluids/gibblet.rsi/meta.json
@@ -23,4 +23,4 @@
             "name": "gibblet-4"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Fluids/puddle.rsi/meta.json b/Resources/Textures/Fluids/puddle.rsi/meta.json
index 5e0b79b314..4af133c17c 100644
--- a/Resources/Textures/Fluids/puddle.rsi/meta.json
+++ b/Resources/Textures/Fluids/puddle.rsi/meta.json
@@ -62,4 +62,4 @@
             "name": "splat15"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Fluids/smear.rsi/meta.json b/Resources/Textures/Fluids/smear.rsi/meta.json
index ebccb6d459..6082c2f816 100644
--- a/Resources/Textures/Fluids/smear.rsi/meta.json
+++ b/Resources/Textures/Fluids/smear.rsi/meta.json
@@ -29,4 +29,4 @@
             "name": "smear-6"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Fluids/splatter.rsi/meta.json b/Resources/Textures/Fluids/splatter.rsi/meta.json
index b224dd00a5..c5bbd5d53c 100644
--- a/Resources/Textures/Fluids/splatter.rsi/meta.json
+++ b/Resources/Textures/Fluids/splatter.rsi/meta.json
@@ -26,4 +26,4 @@
             "name": "splatter-5"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Fluids/vomit.rsi/meta.json b/Resources/Textures/Fluids/vomit.rsi/meta.json
index f0a3ffb3b5..b3f54b8fa8 100644
--- a/Resources/Textures/Fluids/vomit.rsi/meta.json
+++ b/Resources/Textures/Fluids/vomit.rsi/meta.json
@@ -20,4 +20,4 @@
             "name": "vomit-3"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Fluids/vomit_toxin.rsi/meta.json b/Resources/Textures/Fluids/vomit_toxin.rsi/meta.json
index 825ecc9876..cedc76e766 100644
--- a/Resources/Textures/Fluids/vomit_toxin.rsi/meta.json
+++ b/Resources/Textures/Fluids/vomit_toxin.rsi/meta.json
@@ -20,4 +20,4 @@
             "name": "vomit_toxin-3"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Fluids/writing.rsi/meta.json b/Resources/Textures/Fluids/writing.rsi/meta.json
index 5d55444729..8185c3c5e7 100644
--- a/Resources/Textures/Fluids/writing.rsi/meta.json
+++ b/Resources/Textures/Fluids/writing.rsi/meta.json
@@ -23,4 +23,4 @@
             "name": "writing-4"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Interface/Actions/actions_fakemindshield.rsi/meta.json b/Resources/Textures/Interface/Actions/actions_fakemindshield.rsi/meta.json
index 9aa1bd716b..d78c10d577 100644
--- a/Resources/Textures/Interface/Actions/actions_fakemindshield.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/actions_fakemindshield.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-3.0",
     "copyright": "By ketufaispikinut (Github)",
diff --git a/Resources/Textures/Interface/Actions/carp_rift.rsi/meta.json b/Resources/Textures/Interface/Actions/carp_rift.rsi/meta.json
index 2567d69886..6928d648f7 100644
--- a/Resources/Textures/Interface/Actions/carp_rift.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/carp_rift.rsi/meta.json
@@ -18,4 +18,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Interface/Actions/changeling.rsi/meta.json b/Resources/Textures/Interface/Actions/changeling.rsi/meta.json
index 40bf719cc5..f3b6f3ddd5 100644
--- a/Resources/Textures/Interface/Actions/changeling.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/changeling.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC0-1.0",
     "copyright": "Created by TiniestShark (github).",
diff --git a/Resources/Textures/Interface/Actions/changeling2.rsi/armblade_sting.png b/Resources/Textures/Interface/Actions/changeling2.rsi/armblade_sting.png
new file mode 100644
index 0000000000..52b7e5eb26
Binary files /dev/null and b/Resources/Textures/Interface/Actions/changeling2.rsi/armblade_sting.png differ
diff --git a/Resources/Textures/Interface/Actions/changeling2.rsi/meta.json b/Resources/Textures/Interface/Actions/changeling2.rsi/meta.json
index 07e68df6ba..8e8d9ccea6 100644
--- a/Resources/Textures/Interface/Actions/changeling2.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/changeling2.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by ketufaispikinut from a sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 (scientist suit), a sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 (hydro suit) and the changeling ability border/background sprites created by TiniestShark. Biodegrade, Mimicry and Extract Dna On/Off, Blind, Mute, Neurodepressant, Cryogenic, Lethal and Hallucination stings, screech, nv on/off by ketufaispikinut, based on TiniestShark's textures. Shop icon by ketufaispikinut, based on TiniestShark's textures. last_resort taken from https://github.com/tgstation/tgstation/blob/5c90546a27a1e5ea59b9f127ae274d7341acc70b/icons/mob/actions/actions_changeling.dmi and modified by Pok27 (GitHub). take_over_corpse by Pok27 (GitHub). Mindshield on/off textures by ketufaispikinut, based on TiniestShark's textures.",
+    "copyright": "Made by ketufaispikinut from a sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 (scientist suit), a sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 (hydro suit) and the changeling ability border/background sprites created by TiniestShark. Biodegrade, Mimicry and Extract Dna On/Off, Blind, Mute, Neurodepressant, Cryogenic, Lethal and Hallucination stings, screech, nv on/off by ketufaispikinut, based on TiniestShark's textures. Shop icon by ketufaispikinut, based on TiniestShark's textures. last_resort taken from https://github.com/tgstation/tgstation/blob/5c90546a27a1e5ea59b9f127ae274d7341acc70b/icons/mob/actions/actions_changeling.dmi and modified by Pok27 (GitHub). take_over_corpse by Pok27 (GitHub). Mindshield on/off textures by ketufaispikinut, based on TiniestShark's textures. armblade_sting by ScarKy0 (Github) based on ketufaispikinut's stings and TiniestShark's textures.",
     "size": {
         "x": 32,
         "y": 32
@@ -37,6 +37,9 @@
         {
             "name": "lethal_sting"
         },
+        {
+            "name": "armblade_sting"
+        },
         {
             "name": "extract_dna_on"
         },
diff --git a/Resources/Textures/Interface/Actions/devour.rsi/meta.json b/Resources/Textures/Interface/Actions/devour.rsi/meta.json
index cfc588ef32..ce5abf331c 100644
--- a/Resources/Textures/Interface/Actions/devour.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/devour.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC0-1.0",
   "copyright": "Created by EmoGarbage404 (github), localized by Dezzzix; Discord: dezzzix (651428903352795136)",
diff --git a/Resources/Textures/Interface/Actions/pai-map.rsi/meta.json b/Resources/Textures/Interface/Actions/pai-map.rsi/meta.json
index 6e71727140..39e02968a7 100644
--- a/Resources/Textures/Interface/Actions/pai-map.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/pai-map.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC0-1.0",
   "copyright": "Made by UbaserB by overlaying Station Map sprites. Original sprites made by brainfood1183 (github) for ss14",
diff --git a/Resources/Textures/Interface/Alerts/changeling.rsi/meta.json b/Resources/Textures/Interface/Alerts/changeling.rsi/meta.json
index 78137bbfcc..453b4f3d3a 100644
--- a/Resources/Textures/Interface/Alerts/changeling.rsi/meta.json
+++ b/Resources/Textures/Interface/Alerts/changeling.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "Made by ketufaispikinut from a sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 (scientist suit).",
diff --git a/Resources/Textures/Interface/Alerts/pressure.rsi/meta.json b/Resources/Textures/Interface/Alerts/pressure.rsi/meta.json
index 226205133c..2fd7f9e8fc 100644
--- a/Resources/Textures/Interface/Alerts/pressure.rsi/meta.json
+++ b/Resources/Textures/Interface/Alerts/pressure.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 04e43d8c1d5097fdb697addd4395fb849dd341bd, heighpressure1, heighpressure2, lowpressure1 and lowpressure2 localized by discord:kuro_0001 (388673708753027083)", "states": [{"name": "highpressure1", "directions": 1, "delays": [[1.0]]}, {"name": "highpressure2", "directions": 1, "delays": [[0.5, 0.5]]}, {"name": "lowpressure1", "directions": 1, "delays": [[1.0]]}, {"name": "lowpressure2", "directions": 1, "delays": [[0.5, 0.5]]}]}
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd", "states": [{"name": "highpressure1", "directions": 1, "delays": [[1.0]]}, {"name": "highpressure2", "directions": 1, "delays": [[0.5, 0.5]]}, {"name": "lowpressure1", "directions": 1, "delays": [[1.0]]}, {"name": "lowpressure2", "directions": 1, "delays": [[0.5, 0.5]]}]}
diff --git a/Resources/Textures/Interface/Alerts/stamina.rsi/meta.json b/Resources/Textures/Interface/Alerts/stamina.rsi/meta.json
index 21122621e0..f2a27fcf70 100644
--- a/Resources/Textures/Interface/Alerts/stamina.rsi/meta.json
+++ b/Resources/Textures/Interface/Alerts/stamina.rsi/meta.json
@@ -121,4 +121,4 @@
           ]
         }
       ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Interface/Alerts/temperature.rsi/meta.json b/Resources/Textures/Interface/Alerts/temperature.rsi/meta.json
index 6ecfe4d763..ee0ffda29f 100644
--- a/Resources/Textures/Interface/Alerts/temperature.rsi/meta.json
+++ b/Resources/Textures/Interface/Alerts/temperature.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 1c7401722f397d8ac8afdd10e550c5962e0f38d4", "states": [{"name": "cold1", "directions": 1, "delays": [[1.0]]}, {"name": "cold2", "directions": 1, "delays": [[1.0]]}, {"name": "cold3", "directions": 1, "delays": [[0.3, 0.3]]}, {"name": "hot1", "directions": 1, "delays": [[1.0]]}, {"name": "hot2", "directions": 1, "delays": [[1.0]]}, {"name": "hot3", "directions": 1, "delays": [[0.3, 0.3]]}]}
\ 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 1c7401722f397d8ac8afdd10e550c5962e0f38d4", "states": [{"name": "cold1", "directions": 1, "delays": [[1.0]]}, {"name": "cold2", "directions": 1, "delays": [[1.0]]}, {"name": "cold3", "directions": 1, "delays": [[0.3, 0.3]]}, {"name": "hot1", "directions": 1, "delays": [[1.0]]}, {"name": "hot2", "directions": 1, "delays": [[1.0]]}, {"name": "hot3", "directions": 1, "delays": [[0.3, 0.3]]}]}
diff --git a/Resources/Textures/Interface/Misc/pointing.rsi/meta.json b/Resources/Textures/Interface/Misc/pointing.rsi/meta.json
index ff2120f04c..2e23504cc2 100644
--- a/Resources/Textures/Interface/Misc/pointing.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/pointing.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "size": {
         "x": 32,
diff --git a/Resources/Textures/Interface/Misc/progress_bar.rsi/meta.json b/Resources/Textures/Interface/Misc/progress_bar.rsi/meta.json
index 612f362d3c..bb6b971d20 100644
--- a/Resources/Textures/Interface/Misc/progress_bar.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/progress_bar.rsi/meta.json
@@ -11,4 +11,4 @@
             "name": "icon"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Interface/Nano/Monotone/attributions.yml b/Resources/Textures/Interface/Nano/Monotone/attributions.yml
index e462d7713c..2551d84e8a 100644
--- a/Resources/Textures/Interface/Nano/Monotone/attributions.yml
+++ b/Resources/Textures/Interface/Nano/Monotone/attributions.yml
@@ -26,4 +26,4 @@
 - files: ["monotone_checkbox_unchecked.svg.96dpi.png"]
   license: "CC-BY-SA-3.0"
   copyright: "Modified from checkbox_unchecked.svg.96dpi by chromiumboy"
-  source: "https://github.com/chromiumboy"
\ No newline at end of file
+  source: "https://github.com/chromiumboy"
diff --git a/Resources/Textures/Interface/Nano/inverted_triangle.svg.png.yml b/Resources/Textures/Interface/Nano/inverted_triangle.svg.png.yml
index 497c6beff9..5c43e23305 100644
--- a/Resources/Textures/Interface/Nano/inverted_triangle.svg.png.yml
+++ b/Resources/Textures/Interface/Nano/inverted_triangle.svg.png.yml
@@ -1,2 +1,2 @@
 sample:
-  filter: true
\ No newline at end of file
+  filter: true
diff --git a/Resources/Textures/Interface/Nano/triangle_right.png.yml b/Resources/Textures/Interface/Nano/triangle_right.png.yml
index 900d002f35..09db6037c7 100644
--- a/Resources/Textures/Interface/Nano/triangle_right.png.yml
+++ b/Resources/Textures/Interface/Nano/triangle_right.png.yml
@@ -1,3 +1,3 @@
 sample:
   filter: true
-# for .svg, see inverted_triangle.svg.
\ No newline at end of file
+# for .svg, see inverted_triangle.svg.
diff --git a/Resources/Textures/Interface/Nano/triangle_right_hollow.svg.png.yml b/Resources/Textures/Interface/Nano/triangle_right_hollow.svg.png.yml
index 497c6beff9..5c43e23305 100644
--- a/Resources/Textures/Interface/Nano/triangle_right_hollow.svg.png.yml
+++ b/Resources/Textures/Interface/Nano/triangle_right_hollow.svg.png.yml
@@ -1,2 +1,2 @@
 sample:
-  filter: true
\ No newline at end of file
+  filter: true
diff --git a/Resources/Textures/Interface/NavMap/beveled_arrow_east.png.yml b/Resources/Textures/Interface/NavMap/beveled_arrow_east.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/NavMap/beveled_arrow_east.png.yml
+++ b/Resources/Textures/Interface/NavMap/beveled_arrow_east.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/NavMap/beveled_arrow_north.png.yml b/Resources/Textures/Interface/NavMap/beveled_arrow_north.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/NavMap/beveled_arrow_north.png.yml
+++ b/Resources/Textures/Interface/NavMap/beveled_arrow_north.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/NavMap/beveled_arrow_south.png.yml b/Resources/Textures/Interface/NavMap/beveled_arrow_south.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/NavMap/beveled_arrow_south.png.yml
+++ b/Resources/Textures/Interface/NavMap/beveled_arrow_south.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/NavMap/beveled_arrow_west.png.yml b/Resources/Textures/Interface/NavMap/beveled_arrow_west.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/NavMap/beveled_arrow_west.png.yml
+++ b/Resources/Textures/Interface/NavMap/beveled_arrow_west.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/NavMap/beveled_circle.png.yml b/Resources/Textures/Interface/NavMap/beveled_circle.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/NavMap/beveled_circle.png.yml
+++ b/Resources/Textures/Interface/NavMap/beveled_circle.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/NavMap/beveled_diamond.png.yml b/Resources/Textures/Interface/NavMap/beveled_diamond.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/NavMap/beveled_diamond.png.yml
+++ b/Resources/Textures/Interface/NavMap/beveled_diamond.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/NavMap/beveled_diamond_east_west.png.yml b/Resources/Textures/Interface/NavMap/beveled_diamond_east_west.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/NavMap/beveled_diamond_east_west.png.yml
+++ b/Resources/Textures/Interface/NavMap/beveled_diamond_east_west.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/NavMap/beveled_diamond_north_south.png.yml b/Resources/Textures/Interface/NavMap/beveled_diamond_north_south.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/NavMap/beveled_diamond_north_south.png.yml
+++ b/Resources/Textures/Interface/NavMap/beveled_diamond_north_south.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/NavMap/beveled_hexagon.png.yml b/Resources/Textures/Interface/NavMap/beveled_hexagon.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/NavMap/beveled_hexagon.png.yml
+++ b/Resources/Textures/Interface/NavMap/beveled_hexagon.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/NavMap/beveled_rectangle_east_west.png.yml b/Resources/Textures/Interface/NavMap/beveled_rectangle_east_west.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/NavMap/beveled_rectangle_east_west.png.yml
+++ b/Resources/Textures/Interface/NavMap/beveled_rectangle_east_west.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/NavMap/beveled_rectangle_north_south.png.yml b/Resources/Textures/Interface/NavMap/beveled_rectangle_north_south.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/NavMap/beveled_rectangle_north_south.png.yml
+++ b/Resources/Textures/Interface/NavMap/beveled_rectangle_north_south.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/NavMap/beveled_square.png.yml b/Resources/Textures/Interface/NavMap/beveled_square.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/NavMap/beveled_square.png.yml
+++ b/Resources/Textures/Interface/NavMap/beveled_square.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/NavMap/beveled_star.png.yml b/Resources/Textures/Interface/NavMap/beveled_star.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/NavMap/beveled_star.png.yml
+++ b/Resources/Textures/Interface/NavMap/beveled_star.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/NavMap/beveled_triangle.png.yml b/Resources/Textures/Interface/NavMap/beveled_triangle.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/NavMap/beveled_triangle.png.yml
+++ b/Resources/Textures/Interface/NavMap/beveled_triangle.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/NavMap/ring.yml b/Resources/Textures/Interface/NavMap/ring.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/NavMap/ring.yml
+++ b/Resources/Textures/Interface/NavMap/ring.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/NavMap/ring_filled.yml b/Resources/Textures/Interface/NavMap/ring_filled.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/NavMap/ring_filled.yml
+++ b/Resources/Textures/Interface/NavMap/ring_filled.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt b/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
index d118881a22..49525a023e 100644
--- a/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
+++ b/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
@@ -15,4 +15,6 @@ screwdriver.png by Lorc (edited by chromiumboy) under CC BY 3.0
 https://game-icons.net/1x1/lorc/screwdriver.html
 
 scissors.svg by Icons8 under Good Boy License https://github.com/icons8/WPF-UI-Framework/blob/master/LICENSE.md
-https://github.com/icons8/WPF-UI-Framework/blob/master/Windows%20Icons/Cut.svg
\ No newline at end of file
+https://github.com/icons8/WPF-UI-Framework/blob/master/Windows%20Icons/Cut.svg
+
+vault.svg as Traceur by Gan Khoon Lay from Noun Project (CC BY 3.0) edited by SlamBamActionman (github) (CC BY 3.0)
diff --git a/Resources/Textures/Interface/VerbIcons/die.svg.192dpi.png.yml b/Resources/Textures/Interface/VerbIcons/die.svg.192dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/VerbIcons/die.svg.192dpi.png.yml
+++ b/Resources/Textures/Interface/VerbIcons/die.svg.192dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/VerbIcons/vault.svg b/Resources/Textures/Interface/VerbIcons/vault.svg
new file mode 100644
index 0000000000..c2fda3eb7e
--- /dev/null
+++ b/Resources/Textures/Interface/VerbIcons/vault.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-176 -308.7 258 258" style="enable-background:new -176 -308.7 258 258;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g>
+	<ellipse class="st0" cx="-9.5" cy="-253" rx="22.5" ry="22.5"/>
+</g>
+<g>
+	<path class="st0" d="M22.2-197.6c-2.8-10.8-8.6-18.9-13.6-24.4c-1.7-1.9-3.4-3.5-4.8-4.7c-4.1,2.1-8.6,3.2-13.3,3.2
+		c-9.3,0-17.8-4.2-23.5-11.6c-5-6.6-6.8-14.7-5.7-22.3c-1.6-0.9-3.3-1.9-4.9-3.2c-2.5-1.9-4.8-4.2-6.4-6.8c-1.6-2.6-2.5-5.3-2.5-8.9
+		c0-4,1.3-9.2,5.5-16c2.3-3.8,1.2-8.7-2.6-11c-3.8-2.3-8.7-1.2-11,2.6c-5.4,8.7-7.9,16.9-7.9,24.5c0,6.9,2.1,13,5.2,17.7
+		c4.6,7.2,11,11.7,16.2,14.7c0.1,0.1,0.2,0.1,0.3,0.2c-5.3,12.7-11.7,21.9-28.1,29c-0.3-0.3-0.6-0.5-0.9-0.8
+		c-2.8-2.2-6.1-4.6-10.2-6.5c-4.1-1.9-8.9-3.4-14.5-3.4c-4.2,0-8.6,0.9-12.8,2.9c-6.3,3-11.8,8.3-16.2,15.3
+		c-4.5,7-8.2,15.9-11.4,27.3c-1.8,6.7,2.1,13.5,8.7,15.4c1.1,0.3,2.2,0.5,3.3,0.5c5.5,0,10.5-3.6,12-9.2c3.6-13,7.8-20.5,10.8-23.9
+		c1.5-1.7,2.7-2.5,3.5-2.9c0.8-0.4,1.3-0.5,2-0.5c0.9,0,2.3,0.3,3.9,1c2.5,1.1,5.3,3.3,7.3,5.2c1,0.9,1.8,1.8,2.3,2.4
+		c0.3,0.3,0.4,0.5,0.6,0.6c0,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0.7,0.9,1.6,1.7,2.5,2.4c0.6,0.4,1.1,0.8,1.7,1
+		c-3.8,4-8.4,9.7-12.6,17.1c-4.4,7.7-8.4,17.4-10.3,28.8c-1.9,11.4-1.7,24.5,2,38.8c0.2,0.9,0.5,1.7,0.7,2.6
+		c1.9,6.5,8.6,10.3,15.2,8.6c0.1,0,0.2-0.1,0.3-0.1c6.6-1.9,10.5-8.8,8.6-15.5c-0.2-0.7-0.4-1.3-0.5-2c-2.8-11-2.9-20.3-1.6-28.4
+		c2-12.1,7.4-21.5,12.3-27.9c2.2-2.9,4.3-5.1,5.9-6.7c1.3-0.1,2.7-0.4,4-0.9c0,0,0.1,0,0.1,0c23.7-10.5,38.8-16.7,55.6-34.3
+		c0.5-0.5,0.9-1,1.4-1.5c3.2,4,6.3,9.1,7.9,15.3c1.8,7.1,1.9,15.5-2.6,26.1c-1.7,4.1,0.2,8.8,4.2,10.5c1.7,0.7,3.5,0.8,5.1,0.4
+		c2.3-0.6,4.3-2.2,5.4-4.6C24.6-174.7,24.8-187.3,22.2-197.6z"/>
+</g>
+<path class="st0" d="M-25-57.5h71.5v-102H25.6c-0.1,0.4-0.3,0.7-0.4,1.1c-1.8,4.3-5.5,7.5-10,8.6c-1.2,0.3-2.5,0.5-3.8,0.5
+	c-2,0-4-0.4-5.9-1.2c-3.7-1.6-6.5-4.5-8-8.2c-0.1-0.3-0.2-0.5-0.3-0.8H-25V-57.5z"/>
+</svg>
diff --git a/Resources/Textures/Interface/VerbIcons/vault.svg.192dpi.png b/Resources/Textures/Interface/VerbIcons/vault.svg.192dpi.png
new file mode 100644
index 0000000000..3c9d207945
Binary files /dev/null and b/Resources/Textures/Interface/VerbIcons/vault.svg.192dpi.png differ
diff --git a/Resources/Textures/Interface/VerbIcons/vault.svg.192dpi.yml b/Resources/Textures/Interface/VerbIcons/vault.svg.192dpi.yml
new file mode 100644
index 0000000000..5c43e23305
--- /dev/null
+++ b/Resources/Textures/Interface/VerbIcons/vault.svg.192dpi.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/Interface/character.svg.192dpi.png.yml b/Resources/Textures/Interface/character.svg.192dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/character.svg.192dpi.png.yml
+++ b/Resources/Textures/Interface/character.svg.192dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/emotes.svg.192dpi.png.yml b/Resources/Textures/Interface/emotes.svg.192dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/emotes.svg.192dpi.png.yml
+++ b/Resources/Textures/Interface/emotes.svg.192dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/examine-star.png.yml b/Resources/Textures/Interface/examine-star.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/examine-star.png.yml
+++ b/Resources/Textures/Interface/examine-star.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/fist.svg.192dpi.png.yml b/Resources/Textures/Interface/fist.svg.192dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/fist.svg.192dpi.png.yml
+++ b/Resources/Textures/Interface/fist.svg.192dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/gavel.svg.192dpi.png.yml b/Resources/Textures/Interface/gavel.svg.192dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/gavel.svg.192dpi.png.yml
+++ b/Resources/Textures/Interface/gavel.svg.192dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/hamburger.svg.192dpi.png.yml b/Resources/Textures/Interface/hamburger.svg.192dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/hamburger.svg.192dpi.png.yml
+++ b/Resources/Textures/Interface/hamburger.svg.192dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/hammer.svg.192dpi.png.yml b/Resources/Textures/Interface/hammer.svg.192dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/hammer.svg.192dpi.png.yml
+++ b/Resources/Textures/Interface/hammer.svg.192dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/hammer_sca;ed.svg.192dpi.png.yml b/Resources/Textures/Interface/hammer_sca;ed.svg.192dpi.png.yml
deleted file mode 100644
index e1f62434bc..0000000000
--- a/Resources/Textures/Interface/hammer_sca;ed.svg.192dpi.png.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-#this is just a copy of hammer.svg, but scaled and adjusted slightly so that it can be used as a right-click context menu icon.
-sample:
-  filter: true
diff --git a/Resources/Textures/Interface/hammer_scaled.svg.192dpi.png.yml b/Resources/Textures/Interface/hammer_scaled.svg.192dpi.png.yml
new file mode 100644
index 0000000000..53911adcf6
--- /dev/null
+++ b/Resources/Textures/Interface/hammer_scaled.svg.192dpi.png.yml
@@ -0,0 +1,3 @@
+#this is just a copy of hammer.svg, but scaled and adjusted slightly so that it can be used as a right-click context menu icon.
+sample:
+  filter: true
diff --git a/Resources/Textures/Interface/handsbox.png.yml b/Resources/Textures/Interface/handsbox.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/handsbox.png.yml
+++ b/Resources/Textures/Interface/handsbox.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/info.svg.192dpi.png.yml b/Resources/Textures/Interface/info.svg.192dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/info.svg.192dpi.png.yml
+++ b/Resources/Textures/Interface/info.svg.192dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/inventory.svg.192dpi.png.yml b/Resources/Textures/Interface/inventory.svg.192dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/inventory.svg.192dpi.png.yml
+++ b/Resources/Textures/Interface/inventory.svg.192dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/pray.svg.png.yml b/Resources/Textures/Interface/pray.svg.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/pray.svg.png.yml
+++ b/Resources/Textures/Interface/pray.svg.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/sandbox.svg.192dpi.png.yml b/Resources/Textures/Interface/sandbox.svg.192dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/sandbox.svg.192dpi.png.yml
+++ b/Resources/Textures/Interface/sandbox.svg.192dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/students-cap.svg.192dpi.png.yml b/Resources/Textures/Interface/students-cap.svg.192dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/students-cap.svg.192dpi.png.yml
+++ b/Resources/Textures/Interface/students-cap.svg.192dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/target-doll-high.svg.192dpi.png.yml b/Resources/Textures/Interface/target-doll-high.svg.192dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/target-doll-high.svg.192dpi.png.yml
+++ b/Resources/Textures/Interface/target-doll-high.svg.192dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/target-doll-high.svg.96dpi.png.yml b/Resources/Textures/Interface/target-doll-high.svg.96dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/target-doll-high.svg.96dpi.png.yml
+++ b/Resources/Textures/Interface/target-doll-high.svg.96dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/target-doll-low.svg.192dpi.png.yml b/Resources/Textures/Interface/target-doll-low.svg.192dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/target-doll-low.svg.192dpi.png.yml
+++ b/Resources/Textures/Interface/target-doll-low.svg.192dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/target-doll-low.svg.96dpi.png.yml b/Resources/Textures/Interface/target-doll-low.svg.96dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/target-doll-low.svg.96dpi.png.yml
+++ b/Resources/Textures/Interface/target-doll-low.svg.96dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/target-doll-middle.svg.192dpi.png.yml b/Resources/Textures/Interface/target-doll-middle.svg.192dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/target-doll-middle.svg.192dpi.png.yml
+++ b/Resources/Textures/Interface/target-doll-middle.svg.192dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/target-doll-middle.svg.96dpi.png.yml b/Resources/Textures/Interface/target-doll-middle.svg.96dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/target-doll-middle.svg.96dpi.png.yml
+++ b/Resources/Textures/Interface/target-doll-middle.svg.96dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Interface/target-doll.svg.192dpi.png.yml b/Resources/Textures/Interface/target-doll.svg.192dpi.png.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/Interface/target-doll.svg.192dpi.png.yml
+++ b/Resources/Textures/Interface/target-doll.svg.192dpi.png.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/LobbyScreens/doomed.webp.yml b/Resources/Textures/LobbyScreens/doomed.webp.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/LobbyScreens/doomed.webp.yml
+++ b/Resources/Textures/LobbyScreens/doomed.webp.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/LobbyScreens/janishootout.webp.yml b/Resources/Textures/LobbyScreens/janishootout.webp.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/LobbyScreens/janishootout.webp.yml
+++ b/Resources/Textures/LobbyScreens/janishootout.webp.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/LobbyScreens/reclaimer-nuke.webp.yml b/Resources/Textures/LobbyScreens/reclaimer-nuke.webp.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/LobbyScreens/reclaimer-nuke.webp.yml
+++ b/Resources/Textures/LobbyScreens/reclaimer-nuke.webp.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/LobbyScreens/skellyvstherev.webp.yml b/Resources/Textures/LobbyScreens/skellyvstherev.webp.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/LobbyScreens/skellyvstherev.webp.yml
+++ b/Resources/Textures/LobbyScreens/skellyvstherev.webp.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/LobbyScreens/ssxiv.webp.yml b/Resources/Textures/LobbyScreens/ssxiv.webp.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/LobbyScreens/ssxiv.webp.yml
+++ b/Resources/Textures/LobbyScreens/ssxiv.webp.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/LobbyScreens/susstation.webp.yml b/Resources/Textures/LobbyScreens/susstation.webp.yml
index dabd6601f7..5c43e23305 100644
--- a/Resources/Textures/LobbyScreens/susstation.webp.yml
+++ b/Resources/Textures/LobbyScreens/susstation.webp.yml
@@ -1,2 +1,2 @@
-sample:
+sample:
   filter: true
diff --git a/Resources/Textures/Logo/logo.png.yml b/Resources/Textures/Logo/logo.png.yml
index 497c6beff9..5c43e23305 100644
--- a/Resources/Textures/Logo/logo.png.yml
+++ b/Resources/Textures/Logo/logo.png.yml
@@ -1,2 +1,2 @@
 sample:
-  filter: true
\ No newline at end of file
+  filter: true
diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/meta.json
index b9d3f2bd7f..062ec6a91c 100644
--- a/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/meta.json
@@ -108,4 +108,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/meta.json
index b11726cf73..f941898aaa 100644
--- a/Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/meta.json
@@ -71,4 +71,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Aliens/Carps/dragon.rsi/crit-unshaded.png b/Resources/Textures/Mobs/Aliens/Carps/dragon.rsi/crit-unshaded.png
new file mode 100644
index 0000000000..a84cd2ab89
Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Carps/dragon.rsi/crit-unshaded.png differ
diff --git a/Resources/Textures/Mobs/Aliens/Carps/dragon.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Carps/dragon.rsi/meta.json
index b29668aed9..b8cadf1504 100644
--- a/Resources/Textures/Mobs/Aliens/Carps/dragon.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/Carps/dragon.rsi/meta.json
@@ -5,7 +5,7 @@
     "y": 64
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/Toastgoats/tgstation/commit/024a840eed2a1be3f72435c2bb39faac8025f822",
+  "copyright": "Taken from /tg/station at https://github.com/Toastgoats/tgstation/commit/024a840eed2a1be3f72435c2bb39faac8025f822, crit-unshaded created by sir-lutz (Github)",
   "states": [
     {
       "name": "alive",
@@ -70,6 +70,9 @@
     {
       "name": "crit"
     },
+    {
+      "name": "crit-unshaded"
+    },
     {
       "name": "dead"
     },
@@ -77,4 +80,4 @@
       "name": "dead-unshaded"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Aliens/Lavaland/watcher.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Lavaland/watcher.rsi/meta.json
index 20360f4df2..43e3bd4f2d 100644
--- a/Resources/Textures/Mobs/Aliens/Lavaland/watcher.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/Lavaland/watcher.rsi/meta.json
@@ -22,4 +22,4 @@
       "name": "dead-unshaded"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/meta.json
index d175e4aa89..97f6e5ea4f 100644
--- a/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/Xenos/drone.rsi/meta.json
@@ -21,4 +21,4 @@
       "name": "dead"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/meta.json
index e9f98745bc..911fe93a33 100644
--- a/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/Xenos/praetorian.rsi/meta.json
@@ -21,4 +21,4 @@
       "name": "dead"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/meta.json
index 19161ee8fa..b2aa0168fb 100644
--- a/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/Xenos/queen.rsi/meta.json
@@ -21,4 +21,4 @@
       "name": "dead"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/meta.json
index 19161ee8fa..b2aa0168fb 100644
--- a/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/Xenos/ravager.rsi/meta.json
@@ -21,4 +21,4 @@
       "name": "dead"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/meta.json
index 19161ee8fa..b2aa0168fb 100644
--- a/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/Xenos/runner.rsi/meta.json
@@ -21,4 +21,4 @@
       "name": "dead"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/meta.json
index d175e4aa89..97f6e5ea4f 100644
--- a/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/Xenos/spitter.rsi/meta.json
@@ -21,4 +21,4 @@
       "name": "dead"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Animals/headslug.rsi/meta.json b/Resources/Textures/Mobs/Animals/headslug.rsi/meta.json
index 64666f2c04..cb4b9f413f 100644
--- a/Resources/Textures/Mobs/Animals/headslug.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/headslug.rsi/meta.json
@@ -16,6 +16,16 @@
         },
         {
             "name": "icon"
+        },
+        {
+            "name": "slug_elder",
+            "directions": 4
+        },
+        {
+            "name": "slug_elder_dead"
+        },
+        {
+            "name": "shell"
         }
     ]
 }
diff --git a/Resources/Textures/Mobs/Animals/headslug.rsi/shell.png b/Resources/Textures/Mobs/Animals/headslug.rsi/shell.png
new file mode 100644
index 0000000000..cd03ac6d24
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/headslug.rsi/shell.png differ
diff --git a/Resources/Textures/Mobs/Animals/headslug.rsi/slug_elder.png b/Resources/Textures/Mobs/Animals/headslug.rsi/slug_elder.png
new file mode 100644
index 0000000000..a1ac976334
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/headslug.rsi/slug_elder.png differ
diff --git a/Resources/Textures/Mobs/Animals/headslug.rsi/slug_elder_dead.png b/Resources/Textures/Mobs/Animals/headslug.rsi/slug_elder_dead.png
new file mode 100644
index 0000000000..84bf805d95
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/headslug.rsi/slug_elder_dead.png differ
diff --git a/Resources/Textures/Mobs/Animals/kangaroo.rsi/meta.json b/Resources/Textures/Mobs/Animals/kangaroo.rsi/meta.json
index 494d330032..4d047b90a0 100644
--- a/Resources/Textures/Mobs/Animals/kangaroo.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/kangaroo.rsi/meta.json
@@ -58,4 +58,4 @@
       "name": "kangaroo-space-dead"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json b/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json
index c6bb6e0ac4..c472c52381 100644
--- a/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json
@@ -60,4 +60,4 @@
       "name": "icon"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Animals/possum_old.rsi/meta.json b/Resources/Textures/Mobs/Animals/possum_old.rsi/meta.json
index c0a3b63bfd..9228d9f3f6 100644
--- a/Resources/Textures/Mobs/Animals/possum_old.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/possum_old.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
     "copyright": "Taken from goonstation https://github.com/goonstation/goonstation/commit/c98666f47a90d106c7a154cedffc747b3769e933",
diff --git a/Resources/Textures/Mobs/Animals/slug.rsi/meta.json b/Resources/Textures/Mobs/Animals/slug.rsi/meta.json
index 103f08be90..e162320ca5 100644
--- a/Resources/Textures/Mobs/Animals/slug.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/slug.rsi/meta.json
@@ -15,4 +15,4 @@
       "name": "dead"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Animals/snail.rsi/meta.json b/Resources/Textures/Mobs/Animals/snail.rsi/meta.json
index ca42ca9eed..ac4b025e54 100644
--- a/Resources/Textures/Mobs/Animals/snail.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/snail.rsi/meta.json
@@ -29,4 +29,4 @@
       "name": "snothdead"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/meta.json
index 58b5aa5553..27b9e9d5b7 100644
--- a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/meta.json
@@ -320,4 +320,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Customization/human_facial_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_facial_hair.rsi/meta.json
index 45fee3e085..fce5ae7b93 100644
--- a/Resources/Textures/Mobs/Customization/human_facial_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/human_facial_hair.rsi/meta.json
@@ -1 +1 @@
-{"version":1,"size":{"x":32,"y":32},"copyright":"Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi","license":"CC-BY-SA-3.0","states":[{"name":"3oclock","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"5oclockmoustache","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"7oclock","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"7oclockmoustache","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"abe","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"brokenman","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"chaplin","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"chin","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"chinlessbeard","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"croppedfullbeard","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"dorsalfnil","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"dwarf","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"elvis","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"fiveoclock","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"fullbeard","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"fumanchu","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"gt","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"hip","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"hogan","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"jensen","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"longbeard","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"longbeard_l","delays":[[1.0]]},{"name":"martialartist","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"moonshiner","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"moustache","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"mutton","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"muttonmus","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"neckbeard","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"pencilstache","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"selleck","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"sideburn","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"smallstache","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"vandyke","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"volaju","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"walrus","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"watson","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"wise","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"shaved","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]}]}
\ No newline at end of file
+{"version":1,"size":{"x":32,"y":32},"copyright":"Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi","license":"CC-BY-SA-3.0","states":[{"name":"3oclock","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"5oclockmoustache","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"7oclock","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"7oclockmoustache","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"abe","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"brokenman","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"chaplin","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"chin","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"chinlessbeard","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"croppedfullbeard","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"dorsalfnil","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"dwarf","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"elvis","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"fiveoclock","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"fullbeard","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"fumanchu","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"gt","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"hip","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"hogan","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"jensen","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"longbeard","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"longbeard_l","delays":[[1.0]]},{"name":"martialartist","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"moonshiner","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"moustache","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"mutton","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"muttonmus","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"neckbeard","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"pencilstache","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"selleck","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"sideburn","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"smallstache","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"vandyke","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"volaju","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"walrus","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"watson","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"wise","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"shaved","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]}]}
diff --git a/Resources/Textures/Mobs/Customization/undergarments.rsi/meta.json b/Resources/Textures/Mobs/Customization/undergarments.rsi/meta.json
index d41a500803..11e5bcec8a 100644
--- a/Resources/Textures/Mobs/Customization/undergarments.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/undergarments.rsi/meta.json
@@ -104,4 +104,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/meta.json
index 3516e2cbe6..1739d08d4c 100644
--- a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/meta.json
@@ -36,4 +36,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json
index 7e74ffb8b6..4dbf5e0994 100644
--- a/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json
@@ -56,4 +56,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
index 5e6df07fe2..de173e6a65 100644
--- a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
@@ -104,4 +104,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Demons/abomination.rsi/meta.json b/Resources/Textures/Mobs/Demons/abomination.rsi/meta.json
index d40e2c53fb..1850aa1bb4 100644
--- a/Resources/Textures/Mobs/Demons/abomination.rsi/meta.json
+++ b/Resources/Textures/Mobs/Demons/abomination.rsi/meta.json
@@ -15,4 +15,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Demons/hellspawn.rsi/meta.json b/Resources/Textures/Mobs/Demons/hellspawn.rsi/meta.json
index 060526ee3b..9004fc8c8b 100644
--- a/Resources/Textures/Mobs/Demons/hellspawn.rsi/meta.json
+++ b/Resources/Textures/Mobs/Demons/hellspawn.rsi/meta.json
@@ -15,4 +15,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/meta.json b/Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/meta.json
index 1d2a84bf6d..a597028d8b 100644
--- a/Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/meta.json
+++ b/Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "Head displacement made by zHonys",
diff --git a/Resources/Textures/Mobs/Pets/breaddog.rsi/meta.json b/Resources/Textures/Mobs/Pets/breaddog.rsi/meta.json
index 45d0190b0c..ba5f37c4ef 100644
--- a/Resources/Textures/Mobs/Pets/breaddog.rsi/meta.json
+++ b/Resources/Textures/Mobs/Pets/breaddog.rsi/meta.json
@@ -18,4 +18,4 @@
       "directions": 1
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Silicon/onestar.rsi/meta.json b/Resources/Textures/Mobs/Silicon/onestar.rsi/meta.json
index 088492c49f..dc41fdedd2 100644
--- a/Resources/Textures/Mobs/Silicon/onestar.rsi/meta.json
+++ b/Resources/Textures/Mobs/Silicon/onestar.rsi/meta.json
@@ -190,4 +190,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/meta.json b/Resources/Textures/Mobs/Silicon/output.rsi/meta.json
index a40ed37c60..35de328fe0 100644
--- a/Resources/Textures/Mobs/Silicon/output.rsi/meta.json
+++ b/Resources/Textures/Mobs/Silicon/output.rsi/meta.json
@@ -1 +1 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/2a19963297f91efb452dbb5c1d4eb28a14776b0a/icons/mob/silicon/ai.dmi", "states": [{"name": "ai", "directions": 1, "delays": [[0.2, 0.2, 0.2, 0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.1]]}, {"name": "ai-banned", "directions": 1, "delays": [[0.7, 0.7, 0.7, 0.7, 0.7, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7]]}, {"name": "ai-banned-unshaded", "directions": 1, "delays": [[0.7, 0.7, 0.7, 0.7, 0.7, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7]]}, {"name": "ai-banned_dead", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-banned_dead-unshaded", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-empty", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-empty-unshaded", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-holo-old", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "ai-holo-old-unshaded", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "ai-unshaded", "directions": 1, "delays": [[0.2, 0.2, 0.2, 0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.1]]}, {"name": "ai_dead", "directions": 1, "delays": [[1.0]]}, {"name": "ai_dead-unshaded", "directions": 1, "delays": [[1.0]]}, {"name": "default", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "default-unshaded", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "floating_face", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "floating_face-unshaded", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "horror", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "horror-unshaded", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "xeno_queen", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "xeno_queen-unshaded", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
\ No newline at end of file
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/2a19963297f91efb452dbb5c1d4eb28a14776b0a/icons/mob/silicon/ai.dmi", "states": [{"name": "ai", "directions": 1, "delays": [[0.2, 0.2, 0.2, 0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.1]]}, {"name": "ai-banned", "directions": 1, "delays": [[0.7, 0.7, 0.7, 0.7, 0.7, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7]]}, {"name": "ai-banned-unshaded", "directions": 1, "delays": [[0.7, 0.7, 0.7, 0.7, 0.7, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7]]}, {"name": "ai-banned_dead", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-banned_dead-unshaded", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-empty", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-empty-unshaded", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-holo-old", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "ai-holo-old-unshaded", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "ai-unshaded", "directions": 1, "delays": [[0.2, 0.2, 0.2, 0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.1]]}, {"name": "ai_dead", "directions": 1, "delays": [[1.0]]}, {"name": "ai_dead-unshaded", "directions": 1, "delays": [[1.0]]}, {"name": "default", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "default-unshaded", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "floating_face", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "floating_face-unshaded", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "horror", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "horror-unshaded", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "xeno_queen", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "xeno_queen-unshaded", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
diff --git a/Resources/Textures/Mobs/Species/Human/displacement.rsi/meta.json b/Resources/Textures/Mobs/Species/Human/displacement.rsi/meta.json
index d4d637bd08..9ab500bb91 100644
--- a/Resources/Textures/Mobs/Species/Human/displacement.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Human/displacement.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "jumpsuit-female made by TheShuEd, dwarfism sprites made by SlamBamActionman (Github)",
diff --git a/Resources/Textures/Mobs/Species/Moth/displacement.rsi/meta.json b/Resources/Textures/Mobs/Species/Moth/displacement.rsi/meta.json
index 464ae7b119..4816819c40 100644
--- a/Resources/Textures/Mobs/Species/Moth/displacement.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Moth/displacement.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-4.0",
     "copyright": "Made by Flareguy for Space Station 14",
diff --git a/Resources/Textures/Mobs/Species/Moth/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Moth/parts.rsi/meta.json
index 4e15818415..a103f0d521 100644
--- a/Resources/Textures/Mobs/Species/Moth/parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Moth/parts.rsi/meta.json
@@ -59,4 +59,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
index e46ca56024..08e9aac56d 100644
--- a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "jumpsuit state made by PJB3005. back, hand, head, and eyes states made by Flareguy, ears, hand_l, hand_r, hair and shoes made by TheShuEd",
diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/meta.json b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/meta.json
index dda72541d1..6225b082b2 100644
--- a/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Vulpkanin/displacement.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "FairlySadPanda (Discord/Github)",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/(mdr)grapejuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/(mdr)grapejuice.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/(mdr)grapejuice.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/(mdr)grapejuice.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/banana.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/banana.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/banana.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/banana.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bigteacup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bigteacup.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/bigteacup.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/bigteacup.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/britmug.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/britmug.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/britmug.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/britmug.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/broken.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/broken.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/broken.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/broken.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/brownstar.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/brownstar.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/brownstar.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/brownstar.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/carrotjuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/carrotjuice.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/carrotjuice.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/carrotjuice.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/chocolateglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/chocolateglass.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/chocolateglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/chocolateglass.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cup.rsi/meta.json
index 80ac521b6f..7c719f160d 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/cup.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/cup.rsi/meta.json
@@ -14,4 +14,4 @@
             "name": "icon-1"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/erikasurprise.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/erikasurprise.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/erikasurprise.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/erikasurprise.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_brown.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_brown.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/glass_brown.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/glass_brown.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_brown2.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_brown2.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/glass_brown2.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/glass_brown2.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json
index 90a92542fd..a933667ab2 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-NC-SA-4.0",
     "copyright": "Created by github user moonheart08.",
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_light_yellow.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_light_yellow.rsi/meta.json
index 93be08a545..416c7b5fe7 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/glass_light_yellow.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/glass_light_yellow.rsi/meta.json
@@ -1 +1 @@
-{"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, modified by lapatison", "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, modified by lapatison", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_orange.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_orange.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/glass_orange.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/glass_orange.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_red.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/glass_red.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/glass_red.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_white.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_white.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/glass_white.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/glass_white.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_yellow.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_yellow.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/glass_yellow.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/glass_yellow.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grapejuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/grapejuice.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/grapejuice.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/grapejuice.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grogglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/grogglass.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/grogglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/grogglass.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gsodaglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/gsodaglass.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/gsodaglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/gsodaglass.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar_what.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/jar_what.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/jar_what.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/jar_what.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonade.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lemonade.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/lemonade.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/lemonade.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lemonglass.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/lemonglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/lemonglass.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonlime.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lemonlime.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/lemonlime.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/lemonlime.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/meadglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/meadglass.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/meadglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/meadglass.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/nothing.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/nothing.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/nothing.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/nothing.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/poisonberryjuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/poisonberryjuice.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/poisonberryjuice.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/poisonberryjuice.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shake-blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shake-blue.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/shake-blue.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/shake-blue.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shake-empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shake-empty.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/shake-empty.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/shake-empty.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shake-meat.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shake-meat.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/shake-meat.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/shake-meat.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shake-robo.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shake-robo.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/shake-robo.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/shake-robo.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shake-white.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shake-white.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/shake-white.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/shake-white.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teapot.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/teapot.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/teapot.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/teapot.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/water.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/water.rsi/icon.png
deleted file mode 100644
index 91b094a4df..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Drinks/water.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/water.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/water.rsi/meta.json
deleted file mode 100644
index db0ac608ed..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/water.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"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
diff --git a/Resources/Textures/Objects/Consumable/Drinks/watermelon.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/watermelon.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/watermelon.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/watermelon.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass2.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass2.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass2.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass2.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/meta.json
index b95ee96c6d..f9d48915fa 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/meta.json
@@ -28,4 +28,4 @@
             "name": "fill-4"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain-large.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain-large.png
index e191da93bd..75ba8bb407 100644
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain-large.png and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain-large.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain-slice.png
index a7ddc2c7c1..634e2896fc 100644
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain-slice.png and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain-slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain.png
index af9c1c2acf..4b05f97026 100644
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain.png and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/meta.json
index a73ed7cd2f..c959c9dedc 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026, Resprited by @mishutka09(discord:1152277579206774854)",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/meta.json
index a73ed7cd2f..c959c9dedc 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026, Resprited by @mishutka09(discord:1152277579206774854)",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/meta.json
index a73ed7cd2f..c959c9dedc 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026, Resprited by @mishutka09(discord:1152277579206774854)",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/meta.json
index a73ed7cd2f..c959c9dedc 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026, Resprited by @mishutka09(discord:1152277579206774854)",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json
index 3f5865a361..5fd0b5b81d 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026, Resprited by @mishutka09(discord:1152277579206774854)",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json
index 3f5865a361..5fd0b5b81d 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026, Resprited by @mishutka09(discord:1152277579206774854)",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json
index 3f5865a361..5fd0b5b81d 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026, Resprited by @mishutka09(discord:1152277579206774854)",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/meta.json
index 3f5865a361..5fd0b5b81d 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026, Resprited by @mishutka09(discord:1152277579206774854)",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json
index adc032b859..55905f4fb1 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Modified from sprite taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026, Resprited by @mishutka09(discord:1152277579206774854)",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/meta.json
index f7ec4a4c9a..993507a804 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026, Resprited by @mishutka09(discord:1152277579206774854)",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json
index ceed850f7c..4305ab23b5 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d | vox version made by Kittygyat",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/meta.json
index 78d7b18b89..ec11a1e87a 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/meta.json
index 4e24b483e6..4f378508cf 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/meta.json
index 50aa75e5f8..573b5fd367 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8. lit-equipped-MASK-vox & unlit-equipped-MASK-vox states taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/meta.json
index 50aa75e5f8..573b5fd367 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8. lit-equipped-MASK-vox & unlit-equipped-MASK-vox states taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/meta.json
index a7420e3c72..770733e75a 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8",
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json
index 0d4fd176a0..f0b0300469 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d",
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/meta.json b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/meta.json
index 4820db2c63..d9fb1ce275 100644
--- a/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/meta.json
+++ b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/meta.json
@@ -26,4 +26,4 @@
             "name": "tree06"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/meta.json b/Resources/Textures/Objects/Devices/goldwatch.rsi/meta.json
index 6466438b53..66b91fb3d3 100644
--- a/Resources/Textures/Objects/Devices/goldwatch.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/goldwatch.rsi/meta.json
@@ -95,4 +95,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Devices/output.rsi/meta.json b/Resources/Textures/Objects/Devices/output.rsi/meta.json
index 500ecb8e3e..17be0b3225 100644
--- a/Resources/Textures/Objects/Devices/output.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/output.rsi/meta.json
@@ -1 +1 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/1feffb747a33434a9d28450fc52ade75253aeba5/icons/obj/aicards.dmi", "states": [{"name": "aicard", "directions": 1, "delays": [[0.4, 0.4]]}, {"name": "aicard-full", "directions": 1, "delays": [[0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4]]}, {"name": "aicard-full-unshaded", "directions": 1, "delays": [[0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4]]}, {"name": "aicard-unshaded", "directions": 1, "delays": [[0.4, 0.4]]}]}
\ No newline at end of file
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/1feffb747a33434a9d28450fc52ade75253aeba5/icons/obj/aicards.dmi", "states": [{"name": "aicard", "directions": 1, "delays": [[0.4, 0.4]]}, {"name": "aicard-full", "directions": 1, "delays": [[0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4]]}, {"name": "aicard-full-unshaded", "directions": 1, "delays": [[0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4]]}, {"name": "aicard-unshaded", "directions": 1, "delays": [[0.4, 0.4]]}]}
diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/meta.json b/Resources/Textures/Objects/Devices/securityhandy.rsi/meta.json
index 18a2d93272..2ff702f252 100644
--- a/Resources/Textures/Objects/Devices/securityhandy.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/securityhandy.rsi/meta.json
@@ -25,4 +25,4 @@
       "name": "walkietalkie-on"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Devices/signaltrigger.rsi/meta.json b/Resources/Textures/Objects/Devices/signaltrigger.rsi/meta.json
index 832264cdcf..2254d9a791 100644
--- a/Resources/Textures/Objects/Devices/signaltrigger.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/signaltrigger.rsi/meta.json
@@ -14,4 +14,4 @@
             "directions": 1
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Devices/timer.rsi/meta.json b/Resources/Textures/Objects/Devices/timer.rsi/meta.json
index acad76a3ed..3e26781903 100644
--- a/Resources/Textures/Objects/Devices/timer.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/timer.rsi/meta.json
@@ -14,4 +14,4 @@
             "directions": 1
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Devices/voice.rsi/meta.json b/Resources/Textures/Objects/Devices/voice.rsi/meta.json
index d4a4b57ddf..5910911a76 100644
--- a/Resources/Textures/Objects/Devices/voice.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/voice.rsi/meta.json
@@ -14,4 +14,4 @@
             "directions": 1
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/meta.json
index 22c3183253..fd0cebc134 100644
--- a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "Original by Visne, Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, texture by Ko4erga (discord)",
diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/meta.json
index c65f0db324..ff23c547a8 100644
--- a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, texture by Ko4erga (discord)",
diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/moonbm.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/moonbm.rsi/meta.json
index 825a83f3bc..2ef35dc30f 100644
--- a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/moonbm.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/moonbm.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "Original by Visne, Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, texture from https://github.com/vgstation-coders/vgstation13/tree/e4d3ea7f69d21c3667be12b114fa935c4640cb05",
diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/moonbm_tabletop.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/moonbm_tabletop.rsi/meta.json
index b1b3151e71..cebd1672ca 100644
--- a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/moonbm_tabletop.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/moonbm_tabletop.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, texture from https://github.com/vgstation-coders/vgstation13/tree/e4d3ea7f69d21c3667be12b114fa935c4640cb05",
diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/sandbm.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/sandbm.rsi/meta.json
index bf6c485d5d..da3403cf85 100644
--- a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/sandbm.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/sandbm.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "Original by Visne, Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, texture from https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82",
diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/sandbm_tabletop.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/sandbm_tabletop.rsi/meta.json
index ad851cfb0d..6efaf7c2e1 100644
--- a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/sandbm_tabletop.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/sandbm_tabletop.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, texture from https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82",
diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/shipbm.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/shipbm.rsi/meta.json
index 5f09a73f5b..ce977ce0dd 100644
--- a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/shipbm.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/shipbm.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "Original by Visne, Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, texture from https://opengameart.org/content/seamless-space-backgrounds",
diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/shipbm_tabletop.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/shipbm_tabletop.rsi/meta.json
index f9fc6f4745..ffbfde9036 100644
--- a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/shipbm_tabletop.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/shipbm_tabletop.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, parallax from https://opengameart.org/content/seamless-space-backgrounds",
diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/snowbm.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/snowbm.rsi/meta.json
index 14bf32524b..1811c2f008 100644
--- a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/snowbm.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/snowbm.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "Original by Visne, Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, texture from https://github.com/tgstation/tgstation/tree/8abb19545828230d92ba18827feeb42a67a55d49",
diff --git a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/snowbm_tabletop.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/snowbm_tabletop.rsi/meta.json
index 0b50ef920e..306b59e3e1 100644
--- a/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/snowbm_tabletop.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Tabletop/Battlemaps/snowbm_tabletop.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "Assembled by Just-a-Unity-Dev on GitHub or eclips_e#0001 (728101795427254312) on Discord, texture from https://github.com/tgstation/tgstation/tree/8abb19545828230d92ba18827feeb42a67a55d49",
diff --git a/Resources/Textures/Objects/Fun/Tabletop/chessboard.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/chessboard.rsi/meta.json
index 68fae6e2c2..7e5121f369 100644
--- a/Resources/Textures/Objects/Fun/Tabletop/chessboard.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Tabletop/chessboard.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "Visne",
diff --git a/Resources/Textures/Objects/Fun/Tabletop/chessboard_tabletop.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/chessboard_tabletop.rsi/meta.json
index 9b40a61dcb..8b98ad4649 100644
--- a/Resources/Textures/Objects/Fun/Tabletop/chessboard_tabletop.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Tabletop/chessboard_tabletop.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "Stanbery Trask#5343, Visne",
diff --git a/Resources/Textures/Objects/Misc/broken_bottle.rsi/meta.json b/Resources/Textures/Objects/Misc/broken_bottle.rsi/meta.json
index db0ac608ed..c3f85c4ad4 100644
--- a/Resources/Textures/Objects/Misc/broken_bottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/broken_bottle.rsi/meta.json
@@ -1 +1 @@
-{"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"}]}
diff --git a/Resources/Textures/Objects/Misc/ensnare.rsi/meta.json b/Resources/Textures/Objects/Misc/ensnare.rsi/meta.json
index 0cbe239515..d466a9b73b 100644
--- a/Resources/Textures/Objects/Misc/ensnare.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/ensnare.rsi/meta.json
@@ -12,4 +12,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Misc/ice_crust.rsi/meta.json b/Resources/Textures/Objects/Misc/ice_crust.rsi/meta.json
index 865e457e9b..49552e082b 100644
--- a/Resources/Textures/Objects/Misc/ice_crust.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/ice_crust.rsi/meta.json
@@ -11,4 +11,4 @@
       "name": "ice"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Misc/kudzu.rsi/meta.json b/Resources/Textures/Objects/Misc/kudzu.rsi/meta.json
index 33d2647c68..e58b253ada 100644
--- a/Resources/Textures/Objects/Misc/kudzu.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/kudzu.rsi/meta.json
@@ -35,4 +35,4 @@
       "name": "kudzu_11"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Misc/kudzuflower.rsi/meta.json b/Resources/Textures/Objects/Misc/kudzuflower.rsi/meta.json
index b37660be1c..8ec0ca54d3 100644
--- a/Resources/Textures/Objects/Misc/kudzuflower.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/kudzuflower.rsi/meta.json
@@ -53,4 +53,4 @@
       "name": "kudzu_11"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/meta.json b/Resources/Textures/Objects/Misc/meteor.rsi/meta.json
index 986fed4345..5596b9868f 100644
--- a/Resources/Textures/Objects/Misc/meteor.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/meteor.rsi/meta.json
@@ -1,308 +1,308 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31dd6749bfe32810c46e7913efc99a187479cd51/icons/obj/meteor.dmi. cow_pixel - taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b and modified by B_Kirill. potato by Chaoticaa (GitHub), modified by B_Kirill. clown_pixel - assembly of [Human sprite - taken from https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf ; Clown wig and mask - taken from https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e ; Clown suit - taken from https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 ; Clown shoes - taken from https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe ; Giggles von honkerton - taken from https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1] by B_Kirill.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "small",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31dd6749bfe32810c46e7913efc99a187479cd51/icons/obj/meteor.dmi. cow_pixel - taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b and modified by B_Kirill. potato by Chaoticaa (GitHub), modified by B_Kirill. clown_pixel - assembly of [Human sprite - taken from https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf ; Clown wig and mask - taken from https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e ; Clown suit - taken from https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 ; Clown shoes - taken from https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe ; Giggles von honkerton - taken from https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1] by B_Kirill.",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "small_pixel",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "small_flash",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "small_flash_pixel",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "space_dust"
-    },
-    {
-      "name": "medium",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "medium_pixel",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "medium_piercing",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "medium_piercing_pixel",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "medium_radioactive",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "medium_radioactive_pixel",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "big",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "big_pixel",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "big_cluster",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "big_cluster_pixel",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "human",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "human_pixel",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "firework_pixel"
-    },
-    {
-      "name": "firework"
-    },
-    {
-      "name": "cow_pixel",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "clown_pixel",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "potato",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
+    "states": [
+        {
+            "name": "small",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "small_pixel",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "small_flash",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "small_flash_pixel",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "space_dust"
+        },
+        {
+            "name": "medium",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "medium_pixel",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "medium_piercing",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "medium_piercing_pixel",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "medium_radioactive",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "medium_radioactive_pixel",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "big",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "big_pixel",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "big_cluster",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "big_cluster_pixel",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "human",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "human_pixel",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "firework_pixel"
+        },
+        {
+            "name": "firework"
+        },
+        {
+            "name": "cow_pixel",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "clown_pixel",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "potato",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Misc/photograph.rsi/meta.json b/Resources/Textures/Objects/Misc/photograph.rsi/meta.json
index a76a07d169..f0b5176c40 100644
--- a/Resources/Textures/Objects/Misc/photograph.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/photograph.rsi/meta.json
@@ -1,32 +1,40 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by ketufaispikinut (Github)",
+    "copyright": "Made by ketufaispikinut (Github). Inhands by whatston3 (Github)",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-        "name": "black"
+            "name": "black"
         },
         {
-        "name": "red"
+            "name": "red"
         },
         {
-        "name": "blue"
+            "name": "blue"
         },
         {
-        "name": "green"
+            "name": "green"
         },
         {
-        "name": "yellow"
+            "name": "yellow"
         },
         {
-        "name": "purple"
+            "name": "purple"
         },
         {
-        "name": "rainbow"
+            "name": "rainbow"
+        },
+        {
+            "name": "paper-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "paper-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Misc/photograph.rsi/paper-inhand-left.png b/Resources/Textures/Objects/Misc/photograph.rsi/paper-inhand-left.png
new file mode 100644
index 0000000000..2dc05baac7
Binary files /dev/null and b/Resources/Textures/Objects/Misc/photograph.rsi/paper-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/photograph.rsi/paper-inhand-right.png b/Resources/Textures/Objects/Misc/photograph.rsi/paper-inhand-right.png
new file mode 100644
index 0000000000..3ec584c65e
Binary files /dev/null and b/Resources/Textures/Objects/Misc/photograph.rsi/paper-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/sample_tubes.rsi/meta.json b/Resources/Textures/Objects/Misc/sample_tubes.rsi/meta.json
index 8b343b4cfe..8ac8c3d34a 100644
--- a/Resources/Textures/Objects/Misc/sample_tubes.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/sample_tubes.rsi/meta.json
@@ -26,4 +26,4 @@
       "name": "reinforcer"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Misc/spaceshroom.rsi/meta.json b/Resources/Textures/Objects/Misc/spaceshroom.rsi/meta.json
index 46d9ba04e4..25a45134b4 100644
--- a/Resources/Textures/Objects/Misc/spaceshroom.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/spaceshroom.rsi/meta.json
@@ -17,4 +17,4 @@
             "name": "structure"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Specific/Chapel/chaplainurn.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/chaplainurn.rsi/meta.json
index a257cbc7dc..c4cd544acb 100644
--- a/Resources/Textures/Objects/Specific/Chapel/chaplainurn.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chapel/chaplainurn.rsi/meta.json
@@ -19,4 +19,4 @@
         "directions": 4
       }
     ]
-  }
\ No newline at end of file
+  }
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json
index caf82f33ed..b4c2afbba3 100644
--- a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json
@@ -37,4 +37,4 @@
       "name": "invoice"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/empty.png b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/empty.png
new file mode 100644
index 0000000000..7244b37f5c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/empty.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/meta.json
index 1192d1a208..c998357ae3 100644
--- a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/meta.json
@@ -1,82 +1,56 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/cf45322c7ee16f9d7e43d5260daf24ceb77c1b25",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "mmi_icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "mmi textures made by Marum (https://github.com/marianolarre). Posibrain taken from tgstation at https://github.com/tgstation/tgstation/commit/cf45322c7ee16f9d7e43d5260daf24ceb77c1b25, posibrain-*/mmi-on/mmi-light edited by whatston3",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "mmi_off"
-    },
-    {
-      "name": "mmi_alive"
-    },
-    {
-      "name": "mmi_dead"
-    },
-    {
-      "name": "mmi_brain"
-    },
-    {
-      "name": "mmi_brain_alien"
-    },
-    {
-      "name": "posibrain"
-    },
-    {
-      "name": "posibrain-occupied",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "posibrain-searching",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
+    "states": [
+        {
+            "name": "empty"
+        },
+        {
+            "name": "mmi_icon"
+        },
+        {
+            "name": "mmi_off"
+        },
+        {
+            "name": "mmi_on"
+        },
+        {
+            "name": "mmi_brain"
+        },
+        {
+            "name": "mmi_brain_alien"
+        },
+        {
+            "name": "mmi_light"
+        },
+        {
+            "name": "posibrain"
+        },
+        {
+            "name": "posibrain-occupied",
+            "delays": [
+                [
+                    0.1, 0.1, 0.1, 0.1,
+                    0.1, 0.1, 0.1, 0.1,
+                    0.2, 0.1, 0.1, 0.1,
+                    0.1, 0.1, 0.1, 0.1,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "posibrain-searching",
+            "delays": [
+                [
+                    0.7, 0.1, 0.1, 0.1,
+                    0.3, 0.1, 0.1, 0.1
+                ]
+            ]
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_alive.png b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_alive.png
deleted file mode 100644
index 2732c5a291..0000000000
Binary files a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_alive.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_brain.png b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_brain.png
index 9cb6c2d86e..e65342a38c 100644
Binary files a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_brain.png and b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_brain.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_brain_alien.png b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_brain_alien.png
index 185825cdf7..80c9039aca 100644
Binary files a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_brain_alien.png and b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_brain_alien.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_dead.png b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_dead.png
deleted file mode 100644
index 8e345f8759..0000000000
Binary files a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_dead.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_icon.png b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_icon.png
index e109ee0f31..5efab74dca 100644
Binary files a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_icon.png and b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_light.png b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_light.png
new file mode 100644
index 0000000000..eb563b4680
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_light.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_off.png b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_off.png
index b5d0ebcf25..9ac9223c77 100644
Binary files a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_off.png and b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_off.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_on.png b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_on.png
new file mode 100644
index 0000000000..d93b3205dd
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/mmi_on.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/posibrain-occupied.png b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/posibrain-occupied.png
index c4ea2b8177..2fdd54f8c9 100644
Binary files a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/posibrain-occupied.png and b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/posibrain-occupied.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/posibrain-searching.png b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/posibrain-searching.png
index 026a2bc7c5..f0b62a41ba 100644
Binary files a/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/posibrain-searching.png and b/Resources/Textures/Objects/Specific/Robotics/mmi.rsi/posibrain-searching.png differ
diff --git a/Resources/Textures/Objects/Specific/Security/barrier.rsi/meta.json b/Resources/Textures/Objects/Specific/Security/barrier.rsi/meta.json
index 5cd7cffb03..51fc6ca9e8 100644
--- a/Resources/Textures/Objects/Specific/Security/barrier.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Security/barrier.rsi/meta.json
@@ -23,4 +23,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/meta.json b/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/meta.json
index 0ec31e402a..dbdfdce292 100644
--- a/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/meta.json
@@ -19,4 +19,4 @@
 		  "directions": 4
 		}
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Storage/medalcase.rsi/meta.json b/Resources/Textures/Objects/Storage/medalcase.rsi/meta.json
index 8c9647fc3e..aac2440dcd 100644
--- a/Resources/Textures/Objects/Storage/medalcase.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/medalcase.rsi/meta.json
@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from Beestation-Hornet at https://github.com/BeeStation/BeeStation-Hornet/commit/d06dde90f7bb6e6ba1b4a34bcc2a4624dbb1518c, modified by ps3moira (github)",
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-plastic.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-plastic.png
new file mode 100644
index 0000000000..7435d88131
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-plastic.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
index 5bfa221ab5..6c8dea1a92 100644
--- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
+++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional attributions available in the Resources/Textures/Tiles/attributions.yml file. Ice tile and Snow tile modifications, Astreroid tile and in-hands created by Southbridge-fur (github), Astro-asteroid by kosticia (Github), Ironsands concrete variants modified from other concrete and inhands modified from generic inhands by SeaWyrm (github Aearo-Deepwater)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional attributions available in the Resources/Textures/Tiles/attributions.yml file. Ice tile and Snow tile modifications, Astreroid tile and in-hands created by Southbridge-fur (github), Astro-asteroid by kosticia (Github), Ironsands concrete variants modified from other concrete and inhands modified from generic inhands by SeaWyrm (github Aearo-Deepwater), *-plastic edited by whatston3",
   "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional attributions available in the Resources/Textures/Tiles/attributions.yml file. Ice tile and Snow tile modifications, Astreroid tile and in-hands created by Southbridge-fur (github) | some icons resprited by @mishutka09 (discord: 1152277579206774854)",
     "size": {
         "x": 32,
@@ -41,6 +41,9 @@
         {
             "name": "dark-offset"
         },
+        {
+            "name": "dark-plastic"
+        },
         {
             "name": "desertsand"
         },
@@ -276,6 +279,9 @@
         {
             "name": "steel-horizontal-slats"
         },
+        {
+            "name": "steel-plastic"
+        },
         {
             "name": "silver"
         },
@@ -318,6 +324,9 @@
         {
             "name": "white-pavement-vertical"
         },
+        {
+            "name": "white-plastic"
+        },
         {
             "name": "monofloor"
         },
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-plastic.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-plastic.png
new file mode 100644
index 0000000000..15372842c2
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-plastic.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-plastic.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-plastic.png
new file mode 100644
index 0000000000..93c504f2de
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-plastic.png differ
diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json
index 6f91126877..e6723a6444 100644
--- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json
@@ -22,4 +22,4 @@
         "name": "icon-open"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json
index 4080552023..becb302333 100644
--- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json
@@ -66,4 +66,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json
index 6f91126877..e6723a6444 100644
--- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json
@@ -22,4 +22,4 @@
         "name": "icon-open"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json
index 6f91126877..e6723a6444 100644
--- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json
@@ -22,4 +22,4 @@
         "name": "icon-open"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/meta.json
index 12106394eb..068495fb27 100644
--- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/meta.json
@@ -19,4 +19,4 @@
       "name": "icon"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json
index 6f91126877..e6723a6444 100644
--- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json
@@ -22,4 +22,4 @@
         "name": "icon-open"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Tools/fulton_balloon.rsi/meta.json b/Resources/Textures/Objects/Tools/fulton_balloon.rsi/meta.json
index 36df097eb4..7a483993b9 100644
--- a/Resources/Textures/Objects/Tools/fulton_balloon.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/fulton_balloon.rsi/meta.json
@@ -22,4 +22,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Vehicles/motorbike.rsi/meta.json b/Resources/Textures/Objects/Vehicles/motorbike.rsi/meta.json
index 33f642dd76..62aabe908a 100644
--- a/Resources/Textures/Objects/Vehicles/motorbike.rsi/meta.json
+++ b/Resources/Textures/Objects/Vehicles/motorbike.rsi/meta.json
@@ -15,4 +15,4 @@
       "name": "keys"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Effects/meta.json b/Resources/Textures/Objects/Weapons/Effects/meta.json
index 408eccd3f8..99810b7014 100644
--- a/Resources/Textures/Objects/Weapons/Effects/meta.json
+++ b/Resources/Textures/Objects/Weapons/Effects/meta.json
@@ -22,4 +22,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi/meta.json
index 632f148dc6..af362ad53a 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi/meta.json
@@ -14,4 +14,4 @@
             "name": "base-spent"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/rocket_shell.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/rocket_shell.rsi/meta.json
index eb5f2da45c..d1b38434cb 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/rocket_shell.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/rocket_shell.rsi/meta.json
@@ -11,4 +11,4 @@
             "name": "base"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/pk_box.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/pk_box.rsi/meta.json
index ce835dbd9f..ead16b8ad0 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/pk_box.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/pk_box.rsi/meta.json
@@ -32,4 +32,4 @@
             "name": "mag-7"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/meta.json
index a8510801f8..a5edb3afe4 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/meta.json
@@ -530,4 +530,4 @@
       "name": "nothing-unshaded"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/meta.json
index 3b1547beb7..9f297bde4f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/meta.json
@@ -78,4 +78,4 @@
 			"directions": 4
 		}
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/icon.png
new file mode 100644
index 0000000000..6856a37574
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/meta.json
index 6322804e10..0cddf5e7cc 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/meta.json
@@ -10,6 +10,9 @@
         {
             "name": "base"
         },
+        {
+            "name": "icon"
+        },
         {
             "name": "mag-unshaded-4"
         },
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/meta.json
index bd0b6c0b4a..2b4b762ca2 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/meta.json
@@ -78,4 +78,4 @@
 			"directions": 4
 		}
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/meta.json
index c591453e1c..9bdcbea1a6 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/meta.json
@@ -40,4 +40,4 @@
             "name": "mag-unshaded-4"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Cannons/syringe_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Cannons/syringe_gun.rsi/meta.json
index dae584eb81..c1d454e0ec 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Cannons/syringe_gun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Cannons/syringe_gun.rsi/meta.json
@@ -19,4 +19,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/force_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/force_gun.rsi/meta.json
index 66511d0404..9b21bd1e1f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Launchers/force_gun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/force_gun.rsi/meta.json
@@ -30,4 +30,4 @@
             "directions": 4
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json
index 8f0a2fed6e..bcccc7a561 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json
@@ -37,4 +37,4 @@
       "directions": 4
     }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/tether_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/tether_gun.rsi/meta.json
index 4d8baad4cf..90da0b9573 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Launchers/tether_gun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/tether_gun.rsi/meta.json
@@ -30,4 +30,4 @@
             "directions": 4
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/meta.json
index d42d64964d..7c2c9abe17 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/meta.json
@@ -139,4 +139,4 @@
       "name": "cryoshot"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/meteor.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/meteor.rsi/meta.json
index 86a5b835c6..458a44a86f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/meteor.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/meteor.rsi/meta.json
@@ -12,4 +12,4 @@
       }
     ]
   }
-  
\ No newline at end of file
+  
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/water_shot.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/water_shot.rsi/meta.json
index a7b69027d8..d9b9aa1361 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/water_shot.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/water_shot.rsi/meta.json
@@ -11,4 +11,4 @@
       "name": "icon"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi/meta.json
index 91ba946a6d..3e99c62878 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi/meta.json
@@ -11,4 +11,4 @@
       "name": "xeno_toxic"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json
index 211d71bf1f..e02409519d 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json
@@ -25,4 +25,4 @@
       "name": "ishotgunstep2"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shuttles/laser.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shuttles/laser.rsi/meta.json
index 3760eca2c2..e96ad71b29 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shuttles/laser.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shuttles/laser.rsi/meta.json
@@ -104,4 +104,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json
index 43f600b580..4686afa13f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json
@@ -19,4 +19,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json
index b0f1b27c24..dfb10fde50 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json
@@ -27,4 +27,4 @@
       "name": "base"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/meta.json
index bb15156565..e41d098cbe 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/meta.json
@@ -91,4 +91,4 @@
       "name": "panel"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/meta.json
index 2cd1e9ecb6..f43c2ccd56 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/meta.json
@@ -23,4 +23,4 @@
       "directions": 8
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json
index 3adb37ea5c..d897db0280 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json
@@ -62,4 +62,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Decoration/decorated_fir_tree.rsi/meta.json b/Resources/Textures/Structures/Decoration/decorated_fir_tree.rsi/meta.json
index ba4b535f1a..ca593158e0 100644
--- a/Resources/Textures/Structures/Decoration/decorated_fir_tree.rsi/meta.json
+++ b/Resources/Textures/Structures/Decoration/decorated_fir_tree.rsi/meta.json
@@ -25,4 +25,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Decoration/showcase.rsi/meta.json b/Resources/Textures/Structures/Decoration/showcase.rsi/meta.json
index 855b519aec..c8cffe56eb 100644
--- a/Resources/Textures/Structures/Decoration/showcase.rsi/meta.json
+++ b/Resources/Textures/Structures/Decoration/showcase.rsi/meta.json
@@ -26,4 +26,4 @@
       "name": "showcase_4"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Doors/MaterialDoors/web-door.rsi/opening.png b/Resources/Textures/Structures/Doors/MaterialDoors/web-door.rsi/opening.png
index 4688b8772c..79c4cf3ef0 100644
Binary files a/Resources/Textures/Structures/Doors/MaterialDoors/web-door.rsi/opening.png and b/Resources/Textures/Structures/Doors/MaterialDoors/web-door.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/meta.json
index 4ef0681ba6..98c462fe80 100644
--- a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/meta.json
+++ b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/meta.json
@@ -160,4 +160,4 @@
 	  ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json b/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json
index 1f7049dfbe..1f5976bc60 100644
--- a/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json
+++ b/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json
@@ -29,4 +29,4 @@
       "name": "dresser"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Holo/field.rsi/meta.json b/Resources/Textures/Structures/Holo/field.rsi/meta.json
index 614861a16b..0d54915e48 100644
--- a/Resources/Textures/Structures/Holo/field.rsi/meta.json
+++ b/Resources/Textures/Structures/Holo/field.rsi/meta.json
@@ -23,4 +23,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/meta.json
index 2b5f49cda1..93bccb9785 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/meta.json
@@ -30,4 +30,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/meta.json
index d3f202239c..df60750bfd 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/meta.json
@@ -36,4 +36,4 @@
       "name": "panel"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Machines/anomaly_sync.rsi/meta.json b/Resources/Textures/Structures/Machines/anomaly_sync.rsi/meta.json
index 1a8f1a82ec..98461e1e61 100644
--- a/Resources/Textures/Structures/Machines/anomaly_sync.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/anomaly_sync.rsi/meta.json
@@ -35,4 +35,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Machines/biofabricator.rsi/meta.json b/Resources/Textures/Structures/Machines/biofabricator.rsi/meta.json
index b6aa4d4990..44d01160da 100644
--- a/Resources/Textures/Structures/Machines/biofabricator.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/biofabricator.rsi/meta.json
@@ -1,56 +1,57 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/338c826d1c3172eecd86d8430608669543dce0cc",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/338c826d1c3172eecd86d8430608669543dce0cc",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "panel"
-    },
-    {
-      "name": "unlit",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "building",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "inserting",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "panel"
+        },
+        {
+            "name": "unlit",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "building",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "inserting",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
 }
diff --git a/Resources/Textures/Structures/Machines/biofabricator.rsi/unlit.png b/Resources/Textures/Structures/Machines/biofabricator.rsi/unlit.png
index 10cb435877..4ac908b9ef 100644
Binary files a/Resources/Textures/Structures/Machines/biofabricator.rsi/unlit.png and b/Resources/Textures/Structures/Machines/biofabricator.rsi/unlit.png differ
diff --git a/Resources/Textures/Structures/Machines/exosuit_fabricator.rsi/meta.json b/Resources/Textures/Structures/Machines/exosuit_fabricator.rsi/meta.json
index f0ad6d92af..5201551e78 100644
--- a/Resources/Textures/Structures/Machines/exosuit_fabricator.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/exosuit_fabricator.rsi/meta.json
@@ -59,4 +59,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Machines/fat_sucker.rsi/meta.json b/Resources/Textures/Structures/Machines/fat_sucker.rsi/meta.json
index cfb3d15960..08c7468d10 100644
--- a/Resources/Textures/Structures/Machines/fat_sucker.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/fat_sucker.rsi/meta.json
@@ -47,4 +47,4 @@
       "name": "fat_panel"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json b/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json
index f6be26dbc5..1af0d1c094 100644
--- a/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json
@@ -130,4 +130,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Machines/grinder.rsi/meta.json b/Resources/Textures/Structures/Machines/grinder.rsi/meta.json
index 9b9ed1dbe9..f373508a29 100644
--- a/Resources/Textures/Structures/Machines/grinder.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/grinder.rsi/meta.json
@@ -14,4 +14,4 @@
             "name":"grinder_beaker_attached"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Machines/holopad.rsi/meta.json b/Resources/Textures/Structures/Machines/holopad.rsi/meta.json
index b7601b19c1..4b85a103a3 100644
--- a/Resources/Textures/Structures/Machines/holopad.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/holopad.rsi/meta.json
@@ -97,4 +97,4 @@
       ]
     }	
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Machines/jukebox.rsi/meta.json b/Resources/Textures/Structures/Machines/jukebox.rsi/meta.json
index f447b26ddf..81a5974380 100644
--- a/Resources/Textures/Structures/Machines/jukebox.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/jukebox.rsi/meta.json
@@ -28,4 +28,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Machines/sheetifier.rsi/meta.json b/Resources/Textures/Structures/Machines/sheetifier.rsi/meta.json
index d812ec569a..9ff36df067 100644
--- a/Resources/Textures/Structures/Machines/sheetifier.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/sheetifier.rsi/meta.json
@@ -85,4 +85,4 @@
       "name": "buttons_on"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Magic/Cult/rune.rsi/meta.json b/Resources/Textures/Structures/Magic/Cult/rune.rsi/meta.json
index 182c0b5afc..02d19c6002 100644
--- a/Resources/Textures/Structures/Magic/Cult/rune.rsi/meta.json
+++ b/Resources/Textures/Structures/Magic/Cult/rune.rsi/meta.json
@@ -29,4 +29,4 @@
       "name": "cult7"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Magic/Cult/trap.rsi/meta.json b/Resources/Textures/Structures/Magic/Cult/trap.rsi/meta.json
index fb18bcc7bc..f004d987fa 100644
--- a/Resources/Textures/Structures/Magic/Cult/trap.rsi/meta.json
+++ b/Resources/Textures/Structures/Magic/Cult/trap.rsi/meta.json
@@ -11,4 +11,4 @@
       "name": "trap"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Magic/forcewall.rsi/meta.json b/Resources/Textures/Structures/Magic/forcewall.rsi/meta.json
index 56a718f9e4..8e30edb5b2 100644
--- a/Resources/Textures/Structures/Magic/forcewall.rsi/meta.json
+++ b/Resources/Textures/Structures/Magic/forcewall.rsi/meta.json
@@ -26,4 +26,4 @@
       "name": "forcewall"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/meta.json
index d8bdbb7c58..7eb3c3055e 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/meta.json
@@ -1 +1 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b9982f69706135ceea703817586128b298cbf5e5", "states": [{"name": "broken", "directions": 1, "delays": [[0.5, 0.1, 0.3, 0.1]]}, {"name": "miner", "directions": 1, "delays": [[1.0]]}, {"name": "on", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1]]}]}
\ No newline at end of file
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b9982f69706135ceea703817586128b298cbf5e5", "states": [{"name": "broken", "directions": 1, "delays": [[0.5, 0.1, 0.3, 0.1]]}, {"name": "miner", "directions": 1, "delays": [[1.0]]}, {"name": "on", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1]]}]}
diff --git a/Resources/Textures/Structures/Piping/high_pressure_machine_frame.rsi/meta.json b/Resources/Textures/Structures/Piping/high_pressure_machine_frame.rsi/meta.json
index 25924fea0f..e9bccaf235 100644
--- a/Resources/Textures/Structures/Piping/high_pressure_machine_frame.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/high_pressure_machine_frame.rsi/meta.json
@@ -1 +1 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Julian Giebel <juliangiebel@live.de>", "states": [{"name": "frame", "directions": 1, "delays": [[1.0]]}, {"name": "frame_cables", "directions": 1, "delays": [[1.0]]}, {"name": "frame_electronics", "directions": 1, "delays": [[1.0]]}, {"name": "frame_inlet", "directions": 1, "delays": [[1.0]]}, {"name": "frame_outlet", "directions": 1, "delays": [[1.0]]}, {"name": "frame_unit", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Julian Giebel <juliangiebel@live.de>", "states": [{"name": "frame", "directions": 1, "delays": [[1.0]]}, {"name": "frame_cables", "directions": 1, "delays": [[1.0]]}, {"name": "frame_electronics", "directions": 1, "delays": [[1.0]]}, {"name": "frame_inlet", "directions": 1, "delays": [[1.0]]}, {"name": "frame_outlet", "directions": 1, "delays": [[1.0]]}, {"name": "frame_unit", "directions": 1, "delays": [[1.0]]}]}
diff --git a/Resources/Textures/Structures/Power/Generation/Tesla/coil.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Tesla/coil.rsi/meta.json
index d0a620f16b..15d5e7fa4c 100644
--- a/Resources/Textures/Structures/Power/Generation/Tesla/coil.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/Generation/Tesla/coil.rsi/meta.json
@@ -39,4 +39,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Power/Generation/Tesla/energy_ball.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Tesla/energy_ball.rsi/meta.json
index 8519efeec0..62ab86c977 100644
--- a/Resources/Textures/Structures/Power/Generation/Tesla/energy_ball.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/Generation/Tesla/energy_ball.rsi/meta.json
@@ -46,4 +46,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Power/Generation/Tesla/generator.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Tesla/generator.rsi/meta.json
index cd32288585..3f7e4598d7 100644
--- a/Resources/Textures/Structures/Power/Generation/Tesla/generator.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/Generation/Tesla/generator.rsi/meta.json
@@ -11,4 +11,4 @@
       "name": "icon"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/teg.rsi/meta.json
index b14f15b579..a7f45d6956 100644
--- a/Resources/Textures/Structures/Power/Generation/teg.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/Generation/teg.rsi/meta.json
@@ -279,4 +279,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Power/cable_terminal.rsi/meta.json b/Resources/Textures/Structures/Power/cable_terminal.rsi/meta.json
index 5344175985..ede9f57a57 100644
--- a/Resources/Textures/Structures/Power/cable_terminal.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/cable_terminal.rsi/meta.json
@@ -29,4 +29,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Shuttles/gyroscope.rsi/meta.json b/Resources/Textures/Structures/Shuttles/gyroscope.rsi/meta.json
index 31ef28fa6b..f1affa4d9d 100644
--- a/Resources/Textures/Structures/Shuttles/gyroscope.rsi/meta.json
+++ b/Resources/Textures/Structures/Shuttles/gyroscope.rsi/meta.json
@@ -40,4 +40,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Shuttles/iff.rsi/meta.json b/Resources/Textures/Structures/Shuttles/iff.rsi/meta.json
index f4525a5d57..3cb696c8f4 100644
--- a/Resources/Textures/Structures/Shuttles/iff.rsi/meta.json
+++ b/Resources/Textures/Structures/Shuttles/iff.rsi/meta.json
@@ -30,4 +30,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/meta.json b/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/meta.json
index 4f02c929a9..8419980a6a 100644
--- a/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/meta.json
+++ b/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/meta.json
@@ -31,4 +31,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Specific/Anomalies/tech_anom.rsi/meta.json b/Resources/Textures/Structures/Specific/Anomalies/tech_anom.rsi/meta.json
index 26360487fd..77e41ad2f4 100644
--- a/Resources/Textures/Structures/Specific/Anomalies/tech_anom.rsi/meta.json
+++ b/Resources/Textures/Structures/Specific/Anomalies/tech_anom.rsi/meta.json
@@ -87,4 +87,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Specific/xeno_building.rsi/meta.json b/Resources/Textures/Structures/Specific/xeno_building.rsi/meta.json
index c4a1b417ae..c0076b64e6 100644
--- a/Resources/Textures/Structures/Specific/xeno_building.rsi/meta.json
+++ b/Resources/Textures/Structures/Specific/xeno_building.rsi/meta.json
@@ -24,4 +24,4 @@
       "directions": 1
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Storage/Crates/artifact.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/artifact.rsi/meta.json
index 1a535ab97c..8849155557 100644
--- a/Resources/Textures/Structures/Storage/Crates/artifact.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/artifact.rsi/meta.json
@@ -41,4 +41,4 @@
       "name": "invoice"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Storage/Crates/livestock.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/meta.json
index c9fe6b551c..5f2cc2fb06 100644
--- a/Resources/Textures/Structures/Storage/Crates/livestock.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/meta.json
@@ -17,4 +17,4 @@
       "name": "open"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/meta.json
index cfd113efd3..83b032f23d 100644
--- a/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/meta.json
@@ -36,4 +36,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Storage/Crates/toybox.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/toybox.rsi/meta.json
index 9c0d876c50..1fed56c2e9 100644
--- a/Resources/Textures/Structures/Storage/Crates/toybox.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/toybox.rsi/meta.json
@@ -49,4 +49,4 @@
       "name": "invoice"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json
index a3fb20976e..21bff0953f 100644
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json
@@ -44,4 +44,4 @@
       "name": "chem-6"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json
index 79e0904dd9..69bf848da8 100644
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json
@@ -50,4 +50,4 @@
       "name": "bar-12"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json
index 2daba51b6c..d67284f9cc 100644
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json
@@ -50,4 +50,4 @@
       "name": "kitchen-12"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json
index 544b43a1e8..e3ef599cee 100644
--- a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json
@@ -26,4 +26,4 @@
       "name": "open"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json
index 544b43a1e8..e3ef599cee 100644
--- a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json
@@ -26,4 +26,4 @@
       "name": "open"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json
index 544b43a1e8..e3ef599cee 100644
--- a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json
@@ -26,4 +26,4 @@
       "name": "open"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Storage/orebox.rsi/meta.json b/Resources/Textures/Structures/Storage/orebox.rsi/meta.json
index e24ab0f25d..f369a00881 100644
--- a/Resources/Textures/Structures/Storage/orebox.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/orebox.rsi/meta.json
@@ -14,4 +14,4 @@
       "name": "orebox-top"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/meta.json
index fc03198977..35064119c7 100644
--- a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/meta.json
@@ -47,4 +47,4 @@
       "name": "cabinet-filled-open"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Walls/random.rsi/meta.json b/Resources/Textures/Structures/Walls/random.rsi/meta.json
index 86b21c8308..a95e1b3cef 100644
--- a/Resources/Textures/Structures/Walls/random.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/random.rsi/meta.json
@@ -11,4 +11,4 @@
       "name": "randomgrille"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/barricades.rsi/meta.json b/Resources/Textures/Structures/barricades.rsi/meta.json
index 367f94de64..0c295042a7 100644
--- a/Resources/Textures/Structures/barricades.rsi/meta.json
+++ b/Resources/Textures/Structures/barricades.rsi/meta.json
@@ -20,4 +20,4 @@
 	  "directions": 4
 	}
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/cryostorage.rsi/meta.json b/Resources/Textures/Structures/cryostorage.rsi/meta.json
index 24426d5b81..d89767ae50 100644
--- a/Resources/Textures/Structures/cryostorage.rsi/meta.json
+++ b/Resources/Textures/Structures/cryostorage.rsi/meta.json
@@ -42,4 +42,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/meta.json b/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/meta.json
index 185ed3fad9..b0b93cde42 100644
--- a/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/meta.json
+++ b/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/meta.json
@@ -46,4 +46,4 @@
       "name": "chasm"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/meta.json b/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/meta.json
index e303031e1f..66fcf54138 100644
--- a/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/meta.json
+++ b/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/meta.json
@@ -46,4 +46,4 @@
       "name": "chasm"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/meta.json b/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/meta.json
index e303031e1f..66fcf54138 100644
--- a/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/meta.json
+++ b/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/meta.json
@@ -46,4 +46,4 @@
       "name": "chasm"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/meta.json b/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/meta.json
index e303031e1f..66fcf54138 100644
--- a/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/meta.json
+++ b/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/meta.json
@@ -46,4 +46,4 @@
       "name": "chasm"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Tiles/Planet/attributions.yml b/Resources/Textures/Tiles/Planet/attributions.yml
index f85b983186..267c83585b 100644
--- a/Resources/Textures/Tiles/Planet/attributions.yml
+++ b/Resources/Textures/Tiles/Planet/attributions.yml
@@ -1,4 +1,4 @@
 - files: ["basalt.png"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from tgstation"
-  source: "https://github.com/tgstation/tgstation/tree/423404b31e36c4605faacec881b324db8997b0a6"
\ No newline at end of file
+  source: "https://github.com/tgstation/tgstation/tree/423404b31e36c4605faacec881b324db8997b0a6"
diff --git a/Resources/Textures/Tiles/Planet/basalt.rsi/meta.json b/Resources/Textures/Tiles/Planet/basalt.rsi/meta.json
index a16b6d3fb6..1cd71f8d85 100644
--- a/Resources/Textures/Tiles/Planet/basalt.rsi/meta.json
+++ b/Resources/Textures/Tiles/Planet/basalt.rsi/meta.json
@@ -63,4 +63,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Tiles/Planet/lava.rsi/meta.json b/Resources/Textures/Tiles/Planet/lava.rsi/meta.json
index d4d7e14afc..d6de6fe12c 100644
--- a/Resources/Textures/Tiles/Planet/lava.rsi/meta.json
+++ b/Resources/Textures/Tiles/Planet/lava.rsi/meta.json
@@ -262,4 +262,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/meta.json b/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/meta.json
index 0d71d4b561..0a9059d488 100644
--- a/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/meta.json
+++ b/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/meta.json
@@ -63,4 +63,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/deprecated.rsi/meta.json b/Resources/Textures/deprecated.rsi/meta.json
index 74f824ade7..e8a2fbde5c 100644
--- a/Resources/Textures/deprecated.rsi/meta.json
+++ b/Resources/Textures/deprecated.rsi/meta.json
@@ -11,4 +11,4 @@
             "name": "deprecated"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index dc8b425481..44cbc5d39d 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -1,4 +1,4 @@
-version: 1 # Not used right now, whatever.
+version: 1 # Not used right now, whatever.
 binds:
 - function: UIClick
   type: State
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 577e759300..2ecda02954 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -1190,7 +1190,13 @@ DrinkNeurotoxinGlass: null
 FloorAzureWaterEntity: FloorWaterEntity
 XenoborgModuleFireExtinguisher: BorgModuleFireExtinguisher
 LightReplacerEmpty: LightReplacer
+ArmBlade: Armblade # https://github.com/space-wizards/space-station-14/pull/45724/
 
 #2026-08-19
 JanitorServiceLight: null
 
+#2026-08-31
+DrinkWaterJug: JugWater
+
+#2026-09-05
+AsimovCircuitBoard: CrewsimovCircuitBoard
diff --git a/Resources/toolshedEngineCommandPerms.yml b/Resources/toolshedEngineCommandPerms.yml
index 476676ac54..7f61ecd038 100644
--- a/Resources/toolshedEngineCommandPerms.yml
+++ b/Resources/toolshedEngineCommandPerms.yml
@@ -1,4 +1,4 @@
-- Flags: QUERY
+- Flags: QUERY
   Commands:
     - entities
     - nearby
diff --git a/RobustToolbox b/RobustToolbox
index edf061e745..fee0dd647e 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit edf061e7450a4074f173e3000bf1552b6f54082f
+Subproject commit fee0dd647ebe95ad62d8945440450fb6cd4749a7